public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utillinux: rename to util-linux

Browse Source
This commit is contained in:
Graham Christensen
2020-11-24 10:29:28 -05:00
parent 79086e5d55
commit bc49a0815a
265 changed files with 574 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/commitizen/node-composition.nix
View File

@@ -6,7 +6,7 @@
let
nodeEnv = import ./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;
};

8
pkgs/applications/version-management/commitizen/node-env.nix
View File

@@ -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;
@@ -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;
@@ -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;
@@ -516,7 +516,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