public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs
, gitlabEnterprise ? false, callPackage, yarn
, yarn2nix-moretea, replace
, fixup_yarn_lock, replace
}:
let
@@ -62,7 +62,7 @@ let
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
# 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

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

@@ -1,5 +1,5 @@
#!/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_log