Commit 97dfc365 authored by ajs124's avatar ajs124 Committed by Yureka
Browse files

gitlab: 16.1.4 -> 16.3.1 

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



Fixes CVE-2022-4343
Fixes CVE-2023-0120
Fixes CVE-2023-1279
Fixes CVE-2023-1555
Fixes CVE-2023-3205
Fixes CVE-2023-3915
Fixes CVE-2023-3950
Fixes CVE-2023-4018
Fixes CVE-2023-4378
Fixes CVE-2023-4630
Fixes CVE-2023-4638
Fixes CVE-2023-4647

Co-Authored-By: default avatarYaya <github@uwu.is>
parent 1d77f323

nixos/modules/services/misc/gitlab.nix

+1 −1
Original line number Diff line number Diff line
@@ -1655,7 +1655,7 @@ in { 
        Restart = "on-failure";

        WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";

        ExecStart = concatStringsSep " " [

          "${cfg.packages.gitlab.rubyEnv}/bin/puma"

          "${cfg.packages.gitlab.rubyEnv}/bin/bundle" "exec" "puma"

          "-e production"

          "-C ${cfg.statePath}/config/puma.rb"

          "-w ${cfg.puma.workers}"

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

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

  "version": "16.1.4",

  "repo_hash": "sha256-GVUQBAuLBajKXpZOxaP+QnAVj32XTYDtTfInNFQRRCY=",

  "yarn_hash": "0wykn0vq16n8mz4jfh7dfyp9javzhqlfwmc5i1zm07gld91nirlm",

  "version": "16.3.1",

  "repo_hash": "sha256-E0aa+sUoc8CxQ4ucHOPJL3+A1Al23xWT0TpYSSpZxgc=",

  "yarn_hash": "0lks2s0g7x7psdfmcq353z7gjp9lw1wm72hvkvw26fy21yglml6s",

  "owner": "gitlab-org",

  "repo": "gitlab",

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

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

  "passthru": {

    "GITALY_SERVER_VERSION": "16.1.4",

    "GITLAB_PAGES_VERSION": "16.1.4",

    "GITLAB_SHELL_VERSION": "14.23.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.5",

    "GITLAB_WORKHORSE_VERSION": "16.1.4"

    "GITALY_SERVER_VERSION": "16.3.1",

    "GITLAB_PAGES_VERSION": "16.3.1",

    "GITLAB_SHELL_VERSION": "14.26.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8",

    "GITLAB_WORKHORSE_VERSION": "16.3.1"

  }

}

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

+1 −10
Original line number Diff line number Diff line
@@ -33,15 +33,6 @@ let 
          buildInputs = [ file ];

          buildFlags = [ "--enable-system-libraries" ];

        };

        # the included yarn rake task attaches the yarn:install task

        # to assets:precompile, which is both unnecessary (since we

        # run `yarn install` ourselves) and undoes the shebang patches

        # in node_modules

        railties = x.railties // {

          dontBuild = false;

          patches = [ ./railties-remove-yarn-install-enhancement.patch ];

          patchFlags = [ "-p2" ];

        };

      };

    groups = [

      "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"
@@ -50,7 +41,7 @@ let 
    # `console` executable.

    ignoreCollisions = true;



    extraConfigPaths = [ "${src}/vendor" ];

    extraConfigPaths = [ "${src}/vendor" "${src}/gems" ];

  };



  assets = stdenv.mkDerivation {

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

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



let

  version = "16.1.4";

  version = "16.3.1";

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

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

      repo = "gitaly";

      rev = "v${version}";

      sha256 = "sha256-BgupN+fhUxhvMvqmrJTpLt1gPTHC3SO3HTb1ezJokYQ=";

      sha256 = "sha256-Tc7JsGuTF+JK5SLmaQwVbmdSy/Wvm3VNoZqHTyZFd6k=";

    };



    vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA=";

    vendorSha256 = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0=";



    ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
@@ -42,7 +42,7 @@ let 
  auxBins = buildGoModule ({

    pname = "gitaly-aux";



    subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" ];

    subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" "cmd/gitaly-gpg" ];

  } // commonOpts);

in

buildGoModule ({

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

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


buildGoModule rec {

  pname = "gitlab-elasticsearch-indexer";

  version = "4.3.5";

  version = "4.3.8";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-elasticsearch-indexer";

    rev = "v${version}";

    sha256 = "sha256-2idvN92H4Cc1W71gADrsuUl3+f2weAvL2MOP19NO/3I=";

    sha256 = "sha256-CePFRk+Dpndv4BtINUn8/Y4fhuO4sCyh4+erjfIHZvI=";

  };



  vendorHash = "sha256-7LqzuBVYqpPI2thIJu4kQgCZGMlBlKI8L+j7AdUYrgQ=";

  vendorHash = "sha256-SEYHROFFaR7m7K6l4+zipX0QNYWpbf8qI4pAp1pKAsY=";



  buildInputs = [ icu ];

  nativeBuildInputs = [ pkg-config ];