overlays/backports.nix

@@ -25,7 +25,7 @@ let
   stripJavaArchivesHook = final.makeSetupHook {
     name = "strip-java-archives-hook";
     propagatedBuildInputs = [ final.strip-nondeterminism ];
-  } ./strip-java-archives.sh;
+  } "${nixfiles.inputs.nixpkgs-unstable}/pkgs/build-support/setup-hooks/strip-java-archives.sh";
 
 in {
   vesktop = backport' "vesktop";

overlays/strip-java-archives.sh

@@ -1,16 +0,0 @@
-# This setup hook makes the fixup phase to repack all java archives in a
-# deterministic fashion. The most important change being done is the resetting
-# of the modification times of the archive entries
-
-fixupOutputHooks+=('stripJavaArchivesIn $prefix')
-
-stripJavaArchivesIn() {
-    local dir="$1"
-    echo "stripping java archives in $dir"
-    find $dir -type f -regextype posix-egrep -regex ".*\.(jar|war|hpi|apk)$" -print0 |
-    while IFS= read -rd '' f; do
-        echo "stripping java archive $f"
-        strip-nondeterminism --type jar "$f"
-    done
-}
-

system/common/wm.nix

@@ -10,7 +10,6 @@ in
     services = {
       power-profiles-daemon.enable = mkDefault true;
       blueman.enable = mkDefault config.hardware.bluetooth.enable;
-      udisks2.enable = mkDefault true;
     };
     programs = {
       nm-applet.enable = mkDefault config.networking.networkmanager.enable;

system/profile/base.nix

@@ -99,7 +99,6 @@ in
         nix-du
         graphviz # for nix-du
         nvd
-        nix-diff
 
         # secrets
         age