summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaya <github@uwu.is>2024-05-08 16:18:51 +0200
committerYaya <github@uwu.is>2024-05-10 10:13:19 +0200
commit791e8c8328df539eb836dea72c4d64e6675e64d0 (patch)
tree3f4d3e89e97b47973577ea85f2d1ca70d1ead237
parentMerge pull request #310407 from NixOS/backport-307436-to-release-23.11 (diff)
downloadnixpkgs-791e8c8328df539eb836dea72c4d64e6675e64d0.tar.gz
gitlab: 16.10.4 -> 16.10.5
https://gitlab.com/gitlab-org/gitlab/-/blob/v16.10.5-ee/CHANGELOG.md Fixes CVE-2023-6195 Fixes CVE-2023-6682 Fixes CVE-2023-6688 Fixes CVE-2024-1211 Fixes CVE-2024-1539 Fixes CVE-2024-2454 Fixes CVE-2024-2651 Fixes CVE-2024-2878 Fixes CVE-2024-3976 Fixes CVE-2024-4539 Fixes CVE-2024-4597 (cherry picked from commit ac171272cb1af9d65bb71f423bab922465b60e06)
-rw-r--r--pkgs/applications/version-management/gitlab/data.json12
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix6
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-pages/default.nix4
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix2
4 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index ff2bbcf877c0..03ad46e65943 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
{
- "version": "16.10.4",
- "repo_hash": "sha256-ieS2MO5jBNBK0hmuWLfaDjRNhn98927hlTFrDbV0zCQ=",
+ "version": "16.10.5",
+ "repo_hash": "sha256-w2cXFIm588Q/SB1kO9dGCmxO3+Xee7BaCCipuVcnfXg=",
"yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v16.10.4-ee",
+ "rev": "v16.10.5-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "16.10.4",
- "GITLAB_PAGES_VERSION": "16.10.4",
+ "GITALY_SERVER_VERSION": "16.10.5",
+ "GITLAB_PAGES_VERSION": "16.10.5",
"GITLAB_SHELL_VERSION": "14.34.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
- "GITLAB_WORKHORSE_VERSION": "16.10.4"
+ "GITLAB_WORKHORSE_VERSION": "16.10.5"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index ac63b4296b7a..981e5cfcc5ac 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -6,7 +6,7 @@
}:
let
- version = "16.10.4";
+ version = "16.10.5";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -18,10 +18,10 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- hash = "sha256-dzHGnZwXomCUrlup9VD/0l084Swp9CVi4nJi6MtOwi8=";
+ hash = "sha256-ctJfw4aU5qsv+I3rR9xZPGssYQpTnbn4MdTVOYapHqQ=";
};
- vendorHash = "sha256-mPoz+y1LWpGr+zYqAhxzznMyKIPehsDW+WFxklYSC10=";
+ vendorHash = "sha256-6gZr0/0ZGcFwwAY4IuW2puL/7akMZvaU0ONJGYyyJas=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
index 7e288e0dff57..e6fcc839fd9b 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 = "16.10.4";
+ version = "16.10.5";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
- hash = "sha256-Jdg1cxHra4lHvf8+cojaE9OXR40w24OiwMhDYvmUBkI=";
+ hash = "sha256-wuEYcwAKYO7YZs88NvE0AI5+aZ9JeLBAeXITc2jLGVo=";
};
vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 98404f4a4f6d..0d0afde0766f 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 = "16.10.4";
+ version = "16.10.5";
# nixpkgs-update: no auto update
src = fetchFromGitLab {