diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index b3bb574d94aa..87017cbbc429 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.4.1"; + version = "18.4.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-NsPOxnX8BF9J1SqTj6DhPUWSEq7E5+grumPlwHPbA/8="; + hash = "sha256-jwImYofmGfpnj43FinFmo9SQP6vpM0C4K6fmUECifG0="; }; vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ="; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index cf0235d296b9..e0c7603813ab 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 = "18.4.1"; + version = "18.4.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-C4zdBsZ+Sz9S5lQ5qivqmrlM6C6jEepq152v3XQvA6E="; + hash = "sha256-21VCBUE6wGU7DT98YYPuEz7lw6EMqCfe14mofbai0lk="; }; vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI="; diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index bc1acf521add..b7d743bae841 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "18.4.1", - "repo_hash": "0wqk6vcjsnv84qbngzri4klg299kk154cadl98zf9vzypv5l66rz", + "version": "18.4.2", + "repo_hash": "053fw6g1rrqlmgr22phbsv57pg04iy20yv3yvgz1hm4jn2jm0zln", "yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.4.1-ee", + "rev": "v18.4.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.4.1", - "GITLAB_PAGES_VERSION": "18.4.1", + "GITALY_SERVER_VERSION": "18.4.2", + "GITLAB_PAGES_VERSION": "18.4.2", "GITLAB_SHELL_VERSION": "14.45.2", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1", - "GITLAB_WORKHORSE_VERSION": "18.4.1" + "GITLAB_WORKHORSE_VERSION": "18.4.2" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index 9be3bea4f005..777e5d397bb6 100644 --- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "18.4.1"; + version = "18.4.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile index b9b538dd1b5e..2452d9f209ce 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile @@ -211,7 +211,7 @@ gem 'fog-local', '~> 0.8', feature_category: :shared # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 gem 'fog-aliyun', '~> 0.4', feature_category: :shared -gem 'gitlab-fog-azure-rm', '~> 2.3.0', require: 'fog/azurerm', feature_category: :shared +gem 'gitlab-fog-azure-rm', '~> 2.4.0', require: 'fog/azurerm', feature_category: :shared # for Google storage diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock index 48e3e7112d1a..fe11d3cd5bce 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -739,7 +739,7 @@ GEM gitlab-experiment (0.9.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (2.3.0) + gitlab-fog-azure-rm (2.4.0) faraday (~> 2.0) faraday-follow_redirects (~> 0.3.0) faraday-net_http_persistent (~> 2.0) @@ -2170,7 +2170,7 @@ DEPENDENCIES gitlab-dangerfiles (~> 4.10.0) gitlab-duo-workflow-service-client (~> 0.3)! gitlab-experiment (~> 0.9.1) - gitlab-fog-azure-rm (~> 2.3.0) + gitlab-fog-azure-rm (~> 2.4.0) gitlab-glfm-markdown (~> 0.0.33) gitlab-housekeeper! gitlab-http! diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix index a35d3cb71ccc..7d093a838c87 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix +++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix @@ -2939,10 +2939,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03xwn2477zhc4654c7s1ks72w9lbns79n2qhfca7m17349vivpw8"; + sha256 = "02rnrd403hp5hwgvrapl3mvqp6gzr422v81wwq8dlzm38bjqd2v7"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; gitlab-glfm-markdown = { dependencies = [ "rb_sys" ]; diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py index 469d27d2f705..6c171c981682 100755 --- a/pkgs/by-name/gi/gitlab/update.py +++ b/pkgs/by-name/gi/gitlab/update.py @@ -22,7 +22,7 @@ click_log.basic_config(logger) class GitLabRepo: - version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?(\-gitlab)?") + version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?(\-gitlab)?$") def __init__(self, owner: str = "gitlab-org", repo: str = "gitlab"): self.owner = owner