Skip to content

Commit a5ad862

Browse files
committed
fix: resolve EOL nodejs build failure of node2nix packages
1 parent 0289503 commit a5ad862

File tree

6 files changed

+71
-23
lines changed

6 files changed

+71
-23
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ update/npm-packages-list: # Generate Nix packages list for npm packages
149149
cd ./modules/node; \
150150
nix-shell -p nodePackages.node2nix \
151151
-p nixfmt \
152-
--command 'node2nix -i ./packages.json -o ./packages.nix --nodejs-18 && find . -type f | grep -e "\.nix$$" | xargs nixfmt' && exit
152+
--command 'node2nix -i ./packages.json -o ./packages.nix && find . -type f | grep -e "\.nix$$" | xargs nixfmt' && exit
153153

154154
.PHONY: update/vscode-settings/darwin
155155
update/vscode-settings/darwin: # Update VSCode settings.json & keybindings.json for Darwin

home/darwin.nix

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
1-
{ pkgs, lib, nix, meta, ... }:
1+
{
2+
pkgs,
3+
lib,
4+
nix,
5+
meta,
6+
...
7+
}:
28

39
let
410
args = { inherit pkgs lib meta; };
511
nixPackages = import ../modules/packages args;
6-
extraNodePackages = builtins.attrValues (import ../modules/node { inherit pkgs; });
12+
npmPackages = builtins.attrValues (
13+
import ../modules/node/default.nix {
14+
inherit pkgs;
15+
nodejs = pkgs.nodejs_22;
16+
}
17+
);
718
in
819
{
920
home = {
@@ -23,7 +34,7 @@ in
2334
shellAliases = import ../modules/shellAliases.nix { inherit meta; };
2435

2536
# nix packages
26-
packages = nixPackages ++ extraNodePackages;
37+
packages = nixPackages ++ npmPackages;
2738
# dotfiles in home directory
2839
file = import ../modules/files args;
2940
};

home/linux.nix

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
1-
{ pkgs, lib, nix, meta, ... }:
1+
{
2+
pkgs,
3+
lib,
4+
nix,
5+
meta,
6+
...
7+
}:
28

39
let
410
args = { inherit pkgs lib meta; };
511
nixPackages = import ../modules/packages args;
6-
extraNodePackages = builtins.attrValues (import ../modules/node { inherit pkgs; });
12+
npmPackages = builtins.attrValues (
13+
import ../modules/node/npm.nix {
14+
inherit pkgs;
15+
nodejs = pkgs.nodejs_22;
16+
}
17+
);
718
in
819
{
920
home = {
@@ -25,7 +36,7 @@ in
2536
shellAliases = import ../modules/shellAliases.nix { inherit meta; };
2637

2738
# nix packages
28-
packages = nixPackages ++ extraNodePackages;
39+
packages = nixPackages ++ npmPackages;
2940
# dotfiles in home directory
3041
file = import ../modules/files args;
3142
};

modules/node/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file has been generated by node2nix 1.11.1. Do not edit!
22

33
{ pkgs ? import <nixpkgs> { inherit system; }, system ? builtins.currentSystem
4-
, nodejs ? pkgs."nodejs_18" }:
4+
, nodejs ? pkgs."nodejs_14" }:
55

66
let
77
nodeEnv = import ./node-env.nix {

modules/node/npm.nix

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{ pkgs, ... }:
2+
3+
# TODO: node2nixを使わない場合はこちらでビルドする
4+
# ハッシュの算出
5+
# 1. `src.hash`
6+
# `nix-build -E 'with import <nixpkgs> {}; fetchFromGitHub { owner = "オーナー"; repo = "リポジトリ"; rev = "バージョン"; sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }' 2>&1 | grep "got:"`
7+
# 2. `npmDepsHash:`
8+
# `npmDepsHash = "";`をセットして、`nix-build --no-out-link -E 'with import <nixpkgs> {}; callPackage ./modules/npm-packages.nix {}' -A パッケージ名`を実行する
9+
{
10+
sort-package-json = pkgs.buildNpmPackage rec {
11+
pname = "sort-package-json";
12+
version = "2.10.0";
13+
14+
src = pkgs.fetchFromGitHub {
15+
owner = "keithamus";
16+
repo = "sort-package-json";
17+
rev = "v${version}";
18+
hash = "sha256-JiOQI3oUH4TaCWd8rx8796vXNhwior380PlQfjQXMzA=";
19+
};
20+
21+
npmDepsHash = "sha256-wKs7x1OGX89xT698i3WAz5iNsv71nbmYe8F9DjXO3tI=";
22+
23+
dontNpmBuild = true;
24+
dontFixup = true;
25+
};
26+
}

modules/node/packages.nix

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ let
4949
"3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==";
5050
};
5151
};
52-
"@swc/core-1.12.9" = {
52+
"@swc/core-1.12.11" = {
5353
name = "_at_swc_slash_core";
5454
packageName = "@swc/core";
55-
version = "1.12.9";
55+
version = "1.12.11";
5656
src = fetchurl {
57-
url = "https://registry.npmjs.org/@swc/core/-/core-1.12.9.tgz";
57+
url = "https://registry.npmjs.org/@swc/core/-/core-1.12.11.tgz";
5858
sha512 =
59-
"O+LfT2JlVMsIMWG9x+rdxg8GzpzeGtCZQfXV7cKc1PjIKUkLFf1QJ7okuseA4f/9vncu37dQ2ZcRrPKy0Ndd5g==";
59+
"P3GM+0lqjFctcp5HhR9mOcvLSX3SptI9L1aux0Fuvgt8oH4f92rCUrkodAa0U2ktmdjcyIiG37xg2mb/dSCYSA==";
6060
};
6161
};
6262
"@swc/counter-0.1.3" = {
@@ -89,14 +89,14 @@ let
8989
"u1iIVZV9Q0jxY+yM2vw/hZGDNudsN85bBpTqzAQ9rzkxW9D+e3aEM4Han+ow518gSewkXgjmEK0BD79ZcNVgPw==";
9090
};
9191
};
92-
"@swc/wasm-1.12.9" = {
92+
"@swc/wasm-1.12.11" = {
9393
name = "_at_swc_slash_wasm";
9494
packageName = "@swc/wasm";
95-
version = "1.12.9";
95+
version = "1.12.11";
9696
src = fetchurl {
97-
url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.12.9.tgz";
97+
url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.12.11.tgz";
9898
sha512 =
99-
"IsN7alteok7GzLDejBKw1AB74YS46Gjl2qGCd7umssL9siFaNSAOwmtKXI5dQlwKG8JUHZ7fa5Tc4K7Z7S0C0Q==";
99+
"ow+Pbhia07CXB/rfyLWsLdSMaSV+hUjNrZ+GV4iIg8KuCADdycOaXcya43OiIJIbcWe3XcYdTIpZO3FL/Qj0XA==";
100100
};
101101
};
102102
"@tsconfig/node10-1.0.11" = {
@@ -139,14 +139,14 @@ let
139139
"vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==";
140140
};
141141
};
142-
"@types/node-24.0.10" = {
142+
"@types/node-24.0.13" = {
143143
name = "_at_types_slash_node";
144144
packageName = "@types/node";
145-
version = "24.0.10";
145+
version = "24.0.13";
146146
src = fetchurl {
147-
url = "https://registry.npmjs.org/@types/node/-/node-24.0.10.tgz";
147+
url = "https://registry.npmjs.org/@types/node/-/node-24.0.13.tgz";
148148
sha512 =
149-
"ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA==";
149+
"Qm9OYVOFHFYg3wJoTSrz80hoec5Lia/dPp84do3X7dZvLikQvM1YpmvTBEdIr/e+U8HTkFjLHLnl78K/qjf+jQ==";
150150
};
151151
};
152152
"acorn-8.15.0" = {
@@ -964,16 +964,16 @@ in {
964964
sources."@jridgewell/resolve-uri-3.1.2"
965965
sources."@jridgewell/sourcemap-codec-1.5.4"
966966
sources."@jridgewell/trace-mapping-0.3.9"
967-
sources."@swc/core-1.12.9"
967+
sources."@swc/core-1.12.11"
968968
sources."@swc/counter-0.1.3"
969969
sources."@swc/helpers-0.5.17"
970970
sources."@swc/types-0.1.23"
971-
sources."@swc/wasm-1.12.9"
971+
sources."@swc/wasm-1.12.11"
972972
sources."@tsconfig/node10-1.0.11"
973973
sources."@tsconfig/node12-1.0.11"
974974
sources."@tsconfig/node14-1.0.3"
975975
sources."@tsconfig/node16-1.0.4"
976-
sources."@types/node-24.0.10"
976+
sources."@types/node-24.0.13"
977977
sources."acorn-8.15.0"
978978
sources."acorn-walk-8.3.4"
979979
sources."arg-4.1.3"

0 commit comments

Comments
 (0)