diff options
| author | Yaya <mak@nyantec.com> | 2022-05-05 22:24:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 22:24:52 +0200 |
| commit | 20e362cadde27cd26e601d73ac20ecc856577a05 (patch) | |
| tree | e5b5071d3391836c3af071e1088160e5b100369e | |
| parent | Merge pull request #171696 from NixOS/backport-170994-to-release-21.11 (diff) | |
| download | nixpkgs-20e362cadde27cd26e601d73ac20ecc856577a05.tar.gz | |
[Backport release-21.11] gitlab: 14.9.3 -> 14.9.4 (#171364)
6 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 2bdf0260f1e8..a3aad7520676 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.9.3", - "repo_hash": "04a5z9dr8qs1vrgrdlw5sx5wjwjgqzgj7rqxy4lswycxglc8i1ad", + "version": "14.9.4", + "repo_hash": "1fcssdxdsp067701kcf5yxbwbg5qb7hqkv9y304gdkm8990kjvsy", "yarn_hash": "1mya6y0cb9x8491gpf7f1i7qi2rb0l7d9g5yzj44vvy3mb4rcqaj", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.9.3-ee", + "rev": "v14.9.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.9.3", + "GITALY_SERVER_VERSION": "14.9.4", "GITLAB_PAGES_VERSION": "1.56.1", "GITLAB_SHELL_VERSION": "13.24.0", - "GITLAB_WORKHORSE_VERSION": "14.9.3" + "GITLAB_WORKHORSE_VERSION": "14.9.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index cec4f1928b1b..c4bd1156ec4e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "14.9.3"; + version = "14.9.4"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,7 +23,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-D4Dgw2vqX5464ciYvTqagQG/uXt0Wm15ztdwbyJp1HM="; + sha256 = "sha256-VRAKvsA2J8m1iE/LtGb8NovC9y1DzBn5hy6qQbAuBWM="; }; vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 22b982f5d715..2cdcd8b4db59 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.9.3"; + version = "14.9.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ae8a8e012414..41692f139dd0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -542,4 +542,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.4.4' +gem 'ipynbdiff', '0.4.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 658d79dfcc66..f739d2154400 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -647,7 +647,7 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.4.4) + ipynbdiff (0.4.5) diffy (~> 3.3) json (~> 2.5, >= 2.5.1) jaeger-client (1.1.0) @@ -1528,7 +1528,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.4.4) + ipynbdiff (= 0.4.5) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1687,4 +1687,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.3.9 + 2.3.6 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index cc88cbbbab5b..94352dd6eb1b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2623,10 +2623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cgrr3pc0y11gas6k2js33qghj7rpdh99vavda712wbq3hz42jx2"; + sha256 = "1r1pl4imiqi75bksh17r2j3w74x561z4bx1mpgv6cin1fcrzw9zy"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.5"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; |
