From 28297fcd325011e4fe0aee51752c036e0e59bab3 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 21 Mar 2025 01:12:53 +0100 Subject: [PATCH 1/8] node-env.nix: use each nodejs' python instead of python2 Node v18, v20, v22 and v23 all use some version of python3 --- pkgs/development/node-packages/node-env.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 4123ca029664..373b730698f7 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,9 +1,9 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: +{lib, stdenv, nodejs, pkgs, libtool, runCommand, writeTextFile, writeShellScript, ...}: let - python = if nodejs ? python then nodejs.python else python2; + inherit (nodejs) python; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' From 3814cd057750aec2ea3ea82b5f42bd69dfeb346d Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 21 Mar 2025 01:00:16 +0100 Subject: [PATCH 2/8] elmPackages.node: remove reference to python2 pkgs.nodejs_18 uses python311, which means pkgs.python2 will never be used --- .../development/compilers/elm/packages/node/node-composition.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix index f23ba8e11e71..e095e45b97db 100644 --- a/pkgs/development/compilers/elm/packages/node/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript From b6ecdd7c8f9f8400ab18ea1390dbf49a8deed9d3 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 21 Mar 2025 01:06:38 +0100 Subject: [PATCH 3/8] base16-builder: remove reference to python2 pkgs.nodejs_18 uses python311, which means pkgs.python2 will never be used --- pkgs/misc/base16-builder/node-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index b4bd9d9d41d2..1d201f032168 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit (pkgs) stdenv lib runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; From 3450d8ba82c5600bd19e2d96f8d69df0a6264030 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 21 Mar 2025 01:09:01 +0100 Subject: [PATCH 4/8] mx-puppet-discord: remove reference to python2 pkgs.nodejs_18 uses python311, which means pkgs.python2 will never be used --- pkgs/servers/mx-puppet-discord/node-composition.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 12460bea17a1..e7922d509acb 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript From a06ebb3b609ec2740849211b93d4551d7e4f0b91 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 21 Mar 2025 01:11:08 +0100 Subject: [PATCH 5/8] ethercalc: remove reference to python2 pkgs.nodejs_20 uses python3, which means pkgs.python2 will never be used --- pkgs/servers/web-apps/ethercalc/node-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix index 1042cdba2cb6..0d1f60098bb6 100644 --- a/pkgs/servers/web-apps/ethercalc/node-packages.nix +++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript From ba862e80fd1b1732c7c9f1c654a0691ceca6242e Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 21 Mar 2025 02:02:35 +0100 Subject: [PATCH 6/8] onlykey: remove reference to python2 pkgs.nodejs_18 uses python311, which means pkgs.python2 will never be used --- pkgs/tools/security/onlykey/onlykey.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index 05d8f84ddebb..1814e4887f8c 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript From 136d3b96d2c34220dbfa597008eef0054061cc66 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 21 Mar 2025 01:58:31 +0100 Subject: [PATCH 7/8] composition.nix: remove reference to python2 pkgs.nodejs_22 uses python3, which means pkgs.python2 will never be used --- pkgs/development/node-packages/composition.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 659c43a1feec..6d49245bff5d 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript From f86abd8bb1a9a962415089db938ef1e43dd7f1ac Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Fri, 21 Mar 2025 01:47:55 +0100 Subject: [PATCH 8/8] node-env.nix: remove ellipsis --- pkgs/development/node-packages/node-env.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 373b730698f7..b1ba5526816d 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{lib, stdenv, nodejs, pkgs, libtool, runCommand, writeTextFile, writeShellScript, ...}: +{lib, stdenv, nodejs, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let inherit (nodejs) python;