Skip to content

utillinux -> util-linux #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SuperSandro2000 wants to merge 1 commit into from
Closed

utillinux -> util-linux #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

let
nodeEnv = import ./nix/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
Expand Down
2 changes: 1 addition & 1 deletion lib/expressions/CompositionExpression.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ CompositionExpression.prototype.toNixAST = function() {
paramExpr: {
stdenv: new nijs.NixInherit("pkgs"),
python2: new nijs.NixInherit("pkgs"),
utillinux: new nijs.NixInherit("pkgs"),
util-linux: new nijs.NixInherit("pkgs"),
libtool: new nijs.NixIf({
ifExpr: new nijs.NixAttrReference({
attrSetExpr: new nijs.NixExpression("pkgs"),
Expand Down
8 changes: 4 additions & 4 deletions nix/node-env.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file originates from node2nix

{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:

let
python = if nodejs ? python then nodejs.python else python2;
Expand Down Expand Up @@ -396,7 +396,7 @@ let
stdenv.mkDerivation ({
name = "node_${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ stdenv.lib.optional (stdenv.isLinux) utillinux
++ stdenv.lib.optional (stdenv.isLinux) util-linux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ buildInputs;

Expand Down Expand Up @@ -470,7 +470,7 @@ let
name = "node-dependencies-${name}-${version}";

buildInputs = [ tarWrapper python nodejs ]
++ stdenv.lib.optional (stdenv.isLinux) utillinux
++ stdenv.lib.optional (stdenv.isLinux) util-linux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ buildInputs;

Expand Down Expand Up @@ -537,7 +537,7 @@ let
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";

buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
Expand Down
2 changes: 1 addition & 1 deletion tests/default-v10.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

let
nodeEnv = import ../nix/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
Expand Down
2 changes: 1 addition & 1 deletion tests/default-v12.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

let
nodeEnv = import ../nix/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
Expand Down
2 changes: 1 addition & 1 deletion tests/grunt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let
inherit (pkgs) fetchurl fetchgit;
});
nodeEnv = import ../../nix/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
Expand Down
2 changes: 1 addition & 1 deletion tests/lockfile-v2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

let
nodeEnv = import ../../nix/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
Expand Down
2 changes: 1 addition & 1 deletion tests/lockfile/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

let
nodeEnv = import ../../nix/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
Expand Down
2 changes: 1 addition & 1 deletion tests/scoped/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

let
nodeEnv = import ../../nix/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
Expand Down