From 125bd1f0b55d6fbf43dcaef44d523aec0710d06e Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 23 Nov 2022 20:44:17 -0500 Subject: [PATCH 1/3] doc/languages-frameworks/javascript: update deps hash in example --- doc/languages-frameworks/javascript.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index fa10747dacc4..2c27ef80cdcb 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -177,7 +177,7 @@ buildNpmPackage rec { patches = [ ./remove-prepack-script.patch ]; - npmDepsHash = "sha256-s8SpZY/1tKZVd3vt7sA9vsqHvEaNORQBMrSyhWpj048="; + npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; NODE_OPTIONS = "--openssl-legacy-provider"; From b023946d2bbfe19e3b7ba6249ef48cd59f386949 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Wed, 23 Nov 2022 16:31:44 -0500 Subject: [PATCH 2/3] prefetch-npm-deps: fix hash stability GNU tar will apparently silently include mtime of files if --mtime is passed with an unrecognized date format. This led to hash instability from those mtimes and this fixes it to force all mtimes to epoch timestamp 0. --- pkgs/build-support/node/fetch-npm-deps/default.nix | 4 ++-- pkgs/build-support/node/fetch-npm-deps/src/main.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 7d5ea7cbfbe8..11d5cf328442 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -84,7 +84,7 @@ hash = "sha256-X9mCwPqV5yP0S2GonNvpYnLSLJMd/SUIked+hMRxDpA="; }; - hash = "sha256-5Mg7KDJLMM5e/7BCHGinGAnBRft2ySQzvKW06p3u/0o="; + hash = "sha256-tEdElWJ+KBTxBobzXBpPopQSwK2usGW/it1+yfbVzBw="; }; linkDependencies = makeTest { @@ -107,7 +107,7 @@ hash = "sha256-1fGNxYJi1I4cXK/jinNG+Y6tPEOhP3QAqWOBEQttS9E="; }; - hash = "sha256-8xF8F74nHwL9KPN2QLsxnfvsk0rNCKOZniYJQCD5u/I="; + hash = "sha256-+KA8/orSBJ4EhuSyQO8IKSxsN/FAsYU3lOzq+awuxNQ="; }; }; diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index cf9651d42d64..3d2204071a66 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -421,7 +421,7 @@ fn main() -> anyhow::Result<()> { data = Command::new("tar") .args([ "--sort=name", - "--mtime=0", + "--mtime=@0", "--owner=0", "--group=0", "--numeric-owner", From b2891427b201a12ae9071309817a2abc5357c7a7 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Wed, 23 Nov 2022 16:31:56 -0500 Subject: [PATCH 3/3] open-stage-control: update npmDepsHash --- pkgs/applications/audio/open-stage-control/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 015265774507..6375e268b76c 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -16,7 +16,7 @@ buildNpmPackage rec { ./package-lock.json.patch ]; - npmDepsHash = "sha256-SGLcFjPnmhFoeXtP4gfGr4Qa1dTaXwSnzkweEvYW/1k="; + npmDepsHash = "sha256-5KZXZ4agHcAh3gai5w9YodETIEGJtDq/kyEZOHb9dOc="; nativeBuildInputs = [ copyDesktopItems