From 25feecd652cd1c453792892bdfdd3630bc7a7fed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Jul 2022 13:24:03 +0200 Subject: [PATCH] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/2c94b9801f1a11cde0fc97aa850687bb9137d42c' (2022-07-13) → 'github:nix-community/home-manager/4c5106ed0f3168ff2df21b646aef67e86cbfc11c' (2022-07-15) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/38860c9e91cb00f4d8cd19c7b4e36c45680c89b5' (2022-07-11) → 'github:nixos/nixpkgs/8f485713f5e6b6883a9b6959afa98688360a3ecb' (2022-07-16) Also had to downgrade Node.js version in Pengu since it started to fail with: npm info run @parcel/watcher@2.0.5 install node_modules/@parcel/watcher node-gyp-build npm info run bufferutil@4.0.6 install node_modules/bufferutil node-gyp-build npm info run lmdb@2.2.4 install node_modules/lmdb node-gyp-build npm info run msgpackr-extract@2.0.2 install node_modules/msgpackr-extract node-gyp-build-optional-packages npm info run utf-8-validate@5.0.9 install node_modules/utf-8-validate node-gyp-build npm info run utf-8-validate@5.0.9 install { code: 126, signal: null }e@5. npm info run msgpackr-extract@2.0.2 install { code: 126, signal: null } npm verb reify failed optional dependency /build/source/node_modules/msgpackr-extract npm verb reify failed optional dependency /build/source/node_modules/node-gyp-build-optional-packages npm timing build:run:install:node_modules/msgpackr-extract Completed in 35ms npm info run lmdb@2.2.4 install { code: 126, signal: null } npm info run bufferutil@4.0.6 install { code: 126, signal: null } npm info run @parcel/watcher@2.0.5 install { code: 126, signal: null } npm timing reify:rollback:createSparse Completed in 403msr@2r@2 npm timing reify:rollback:retireShallow Completed in 0ms npm timing command:install Completed in 6310ms npm verb stack Error: command failed npm verb stack at ChildProcess. (/nix/store/vcfm2pcj8dl8inyg93hwrbwkfn3kfr7v-nodejs-18.6.0/lib/node_modules/npm/node_modules/@npmcli/promise-spawn/lib/index.js:63:27) npm verb stack at ChildProcess.emit (node:events:513:28) npm verb stack at maybeClose (node:internal/child_process:1091:16) npm verb stack at Socket. (node:internal/child_process:449:11) npm verb stack at Socket.emit (node:events:513:28) npm verb stack at Pipe. (node:net:757:14) npm verb pkgid utf-8-validate@5.0.9 npm verb cwd /build/source npm verb Linux 5.18.10 npm verb node v18.6.0 npm verb npm v8.13.2 npm ERR! code 126 npm ERR! path /build/source/node_modules/utf-8-validate npm ERR! command failed npm ERR! command sh -c /build/install6584764974.sh npm ERR! sh: /build/install6584764974.sh: /usr/bin/env: bad interpreter: No such file or directory npm verb exit 126 But bumping its dependencies did not help. Bisected that to to the following commit in Nixpkgs: commit 5ad0643e1c0b6ec442754b34316814ea212a76a3 Author: R. Ryantm Date: Thu Jul 14 10:05:53 2022 +0000 nodejs-18_x: 18.5.0 -> 18.6.0 And node.js: commit 0636f86eccdf1c343fe94c16926160dbdefa2553 Author: npm CLI robot Date: Fri Jun 24 18:21:50 2022 -0700 deps: upgrade npm to 8.13.1 PR-URL: https://github.com/nodejs/node/pull/43552 --- flake.lock | 12 ++++++------ flake.nix | 2 +- pkgs/pengu/default.nix | 4 +--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 72f99bd..e30c0e7 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1657719085, - "narHash": "sha256-nQt3MEBwKuKlmFKSRhdoh60AGlc+YlspV5e8kO/3y8U=", + "lastModified": 1657887110, + "narHash": "sha256-8VV0/kZed2z8fGtEc2zr+WLxTow+JTIlMjnSisyv0GQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c94b9801f1a11cde0fc97aa850687bb9137d42c", + "rev": "4c5106ed0f3168ff2df21b646aef67e86cbfc11c", "type": "github" }, "original": { @@ -170,11 +170,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657533762, - "narHash": "sha256-/cxTFSMmpAb8tBp1yVga1fj+i8LB9aAxnMjYFpRMuVs=", + "lastModified": 1658015103, + "narHash": "sha256-mO+23f3SO+fBzEvbxRe6GkSB5Xp43CT2sV8Rs8MYdz8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "38860c9e91cb00f4d8cd19c7b4e36c45680c89b5", + "rev": "8f485713f5e6b6883a9b6959afa98688360a3ecb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c4e6f54..3f7262b 100644 --- a/flake.nix +++ b/flake.nix @@ -95,7 +95,7 @@ # Take only napalm attribute from napalm overlay and # pass it the latest nodejs. (lib.pipe napalm.overlay [ - (locallyOverrideFinal (final: { nodejs = final.nodejs_latest; })) + (locallyOverrideFinal (final: { nodejs = final.nodejs; })) (filterOverlayAttrs [ "napalm" ]) ]) diff --git a/pkgs/pengu/default.nix b/pkgs/pengu/default.nix index e1d3e11..106b6c8 100644 --- a/pkgs/pengu/default.nix +++ b/pkgs/pengu/default.nix @@ -2,7 +2,7 @@ runCommand, fetchFromGitHub, napalm, - nodejs_latest, + nodejs, python3, unstableGitUpdater, }: @@ -17,8 +17,6 @@ let npm config set audit false ''; - nodejs = nodejs_latest; - src = fetchFromGitHub { owner = "jtojnar"; repo = "pengu";