Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nix-community/dream2nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 41a9c7090275be0cde8142693256e9db13328c6e
Choose a base ref
..
head repository: nix-community/dream2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa3e37fb2cbecc4f059e143df8e11713df75336c
Choose a head ref
Showing with 1 addition and 14 deletions.
  1. +1 −14 src/subsystems/nodejs/translators/resolved-json/default.nix
15 changes: 1 addition & 14 deletions src/subsystems/nodejs/translators/resolved-json/default.nix
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@
tree,
# translator args
name ? project.name or "untitled",
nodejs,
...
} @ args: let
b = builtins;
@@ -32,7 +31,7 @@
lock =
nodejsUtils.getWorkspaceLockFile tree project "package-lock.json";
resolved = pkgs.runCommandLocal "resolved.json" {} ''
${nodejs}/bin/node ${./resolver.cjs} ${lock.fullPath} $out
${pkgs.nodejs}/bin/node ${./resolver.cjs} ${lock.fullPath} $out
'';
in
l.fromJSON (l.readFile resolved);
@@ -131,17 +130,5 @@ in rec {
default = "{automatic}";
type = "argument";
};

# TODO: this should either be removed or only used to select
# the nodejs version for translating, not for building.
nodejs = {
description = "nodejs version to use for building";
default = "14";
examples = [
"14"
"16"
];
type = "argument";
};
};
}