diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-07-24 14:54:33 +0200 |
|---|---|---|
| committer | Winter <winter@winter.cafe> | 2022-10-16 13:25:38 -0400 |
| commit | 58abd5a8c817a615ffe9ff3322b0555045ef73f8 (patch) | |
| tree | 3573335300cfa70703389ae2ea1673976aab84aa | |
| parent | hedgedoc: 1.9.0 -> 1.9.4 (#178129) (diff) | |
| download | nixpkgs-58abd5a8c817a615ffe9ff3322b0555045ef73f8.tar.gz | |
yarn2nix: change yarnFlags to append by default
The main usecase for this variable is to append --production to yarn
which now got a whole lot easier because you no longer need to repeat
the defaults.
(cherry picked from commit 9bbc053f1abb8d0b2435a9768a2073bd1452ddd2)
4 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/applications/editors/uivonim/default.nix b/pkgs/applications/editors/uivonim/default.nix index 0a04ddb7be5b..23d09cdc4ba3 100644 --- a/pkgs/applications/editors/uivonim/default.nix +++ b/pkgs/applications/editors/uivonim/default.nix @@ -35,8 +35,6 @@ mkYarnPackage rec { name = "uivonim-build-${version}"; inherit version src packageJSON yarnLock yarnNix yarnPreBuild distPhase; - yarnFlags = [ "--offline" ]; - buildPhase = '' yarn build:prod ''; @@ -47,7 +45,7 @@ mkYarnPackage rec { }; # The --production flag disables the devDependencies. - yarnFlags = [ "--offline" "--production" ]; + yarnFlags = [ "--production" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 40ae8502c762..29f3cbd0b13b 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -14,7 +14,7 @@ mkYarnPackage rec { packageJSON = ./package.json; yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; - yarnFlags = [ "--production" "--offline" ]; + yarnFlags = [ "--production" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 67c9b91594b9..6b1d960b371c 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -69,7 +69,7 @@ in rec { yarnLock, yarnNix ? mkYarnNix { inherit yarnLock; }, offlineCache ? importOfflineCache yarnNix, - yarnFlags ? defaultYarnFlags, + yarnFlags ? [ ], pkgConfig ? {}, preBuild ? "", postBuild ? "", @@ -141,7 +141,7 @@ in rec { ${workspaceDependencyLinks} - yarn install ${lib.escapeShellArgs yarnFlags} + yarn install ${lib.escapeShellArgs (defaultYarnFlags ++ yarnFlags)} ${lib.concatStringsSep "\n" postInstall} @@ -241,7 +241,7 @@ in rec { yarnLock ? src + "/yarn.lock", yarnNix ? mkYarnNix { inherit yarnLock; }, offlineCache ? importOfflineCache yarnNix, - yarnFlags ? defaultYarnFlags, + yarnFlags ? [ ], yarnPreBuild ? "", yarnPostBuild ? "", pkgConfig ? {}, diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index c04a7c15b7f1..dd3f1144a23b 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -55,9 +55,7 @@ stdenvNoCC.mkDerivation rec { name = "${pname}-modules-${version}"; inherit pname version; - yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [ - "--production" - ]; + yarnFlags = [ "--production" ]; pkgConfig = { keytar = { |