Commit 1dabbf30 authored by Yaya's avatar Yaya Committed by Yureka
Browse files

gitlab: 16.9.2 -> 16.10.1 

https://gitlab.com/gitlab-org/gitlab/-/blob/v16.10.1-ee/CHANGELOG.md

Fixes CVE-2023-6371
Fixes CVE-2024-2818
parent f4a04eea

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

+9 −9
Original line number Diff line number Diff line 
{

  "version": "16.9.2",

  "repo_hash": "sha256-pvmbxCySSc+Ug4W3cpXA6L7E3/I6J2A0BpcjFbR3YEI=",

  "yarn_hash": "02vchjx17h6kk268pwrjqmrri0wa6vrljm7y5s23hwzir4v86slq",

  "version": "16.10.1",

  "repo_hash": "sha256-Bd2BvdWUJJm+hJZHFaW2PyMdaNTZWArpaQ3nY06BBBY=",

  "yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",

  "owner": "gitlab-org",

  "repo": "gitlab",

  "rev": "v16.9.2-ee",

  "rev": "v16.10.1-ee",

  "passthru": {

    "GITALY_SERVER_VERSION": "16.9.2",

    "GITLAB_PAGES_VERSION": "16.9.2",

    "GITLAB_SHELL_VERSION": "14.33.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.7.0",

    "GITLAB_WORKHORSE_VERSION": "16.9.2"

    "GITALY_SERVER_VERSION": "16.10.1",

    "GITLAB_PAGES_VERSION": "16.10.1",

    "GITLAB_SHELL_VERSION": "14.34.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",

    "GITLAB_WORKHORSE_VERSION": "16.10.1"

  }

}

pkgs/applications/version-management/gitlab/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ let 
                cp Cargo.lock $out

              '';

            };

            hash = "sha256-csasA2RH1vwRdF/9/BpFmh0AKsP3xtGmrhCx6mbVf6k=";

            hash = "sha256-7q2xWAsFkXHxkYNzIjPwJRy72xMXF278cpVzqGLt/9Y=";

          };



          dontBuild = false;
@@ -112,6 +112,8 @@ let 
    GITLAB_LOG_PATH = "log";

    FOSS_ONLY = !gitlabEnterprise;



    SKIP_YARN_INSTALL = 1;



    configurePhase = ''

      runHook preConfigure

pkgs/applications/version-management/gitlab/gitaly/default.nix

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



let

  version = "16.9.2";

  version = "16.10.1";

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

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

      repo = "gitaly";

      rev = "v${version}";

      hash = "sha256-YlSZq7+YtV9mhZDoNZ7QStbZLQ/Vtt8H2ZW84ONvCq8=";

      hash = "sha256-YMvxSQcvFj/ugTGjTThmwi1V9M+rc3fldrmChWzXKR8=";

    };



    vendorHash = "sha256-aqwdeBjR8IGa1DsAXY1h7vq7OkuTgoDim5m40YKlcmo=";

    vendorHash = "sha256-zaldiRg7fk/HncpfR7k+dDprsOp1ziQHgX8B4l7bwe0=";



    ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];

pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,17 +2,17 @@ 


buildGoModule rec {

  pname = "gitlab-elasticsearch-indexer";

  version = "4.7.0";

  version = "4.8.0";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-elasticsearch-indexer";

    rev = "v${version}";

    sha256 = "sha256-xkCG8PyOXQl2xqsq3INqYWGdcJpJgRsi/hB9creGTSM=";

    sha256 = "sha256-JHUDZmGlZGyvsB4wgAnNyIEtosZG4ajZ4eBGumH97ZI=";

  };



  vendorHash = "sha256-1eyIRlrgEQ6iiM2tom5S92BlsyaPVKZzSU3+Mmdxi+4=";

  vendorHash = "sha256-ztRKXoXncY66XJVwlPn4ShLWTD4Cr0yYHoUdquJItDM=";



  buildInputs = [ icu ];

  nativeBuildInputs = [ pkg-config ];

pkgs/applications/version-management/gitlab/gitlab-pages/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,17 +2,17 @@ 


buildGoModule rec {

  pname = "gitlab-pages";

  version = "16.9.2";

  version = "16.10.1";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-pages";

    rev = "v${version}";

    hash = "sha256-1ygIMatPcqvhjN5Zkuk0WXd9iW6fv3bLK9EZsIII/WM=";

    hash = "sha256-jUTUYbkUad2WrI8lkktd2pr3+GPraEUXT+efOb7JcKw=";

  };



  vendorHash = "sha256-ZjIjGZaZhxa3OvdaA4qD+Qza604mxe1u+zAUtIAKouo=";

  vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";

  subPackages = [ "." ];



  meta = with lib; {