summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLara <lara@uwu.is>2022-02-12 14:01:17 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-02-13 21:45:58 +0000
commit56dcb83929de64ebc7296d6282ab49a92803a15f (patch)
tree641ace6af71c8ab3a2a11a6ea926529e0169cd3f
parentMerge pull request #159688 from NixOS/backport-158816-to-release-21.11 (diff)
downloadnixpkgs-origin/backport-159559-to-release-21.11.tar.gz
https://about.gitlab.com/releases/2022/02/08/gitlab-14-7-2-released/ (cherry picked from commit 9fdd3875dc8f82a36e548f3d01d4beef4ba6f5a7)
-rw-r--r--pkgs/applications/version-management/gitlab/data.json10
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix4
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix2
-rw-r--r--pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock2
-rw-r--r--pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix4
5 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index c948a4450f3a..5b8bd65a5111 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
{
- "version": "14.7.1",
- "repo_hash": "1zph7a2mqwbmgc6isd0vl6w8j9lrlcnxyhabzpcms4v3q3agr4f3",
+ "version": "14.7.2",
+ "repo_hash": "1jnwbcsswvy6jjrc2jclrxyyxi54caf8w51sgyiqaik5s3p4wgnx",
"yarn_hash": "12k2r1y7kw95kfsmy0s8rbsf0vldr8c2liah0rkc7pihr19gq3w7",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v14.7.1-ee",
+ "rev": "v14.7.2-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "14.7.1",
+ "GITALY_SERVER_VERSION": "14.7.2",
"GITLAB_PAGES_VERSION": "1.51.0",
"GITLAB_SHELL_VERSION": "13.22.2",
- "GITLAB_WORKHORSE_VERSION": "14.7.1"
+ "GITLAB_WORKHORSE_VERSION": "14.7.2"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 708e448f8be5..dfa6d71b142a 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -23,7 +23,7 @@ let
gemdir = ./.;
};
- version = "14.7.1";
+ version = "14.7.2";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
@@ -35,7 +35,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-MGcqYbHHeYwjfnvrJG/ZtOnyxsj+w1kPHOkVHf2AeMQ=";
+ sha256 = "sha256-gtQmRryTYwT2e4lamWYJ7Ri7dEGI7vg/Ir1gnuGmHQg=";
};
vendorSha256 = "sha256-eapqtSstc7d3R7A/5krKV0uVr9GhGkHHMrmsBOpWAbo=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 0b2e24e9d867..a8e1b11d7ebc 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "14.7.1";
+ version = "14.7.2";
src = fetchFromGitLab {
owner = data.owner;
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index c3faffef3525..affca2e2922b 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -1114,7 +1114,7 @@ GEM
rubocop-ast (>= 0.7.1)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
- ruby-magic (0.5.3)
+ ruby-magic (0.5.4)
mini_portile2 (~> 2.6)
ruby-prof (1.3.1)
ruby-progressbar (1.11.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index a74ca37e00e7..025378dd5dbd 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -4680,10 +4680,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "192bc7a4jgqcjgsp8jzkb2f355k5shy133zbvfcrjb7rjla7n9l9";
+ sha256 = "1m91qhhh2sakmd6kznipmwwb3i2qlfx40fpnj4vsh40d2f2v25rc";
type = "gem";
};
- version = "0.5.3";
+ version = "0.5.4";
};
ruby-prof = {
groups = ["default"];