diff options
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitlab-container-registry')
2 files changed, 7 insertions, 46 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch b/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch deleted file mode 100644 index 16f47fb3ae18d..0000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bc359e8f51a17ba759121339e87e90eed16e98fe Mon Sep 17 00:00:00 2001 -From: Yaya <mak@nyantec.com> -Date: Tue, 20 Jun 2023 10:01:23 +0000 -Subject: [PATCH] Disable inmemory storage driver test - ---- - .../storage/driver/inmemory/driver_test.go | 19 ------------------- - 1 file changed, 19 deletions(-) - delete mode 100644 registry/storage/driver/inmemory/driver_test.go - -diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go -deleted file mode 100644 -index dbc1916f..00000000 ---- a/registry/storage/driver/inmemory/driver_test.go -+++ /dev/null -@@ -1,19 +0,0 @@ --package inmemory -- --import ( -- "testing" -- -- storagedriver "github.com/docker/distribution/registry/storage/driver" -- "github.com/docker/distribution/registry/storage/driver/testsuites" -- "gopkg.in/check.v1" --) -- --// Hook up gocheck into the "go test" runner. --func Test(t *testing.T) { check.TestingT(t) } -- --func init() { -- inmemoryDriverConstructor := func() (storagedriver.StorageDriver, error) { -- return New(), nil -- } -- testsuites.RegisterSuite(inmemoryDriverConstructor, testsuites.NeverSkip) --} --- -2.40.1 - 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 c92cc3e0ddeb0..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 = "3.93.0"; + version = "4.5.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,16 +10,15 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-4jsnfkHXs9FSnyQ6JP/zmW51x8fHyQ0n+B8EPOoTSAA="; + hash = "sha256-dCDybwIfzC79Mobejz/5XbEMQXkPuO8HejjannA6k/M="; }; - vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4="; - - patches = [ - ./Disable-inmemory-storage-driver-test.patch - ]; + vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc="; postPatch = '' + # Disable flaky inmemory storage driver test + rm registry/storage/driver/inmemory/driver_test.go + substituteInPlace health/checks/checks_test.go \ --replace \ 'func TestHTTPChecker(t *testing.T) {' \ @@ -27,7 +26,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "The GitLab Docker toolset to pack, ship, store, and deliver content"; + description = "GitLab Docker toolset to pack, ship, store, and deliver content"; license = licenses.asl20; maintainers = with maintainers; [ yayayayaka xanderio ]; platforms = platforms.unix; |