diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-18 00:02:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-18 00:02:13 +0000 |
commit | e2bf665bb2ccf2518176c2c9de81374125b36aa7 (patch) | |
tree | 27089a14dec07d1dace87f0fade032cd3e41416e /pkgs/applications/networking/instant-messengers | |
parent | 5c2b2d5b745887f2b771f34ac834753375cbf78e (diff) | |
parent | 3f1bb546b5eb45359d708aa93df420be25b6a28b (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index ffbee0f25f828..3fcbfcbf4649c 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 343c21d64730c..2d69022ec35df 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 980e22c0c3e30..ed6b5ebe72a65 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 2debdc6140d2b..7a3ad36e47b74 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 037d27cf06602..6c976fdd0a433 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 |