From 0142bd49cce94475cde12f5684570b5620f8a9fb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 17:07:43 +0100 Subject: [PATCH] gitlab: 12.7.4 -> 12.7.5 https://about.gitlab.com/releases/2020/01/31/gitlab-12-7-5-released/ --- .../version-management/gitlab/data.json | 6 +-- .../version-management/gitlab/gitaly/deps.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 5 +-- .../gitlab/rubyEnv/Gemfile.lock | 25 +++++------ .../gitlab/rubyEnv/gemset.nix | 43 ++++++++++--------- 5 files changed, 40 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 814a94f2e4be..6e83e5d2566d 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,9 +1,9 @@ { - "version": "12.7.4", - "repo_hash": "02n1paz1m8dq8kmill1bwgkzai5yx7zzqa0rc3cz50pdyfq9lp5c", + "version": "12.7.5", + "repo_hash": "0jlhaakpg6bycajbhm3100gs2ka9f6iv529dvj3y1k6gysd2dpvs", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.7.4-ee", + "rev": "v12.7.5-ee", "passthru": { "GITALY_SERVER_VERSION": "1.83.0", "GITLAB_PAGES_VERSION": "1.12.0", diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index f710523103f6..8853dded8f22 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1319,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + rev = "v1.1.4"; + sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; }; } { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 0c3974ceeba6..04c9f9808a74 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -132,9 +132,8 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '~> 6.8' -gem 'aws-sdk-core', '~> 3' -gem 'aws-sdk-cloudformation', '~> 1' -gem 'faraday_middleware-aws-sigv4' +gem 'aws-sdk' +gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.12' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index d4dd0a37570f..0733d49c3de4 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -81,15 +81,13 @@ GEM attr_required (1.0.1) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.263.0) - aws-sdk-cloudformation (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.88.0) - aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) + aws-sdk (2.11.374) + aws-sdk-resources (= 2.11.374) + aws-sdk-core (2.11.374) + aws-sigv4 (~> 1.0) jmespath (~> 1.0) + aws-sdk-resources (2.11.374) + aws-sdk-core (= 2.11.374) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) axiom-types (0.1.1) @@ -278,9 +276,9 @@ GEM faraday (~> 0.8) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - faraday_middleware-aws-sigv4 (0.3.0) - aws-sigv4 (~> 1.0) - faraday (>= 0.15) + faraday_middleware-aws-signers-v4 (0.1.7) + aws-sdk-resources (~> 2) + faraday (~> 0.9) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json @@ -1144,8 +1142,7 @@ DEPENDENCIES atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print - aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3) + aws-sdk babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.4.0) @@ -1191,7 +1188,7 @@ DEPENDENCIES escape_utils (~> 1.1) factory_bot_rails (~> 5.1.0) faraday (~> 0.12) - faraday_middleware-aws-sigv4 + faraday_middleware-aws-signers-v4 fast_blank ffaker (~> 2.10) flipper (~> 0.17.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f1c2f04e2604..a1f2a95197c3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -319,37 +319,38 @@ }; version = "1.0.3"; }; - aws-partitions = { + aws-sdk = { + dependencies = ["aws-sdk-resources"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr3f9bdh9lxqy4c999sk99avy46fygx4hf3i86adpvrj6axmygs"; + sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0"; type = "gem"; }; - version = "1.263.0"; - }; - aws-sdk-cloudformation = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11fhscz4y6lq9c8p0ikq5608qbv4bhi6sq7bxn6vnsgx9m45kvq1"; - type = "gem"; - }; - version = "1.29.0"; + version = "2.11.374"; }; aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + dependencies = ["aws-sigv4" "jmespath"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yl3aw8q7ddm5x2wrqdry038gnkw0ys5il2qhlifqyc0qk8yhlfz"; + sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9"; type = "gem"; }; - version = "3.88.0"; + version = "2.11.374"; + }; + aws-sdk-resources = { + dependencies = ["aws-sdk-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4"; + type = "gem"; + }; + version = "2.11.374"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -1316,16 +1317,16 @@ }; version = "0.12.2"; }; - faraday_middleware-aws-sigv4 = { - dependencies = ["aws-sigv4" "faraday"]; + faraday_middleware-aws-signers-v4 = { + dependencies = ["aws-sdk-resources" "faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gk2qakcvvbgfvvfd8cgf13sligv5mp816ykmra9llqmbfym8ikl"; + sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp"; type = "gem"; }; - version = "0.3.0"; + version = "0.1.7"; }; faraday_middleware-multi_json = { dependencies = ["faraday_middleware" "multi_json"];