diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-03 00:04:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 00:04:07 +0000 |
| commit | 74f2e360359aaf3d42706c1f70911ae939d966e8 (patch) | |
| tree | 28d303ba9d9a6c98855dbbf1d31437c71ee87be2 /pkgs/applications/version-management | |
| parent | 0ae3aa5345b2840a7490e9f17a7d1c5cf1b2f6ad (diff) | |
| parent | a62844b302507c7531ad68a86cb7aa54704c9cb4 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index aee4ee3df1b62..47ca0f4f48d3c 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -50,15 +50,15 @@ let extraConfigPaths = lib.forEach data.vendored_gems (gem: "${src}/vendor/gems/${gem}"); }; - yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = data.yarn_hash; - }; - assets = stdenv.mkDerivation { pname = "gitlab-assets"; inherit version src; + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = data.yarn_hash; + }; + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ]; patches = [ @@ -91,7 +91,7 @@ let export HOME=$NIX_BUILD_TOP/fake_home # Make yarn install packages from our offline cache, not the registry - 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_yarn_lock}/bin/fixup_yarn_lock yarn.lock |