Merge pull request #262552 from romildo/upd.nordic

nordic: unstable-2023-05-12 -> unstable-2023-10-17

pkgs/data/themes/nordic/default.nix

@@ -2,76 +2,78 @@
 , stdenv
 , fetchFromGitHub
 , gtk-engine-murrine
+, breeze-icons
+, plasma-framework
+, plasma-workspace
 , jdupes
-, libsForQt5
 }:
 
 stdenv.mkDerivation rec {
   pname = "nordic";
-  version = "unstable-2023-05-12";
+  version = "unstable-2023-10-17";
 
   srcs = [
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "399246cdcbdb1a714c5bb294857cd5a6494b6006";
+      rev = "e97d2bcf4494f8ab502e33d13c74b396469a42f4";
-      sha256 = "sha256-0yZ4QYcdcGHEw6tdcXAKZ4e+mhNNmvihBxp2sLgTuu8=";
+      hash = "sha256-7WfCE3eoJ7maAYqgQNb0mlw8u3zc6NAwTJN+PVojDcE=";
       name = "Nordic";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "3599ddb6f8b7de936cf106bddd4f929ddfe88b1c";
+      rev = "73ed3490c13b2df6c3d27d6b3bcba0c087297f4a";
-      sha256 = "sha256-ft5UbBnjP0xNFFVwk5Elvrpcj273OupjM+MGJVlvJZQ=";
+      hash = "sha256-fRmGiqtjfGFIfr5hRBS3ZPFYEpQx391WoxphB5gRTJo=";
       name = "Nordic-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "b03b66d5badadc2e5ff27b8745a2308b8fafaa61";
+      rev = "4b1fc2942bad203a0aa035cbb688b28005bb1011";
-      sha256 = "sha256-6dORsGfYi7q8z7JWA3Y9oqVs9bhT/gbdSrcgJcebGP8=";
+      hash = "sha256-VU5Bo39l8xdR6QmbTR0Qic6XkSfDFrhyjoHaMm9SBYM=";
       name = "Nordic-darker";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "e19b75f56e5c328352c183fc960a0be54e99836e";
+      rev = "6d57a16eef66c25f0212b7d2f02e208f2afdf4f9";
-      sha256 = "sha256-deKHT0dE5tsUo7+vkzxQ/eRon7COrOAWolw17VtKhiE=";
+      hash = "sha256-Sq5ZXOh+HA+udQHL2wUw5azgKwAVVvHGNb3SiuOn0nQ=";
       name = "Nordic-darker-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "b134b4a1299b3c4a2d9543707ec2b5a0fc97987c";
+      rev = "566e38c40bca86df93d0e9226c33d5d525d34454";
-      sha256 = "sha256-XSDwc0/59sUHkS0holvujmr/p6vX79648l9cxJqunuM=";
+      hash = "sha256-Wl/m2O0tVCFgZhPC/gcNgKr0JqQbiyQBpGEcp8g6kvY=";
       name = "Nordic-bluish-accent";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "a4efbc09470b36f4cf6af60b5fdfeb8e09282fb3";
+      rev = "b43efee28129634fdefe70f2a03c401efc7dc22f";
-      sha256 = "sha256-Qgrl6p0AhbhK0+aM8hu85Kz/Lz/b2Nn8uWS+WpTGjU4=";
+      hash = "sha256-rLOWkfTMFEnVU2tuw5M2fvbNMPfxIu+gzi+3gnBEhx4=";
       name = "Nordic-bluish-accent-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "0d44fb16d0f07ef8615fd7740317a518d2b9411f";
+      rev = "2192acfce55fbb9a2982886abe25e623d0e7ff66";
-      sha256 = "sha256-388251/Tg4jyn7c8zkrUxVFooN9O67xk2NTSeYa0VvI=";
+      hash = "sha256-B/sAy4I+9gX9dHXUldcN5t0vlOL2Jnoan/hRV+tNnSo=";
       name = "Nordic-Polar";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "0eea9185946fee20b6d7472548226a3652dea7ae";
+      rev = "a24b42411d8ea0dc63bf0778e443be251858e586";
-      sha256 = "sha256-8JFrmGKn8cl1x3TeDPee1zbMmtypJ9kALv/PRqRHGAU=";
+      hash = "sha256-02z4eMFtok1+SeW+ai7vZCXZb6ZhU4l4ch1Zc/GyhYM=";
       name = "Nordic-Polar-standard-buttons";
     })
   ];
@@ -80,47 +82,57 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ jdupes ];
 
-  buildInputs = with libsForQt5; [
+  propagatedUserEnvPkgs = [
-    plasma-framework
+    gtk-engine-murrine
-    qtgraphicaleffects
-    plasma-workspace
     breeze-icons
+    plasma-framework
+    plasma-workspace
   ];
 
   dontWrapQtApps = true;
 
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
   installPhase = ''
     runHook preInstall
 
+    # install theme files
     mkdir -p $out/share/themes
     cp -a Nordic* $out/share/themes
+
+    # remove uneeded files
     rm -r $out/share/themes/*/.gitignore
     rm -r $out/share/themes/*/Art
+    rm -r $out/share/themes/*/FUNDING.yml
     rm -r $out/share/themes/*/LICENSE
     rm -r $out/share/themes/*/README.md
     rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js}
     rm -r $out/share/themes/*/src
     rm -r $out/share/themes/*/cinnamon/*.scss
-    rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss}
+    rm -r $out/share/themes/*/gnome-shell/{earlier-versions,extensions,*.scss}
     rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh}
     rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss}
+    rm -r $out/share/themes/*/gtk-4.0/{apps,widgets,*.scss}
     rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish}
 
+    # move wallpapers to appropriate directory
+    mkdir -p $out/share/wallpapers/Nordic
+    mv -v $out/share/themes/Nordic/extras/wallpapers/* $out/share/wallpapers/Nordic/
+    rmdir $out/share/themes/Nordic/extras{/wallpapers,}
+
     # move kde related contents to appropriate directories
-    mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes/Nordic}
+    mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes,icons}
     mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/
     mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/
     mv -v $out/share/themes/Nordic/kde/konsole $out/share/
     mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/
     mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/
-    mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/
+    mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/
+    mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/
+    mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/
     rm -rf $out/share/themes/Nordic/kde
 
-    # Replace duplicate files with hardlinks to the first file in each
+    # Replace duplicate files with symbolic links to the first file in
-    # set of duplicates, reducing the installed size in about 65%
+    # each set of duplicates, reducing the installed size in about 53%
-    jdupes -L -r $out/share
+    jdupes --quiet --link-soft --recurse $out/share
 
     runHook postInstall
   '';

pkgs/top-level/all-packages.nix

@@ -29710,7 +29710,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration;
   };
 
-  nordic = callPackage ../data/themes/nordic { };
+  nordic = callPackage ../data/themes/nordic {
+    inherit (libsForQt5) breeze-icons plasma-framework plasma-workspace;
+  };
 
   nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { };