From fb0d66108175f469219a0a1ebf4a3fa053d16cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Apr 2024 13:34:05 -0400 Subject: [PATCH] treewide: replace prefetch-yarn-deps with fixup-yarn-lock where necessary --- pkgs/applications/audio/muzika/default.nix | 4 ++-- pkgs/applications/graphics/drawio/default.nix | 4 ++-- pkgs/applications/misc/tandoor-recipes/frontend.nix | 4 ++-- pkgs/applications/networking/cluster/tilt/assets.nix | 4 ++-- .../instant-messengers/element/element-desktop.nix | 4 ++-- .../networking/instant-messengers/element/element-web.nix | 4 ++-- .../instant-messengers/element/seshat/default.nix | 4 ++-- .../instant-messengers/hydrogen-web/unwrapped.nix | 4 ++-- .../instant-messengers/teams-for-linux/default.nix | 4 ++-- pkgs/applications/networking/irc/thelounge/default.nix | 4 ++-- pkgs/applications/version-management/gitlab/default.nix | 4 ++-- pkgs/applications/version-management/sapling/default.nix | 4 ++-- pkgs/applications/virtualization/podman-desktop/default.nix | 4 ++-- pkgs/by-name/aw/aws-azure-login/package.nix | 4 ++-- pkgs/by-name/de/devcontainer/package.nix | 4 ++-- pkgs/by-name/fe/fernglas/package.nix | 4 ++-- pkgs/by-name/gi/gitmoji-cli/package.nix | 4 ++-- pkgs/by-name/in/incus/ui.nix | 4 ++-- pkgs/by-name/lx/lxd-ui/package.nix | 4 ++-- pkgs/by-name/me/mealie/mealie-frontend.nix | 4 ++-- pkgs/by-name/me/mermaid-cli/package.nix | 4 ++-- pkgs/by-name/no/node-hp-scan-to/package.nix | 4 ++-- pkgs/by-name/px/pxder/package.nix | 4 ++-- pkgs/by-name/sh/shepherd/package.nix | 4 ++-- pkgs/by-name/ve/vercel-pkg/package.nix | 4 ++-- pkgs/development/python-modules/dash/default.nix | 4 ++-- pkgs/development/tools/electron-fiddle/default.nix | 4 ++-- pkgs/development/tools/electron/common.nix | 4 ++-- pkgs/games/anki/default.nix | 6 +++--- pkgs/games/heroic/default.nix | 4 ++-- pkgs/games/r2modman/default.nix | 4 ++-- pkgs/servers/akkoma/admin-fe/default.nix | 4 ++-- pkgs/servers/akkoma/akkoma-fe/default.nix | 4 ++-- pkgs/servers/alice-lg/default.nix | 4 ++-- pkgs/servers/gotify/ui.nix | 4 ++-- pkgs/servers/mastodon/default.nix | 4 ++-- .../matrix-synapse/matrix-appservice-irc/default.nix | 4 ++-- pkgs/servers/monitoring/grafana-agent/default.nix | 4 ++-- pkgs/servers/peertube/default.nix | 4 ++-- pkgs/servers/rmfakecloud/webui.nix | 4 ++-- pkgs/servers/teleport/generic.nix | 4 ++-- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- pkgs/servers/web-apps/outline/default.nix | 4 ++-- pkgs/tools/admin/pgadmin/default.nix | 4 ++-- pkgs/tools/networking/ratman/default.nix | 4 ++-- pkgs/tools/typesetting/marp/default.nix | 4 ++-- 46 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/applications/audio/muzika/default.nix b/pkgs/applications/audio/muzika/default.nix index 86a3f1961983..d3b4e3d27452 100644 --- a/pkgs/applications/audio/muzika/default.nix +++ b/pkgs/applications/audio/muzika/default.nix @@ -2,7 +2,7 @@ , desktop-file-utils , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , gjs , glib-networking , gobject-introspection @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ninja nodejs pkg-config - prefetch-yarn-deps + fixup-yarn-lock wrapGAppsHook4 yarn ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 9464a0d7d1dc..b53879974d00 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeDesktopItem , copyDesktopItems -, prefetch-yarn-deps +, fixup-yarn-lock , makeWrapper , autoSignDarwinBinariesHook , nodejs @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock makeWrapper nodejs yarn diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix index d63c0874171e..2b53e1efa930 100644 --- a/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchYarnDeps, prefetch-yarn-deps, callPackage, nodejs }: +{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs }: let common = callPackage ./common.nix { }; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs nodejs.pkgs.yarn ]; diff --git a/pkgs/applications/networking/cluster/tilt/assets.nix b/pkgs/applications/networking/cluster/tilt/assets.nix index 6bc70de3213f..8fafcf666d8d 100644 --- a/pkgs/applications/networking/cluster/tilt/assets.nix +++ b/pkgs/applications/networking/cluster/tilt/assets.nix @@ -2,7 +2,7 @@ , stdenvNoCC , version, src , fetchYarnDeps -, prefetch-yarn-deps, yarn, nodejs +, fixup-yarn-lock, yarn, nodejs }: stdenvNoCC.mkDerivation rec { @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { inherit src version; - nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ]; + nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/web/yarn.lock"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index ffbee0f25f82..3fcbfcbf4649 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeWrapper , makeDesktopItem -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , nodejs , fetchYarnDeps @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = desktopYarnHash; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper jq ] + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs makeWrapper jq ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; inherit seshat; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 343c21d64730..2d69022ec35d 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -6,7 +6,7 @@ , writeText , jq , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , jitsi-meet }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = webYarnHash; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; + nativeBuildInputs = [ yarn fixup-yarn-lock jq nodejs ]; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 980e22c0c3e3..ed6b5ebe72a6 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, prefetch-yarn-deps, CoreServices, fetchYarnDeps, removeReferencesTo }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, fixup-yarn-lock, CoreServices, fetchYarnDeps, removeReferencesTo }: let pinData = lib.importJSON ./pin.json; @@ -16,7 +16,7 @@ in rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/seshat-node/native"; - nativeBuildInputs = [ nodejs python3 yarn prefetch-yarn-deps ]; + nativeBuildInputs = [ nodejs python3 yarn fixup-yarn-lock ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; npm_config_nodedir = nodejs; diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 2debdc6140d2..7a3ad36e47b7 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs ]; + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 037d27cf0660..6c976fdd0a43 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -7,7 +7,7 @@ , yarn , nodejs , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , electron , libnotify , libpulseaudio @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jBwyIyiWeqNmOnxmVOr7c4oMWwHElEjM25sShhTMi78="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs copyDesktopItems makeWrapper ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index f309da11df85..1078f515c69a 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , nodejs , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , python3 , npmHooks , darwin @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; }; - nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ sqlite ]; configurePhase = '' diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index ad63b76f114f..2e440e2b9766 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -2,7 +2,7 @@ , ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl , defaultGemConfig, buildRubyGem , gitlabEnterprise ? false, callPackage, yarn -, prefetch-yarn-deps, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config +, fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config , cargo, rustc, rustPlatform }: @@ -94,7 +94,7 @@ let sha256 = data.yarn_hash; }; - nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert prefetch-yarn-deps ]; + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert fixup-yarn-lock ]; patches = [ # Since version 12.6.0, the rake tasks need the location of git, diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 0d99b350c0b8..c5f2adf153f5 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -13,7 +13,7 @@ , fetchYarnDeps , yarn , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , glibcLocales , libiconv , Cocoa @@ -66,7 +66,7 @@ let inherit version; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs yarn ]; diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 80c013becb40..fdf829401399 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , makeWrapper , copyDesktopItems @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn - prefetch-yarn-deps + fixup-yarn-lock nodejs makeWrapper copyDesktopItems diff --git a/pkgs/by-name/aw/aws-azure-login/package.nix b/pkgs/by-name/aw/aws-azure-login/package.nix index 099726ba9e8d..fc693e3eed01 100644 --- a/pkgs/by-name/aw/aws-azure-login/package.nix +++ b/pkgs/by-name/aw/aws-azure-login/package.nix @@ -6,7 +6,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: stdenv.mkDerivation (finalAttrs: { @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index aaf4f562e06f..20eebbc9d5ab 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchYarnDeps , fetchFromGitHub -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , python3 , makeWrapper @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Wy0UP8QaQzZ1par7W5UhnRLc5DF2PAif0JIZJtRokBk="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps python3 makeWrapper ]; + nativeBuildInputs = [ yarn fixup-yarn-lock python3 makeWrapper ]; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix index 3de973612857..de0c7706af6f 100644 --- a/pkgs/by-name/fe/fernglas/package.nix +++ b/pkgs/by-name/fe/fernglas/package.nix @@ -3,7 +3,7 @@ , rustPlatform , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , python3 , jq , yarn @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0wj5AS8RLVr+S/QWWxCsMvmVjmXUWGfR9kPaZimJEss="; }; - nativeBuildInputs = [ yarn nodejs-slim prefetch-yarn-deps python3 jq ]; + nativeBuildInputs = [ yarn nodejs-slim fixup-yarn-lock python3 jq ]; nlnog_communities = fetchFromGitHub { owner = "NLNOG"; diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix index 79a801000ad1..2534fa745cd7 100644 --- a/pkgs/by-name/gi/gitmoji-cli/package.nix +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , testers }: @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/in/incus/ui.nix b/pkgs/by-name/in/incus/ui.nix index ec7518ef83ad..5d2d248d6940 100644 --- a/pkgs/by-name/in/incus/ui.nix +++ b/pkgs/by-name/in/incus/ui.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , nixosTests , git @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn git ]; diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix index e5bc293e873b..2475a653c3cc 100644 --- a/pkgs/by-name/lx/lxd-ui/package.nix +++ b/pkgs/by-name/lx/lxd-ui/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchYarnDeps, nodejs, - prefetch-yarn-deps, + fixup-yarn-lock, yarn, nixosTests, nix-update-script, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index 5a7b677802ee..a98d22761e71 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -1,5 +1,5 @@ src: version: -{ lib, fetchYarnDeps, nodejs_18, prefetch-yarn-deps, stdenv }: stdenv.mkDerivation { +{ lib, fetchYarnDeps, nodejs_18, fixup-yarn-lock, stdenv }: stdenv.mkDerivation { name = "mealie-frontend"; inherit version; src = "${src}/frontend"; @@ -10,7 +10,7 @@ src: version: }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs_18 nodejs_18.pkgs.yarn ]; diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix index a299e69bc69e..d00da6941cf8 100644 --- a/pkgs/by-name/me/mermaid-cli/package.nix +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , chromium }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/no/node-hp-scan-to/package.nix b/pkgs/by-name/no/node-hp-scan-to/package.nix index b6a5eced5f46..93ea3b3a760a 100644 --- a/pkgs/by-name/no/node-hp-scan-to/package.nix +++ b/pkgs/by-name/no/node-hp-scan-to/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/px/pxder/package.nix b/pkgs/by-name/px/pxder/package.nix index 96760f7f6692..8621621fe850 100644 --- a/pkgs/by-name/px/pxder/package.nix +++ b/pkgs/by-name/px/pxder/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , makeWrapper -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , nodejs }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/sh/shepherd/package.nix b/pkgs/by-name/sh/shepherd/package.nix index 4cd45aaea0b3..3f7323e56482 100644 --- a/pkgs/by-name/sh/shepherd/package.nix +++ b/pkgs/by-name/sh/shepherd/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/by-name/ve/vercel-pkg/package.nix b/pkgs/by-name/ve/vercel-pkg/package.nix index d3313069e4d0..c27d6699ed71 100644 --- a/pkgs/by-name/ve/vercel-pkg/package.nix +++ b/pkgs/by-name/ve/vercel-pkg/package.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ]; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 6a9adcad5454..89601f3f482d 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -6,7 +6,7 @@ , setuptools , nodejs , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , fetchYarnDeps , flask @@ -52,7 +52,7 @@ buildPythonPackage rec { setuptools nodejs yarn - prefetch-yarn-deps + fixup-yarn-lock ]; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix index e88d5e0fc682..16d96297c544 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , fetchurl -, prefetch-yarn-deps +, fixup-yarn-lock , git , lib , makeDesktopItem @@ -51,7 +51,7 @@ let pname = "${pname}-unwrapped"; inherit version src; - nativeBuildInputs = [ prefetch-yarn-deps git nodejs util-linux yarn zip ]; + nativeBuildInputs = [ fixup-yarn-lock git nodejs util-linux yarn zip ]; configurePhase = '' export HOME=$TMPDIR diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index a29de512404d..19f0dd427023 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -5,7 +5,7 @@ , python3 , fetchYarnDeps , fetchNpmDeps -, prefetch-yarn-deps +, fixup-yarn-lock , npmHooks , yarn , substituteAll @@ -29,7 +29,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { inherit (info) version; buildTargets = [ "electron:electron_dist_zip" ]; - nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn prefetch-yarn-deps unzip npmHooks.npmConfigHook ]; + nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn fixup-yarn-lock unzip npmHooks.npmConfigHook ]; buildInputs = base.buildInputs ++ [ libnotify ]; electronOfflineCache = fetchYarnDeps { diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index eca62c640bcf..e57ee90f631d 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -12,7 +12,7 @@ , nixosTests , nodejs , nodejs-slim -, prefetch-yarn-deps +, fixup-yarn-lock , protobuf , python3 , qt6 @@ -103,7 +103,7 @@ let nativeBuildInputs = [ nodejs-slim - prefetch-yarn-deps + fixup-yarn-lock yarn ]; @@ -138,7 +138,7 @@ python3.pkgs.buildPythonApplication { nativeBuildInputs = [ fakeGit offlineYarn - prefetch-yarn-deps + fixup-yarn-lock cargo installShellFiles diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index cf85c5ddc5ee..354eeba61aad 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , python3 , makeWrapper @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ yarn - prefetch-yarn-deps + fixup-yarn-lock nodejs python3 makeWrapper diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 5c173b5e969a..b0563a49d6b9 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -2,7 +2,7 @@ , stdenv , yarn , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , electron , fetchFromGitHub @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn - prefetch-yarn-deps + fixup-yarn-lock nodejs makeWrapper copyDesktopItems diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index 20ffd3054762..c670046f4264 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 2e3dd149140d..32255320b917 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 9160b3fe81a9..875b5b9b0031 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 e22831cfbbdc..43bb86e45823 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 dcd2a6dcae35..78c72187d81e 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 09f1bc739863..8811c816a0ac 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 bac1f1915003..745e5f5e25d5 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 12c9cb2e5ab2..524734819109 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 ceadafc80503..98c4822a90b3 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 80a05f979175..e47845ea56c6 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 b72925c0ab2e..57c252054eb9 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 6464035db317..a6b069f1dad8 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 { diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 35f633145a4d..95b8963afb7c 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -7,7 +7,7 @@ , postgresqlTestHook , postgresql , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , stdenv , server-mode ? true @@ -151,7 +151,7 @@ pythonPackages.buildPythonApplication rec { cp -v ../pkg/pip/setup_pip.py setup.py ''; - nativeBuildInputs = with pythonPackages; [ cython pip sphinx yarn prefetch-yarn-deps nodejs ]; + nativeBuildInputs = with pythonPackages; [ cython pip sphinx yarn fixup-yarn-lock nodejs ]; buildInputs = [ zlib pythonPackages.wheel diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix index 65f32add0f6b..96b1b94563af 100644 --- a/pkgs/tools/networking/ratman/default.nix +++ b/pkgs/tools/networking/ratman/default.nix @@ -6,7 +6,7 @@ , protobuf , rustPlatform , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , stdenv , yarn , nodejs @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pWjKL41r/bTvWv+5qCgCFVL9+o64BiV2/ISdLeKEOqE="; }; - nativeBuildInputs = [ yarn nodejs prefetch-yarn-deps ]; + nativeBuildInputs = [ yarn nodejs fixup-yarn-lock ]; outputs = [ "out" "dist" ]; diff --git a/pkgs/tools/typesetting/marp/default.nix b/pkgs/tools/typesetting/marp/default.nix index 574159a76fa1..b61cc4dcdf66 100644 --- a/pkgs/tools/typesetting/marp/default.nix +++ b/pkgs/tools/typesetting/marp/default.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , makeWrapper , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , yarn }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - prefetch-yarn-deps + fixup-yarn-lock yarn ];