Unverified Commit 9db0ab9d authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

gitlab: 17.11.2 -> 18.0.0; move to pkgs/by-name (#408380)

parents eb394bfc c46cc8a6

nixos/doc/manual/release-notes/rl-2505.section.md

+2 −0
Original line number Diff line number Diff line
@@ -348,6 +348,8 @@ Alongside many enhancements to NixOS modules and general system improvements, th 


- The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses.



- `gitlab` has been updated from 17.x to 18.x and requires `postgresql` >= 16, as stated in the [documentation](https://docs.gitlab.com/18.0/install/requirements/#postgresql). Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation.



- `services.gitlab` now requires the setting of `activeRecordPrimaryKeyFile`, `activeRecordDeterministicKeyFile`, `activeRecordSaltFile` as GitLab introduced Rails ActiveRecord encryption.



- `python3Packages.bpycv` has been removed due to being incompatible with Blender 4 and unmaintained.

nixos/modules/services/misc/gitlab.nix

+2 −2
Original line number Diff line number Diff line
@@ -1237,8 +1237,8 @@ in 
        message = "services.gitlab.secrets.activeRecordSaltFile must be set!";

      }

      {

        assertion = versionAtLeast postgresqlPackage.version "14.9";

        message = "PostgreSQL >= 14.9 is required to run GitLab 17. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading";

        assertion = versionAtLeast postgresqlPackage.version "16";

        message = "PostgreSQL >= 16 is required to run GitLab 18. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading";

      }

    ];

pkgs/applications/version-management/gitlab/data.json

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
{

  "version": "17.11.2",

  "repo_hash": "1jaxqchqag6q0c4vmrpwnmflv72b2xpskba9b0m4y6w6sy7hqx7q",

  "yarn_hash": "0z06jaxqbg2wnq7yhpkba0cpxp4w4iy2cxla8nhc6kgx49xk179v",

  "owner": "gitlab-org",

  "repo": "gitlab",

  "rev": "v17.11.2-ee",

  "passthru": {

    "GITALY_SERVER_VERSION": "17.11.2",

    "GITLAB_PAGES_VERSION": "17.11.2",

    "GITLAB_SHELL_VERSION": "14.41.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.0",

    "GITLAB_WORKHORSE_VERSION": "17.11.2"

  }

}

pkgs/by-name/gi/gitaly/git.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 


stdenv.mkDerivation rec {

  pname = "gitaly-git";

  version = "2.48.1.gl1";

  version = "2.49.0.gl2";



  # `src` attribute for nix-update

  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "git";

    rev = "v${version}";

    hash = "sha256-j7yKImeRerdsYtSMrAU4y5vAJ2BT5wnJxURbDIwVot4=";

    hash = "sha256-1y94T5UBG7s76ENsUmaXRXngSKmqIAT0nq1u+QjSWaY=";

  };



  # we actually use the gitaly build system

pkgs/by-name/gi/gitaly/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
}:



let

  version = "17.11.2";

  version = "18.0.0";

  package_version = "v${lib.versions.major version}";

  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -21,10 +21,10 @@ let 
      owner = "gitlab-org";

      repo = "gitaly";

      rev = "v${version}";

      hash = "sha256-Ihw3Mezfz9H19oGM7X9B50aUbyh1JjDOmVU5ZNoiWug=";

      hash = "sha256-IhFKEBYCEORLPEplPDRdV61kY5ZgFAxJmfmoG9Q58ec=";

    };



    vendorHash = "sha256-ExqgxukFKXq/Z//hGSoDevfpJiNbVHhind63os1/3Fk=";

    vendorHash = "sha256-PXONynRY5ZLQO2yQdtljDmLhVBIgfEYmyez9pIm9vtw=";



    ldflags = [

      "-X ${gitaly_package}/internal/version.version=${version}"