From 6691c568b0624e2fdd4c3c5320960d96900d544b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 18:06:37 +0100
Subject: [PATCH] nixosTests.gitlab: fix eval

This was recently turned into a throw.
---
 nixos/modules/services/misc/docker-registry.nix | 2 +-
 nixos/modules/services/misc/gitlab.nix          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 2c2a59052d1b..f4abe2c8bf86 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -48,7 +48,7 @@ in
   options.services.dockerRegistry = {
     enable = lib.mkEnableOption "Docker Registry";
 
-    package = lib.mkPackageOption pkgs "docker-distribution" {
+    package = lib.mkPackageOption pkgs "distribution" {
       example = "gitlab-container-registry";
     };
 
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 127a7e73e83e..f0c21379ee3c 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -588,12 +588,12 @@ in
             if versionAtLeast config.system.stateVersion "23.11" then
               pkgs.gitlab-container-registry
             else
-              pkgs.docker-distribution;
-          defaultText = literalExpression "pkgs.docker-distribution";
+              pkgs.distribution;
+          defaultText = literalExpression "pkgs.distribution";
           description = ''
             Container registry package to use.
 
-            External container registries such as `pkgs.docker-distribution` are not supported
+            External container registries such as `pkgs.distribution` are not supported
             anymore since GitLab 16.0.0.
           '';
         };
@@ -1179,7 +1179,7 @@ in
         (
           cfg.registry.enable
           && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0"
-          && cfg.registry.package == pkgs.docker-distribution
+          && cfg.registry.package == pkgs.distribution
         )
         ''
           Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.