Merge staging-next into staging

3 files changed, 21 insertions, 12 deletions

diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 0868f1c159b5c..1652415295ac2 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "23.10.09";
+  version = "23.11.11";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-NAvgrD0ckAC0vpF7BkEVWGmsuoWeMuSOdp2c9wEzv4s=";
+    sha256 = "sha256-yu9ufr1l21l6v8bRXLJcVkpBD0fDIlgePbStTLH+CDc=";
   };
 
   nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index 82256441fbb1e..2e302735f17cc 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
-, fetchurl
 , glib
 , gnome-shell
 , gtk-engine-murrine
@@ -23,20 +22,20 @@
 let
 
   pname = "mojave-gtk-theme";
-  version = "2023-06-13";
+  version = "2023-08-04";
 
   main_src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    hash = "sha256-0jb/VQ6Z0BGaEka57BWM0pBweP08cr4jfPRdEN/BJ1M=";
+    hash = "sha256-boS/GPjuJV5lZjyHW7tG74T6a3SASQVGnSz++5HkCuw=";
   };
 
   wallpapers_src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = "0c4ae6ddff7e3fab4959469461c4d4042deb1b2f";
-    hash = "sha256-7LSZSsRt6zTVPLWzuBgwRC1q1MHp5pN/pMl3x2wR8Ow=";
+    rev = "1dc23c2b45d7e073e080cfb02f43aab0e59b6b2c";
+    hash = "sha256-nkw8gXYx8fN1yn0A5M2fWwOvfUQ6izynxRw5JA61InM=";
     name = "wallpapers";
   };
 
@@ -118,6 +117,7 @@ stdenvNoCC.mkDerivation rec {
       ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \
       ${lib.optionalString (opacityVariants != []) "--opacity " + builtins.toString opacityVariants} \
       ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \
+      --icon nixos \
       --dest $out/share/themes
 
     ${lib.optionalString wallpapers ''
diff --git a/pkgs/data/themes/numix/default.nix b/pkgs/data/themes/numix/default.nix
index 23f491d4a9adb..a55970d5dccf6 100644
--- a/pkgs/data/themes/numix/default.nix
+++ b/pkgs/data/themes/numix/default.nix
@@ -1,19 +1,26 @@
-{ lib, stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf
+{ lib
+, stdenv
+, fetchFromGitHub
+, sassc
+, glib
+, libxml2
+, gdk-pixbuf
 , gtk-engine-murrine
+, gitUpdater
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.6.7";
   pname = "numix-gtk-theme";
+  version = "unstable-2021-06-08";
 
   src = fetchFromGitHub {
     repo = "numix-gtk-theme";
     owner = "numixproject";
-    rev = version;
-    sha256 = "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7";
+    rev = "ad4b345cb19edba96bec72d6dc97ed1b568755a8";
+    hash = "sha256-7KX5xC6Gr6azqL2qyc8rYb3q9UhcGco2uEfltsQ+mgo=";
   };
 
-  nativeBuildInputs = [ sass glib libxml2 gdk-pixbuf ];
+  nativeBuildInputs = [ sassc glib libxml2 gdk-pixbuf ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
@@ -22,6 +29,8 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)";
     homepage = "https://numixproject.github.io";