Move mkDerivation-for-ca to config.nix.in

That way it can be reused more generically
NixOS · Apr 28, 2021 · 8ef36cc · 8ef36cc
1 parent ca86783
commit 8ef36cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/t/jobs/config.nix.in b/t/jobs/config.nix.in
@@ -6,4 +6,9 @@ rec {
       system = builtins.currentSystem;
       PATH = path;
     } // args);
+  mkContentAddressedDerivation = args: mkDerivation ({
+    __contentAddressed = true;
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+  } // args);
 }
diff --git a/t/jobs/content-addressed.nix b/t/jobs/content-addressed.nix
@@ -1,26 +1,19 @@
 let cfg =  import ./config.nix; in
-let
-  mkDerivation = args: cfg.mkDerivation ({
-    __contentAddressed = true;
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-  } // args);
-in
 {
   empty_dir =
-    mkDerivation {
+    cfg.mkContentAddressedDerivation {
       name = "empty-dir";
       builder = ./empty-dir-builder.sh;
     };
 
   fails =
-    mkDerivation {
+    cfg.mkContentAddressedDerivation {
       name = "fails";
       builder = ./fail.sh;
     };
 
   succeed_with_failed =
-    mkDerivation {
+    cfg.mkContentAddressedDerivation {
       name = "succeed-with-failed";
       builder = ./succeed-with-failed.sh;
     };