From 4788070d4872fbba66287ccdbc9187d18784405c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 09:10:53 +0800 Subject: [PATCH 1/6] pantheon.epiphany: remove fixme They are fixing the tab styling issues on their GTK theme and no actual things to do here. --- pkgs/desktops/gnome/core/epiphany/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 3f25e303dc1e0..6f673d632267b 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { patches = lib.optionals withPantheon [ # https://github.com/elementary/browser - # FIXME: Update the patches when https://github.com/elementary/browser/pull/41 merged ./dark-style.patch ./navigation-buttons.patch ]; From 8ffb81729cf77922703aa2f1a4b6e83ee8ff4fdb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 09:15:48 +0800 Subject: [PATCH 2/6] pantheon.sideload: 6.0.1 -> 6.0.2 --- pkgs/desktops/pantheon/apps/sideload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index fad1186578cf3..df152afc1a0c8 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sideload"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0mwcaayzcm5pjcwdd61can93y66jiz4wyz9wr8j5fbns5hbk3z5m"; + sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9"; }; passthru = { From ab0b955aa9f28b42f1d4481ac423c0fa22301f6c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 09:19:49 +0800 Subject: [PATCH 3/6] pantheon.elementary-greeter: 6.0.0 -> 6.0.1 --- .../pantheon/desktop/elementary-greeter/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 86b71ab49930e..f68898239aad9 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "6.0.0"; + version = "6.0.1"; repoName = "greeter"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1ny1003bbpdscc4kr2d94zc5vxm30y64dpj3fpd5zz2p2g0cq2h9"; + sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq"; }; passthru = { @@ -89,12 +89,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/greeter/pull/545 - (fetchpatch { - url = "https://github.com/elementary/greeter/commit/d1373a7db827bc753bfcd70d0c8f25460ea9f1de.patch"; - sha256 = "0s8l7ycd2s307d3dh1p4vdk33dbzjzqwxs6msyb9w0ycfyxlwdvp"; - }) ./sysconfdir-install.patch # Needed until https://github.com/elementary/greeter/issues/360 is fixed (substituteAll { From 3984a1898379ff3492dfa1f75c534944fd35cd54 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 09:22:06 +0800 Subject: [PATCH 4/6] pantheon.elementary-calendar: 6.0.1 -> 6.0.2 --- pkgs/desktops/pantheon/apps/elementary-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 6afd44018314a..549493966c132 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "6.0.1"; + version = "6.0.2"; repoName = "calendar"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1caxc42jrys5s4x9qai5wdpcwpkmyvnqx9z75974g7swiz1lrzq6"; + sha256 = "16xp8gfgpyz9xpjsxm6jlk4skkknj65g0q4x0qvw9sg9f1p6a514"; }; passthru = { From 6c6ad98728ca12fa4091d0dfb2d80314defece77 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 09:24:06 +0800 Subject: [PATCH 5/6] pantheon.switchboard-plug-keyboard: 2.5.0 -> 2.5.1 --- .../apps/switchboard-plugs/keyboard/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index d8023a1bf37cd..26476d4fe0a6e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -21,22 +21,16 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1nsy9fh6qj5kyg22bs1hm6kpsvarwc63q0hl0nbwymvnhfjf6swp"; + sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y"; }; patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-keyboard/pull/377 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6d8bcadba05b4ee1115b891448b0de31bcba3749.patch"; - sha256 = "1bppxakj71r3cfy8sw19xbyngb7r6nyirc4g6pjf02cdidhw3v8l"; - }) ./0001-Remove-Install-Unlisted-Engines-function.patch (substituteAll { src = ./fix-paths.patch; From 6632becbe02c7538a484758f3b57ac0fa19179d2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 09:26:13 +0800 Subject: [PATCH 6/6] pantheon.switchboard-plug-mouse-touchpad: 6.0.0 -> 6.1.0 --- .../apps/switchboard-plugs/mouse-touchpad/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index ca0319a5498d2..dda4fa8a3a206 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "19kiwrdpan8hr5r79y591591qjx7pm3x814xfkg9vi11ndbcrznr"; + sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5"; }; passthru = { @@ -60,12 +60,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; touchegg = touchegg; }) - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-mouse-touchpad/pull/185 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-mouse-touchpad/commit/a6f84dc08be5dc6f7535082bacfa24e2dff4ef67.patch"; - sha256 = "0fxl894dzw1f84n36mb9y7gshs69xcb0samvs2gsa0pcdlzfp3cy"; - }) ]; meta = with lib; {