nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-09-19 02:17:14 +03:00
Code Issues Projects Releases Wiki Activity

make builders not depend on dlib and utils

Browse Source
This commit is contained in:
DavHau 2022-06-07 16:04:20 +02:00
parent 31cee1a17a
commit ed8a64c463
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/subsystems/nodejs/builders/granular/default.nix
View File

@ -10,9 +10,6 @@
runCommand,
stdenv,
writeText,
# dream2nix inputs
externals,
utils,
...
}: {
# Funcs
@ -201,7 +198,7 @@
packageName = name;
pname = utils.sanitizeDerivationName name;
pname = lib.replaceStrings ["@" "/"] ["__at__" "__slash__"] name;
passthru.dependencies = passthruDeps;

2
src/subsystems/nodejs/builders/granular/fix-package.py
View File

@ -29,7 +29,7 @@ if 'os' in package_json:
# If it is a github dependency referred by revision,
# we can not rely on the version inside the package.json.
# In case of an 'unknown' version coming from the dream lock,
# do not override the version from package.json
# do not override the version from package.json
version = os.environ.get("version")
if version not in ["unknown", package_json.get('version')]:
print(

5
src/templates/builders/default.nix
View File

@ -7,7 +7,6 @@
stdenv,
# dream2nix inputs
externals,
utils,
...
}: {
### FUNCTIONS
@ -35,7 +34,7 @@
produceDerivation,
...
} @ args: let
b = builtins;
l = lib // builtins;
# the main package
defaultPackage = allPackages."${defaultPackageName}"."${defaultPackageVersion}";
@ -60,7 +59,7 @@
# Generates a derivation for a specific package name + version
makeOnePackage = name: version: let
pkg = stdenv.mkDerivation rec {
pname = utils.sanitizeDerivationName name;
pname = l.strings.sanitizeDerivationName name;
inherit version;
src = getSource name version;