From 56d038d8f9605a410d7c1f6029ffbaa0aeb57a21 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 11 Aug 2023 18:20:38 +0800 Subject: [PATCH 1/4] pantheon.gala: 7.1.1 -> 7.1.2 https://github.com/elementary/gala/releases/tag/7.1.2 --- pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 745f8b6c0149..ebf99d6ed0fa 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "7.1.1"; + version = "7.1.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-s63znprGrMvitefAKlbL3r1s0kbo7NA9bhrNH8w0h2o="; + sha256 = "sha256-g+Zcdl6SJ4uO6I1x3Ru6efZkf+O3UaW790n/zxmGkHU="; }; patches = [ From ec07684718da11035737a32eca5f65f8694ad937 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 11 Aug 2023 18:22:13 +0800 Subject: [PATCH 2/4] pantheon.elementary-videos: 2.9.1 -> 3.0.0 https://github.com/elementary/videos/releases/tag/3.0.0 --- .../apps/elementary-videos/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 7bdcd1dbac98..6411971fdb05 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -6,40 +6,34 @@ , meson , ninja , vala -, python3 , gtk3 , granite , libgee , libhandy -, clutter-gst -, clutter-gtk , gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.9.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-G961ndONwHiqdeO26Ulxkg71ByfdFMAV35VFzu4TQ3M="; + sha256 = "sha256-O98478E3NlY2NYqjyy8mcXZ3lG+wIV+VrPzdzOp44yA="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook ]; buildInputs = [ - clutter-gst - clutter-gtk granite gtk3 libgee @@ -48,16 +42,12 @@ stdenv.mkDerivation rec { gst-libav gst-plugins-bad gst-plugins-base - gst-plugins-good + # https://github.com/elementary/videos/issues/356 + (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-ugly gstreamer ]); - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From 82ac97f610f58ce58d339d90e105848494a3b1ed Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 11 Aug 2023 18:23:51 +0800 Subject: [PATCH 3/4] pantheon.elementary-onboarding: 7.1.0 -> 7.2.0 https://github.com/elementary/onboarding/releases/tag/7.2.0 --- .../desktop/elementary-onboarding/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index e5a90d8f4f0a..439d434488ef 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , appcenter @@ -19,20 +18,19 @@ stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "onboarding"; rev = version; - sha256 = "sha256-OWALEcVOOh7wjEEvysd+MQhB/iK3105XCIVp5pklMwY="; + sha256 = "sha256-5vEKQUGg5KQSheM6tSK8uieEfCqlY6pABfPb/333FHU="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; @@ -47,11 +45,6 @@ stdenv.mkDerivation rec { libgee ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From 4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 13 Aug 2023 20:08:56 +0800 Subject: [PATCH 4/4] pantheon.elementary-default-settings: Backport picture-uri-dark changes --- .../elementary-default-settings/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 6958547899fa..e3fd576a14e0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -24,6 +25,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI="; }; + patches = [ + # Don't set picture-uri-dark. elementary-gsettings-schemas won't + # aware of our custom remove-backgrounds.gschema.override so it + # will be a confusing invalid value otherwise (though gala actually + # can handle it well). + # https://github.com/elementary/default-settings/pull/282 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/881f84b8316e549ab627b7ac9acf352e0346a1a4.patch"; + sha256 = "sha256-zf2Anr+ljLjHbn5ZmRj3nCRVJ52rwe4EkwdIfSOGeLQ="; + }) + # https://github.com/elementary/default-settings/pull/283 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/37ef6062a8651875dd9d927c5730155c8b26e953.patch"; + sha256 = "sha256-u7rrwuHgMPn1eIyIuwJcBgy8SshaXgrgFTSNm8IHbaY="; + }) + ]; + nativeBuildInputs = [ accountsservice dbus