about summary refs log tree commit diff
path: root/pkgs/development/node-packages
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@sap.com>2023-04-14 15:44:56 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-04-25 11:28:31 +0200
commit9dc7d17ed8744b1d3b8acc0d7150bfc825eadfcd (patch)
tree64fc19b6af2205bce253e698d0428f9aa94cd37f /pkgs/development/node-packages
parentaad577bd30b0ab16a7859973c88edd6d0d5becde (diff)
node2nix: use new name package name for nodejs
We do not want to generate files with aliases in them
Diffstat (limited to 'pkgs/development/node-packages')
-rw-r--r--pkgs/development/node-packages/overrides.nix17
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index a4acdc0d1c4d5..73ccd81128631 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -341,23 +341,16 @@ final: prev: {
     src = fetchFromGitHub {
       owner = "svanderburg";
       repo = "node2nix";
-      rev = "026360084db8a27095aafdac7125d7f1a93046c8";
-      sha256 = "sha256-zO/xGG10v7HGv58RLX5SFd7QOXAL2vRxCRM8IfRZ8JA=";
+      rev = "315e1b85a6761152f57a41ccea5e2570981ec670";
+      sha256 = "sha256-8OxTOkwBPcnjyhXhxQEDd8tiaQoHt91zUJX5Ka+IXco=";
     };
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postInstall = let
       patches = [
-        # Needed to fix Node.js 16+ - PR svanderburg/node2nix#302
+        # fix nodejs attr names
         (fetchpatch {
-          name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch";
-          url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch";
-          hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8=";
-        })
-        # Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314
-        (fetchpatch {
-          name = "convert-crlf-for-script-bin-files.patch";
-          url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch";
-          hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU=";
+          url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch";
+          hash = "sha256-pe8Xm4mjPh9oKXugoMY6pRl8YYgtdw0sRXN+TienalU=";
         })
       ];
     in ''