summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-06-02 09:07:18 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-06-02 09:07:18 +0200
commite98c804cc92cd3412ae6877e9014b3193a5aa3e6 (patch)
treebbe27902757f3aa5abdc30113d937e695e903348 /maintainers
parentc3dd31f177b532e7e94b74afca7241778c23af6f (diff)
downloadnixpkgs-e98c804cc92cd3412ae6877e9014b3193a5aa3e6.tar
nixpkgs-e98c804cc92cd3412ae6877e9014b3193a5aa3e6.tar.gz
nixpkgs-e98c804cc92cd3412ae6877e9014b3193a5aa3e6.tar.bz2
nixpkgs-e98c804cc92cd3412ae6877e9014b3193a5aa3e6.tar.lz
nixpkgs-e98c804cc92cd3412ae6877e9014b3193a5aa3e6.tar.xz
nixpkgs-e98c804cc92cd3412ae6877e9014b3193a5aa3e6.tar.zst
nixpkgs-e98c804cc92cd3412ae6877e9014b3193a5aa3e6.zip
maintainers/scripts/update.nix: Clean up
Make calling update.py a little nicer
Diffstat (limited to 'maintainers')
-rwxr-xr-xmaintainers/scripts/update.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index b980514cc09..04723cb8a36 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -130,6 +130,14 @@ let
     updateScript = map builtins.toString (pkgs.lib.toList package.updateScript);
   };
 
+  packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages));
+
+  optionalArgs =
+    pkgs.lib.optional (max-workers != null) "--max-workers=${max-workers}"
+    ++ pkgs.lib.optional (keep-going == "true") "--keep-going";
+
+  args = [ packagesJson ] ++ optionalArgs;
+
 in pkgs.stdenv.mkDerivation {
   name = "nixpkgs-update-script";
   buildCommand = ''
@@ -144,6 +152,6 @@ in pkgs.stdenv.mkDerivation {
   '';
   shellHook = ''
     unset shellHook # do not contaminate nested shells
-    exec ${pkgs.python3.interpreter} ${./update.py} ${pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages))}${pkgs.lib.optionalString (max-workers != null) " --max-workers=${max-workers}"}${pkgs.lib.optionalString (keep-going == "true") " --keep-going"}
+    exec ${pkgs.python3.interpreter} ${./update.py} ${builtins.concatStringsSep " " args}
   '';
 }