Skip to content

Commit

Permalink
Fix build issues with node 18 and 20
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Norton committed Oct 17, 2023
1 parent 0e9441a commit 209c525
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 44 deletions.
30 changes: 24 additions & 6 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

86 changes: 48 additions & 38 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,234 +8,244 @@
flake-utils.lib.eachDefaultSystem (system:
with nixpkgs.legacyPackages.${system}; {
packages = let
buildNodejs20 =
callPackage "${nixpkgs}/pkgs/development/web/nodejs/nodejs.nix" {
icu = icu72;
python = python3;
};
buildNodejs18 =
callPackage "${nixpkgs}/pkgs/development/web/nodejs/nodejs.nix" {
icu = icu72;
python = python3;
};
buildNodejs =
callPackage "${nixpkgs}/pkgs/development/web/nodejs/nodejs.nix" {
icu = icu68;
python = python3;
};
v20_8_0 = (buildNodejs {
v20_8_0 = (buildNodejs20 {
enableNpm = true;
version = "20.8.0";
sha256 = "0k3hf41kdj4yylcyjm730ah7mdp5dczcr8wxp8811xkdmr3yhas1";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_7_0 = (buildNodejs {
v20_7_0 = (buildNodejs20 {
enableNpm = true;
version = "20.7.0";
sha256 = "1siby56zq5jl7zihmpcpwpy5rcw5vxs6cncn0m41f5a6bk8drkrz";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_6_1 = (buildNodejs {
v20_6_1 = (buildNodejs20 {
enableNpm = true;
version = "20.6.1";
sha256 = "0avadhibwmdwcxabnfcsaai69028schr44iv6h680f5aimr5xv1s";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_6_0 = (buildNodejs {
v20_6_0 = (buildNodejs20 {
enableNpm = true;
version = "20.6.0";
sha256 = "1ynnlwq9v6p89p7q1qw41hwp7v8dnflkfz8dig9ihjwggax5rywy";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_5_1 = (buildNodejs {
v20_5_1 = (buildNodejs20 {
enableNpm = true;
version = "20.5.1";
sha256 = "14212g44jq2q912zvjv6h0jp39cij7lki9dzawb8dhiq5ym73723";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_5_0 = (buildNodejs {
v20_5_0 = (buildNodejs20 {
enableNpm = true;
version = "20.5.0";
sha256 = "0n70f8gn9bz33vx2qzy1j0aysqfaa8dvfycs0r7c1wfyb1lpacnb";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_4_0 = (buildNodejs {
v20_4_0 = (buildNodejs20 {
enableNpm = true;
version = "20.4.0";
sha256 = "0j2kxs8cxy61hd2vjxf9hynyfqh9s62xipsxkl13rdi6qmrhpg89";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_3_1 = (buildNodejs {
v20_3_1 = (buildNodejs20 {
enableNpm = true;
version = "20.3.1";
sha256 = "14cr7x7wzn5kw2q0369z66qqd2c4jxgildcv72s5jyb90srjva0j";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_3_0 = (buildNodejs {
v20_3_0 = (buildNodejs20 {
enableNpm = true;
version = "20.3.0";
sha256 = "0dbl9x2yzjbzb54gk3jnssvrrvlkcji3xfv6j1r7afpd4fad9a0v";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_2_0 = (buildNodejs {
v20_2_0 = (buildNodejs20 {
enableNpm = true;
version = "20.2.0";
sha256 = "12grrpplasg4vqbq92b0sk78dqn2afq6j7zz2jbmcdbc67r3sli2";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_1_0 = (buildNodejs {
v20_1_0 = (buildNodejs20 {
enableNpm = true;
version = "20.1.0";
sha256 = "1d9njij0d4laipcywkbqfi15dbgn319src92j55q3589hq8rw3v0";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v20_0_0 = (buildNodejs {
v20_0_0 = (buildNodejs20 {
enableNpm = true;
version = "20.0.0";
sha256 = "1dawgfblpki21di5jv5359xq78id8z7cz1c1775x3xv8jmbyfl3l";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_18_1 = (buildNodejs {
v18_18_1 = (buildNodejs18 {
enableNpm = true;
version = "18.18.1";
sha256 = "1xl2wyd4pnkw43ry9snvs5sn0zw0xrqlyjzalmij0aqcxi3m1jf3";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_18_0 = (buildNodejs {
v18_18_0 = (buildNodejs18 {
enableNpm = true;
version = "18.18.0";
sha256 = "140gzrf9zm9dzfaqlbjq771r717rg3d4gnq05y4rzn9l6sndpm74";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_17_1 = (buildNodejs {
v18_17_1 = (buildNodejs18 {
enableNpm = true;
version = "18.17.1";
sha256 = "0np6yp6aw8h0k02dllpi2qp59h84z0cnhk371fn0f3zhs01wy5gj";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_17_0 = (buildNodejs {
v18_17_0 = (buildNodejs18 {
enableNpm = true;
version = "18.17.0";
sha256 = "01h4fzr0dpnhmd96hxhbb8dhyylp68j5ramrrh9w4fgaynnzmh40";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_16_1 = (buildNodejs {
v18_16_1 = (buildNodejs18 {
enableNpm = true;
version = "18.16.1";
sha256 = "0wp2xyz5yqcvb6949xaqpan73rfhdc3cdfsvx7vzvzc9in64yh78";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_16_0 = (buildNodejs {
v18_16_0 = (buildNodejs18 {
enableNpm = true;
version = "18.16.0";
sha256 = "067ijdh9073wyvqb7rlxjy8lbl08j0hg5954vnd50ni37qiimn1k";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_15_0 = (buildNodejs {
v18_15_0 = (buildNodejs18 {
enableNpm = true;
version = "18.15.0";
sha256 = "0dxa9mcda1jpbw721i3yx6141sm0d5j1h8sw362355zz318dci4f";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_14_2 = (buildNodejs {
v18_14_2 = (buildNodejs18 {
enableNpm = true;
version = "18.14.2";
sha256 = "11f6146igf088kka03iifmsw0pqihqnxncr01z6cmqpy4pfn9hzv";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_14_1 = (buildNodejs {
v18_14_1 = (buildNodejs18 {
enableNpm = true;
version = "18.14.1";
sha256 = "016sjdkzz0mkaiadsclfs1s6xvij1ghnni59agphmzb6h91m7hzf";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_14_0 = (buildNodejs {
v18_14_0 = (buildNodejs18 {
enableNpm = true;
version = "18.14.0";
sha256 = "0yi6y00aq17wkazb29zsdqlnlgh96n8rdc0a5glcimck379rvvs2";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_13_0 = (buildNodejs {
v18_13_0 = (buildNodejs18 {
enableNpm = true;
version = "18.13.0";
sha256 = "0s6sscynhw9limpp43f965rn9grdamcvsnd9wfb2h5qxw1icajpx";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_12_1 = (buildNodejs {
v18_12_1 = (buildNodejs18 {
enableNpm = true;
version = "18.12.1";
sha256 = "1prqv6bg4abapsz8njys97ahnxia2srgsb75j2i5j9n53d2hd92g";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_12_0 = (buildNodejs {
v18_12_0 = (buildNodejs18 {
enableNpm = true;
version = "18.12.0";
sha256 = "0bpl0klb60wnhh53xdzgxa0dajjlrnk6dmnfcdvikswr54gg19vk";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_11_0 = (buildNodejs {
v18_11_0 = (buildNodejs18 {
enableNpm = true;
version = "18.11.0";
sha256 = "05yfs36c8p4qx1gh32bk5lp1wq239vk0rnvrjglw2yffdzf475lb";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_10_0 = (buildNodejs {
v18_10_0 = (buildNodejs18 {
enableNpm = true;
version = "18.10.0";
sha256 = "17z8081bqsldx4dl7399dp9gdsmd04lgnwvwycj7sjmyw9a1nwdd";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_9_1 = (buildNodejs {
v18_9_1 = (buildNodejs18 {
enableNpm = true;
version = "18.9.1";
sha256 = "1nfm7n90vlg1wsr3gkadh1iijjnsqsfn522wj6csd2sn8cyrd0gk";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_9_0 = (buildNodejs {
v18_9_0 = (buildNodejs18 {
enableNpm = true;
version = "18.9.0";
sha256 = "0m4n9nc03jxaisk6y3rgf1ifgrxilw1dxk0aj28ng5xdzsdchp67";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_8_0 = (buildNodejs {
v18_8_0 = (buildNodejs18 {
enableNpm = true;
version = "18.8.0";
sha256 = "1fc67k74s62qvxgyr20hr3mr5zklsybqv2k6y4a6dpjys0jrhp9b";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_7_0 = (buildNodejs {
v18_7_0 = (buildNodejs18 {
enableNpm = true;
version = "18.7.0";
sha256 = "1hn3wa9k84gc0v6m8g3hgrjz9pr5map5qwg60f4vmrnzj8ya6d48";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_6_0 = (buildNodejs {
v18_6_0 = (buildNodejs18 {
enableNpm = true;
version = "18.6.0";
sha256 = "0k05phvlpwf467sbaxcvdzr4ncclm9fpldml8fbfrjigl4rhr2sz";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_5_0 = (buildNodejs {
v18_5_0 = (buildNodejs18 {
enableNpm = true;
version = "18.5.0";
sha256 = "0c50y6c52pmbxc8x1zhkzq608bwvcma4fj39cd1mvc40wfa5d2rn";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_4_0 = (buildNodejs {
v18_4_0 = (buildNodejs18 {
enableNpm = true;
version = "18.4.0";
sha256 = "1ddvbblp7wr1kkjws3d0lqfgb2ak1420ci8pmp4ghq83jydg3mll";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_3_0 = (buildNodejs {
v18_3_0 = (buildNodejs18 {
enableNpm = true;
version = "18.3.0";
sha256 = "0986ac61bkgnqvqlqpw596kcbkqks9qyg63qlp6mfl3fca0lls9z";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_2_0 = (buildNodejs {
v18_2_0 = (buildNodejs18 {
enableNpm = true;
version = "18.2.0";
sha256 = "0vfnr9mwqiiqdzz4sffp07pyxiwrpbwh4l2vj174fismpxgb2193";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_1_0 = (buildNodejs {
v18_1_0 = (buildNodejs18 {
enableNpm = true;
version = "18.1.0";
sha256 = "0zhb61ihzslmpl1g3dd6vcxjccc8gwj1v4hfphk7f3cy10hcrc78";
patches = lib.optional stdenv.isDarwin "${nixpkgs}/pkgs/development/web/nodejs/./bypass-xcodebuild.diff";
});
v18_0_0 = (buildNodejs {
v18_0_0 = (buildNodejs18 {
enableNpm = true;
version = "18.0.0";
sha256 = "0xffp1c8a2zbdf99jdn0fbym8wnsikkw7xczjydcc95m81jhwk9l";
Expand Down

0 comments on commit 209c525

Please sign in to comment.