diff options
| author | Yaya <github@uwu.is> | 2024-06-13 07:19:28 +0200 |
|---|---|---|
| committer | Yaya <github@uwu.is> | 2024-06-13 13:20:20 +0200 |
| commit | e34d62d869c3fbd23ab7440628bfea28b1e176c2 (patch) | |
| tree | cf9370d11c96e5497a6e985385d08ab6a078218d /pkgs/applications/version-management/gitlab | |
| parent | 7e9c87c67b97efa5c174fde31426a5df2369ab72 (diff) | |
gitlab-container-registry: 4.1.0 -> 4.5.0
https://gitlab.com/gitlab-org/container-registry/-/blob/v4.5.0-gitlab/CHANGELOG.md Fixes CVE-2024-1495 Fixes CVE-2024-1963 Fixes CVE-2024-4201 Fixes CVE-2024-5469
Diffstat (limited to 'pkgs/applications/version-management/gitlab')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index d37604612bdf3..144fd40edd9c6 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -4,6 +4,7 @@ , gitlabEnterprise ? false, callPackage, yarn , fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config , cargo, rustc, rustPlatform +, icu, zlib, which }: let @@ -49,7 +50,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-7q2xWAsFkXHxkYNzIjPwJRy72xMXF278cpVzqGLt/9Y="; + hash = "sha256-SncgYYnoSaWA4kQWonoXXbSMu1mnwTyhdLXFagqgH+o="; }; dontBuild = false; @@ -74,6 +75,9 @@ let find $out -type f -name .rustc_info.json -delete ''; }; + static_holmes = attrs: { + buildInputs = [ which icu zlib ]; + }; }; groups = [ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index d14246d7a6b44..d84947908c721 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.1.0"; + version = "4.5.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-t+i9IuBH94PpfriIAaqqWYZHxKJJDOedJ3BQXGEPp0A="; + hash = "sha256-dCDybwIfzC79Mobejz/5XbEMQXkPuO8HejjannA6k/M="; }; vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc="; |