pinch: 1.1 -> 1.2

[auto-upgrade-with-pinch] / modules / auto-upgrade.nix

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index 216c4baf8fa624e4d2ed08680c21edfa0ccd27d4..8bf21aaaf988c5d3b0b5d6648ca403785276d05f 100644 (file)
--- a/modules/auto-upgrade.nix
+++ b/modules/auto-upgrade.nix
@@ -3,7 +3,7 @@ with lib;
 let
   cfg = config.system.autoUpgradeWithPinch;
   auto-upgrade-script = pkgs.writeShellScript "auto-upgrade" ''
 let
   cfg = config.system.autoUpgradeWithPinch;
   auto-upgrade-script = pkgs.writeShellScript "auto-upgrade" ''

-    flock /run/auto-upgrade-with-pinch ${
+    ${pkgs.utillinux}/bin/flock /run/auto-upgrade-with-pinch ${

       pkgs.writeShellScript "auto-upgrade-with-lock-held" ''
         set -e
 
       pkgs.writeShellScript "auto-upgrade-with-lock-held" ''
         set -e
 


@@ -18,7 +18,7 @@ let
         as_user() {
           ${
             if cfg.userEnvironment.enable then ''
         as_user() {
           ${
             if cfg.userEnvironment.enable then ''

-              sudo -u ${escapeShellArg cfg.userEnvironment.user} "$@"
+              /run/wrappers/bin/sudo -u ${escapeShellArg cfg.userEnvironment.user} "$@"

             '' else ''
               :
             ''
             '' else ''
               :
             ''


@@ -34,7 +34,7 @@ let
 
         # Build
         in_tmpdir ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build
 
         # Build
         in_tmpdir ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build

-        as_user nix-build '<nixpkgs>' -A ${
+        as_user nix-build --no-out-link '<nixpkgs>' -A ${

           escapeShellArg cfg.userEnvironment.package
         }
 
           escapeShellArg cfg.userEnvironment.package
         }
 


@@ -137,7 +137,7 @@ in {
       (import ../overlays/pinch.nix)
       (self: super: {
         auto-upgrade = super.writeShellScriptBin "auto-upgrade" ''
       (import ../overlays/pinch.nix)
       (self: super: {
         auto-upgrade = super.writeShellScriptBin "auto-upgrade" ''

-          sudo ${auto-upgrade-script}
+          /run/wrappers/bin/sudo ${auto-upgrade-script}

         '';
       })
     ];
         '';
       })
     ];