mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-04 05:50:00 +00:00
treewide: remove hallucinated npmDepsFetcherVersion 3 (#548225)
This commit is contained in:
@@ -300,8 +300,19 @@
|
||||
NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverridesString;
|
||||
|
||||
# Fetcher version controls which features are enabled in prefetch-npm-deps
|
||||
# Version 2+ enables packument fetching for workspace support
|
||||
NPM_FETCHER_VERSION = toString fetcherVersion;
|
||||
NPM_FETCHER_VERSION =
|
||||
let
|
||||
# Increment when we introduce a new version.
|
||||
validFetcherVersions = [
|
||||
1 # Initial version
|
||||
2 # enables packument fetching for workspace support
|
||||
];
|
||||
in
|
||||
assert lib.assertMsg (lib.elem fetcherVersion validFetcherVersions)
|
||||
"fetchNpmDeps: fetcher version must be one of: ${
|
||||
lib.concatMapStringsSep ", " toString validFetcherVersions
|
||||
}.";
|
||||
(toString fetcherVersion);
|
||||
|
||||
SSL_CERT_FILE =
|
||||
if
|
||||
|
||||
@@ -73,8 +73,8 @@ buildNpmPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
npmWorkspace = "apps/desktop";
|
||||
npmDepsFetcherVersion = 3;
|
||||
npmDepsHash = "sha256-8wjt5wnJG4S4EeGWGxbo6Bwt76GIqrSiwqwwwQ17Y5Y=";
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-WRxlvkgWboO0ukUHgjC5CrfgfwnmUfDXI4r5dx9CKww=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs)
|
||||
|
||||
@@ -61,7 +61,7 @@ let
|
||||
__structuredAttrs = true;
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/dashboard";
|
||||
npmDepsFetcherVersion = 3;
|
||||
npmDepsFetcherVersion = 2;
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs)
|
||||
@@ -70,8 +70,8 @@ let
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-gBWJP0dF2zDEWLYxfKYQSn9O5hVRkcviDv9oP267pQQ=";
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-d/+54lpNe0tXrC+Mrhpc1cdXOMjYblE0QByIdiaDgU0=";
|
||||
};
|
||||
});
|
||||
in
|
||||
|
||||
@@ -31,8 +31,8 @@ buildNpmPackage (finalAttrs: {
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-pg+USHnvcxaXG/floNItLXNFJOPvuDltQCcN1qT/nng=";
|
||||
npmDepsFetcherVersion = 3;
|
||||
npmDepsHash = "sha256-JxyG7qMJS7zchxLIxYCmsFajUVW4fONnqgeq2iKlt4A=";
|
||||
npmDepsFetcherVersion = 2;
|
||||
|
||||
nativeBuildInputs = [ bun ];
|
||||
|
||||
|
||||
@@ -21,11 +21,12 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
npmDepsFetcherVersion = 3;
|
||||
hash = "sha256-V9aRKoJ6+BN/q7NS21eZBopzkWje8sOGGL1AgO4cUM0=";
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-xobZg0Hc+Yi9+q6kMwuKtBb4pjdYNS4T9VdFy5hARlw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -23,8 +23,8 @@ buildNpmPackage (finalAttrs: {
|
||||
hash = "sha256-XWhQ5GlAGW0WAyiPwBULLz1yQps2IdjVkusQ0a88tCs=";
|
||||
};
|
||||
|
||||
npmDepsFetcherVersion = 3;
|
||||
npmDepsHash = "sha256-dRc+hTk5ELw0rJhT71heFnLjTmjN1UpIOHUMXKt4YwU=";
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-2vr8Yspm6CCVnO6Jf8B3wiL6X+Tp6hZZEPr+WC/Dcak=";
|
||||
|
||||
# npm 11 incompatible with fetchNpmDeps
|
||||
# https://github.com/NixOS/nixpkgs/issues/474535
|
||||
|
||||
@@ -24,9 +24,9 @@ buildNpmPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsFetcherVersion = 3;
|
||||
npmDepsFetcherVersion = 2;
|
||||
|
||||
npmDepsHash = "sha256-AmJNFEw7IF9PjgeRma6vp3I7a60ZkekfRkPXJtjVIik=";
|
||||
npmDepsHash = "sha256-e7C2ZG7SH9xjfU07lX8rzPeox6k2Fdz7AowOduLxvvs=";
|
||||
|
||||
nodejs = nodejs_24;
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ buildNpmPackage rec {
|
||||
hash = "sha256-Uz0wPdhTVy2yOlKWAy5phr+30NmFaIPQQh5bsiWCDLA=";
|
||||
};
|
||||
|
||||
npmDepsFetcherVersion = 3;
|
||||
npmDepsHash = "sha256-PaDxqVsq00QIKDmhDhsEbKdM4QXfXn28PgpOyZjB60k=";
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-SkzEM54nMFqiYUqIRTbp3+yaZEJMgjFkjRLT5NZTN94=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
Reference in New Issue
Block a user