From b33cd46247a563547a4cfe38f624621d84dcc868 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 09:45:59 +0800 Subject: [PATCH 1/5] pantheon.elementary-capnet-assist: 2.4.3 -> 2.4.4 https://github.com/elementary/capnet-assist/releases/tag/2.4.4 --- .../pantheon/services/elementary-capnet-assist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index fe2649f82a60..4b88ea3e5abd 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "elementary"; repo = "capnet-assist"; rev = version; - sha256 = "sha256-06DWkLkVpdSYnKOR8zqA0tvWXYrglBM9R/XEIfIkwQU="; + sha256 = "sha256-vnFrGHt/rtrDmXokYRoebVpNLfkZPe5IShRsXCWWsXs="; }; nativeBuildInputs = [ From 890c7a41e619b136a5ba373f8f33d43c793e8701 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 09:46:34 +0800 Subject: [PATCH 2/5] pantheon.elementary-camera: 6.2.1 -> 6.2.2 https://github.com/elementary/camera/releases/tag/6.2.2 --- pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index ed0c6bd91807..b1bb55f1d39b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "elementary-camera"; - version = "6.2.1"; + version = "6.2.2"; src = fetchFromGitHub { owner = "elementary"; repo = "camera"; rev = version; - sha256 = "sha256-ijzEMGXoH0gACem/3JaC/aOIaOQgP7Y7n48NgoDMKBk="; + sha256 = "sha256-Sj89TBat2RY2Ms02M0P7gmE9tXYk1yrnPLzDwGyAFZA="; }; nativeBuildInputs = [ From cc12b195fc4aea9ece32519028eaef5418ad1437 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 09:49:10 +0800 Subject: [PATCH 3/5] pantheon.elementary-music: 7.0.1 -> 7.1.0 https://github.com/elementary/music/releases/tag/7.1.0 --- pkgs/desktops/pantheon/apps/elementary-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index b38e315ac773..258ff8e2dadb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-music"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "music"; rev = version; - sha256 = "sha256-PttmC1Z3rX2XWCECc320HMs692hSBsxkmnh1Q8a/Mg8="; + sha256 = "sha256-L+E5gDtIgVkfmOIhzS7x8vtyMJYqx/UQpYMChrt2Tgo="; }; nativeBuildInputs = [ From 6912f855c63e070963481bce00e7c640384fae69 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 09:49:30 +0800 Subject: [PATCH 4/5] pantheon.elementary-calculator: 2.0.1 -> 2.0.2 https://github.com/elementary/calculator/releases/tag/2.0.2 --- .../apps/elementary-calculator/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index b8c4c2035098..c06448bdc41a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -8,6 +8,8 @@ , python3 , vala , wrapGAppsHook4 +, elementary-gtk-theme +, elementary-icon-theme , granite7 , gtk4 , libgee @@ -15,13 +17,13 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "calculator"; rev = version; - sha256 = "sha256-7aKJDlpODIysrHtqtD5wfd+dULFpD+LfWsjzg3OAxkY="; + sha256 = "sha256-PLdPu43ns03vhBwaGw4BWCLNvcJbhUA+5Gr5b//TqfA="; }; nativeBuildInputs = [ @@ -34,6 +36,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-icon-theme granite7 gtk4 libgee @@ -44,6 +47,15 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + preFixup = '' + gappsWrapperArgs+=( + # The GTK theme is hardcoded. + --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + # The icon theme is hardcoded. + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + ) + ''; + passthru = { updateScript = nix-update-script { }; }; From 0680d20720f2e92a61b1d3ff1da47b9a15157741 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 09:49:55 +0800 Subject: [PATCH 5/5] pantheon.elementary-screenshot: 6.0.3 -> 6.0.4 https://github.com/elementary/screenshot/releases/tag/6.0.4 --- pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index b41dbaaae88c..1ac5d6979ebb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-screenshot"; - version = "6.0.3"; + version = "6.0.4"; src = fetchFromGitHub { owner = "elementary"; repo = "screenshot"; rev = version; - sha256 = "sha256-7BrowiMUDcf0raeOEFen2V3nenymgE6Rg5a3RilMQaI="; + sha256 = "sha256-xG67a19ySuYc5IXlEkaqhnDpDa2krF2y6PnhJkd/rOg="; }; nativeBuildInputs = [