nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 03:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitlab: 14.3.2 -> 14.3.3

Browse Source
This commit is contained in:
Lara 2021-10-14 10:32:36 +00:00
parent 72fbd63c5c
commit e7331d2e85
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,13 +1,13 @@
{ {
"version": "14.3.2", "version": "14.3.3",
"repo_hash": "1vsppz5akx5l54riacqbzkgdy47j9r71550mg2ay5ihy6iqxa2xr", "repo_hash": "1sh8lf6arqljzc0hmajl2r2j38ahk9hl6kikg9inw72xycrll7dk",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v14.3.2-ee", "rev": "v14.3.3-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "14.3.2", "GITALY_SERVER_VERSION": "14.3.3",
"GITLAB_PAGES_VERSION": "1.44.0", "GITLAB_PAGES_VERSION": "1.44.0",
"GITLAB_SHELL_VERSION": "13.21.1", "GITLAB_SHELL_VERSION": "13.21.1",
"GITLAB_WORKHORSE_VERSION": "14.3.2" "GITLAB_WORKHORSE_VERSION": "14.3.3"
} }
} }

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

@ -80,11 +80,6 @@ let
# Fixup "resolved"-entries in yarn.lock to match our offline cache # Fixup "resolved"-entries in yarn.lock to match our offline cache
${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
# fixup_yarn_lock currently doesn't correctly fix the dagre-d3
# url, so we have to do it manually
${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \
'"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules/ patchShebangs node_modules/

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

@ -20,7 +20,7 @@ let
}; };
}; };
}; };
version = "14.3.2"; version = "14.3.3";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in in
@ -32,7 +32,7 @@ buildGoModule {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-00Sgv1b3dwbN7ic//7NtrdiliunOnXRJ0GTQHYFjuqo="; sha256 = "sha256-WC361E+p3i02n2YCOwUzRxCWFt5UMEfJi6tHZPj1dgo=";
}; };
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";

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

@ -5,7 +5,7 @@ in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "14.3.2"; version = "14.3.3";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = data.owner; owner = data.owner;

2
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -1650,4 +1650,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.1) yajl-ruby (~> 1.4.1)
BUNDLED WITH BUNDLED WITH
2.2.24 2.2.20