diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index e46f414f83d6..1c22d6f1c966 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.1.1", - "repo_hash": "1ivaicgz4lgl6l06fnr9wfpn71b88yd22ryi3qn2r40rg3vjl1vf", + "version": "17.1.2", + "repo_hash": "08nd4194wyb1rs47crcq7vci9b5a6izda23bkjavc0iwdsibf0c3", "yarn_hash": "1xyc3c3hhfp5lgrpacj4gsfbql3wn0brdp16ivnqg4n0csjlizq7", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.1.1-ee", + "rev": "v17.1.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.1.1", - "GITLAB_PAGES_VERSION": "17.1.1", + "GITALY_SERVER_VERSION": "17.1.2", + "GITLAB_PAGES_VERSION": "17.1.2", "GITLAB_SHELL_VERSION": "14.36.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.0.0", - "GITLAB_WORKHORSE_VERSION": "17.1.1" + "GITLAB_WORKHORSE_VERSION": "17.1.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index eb7499058674..953dd4b2aefa 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -5,7 +5,7 @@ }: let - version = "17.1.1"; + version = "17.1.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,7 +17,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-c9gLVVRNSkl4RI7LN0UZc6CAzcLIbWGIvsjoiaPdUKY="; + hash = "sha256-KL6BL5iSOUV0iu0omDGc7upl45p0yet92DiP4DesB+Q="; }; vendorHash = "sha256-yOm0cPC8v6L3gkekUMpf5U86XzpnmeoLTgZSFBb02BA="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 655bfe02ca0e..bc523c69d665 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.1.1"; + version = "17.1.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-cwFqzKXDWuIESdDjuPYos73Ly+zd+J20aJJi0RiRdus="; + hash = "sha256-QnB5VH8iPWdMCK690REepws6hvX0e++6DNX2vE9t2JM="; }; vendorHash = "sha256-uVpkCl5rSAtg6gDnL3d11AaOlGNpS2xaPtJrthUNbfE="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 2b1677e1b8dc..a82b5b476ff1 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.1.1"; + version = "17.1.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index aa9a829983a8..b3b360bd7e07 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1691,7 +1691,8 @@ GEM simplecov_json_formatter (0.1.4) singleton (0.1.1) sixarm_ruby_unaccent (1.2.0) - slack-messenger (2.3.4) + slack-messenger (2.3.5) + re2 (= 2.7.0) snaky_hash (2.0.0) hashie version_gem (~> 1.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f64d8b7daba9..a6c14183a2c0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -6295,14 +6295,15 @@ src: version = "1.2.0"; }; slack-messenger = { + dependencies = ["re2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h89asinyyyq88v89fdc3nw0g74vq2f7p59s18jrq3svpv913ij9"; + sha256 = "1kb3dhp38wllw8f54qcik05zw0w4v0a5171cqmgjqp6c63mb0q63"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.5"; }; snaky_hash = { dependencies = ["hashie" "version_gem"];