diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 92d1b53fa9fc..363025c9485c 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.9.1", - "repo_hash": "17ldwswipr82db7mrx1rjwdns2waih6ay443icyj6s815s3g56aj", + "version": "17.9.2", + "repo_hash": "08gkn3j4v75azb0fahlf4i8vllm5c26537li6vx0yir8ri249xzl", "yarn_hash": "1bvv79jr6d9p33h81mc0miwc7rw3irblmcqbig8ikpb589kr09yv", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.9.1-ee", + "rev": "v17.9.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.9.1", - "GITLAB_PAGES_VERSION": "17.9.1", + "GITALY_SERVER_VERSION": "17.9.2", + "GITLAB_PAGES_VERSION": "17.9.2", "GITLAB_SHELL_VERSION": "14.40.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", - "GITLAB_WORKHORSE_VERSION": "17.9.1" + "GITLAB_WORKHORSE_VERSION": "17.9.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 9a5bc1ac24f5..777219b34cbe 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 = "17.9.1"; + version = "17.9.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 2368ccd0974b..aa166db1a7f6 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -95,7 +95,7 @@ gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access gem 'rexml', '~> 3.4.0', feature_category: :shared -gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access +gem 'ruby-saml', '~> 1.18.0', path: 'vendor/gems/ruby-saml', feature_category: :system_access gem 'omniauth', '~> 2.1.0', feature_category: :system_access gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access gem 'omniauth-azure-activedirectory-v2', '~> 2.0', feature_category: :system_access @@ -164,7 +164,7 @@ gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # GraphQL API -gem 'graphql', '~> 2.4.1', feature_category: :api +gem 'graphql', '2.4.11', path: 'vendor/gems/graphql', feature_category: :api gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index c61b6ab26e22..60037d3efecc 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -170,6 +170,14 @@ PATH google-protobuf (~> 3) grpc +PATH + remote: vendor/gems/graphql + specs: + graphql (2.4.11) + base64 + fiber-storage + logger + PATH remote: vendor/gems/mail-smtp_pool specs: @@ -206,6 +214,13 @@ PATH nokogiri (>= 1.4.4) omniauth (~> 2.0) +PATH + remote: vendor/gems/ruby-saml + specs: + ruby-saml (1.18.0) + nokogiri (>= 1.13.10) + rexml + PATH remote: vendor/gems/sidekiq-7.2.4 specs: @@ -939,9 +954,6 @@ GEM faraday (~> 2.0) graphql-client graphlyte (1.0.0) - graphql (2.4.8) - base64 - fiber-storage graphql-client (0.23.0) activesupport (>= 3.0) graphql (>= 1.13.0) @@ -1703,9 +1715,6 @@ GEM ruby-openai (3.7.0) httparty (>= 0.18.1) ruby-progressbar (1.11.0) - ruby-saml (1.17.0) - nokogiri (>= 1.13.10) - rexml ruby-statistics (4.1.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) @@ -2147,7 +2156,7 @@ DEPENDENCIES grape_logging (~> 1.8, >= 1.8.4) graphlient (~> 0.8.0) graphlyte (~> 1.0.0) - graphql (~> 2.4.1) + graphql (= 2.4.11)! graphql-docs (~> 5.0.0) grpc (= 1.63.0) gssapi (~> 1.3.1) @@ -2298,7 +2307,7 @@ DEPENDENCIES ruby-magic (~> 0.6) ruby-openai (~> 3.7) ruby-progressbar (~> 1.10) - ruby-saml (~> 1.17.0) + ruby-saml (~> 1.18.0)! rubyzip (~> 2.3.2) rugged (~> 1.6) sanitize (~> 6.0.2) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 849270039b55..7e5b5ac33ab1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2935,15 +2935,14 @@ src: version = "1.0.0"; }; graphql = { - dependencies = ["base64" "fiber-storage"]; + dependencies = ["base64" "fiber-storage" "logger"]; groups = ["default" "development" "test"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dbg7xp1jgcfnmpvv8xcpzxandjkhqpsfybiwipz0sj7br685zzn"; - type = "gem"; + path = "${src}/vendor/gems/graphql"; + type = "path"; }; - version = "2.4.8"; + version = "2.4.11"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -6096,11 +6095,10 @@ src: groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684"; - type = "gem"; + path = "${src}/vendor/gems/ruby-saml"; + type = "path"; }; - version = "1.17.0"; + version = "1.18.0"; }; ruby-statistics = { groups = ["default" "test"]; diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index a1f3a1076822..79d7a5158a5e 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "17.9.1"; + version = "17.9.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,7 +21,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-xgNuU4m+19+FXZkL2ROx+BdyQu6cE2A7Jq2PFLNhGxc="; + hash = "sha256-QoIM2I9dLFmN4dFbiFu1pWCGj4Yiel9HGUb7jYWc4Hg="; }; vendorHash = "sha256-ZPxlv8jc3VWS1XzIyXs3W3aCxdTiDl8+Wx82exuYBDY="; diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index 03649736a719..4447e6c614ea 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.16.0"; + version = "4.17.1"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -15,10 +15,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-PnX2pLbNqeJmvs+nFiCVW+sYVt8AJ7CEexGcYV7IN4U="; + hash = "sha256-zsrNu1Xdi2143i9po8UzEOtidwWjRlR5n0bOksz75FE="; }; - vendorHash = "sha256-oNQoKn8GPJxmUzkUHGzax2/KWyI3VXLRtAvWe9B64Ds="; + vendorHash = "sha256-I/umXgVm9a+0Ay3ARuaa4Dua4Zhc5p2TONHvhCt3Qtk="; postPatch = '' substituteInPlace health/checks/checks_test.go \ diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 78efcbbcbe85..fe14381be3b4 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.9.1"; + version = "17.9.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-M+VtrMUiXc2e8Kk6ZSLbysWLmw7rlLSTVloBz0O4gP0="; + hash = "sha256-5LnFiuGq7RSPum0ctkz3YwK7ZLl9+tLJtKhxbEOs3ZE="; }; vendorHash = "sha256-2UtdooVoyoWr4yOPCRBAjkftn29DhJonpJSguHwfHNE=";