diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-04-17 13:34:05 -0400 |
---|---|---|
committer | Lily Foster <lily@lily.flowers> | 2024-04-17 13:34:05 -0400 |
commit | fb0d66108175f469219a0a1ebf4a3fa053d16cac (patch) | |
tree | 2ae0efb8e9f771122a8e04d1548242b82ee13566 /pkgs/servers | |
parent | 6181939cdffb65f70feeeb8d9f241ae4c3de030b (diff) |
treewide: replace prefetch-yarn-deps with fixup-yarn-lock where necessary
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/akkoma/admin-fe/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/akkoma/akkoma-fe/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/alice-lg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/gotify/ui.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mastodon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana-agent/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/peertube/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/rmfakecloud/webui.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/teleport/generic.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/web-apps/discourse/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/web-apps/outline/default.nix | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index 20ffd30547625..c670046f4264b 100644 --- a/pkgs/servers/akkoma/admin-fe/default.nix +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitea, fetchYarnDeps -, prefetch-yarn-deps, yarn, nodejs +, fixup-yarn-lock, yarn, nodejs , python3, pkg-config, libsass }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock yarn nodejs pkg-config diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index 2e3dd149140d1..32255320b9173 100644 --- a/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitea, fetchYarnDeps -, prefetch-yarn-deps, yarn, nodejs +, fixup-yarn-lock, yarn, nodejs , jpegoptim, oxipng, nodePackages }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock yarn nodejs jpegoptim diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 9160b3fe81a91..875b5b9b00317 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -6,7 +6,7 @@ , yarn , nodejs , nixosTests -, prefetch-yarn-deps +, fixup-yarn-lock }: buildGoModule rec { @@ -32,7 +32,7 @@ buildGoModule rec { hash = "sha256-PwByNIegKYTOT8Yg3nDMDFZiLRVkbX07z99YaDiBsIY="; }; - nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ]; + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index e22831cfbbdca..43bb86e458238 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -1,6 +1,6 @@ { stdenv , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs-slim , fetchFromGitHub , fetchYarnDeps @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hash = "sha256-ejHzo6NHCMlNiYePWvfMY9Blb58pj3UQ5PFI0V84flI="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs-slim ]; + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs-slim ]; postPatch = '' export HOME=$NIX_BUILD_TOP/fake_home diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index dcd2a6dcae35d..78c72187d81e8 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests , yarn, callPackage, ruby, writeShellScript -, fetchYarnDeps, prefetch-yarn-deps +, fetchYarnDeps, fixup-yarn-lock , brotli # Allow building a fork or custom version of Mastodon: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { hash = yarnHash; }; - nativeBuildInputs = [ prefetch-yarn-deps nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; + nativeBuildInputs = [ fixup-yarn-lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; RAILS_ENV = "production"; NODE_ENV = "production"; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 09f1bc739863f..8811c816a0ac8 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , nodejs-slim , matrix-sdk-crypto-nodejs @@ -34,7 +34,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs-slim nodejs.pkgs.yarn nodejs.pkgs.node-gyp-build diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index bac1f19150032..745e5f5e25d51 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,11 +2,11 @@ , buildGoModule , fetchFromGitHub , fetchYarnDeps +, fixup-yarn-lock , grafana-agent , nix-update-script , nixosTests , nodejs -, prefetch-yarn-deps , stdenv , systemd , testers @@ -44,7 +44,7 @@ buildGoModule rec { "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z" ]; - nativeBuildInputs = [ prefetch-yarn-deps nodejs yarn ]; + nativeBuildInputs = [ fixup-yarn-lock nodejs yarn ]; tags = [ "builtinassets" diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 12c9cb2e5ab24..524734819109e 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,7 +6,7 @@ , fetchYarnDeps , nixosTests , brotli -, prefetch-yarn-deps +, fixup-yarn-lock , jq , nodejs , which @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "cli" "runner" ]; - nativeBuildInputs = [ brotli prefetch-yarn-deps jq which yarn ]; + nativeBuildInputs = [ brotli fixup-yarn-lock jq which yarn ]; buildInputs = [ nodejs ]; diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/servers/rmfakecloud/webui.nix index ceadafc805033..98c4822a90b3a 100644 --- a/pkgs/servers/rmfakecloud/webui.nix +++ b/pkgs/servers/rmfakecloud/webui.nix @@ -1,4 +1,4 @@ -{ version, src, stdenv, lib, fetchYarnDeps, prefetch-yarn-deps, yarn, nodejs }: +{ version, src, stdenv, lib, fetchYarnDeps, fixup-yarn-lock, yarn, nodejs }: stdenv.mkDerivation rec { inherit version src; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-JLCrpzytMKejmW+WlM6yybsoIZiimiJdPG5dSIn1L14="; }; - nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ]; + nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; buildPhase = '' export HOME=$(mktemp -d) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 80a05f979175f..e47845ea56c6f 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -19,7 +19,7 @@ , yarn , wasm-bindgen-cli , wasm-pack -, prefetch-yarn-deps +, fixup-yarn-lock , nixosTests , withRdpClient ? true @@ -80,7 +80,7 @@ let "-C linker=lld" ]; - nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ] ++ + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock ] ++ lib.optional (lib.versionAtLeast version "15") [ binaryen cargo diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index b72925c0ab2e3..57c252054eb94 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -35,7 +35,7 @@ , icu , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodePackages , nodejs_18 , jq @@ -215,7 +215,7 @@ let nodejs_18 jq moreutils - prefetch-yarn-deps + fixup-yarn-lock ]; outputs = [ "out" "javascripts" ]; diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 6464035db3174..a6b069f1dad89 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , makeWrapper -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , yarn , nixosTests @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-jK1jZ9NyBl3Dioh/7gXWx6XyyI6xJKt2a/XXzbhllZM="; }; - nativeBuildInputs = [ makeWrapper prefetch-yarn-deps ]; + nativeBuildInputs = [ makeWrapper fixup-yarn-lock ]; buildInputs = [ yarn nodejs ]; yarnOfflineCache = fetchYarnDeps { |