diff --git a/src/builders/nodejs/granular/default.nix b/src/builders/nodejs/granular/default.nix index b8f98edd..c1f9d1a4 100644 --- a/src/builders/nodejs/granular/default.nix +++ b/src/builders/nodejs/granular/default.nix @@ -18,7 +18,6 @@ getCyclicDependencies, # name: version: -> [ {name=; version=; } ] getDependencies, # name: version: -> [ {name=; version=; } ] getSource, # name: version: -> store-path - buildPackageWithOtherBuilder, # { builder, name, version }: -> drv # Attributes subsystemAttrs, # attrset defaultPackageName, # string @@ -32,10 +31,6 @@ # Example: # produceDerivation name (mkDerivation {...}) produceDerivation, - # Custom Options: (parametrize builder behavior) - # These can be passed by the user via `builderArgs`. - # All options must provide default - standalonePackageNames ? [], nodejs ? null, ... } @ args: let diff --git a/src/default.nix b/src/default.nix index 1b00e10a..a8fb0c87 100644 --- a/src/default.nix +++ b/src/default.nix @@ -258,37 +258,9 @@ conditionalOverrides = packageOverrides; }; - buildPackageWithOtherBuilder = { - builder, - name, - version, - inject ? {}, - }: let - subDreamLockLoaded = utils.readDreamLock { - dreamLock = - utils.dreamLock.getSubDreamLock dreamLock name version; - }; - in - callBuilder { - inherit - builder - builderArgs - fetchedSources - inject - sourceOverrides - packageOverrides - ; - - dreamLock = - subDreamLockLoaded.lock; - - outputs = allOutputs; - }; - outputs = builder (builderArgs // { inherit - buildPackageWithOtherBuilder produceDerivation dreamLock ; diff --git a/src/templates/builders/default.nix b/src/templates/builders/default.nix index bdf5f49b..ca2918a7 100644 --- a/src/templates/builders/default.nix +++ b/src/templates/builders/default.nix @@ -13,11 +13,13 @@ getCyclicDependencies, # name: version: -> [ {name=; version=; } ] getDependencies, # name: version: -> [ {name=; version=; } ] getSource, # name: version: -> store-path - buildPackageWithOtherBuilder, # { builder, name, version }: -> drv + # to get information about the original source spec + getSourceSpec, # name: version: -> {type="git"; url=""; hash="";} # Attributes subsystemAttrs, # attrset defaultPackageName, # string defaultPackageVersion, # string + # all existing package names and versions # attrset of pname -> versions, # where versions is a list of version strings packageVersions, @@ -26,10 +28,6 @@ # Example: # produceDerivation name (mkDerivation {...}) produceDerivation, - # Custom Options: (parametrize builder behavior) - # These can be passed by the user via `builderArgs`. - # All options must provide default - standalonePackageNames ? [], ... } @ args: let b = builtins;