summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLara <lara@uwu.is>2021-09-20 21:44:10 +0200
committerYuka <yuka@yuka.dev>2021-09-21 13:22:10 +0200
commiteb24e2e6b1a09bf0c32e6901149bb0cc9689e9fc (patch)
tree146951508d0892c2f5a301dd4ee96af5bdf39447
parentgitit: 0.13.0.0 -> 0.15.0.0 (diff)
downloadnixpkgs-eb24e2e6b1a09bf0c32e6901149bb0cc9689e9fc.tar.gz
gitlab: 14.2.3 -> 14.2.4
(cherry picked from commit e5f70272c5ebe77cea9f045f8cac1d934d6a7ca5)
-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
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 7425af1f98a5..ff42c2d78ce0 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
{
- "version": "14.2.3",
- "repo_hash": "06fr8srz5ii0h65b1h2zfm8kzqz9g8jy2aq4g5js6kmv44zjya1p",
+ "version": "14.2.4",
+ "repo_hash": "1bh95c7rrz9v2vn008lm4zqfm4n7my8r1b2665cippyi4bw0dfjr",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v14.2.3-ee",
+ "rev": "v14.2.4-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "14.2.3",
+ "GITALY_SERVER_VERSION": "14.2.4",
"GITLAB_PAGES_VERSION": "1.42.0",
"GITLAB_SHELL_VERSION": "13.19.1",
- "GITLAB_WORKHORSE_VERSION": "14.2.3"
+ "GITLAB_WORKHORSE_VERSION": "14.2.4"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 6f391b129a00..351b2911903c 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -20,7 +20,7 @@ let
};
};
};
- version = "14.2.3";
+ version = "14.2.4";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
@@ -32,7 +32,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-TSA5CoNaLeMu7O02rsaR/rNciLwzxSIUUQsCo40Z15c=";
+ sha256 = "sha256-jVYPJWFJN/KDEi8j+BOWTbH8xP0ZLPewhGsJfj5h/0w=";
};
vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 68d82bf3bb35..8f5c05cc9612 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.2.3";
+ version = "14.2.4";
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 3c5286b5edd3..ad2445ad750c 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -1657,4 +1657,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.1)
BUNDLED WITH
- 2.2.20
+ 2.2.24