Unverified Commit 6691c568 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

nixosTests.gitlab: fix eval 

This was recently turned into a throw.
parent c282a562

nixos/modules/services/misc/docker-registry.nix

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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.