colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: replace prefetch-yarn-deps with fixup-yarn-lock where necessary

This commit is contained in:
Sandro Jäckel 2024-04-17 13:34:05 -04:00 committed by Lily Foster
parent 6181939cdf
commit fb0d661081
No known key found for this signature in database
GPG Key ID: 49340081E484C893
46 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/muzika/default.nix
View File

@ -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
];

4
pkgs/applications/graphics/drawio/default.nix
View File

@ -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

4
pkgs/applications/misc/tandoor-recipes/frontend.nix
View File

@ -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
];

4
pkgs/applications/networking/cluster/tilt/assets.nix
View File

@ -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";

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -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;

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -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

4
pkgs/applications/networking/instant-messengers/element/seshat/default.nix
View File

@ -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;

4
pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
View File

@ -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

4
pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
View File

@ -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

4
pkgs/applications/networking/irc/thelounge/default.nix
View File

@ -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 = ''

4
pkgs/applications/version-management/gitlab/default.nix
View File

@ -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,

4
pkgs/applications/version-management/sapling/default.nix
View File

@ -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
];

4
pkgs/applications/virtualization/podman-desktop/default.nix
View File

@ -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

4
pkgs/by-name/aw/aws-azure-login/package.nix
View File

@ -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
];

4
pkgs/by-name/de/devcontainer/package.nix
View File

@ -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

4
pkgs/by-name/fe/fernglas/package.nix
View File

@ -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";

4
pkgs/by-name/gi/gitmoji-cli/package.nix
View File

@ -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
];

4
pkgs/by-name/in/incus/ui.nix
View File

@ -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
];

4
pkgs/by-name/lx/lxd-ui/package.nix
View File

@ -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
];

4
pkgs/by-name/me/mealie/mealie-frontend.nix
View File

@ -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
];

4
pkgs/by-name/me/mermaid-cli/package.nix
View File

@ -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
];

4
pkgs/by-name/no/node-hp-scan-to/package.nix
View File

@ -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
];

4
pkgs/by-name/px/pxder/package.nix
View File

@ -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
];

4
pkgs/by-name/sh/shepherd/package.nix
View File

@ -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
];

4
pkgs/by-name/ve/vercel-pkg/package.nix
View File

@ -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
];

4
pkgs/development/python-modules/dash/default.nix
View File

@ -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 {

4
pkgs/development/tools/electron-fiddle/default.nix
View File

@ -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

4
pkgs/development/tools/electron/common.nix
View File

@ -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 {

6
pkgs/games/anki/default.nix
View File

@ -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

4
pkgs/games/heroic/default.nix
View File

@ -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

4
pkgs/games/r2modman/default.nix
View File

@ -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

4
pkgs/servers/akkoma/admin-fe/default.nix
View File

@ -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

4
pkgs/servers/akkoma/akkoma-fe/default.nix
View File

@ -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

4
pkgs/servers/alice-lg/default.nix
View File

@ -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

4
pkgs/servers/gotify/ui.nix
View File

@ -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

4
pkgs/servers/mastodon/default.nix
View File

@ -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";

4
pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
View File

@ -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

4
pkgs/servers/monitoring/grafana-agent/default.nix
View File

@ -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"

4
pkgs/servers/peertube/default.nix
View File

@ -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 ];

4
pkgs/servers/rmfakecloud/webui.nix
View File

@ -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)

4
pkgs/servers/teleport/generic.nix
View File

@ -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

4
pkgs/servers/web-apps/discourse/default.nix
View File

@ -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" ];

4
pkgs/servers/web-apps/outline/default.nix
View File

@ -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 {

4
pkgs/tools/admin/pgadmin/default.nix
View File

@ -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

4
pkgs/tools/networking/ratman/default.nix
View File

@ -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" ];

4
pkgs/tools/typesetting/marp/default.nix
View File

@ -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
];