Changeset 72539dd in trunk

Timestamp:

2023-07-04T18:39:26Z (21 months ago)

Author:

Jean-Paul Calderone <exarkun@…>

Branches:

master

Children:

94e608f1

Parents:

9788e4c1

Message:

refactor the env builders a bit

File:

• flake.nix (modified) (3 diffs)

flake.nix ¶

@@ -74 +74 @@
       unitTestName = pyVersion: "${pyVersion}-unittest";
 
+      # (string -> a) -> (string -> b) -> string -> attrset a b
+      #
+      # Make a singleton attribute set from the result of two functions.
+      singletonOf = f: g: x: { ${f x} = g x; };
+
       # Create a derivation that includes a Python runtime, Tahoe-LAFS, and
       # all of its dependencies.
-      makeRuntimeEnv = pyVersion: {
-        ${packageName pyVersion} = makeRuntimeEnv' pyVersion;
-      };
-
+      makeRuntimeEnv = singletonOf packageName makeRuntimeEnv';
       makeRuntimeEnv' = pyVersion: (pkgs.${pyVersion}.withPackages (ps: with ps;
         [ tahoe-lafs ] ++
@@ -90 +92 @@
       # Create a derivation that includes a Python runtime, Tahoe-LAFS, and
       # all of its dependencies.
-      makeTestEnv = pyVersion: {
-        ${packageName pyVersion} = makeTestEnv' pyVersion;
-      };
-
-      makeTestEnv' = pyVersion: (pkgs.${pyVersion}.withPackages (ps: with ps;
+      makeTestEnv = pyVersion: (pkgs.${pyVersion}.withPackages (ps: with ps;
         [ tahoe-lafs ] ++
         tahoe-lafs.passthru.extras.i2p ++
@@ -149 +147 @@
                   ''
                     export TAHOE_LAFS_HYPOTHESIS_PROFILE=ci
-                    ${makeTestEnv' pyVersion}/bin/python -m twisted.trial "$@"
+                    ${makeTestEnv pyVersion}/bin/python -m twisted.trial "$@"
                   '';
             };