ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-30 23:34:12 +03:00
Code Issues Projects Releases Wiki Activity

tree-wide: inherit yarn2nix from yarn2nix-moretea

Browse Source
This commit is contained in:
Milan Pässler 2019-10-20 22:32:31 +02:00 committed by Lassulus
parent 9ab168b500
commit 7e0127e1ca
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, yarn2nix-moretea }: { pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, mkYarnPackage }:
# Notes for maintainers: # Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync. # * versions of `riot-web` and `riot-desktop` should be kept in sync.
@ -14,7 +14,7 @@ let
sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557"; sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557";
}; };
in yarn2nix-moretea.mkYarnPackage rec { in mkYarnPackage rec {
name = "riot-desktop-${version}"; name = "riot-desktop-${version}";
inherit version; inherit version;

2
pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix-moretea.yarn2nix #!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix
set -euo pipefail set -euo pipefail

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

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs , ruby, tzdata, git, nettools, nixosTests, nodejs
, gitlabEnterprise ? false, callPackage, yarn , gitlabEnterprise ? false, callPackage, yarn
, yarn2nix-moretea, replace , fixup_yarn_lock, replace
}: }:
let let
@ -62,7 +62,7 @@ let
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
# Fixup "resolved"-entries in yarn.lock to match our offline cache # Fixup "resolved"-entries in yarn.lock to match our offline cache
${yarn2nix-moretea.fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive

2
pkgs/applications/version-management/gitlab/update.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix-moretea.yarn2nix #! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix
import click import click
import click_log import click_log

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper { stdenv, fetchFromGitHub, fetchpatch, makeWrapper
, which, nodejs, yarn2nix, python2 }: , which, nodejs, mkYarnPackage, python2 }:
yarn2nix.mkYarnPackage rec { mkYarnPackage rec {
name = "codimd"; name = "codimd";
version = "1.5.0"; version = "1.5.0";

9
pkgs/top-level/all-packages.nix
View File

@ -2358,10 +2358,6 @@ in
codimd = callPackage ../servers/web-apps/codimd { codimd = callPackage ../servers/web-apps/codimd {
nodejs = nodejs-10_x; nodejs = nodejs-10_x;
yarn2nix = yarn2nix-moretea.override {
nodejs = nodejs-10_x;
yarn = yarn.override { nodejs = nodejs-10_x; };
};
}; };
colord = callPackage ../tools/misc/colord { }; colord = callPackage ../tools/misc/colord { };
@ -7401,6 +7397,11 @@ in
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { };
inherit (yarn2nix-moretea)
yarn2nix
mkYarnPackage
fixup_yarn_lock;
yasr = callPackage ../applications/audio/yasr { }; yasr = callPackage ../applications/audio/yasr { };
yank = callPackage ../tools/misc/yank { }; yank = callPackage ../tools/misc/yank { };