Merge branch 'nodejs-pure-builder' into devShells

nix-community · Aug 23, 2022 · c2e4006 · c2e4006
2 parents 0a68574 + b8d816a
commit c2e4006
Show file tree

Hide file tree

Showing 12 changed files with 432 additions and 461 deletions.
diff --git a/src/default.nix b/src/default.nix
@@ -284,7 +284,7 @@ in let
           getSourceSpec
           getRoot
           getDependencies
-          getCyclicDependencies
+          getCyclicHelpers
           defaultPackageName
           defaultPackageVersion
           packages

diff --git a/src/subsystems/haskell/builders/default/default.nix b/src/subsystems/haskell/builders/default/default.nix
@@ -14,15 +14,22 @@ in {
   }: {
     ### FUNCTIONS
     # AttrSet -> Bool) -> AttrSet -> [x]
-    getCyclicDependencies, # name: version: -> [ {name=; version=; } ]
-    getDependencies, # name: version: -> [ {name=; version=; } ]
-    getSource, # name: version: -> store-path
+    # name: version: -> helpers
+    getCyclicHelpers,
+    # name: version: -> [ {name=; version=; } ]
+    getDependencies,
+    # name: version: -> store-path
+    getSource,
     # to get information about the original source spec
-    getSourceSpec, # name: version: -> {type="git"; url=""; hash="";}
+    # name: version: -> {type="git"; url=""; hash="";}
+    getSourceSpec,
     ### ATTRIBUTES
-    subsystemAttrs, # attrset
-    defaultPackageName, # string
-    defaultPackageVersion, # string
+    # attrset
+    subsystemAttrs,
+    # string
+    defaultPackageName,
+    # string
+    defaultPackageVersion,
     # all exported (top-level) package names and versions
     # attrset of pname -> version,
     packages,