From fa24e51b723072180c3c9bb7a8c0af42286401fe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 21:32:51 +0800 Subject: [PATCH 1/6] pantheon.switchboard-plug-keyboard: remove fetchpatch from input --- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 26476d4fe0a6e..c3860ba22789b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , nix-update-script , pantheon -, fetchpatch , substituteAll , meson , ninja From 3c6559d673b374d7420f13469860e41b34f131c2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 21:33:50 +0800 Subject: [PATCH 2/6] panthoen.elementary-greeter: remove fetchpatch from input --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index f68898239aad9..e85acf39e722b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , linkFarm , substituteAll From cc8875421b922e8f50cebe6b03e8eb4ddae59739 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 22:01:08 +0800 Subject: [PATCH 3/6] pantheon.switchboard-plug-mouse-touchpad: remove fetchpatch from input --- .../pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix | 1 - 1 file changed, 1 deletion(-) 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 dda4fa8a3a206..0368314e7b4f5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pantheon From 220f1573eda50e5c872cb8b754c50bd09778f7b0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 23 Sep 2021 23:10:12 +0800 Subject: [PATCH 4/6] pantheon.wingpanel-indicator-sound: pin vala version --- .../pantheon/desktop/wingpanel-indicators/sound/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index fcaf06de0113e..55f27d6064675 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -7,7 +7,7 @@ , meson , python3 , ninja -, vala +, vala_0_52 , gtk3 , granite , wingpanel @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/elementary/wingpanel-indicator-sound/issues/219 + vala_0_52 ]; buildInputs = [ From 7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 24 Sep 2021 08:30:49 +0800 Subject: [PATCH 5/6] pantheon.gala: 6.0.1 -> 6.2.0 --- pkgs/desktops/pantheon/desktop/gala/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 280a6a07576d1..3f674075133ea 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , pantheon , pkg-config , meson @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0xp9vviamzdwlcnx4836sxaz2pyfkxswgvjm73ppn7fkdm0zjpzx"; + sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g"; }; passthru = { @@ -75,12 +74,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/gala/pull/1205 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/605aa10ea2a78650e001b2a247c5f7afce478b05.patch"; - sha256 = "0bg67wzrnmx8nlw93i35vhyfx8al0bj0lacgci98vwlp2m1jgbd2"; - }) ./plugins-dir.patch ]; From 6adf8ac2815e1e58a1ada7b72be46303abefc4d0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 24 Sep 2021 08:46:00 +0800 Subject: [PATCH 6/6] pantheon.elementary-photos: 2.7.1 -> 2.7.2 --- .../apps/elementary-photos/default.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index d1206c9d0ae00..61ec86dec44e0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,12 +1,11 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson , ninja , pkg-config -, vala +, vala_0_52 , desktop-file-utils , gtk3 , libaccounts-glib @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.1"; + version = "2.7.2"; repoName = "photos"; @@ -43,18 +42,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p"; + sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; }; - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/photos/pull/629 - (fetchpatch { - url = "https://github.com/elementary/photos/commit/e5230a4305381734e93f1e3d1177da21a8a4121b.patch"; - sha256 = "1igqq51sj1sx6rl8yrw037jsgnaxfwzfs0m6pqzb9q4jvfdimzfi"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -68,7 +58,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/elementary/photos/issues/638 + vala_0_52 wrapGAppsHook ];