Skip to content

Stop referring to utillinux and use util-linux #237

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

Open
tm-drtina wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Stop referring to utillinux and use util-linux #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8610b0b
Stop referring to `utillinux`
tm-drtina Nov 13, 2025
bbc3b51
composition.nix: switch from import to callPackage
tm-drtina Nov 25, 2025
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
5 changes: 2 additions & 3 deletions psa/composition.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_20"}:

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
nodeEnv = pkgs.callPackage ./node-env.nix {
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
Expand Down
11 changes: 4 additions & 7 deletions psa/node-env.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# This file originates from node2nix

{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile, writeShellScript}:

let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;

python = if nodejs ? python then nodejs.python else python2;

# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
Expand Down Expand Up @@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;

Expand Down Expand Up @@ -588,7 +585,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";

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

Expand Down Expand Up @@ -659,7 +656,7 @@ let
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";

buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
Expand Down
5 changes: 2 additions & 3 deletions pscid/composition.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_20"}:

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
nodeEnv = pkgs.callPackage ./node-env.nix {
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
Expand Down
11 changes: 4 additions & 7 deletions pscid/node-env.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# This file originates from node2nix

{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile, writeShellScript}:

let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;

python = if nodejs ? python then nodejs.python else python2;

# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
Expand Down Expand Up @@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;

Expand Down Expand Up @@ -591,7 +588,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";

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

Expand Down Expand Up @@ -662,7 +659,7 @@ let
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";

buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
Expand Down
5 changes: 2 additions & 3 deletions pulp/composition.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_20"}:

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
nodeEnv = pkgs.callPackage ./node-env.nix {
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
Expand Down
11 changes: 4 additions & 7 deletions pulp/node-env.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# This file originates from node2nix

{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile, writeShellScript}:

let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;

python = if nodejs ? python then nodejs.python else python2;

# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
Expand Down Expand Up @@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;

Expand Down Expand Up @@ -591,7 +588,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";

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

Expand Down Expand Up @@ -662,7 +659,7 @@ let
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";

buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
Expand Down
5 changes: 2 additions & 3 deletions purescript-language-server/composition.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_20"}:

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
nodeEnv = pkgs.callPackage ./node-env.nix {
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
Expand Down
11 changes: 4 additions & 7 deletions purescript-language-server/node-env.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# This file originates from node2nix

{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile, writeShellScript}:

let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;

python = if nodejs ? python then nodejs.python else python2;

# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
Expand Down Expand Up @@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;

Expand Down Expand Up @@ -591,7 +588,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";

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

Expand Down Expand Up @@ -662,7 +659,7 @@ let
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";

buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
Expand Down
5 changes: 2 additions & 3 deletions purs-backend-es/composition.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_20"}:

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
nodeEnv = pkgs.callPackage ./node-env.nix {
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
Expand Down
11 changes: 4 additions & 7 deletions purs-backend-es/node-env.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# This file originates from node2nix

{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile, writeShellScript}:

let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;

python = if nodejs ? python then nodejs.python else python2;

# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
Expand Down Expand Up @@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;

Expand Down Expand Up @@ -591,7 +588,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";

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

Expand Down Expand Up @@ -662,7 +659,7 @@ let
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";

buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
Expand Down
5 changes: 2 additions & 3 deletions purs-tidy/composition.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_20"}:

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
nodeEnv = pkgs.callPackage ./node-env.nix {
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
Expand Down
11 changes: 4 additions & 7 deletions purs-tidy/node-env.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# This file originates from node2nix

{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile, writeShellScript}:

let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;

python = if nodejs ? python then nodejs.python else python2;

# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
Expand Down Expand Up @@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;

Expand Down Expand Up @@ -591,7 +588,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";

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

Expand Down Expand Up @@ -662,7 +659,7 @@ let
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";

buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
Expand Down
Loading