gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixosTests.gitlab: fix eval

Browse Source 
This was recently turned into a throw.
This commit is contained in:
Wolfgang Walther
2025-10-28 18:06:49 +01:00
parent c282a56221
commit 6691c568b0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/misc/docker-registry.nix
+1 -1
View File
@@ -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";
};
nixos/modules/services/misc/gitlab.nix
+4 -4
View File
@@ -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.