Unverified Commit a3ba07a2 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #319486 from yayayayaka/gitlab-16.11.4 

gitlab: 16.10.6 -> 16.11.4
parents 27376c9e e34d62d8

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

+8 −8
Original line number Diff line number Diff line 
{

  "version": "16.10.6",

  "repo_hash": "sha256-+nEUyD+ryZicH7suh4MnQRDKMC3M3VWRdO4nZCi2LGs=",

  "yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",

  "version": "16.11.4",

  "repo_hash": "sha256-VtjGV/0Xtmwqu/YZa6P6jUvlTYj9FNKALcJ3ZvMUJBw=",

  "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq",

  "owner": "gitlab-org",

  "repo": "gitlab",

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

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

  "passthru": {

    "GITALY_SERVER_VERSION": "16.10.6",

    "GITLAB_PAGES_VERSION": "16.10.6",

    "GITLAB_SHELL_VERSION": "14.34.0",

    "GITALY_SERVER_VERSION": "16.11.4",

    "GITLAB_PAGES_VERSION": "16.11.4",

    "GITLAB_SHELL_VERSION": "14.35.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",

    "GITLAB_WORKHORSE_VERSION": "16.10.6"

    "GITLAB_WORKHORSE_VERSION": "16.11.4"

  }

}

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

+5 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, gitlabEnterprise ? false, callPackage, yarn

, fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config

, cargo, rustc, rustPlatform

, icu, zlib, which

}:



let
@@ -49,7 +50,7 @@ let 
                cp Cargo.lock $out

              '';

            };

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

            hash = "sha256-SncgYYnoSaWA4kQWonoXXbSMu1mnwTyhdLXFagqgH+o=";

          };



          dontBuild = false;
@@ -74,6 +75,9 @@ let 
            find $out -type f -name .rustc_info.json -delete

          '';

        };

        static_holmes = attrs: {

          buildInputs = [ which icu zlib ];

        };

      };

    groups = [

      "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"

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

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



let

  version = "16.10.6";

  version = "16.11.4";

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

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

      repo = "gitaly";

      rev = "v${version}";

      hash = "sha256-C57p3H1L6ZQfjipGoQJup8u6ofir3rrxORtzUA1afL0=";

      hash = "sha256-sdRKKOWoX0yyqUGpu/mqDdTq2nLZ2Gr5GNV9x99rdeU=";

    };



    vendorHash = "sha256-6gZr0/0ZGcFwwAY4IuW2puL/7akMZvaU0ONJGYyyJas=";

    vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg=";



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

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

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


buildGoModule rec {

  pname = "gitlab-container-registry";

  version = "4.1.0";

  version = "4.5.0";

  rev = "v${version}-gitlab";



  # nixpkgs-update: no auto update
@@ -10,7 +10,7 @@ buildGoModule rec { 
    owner = "gitlab-org";

    repo = "container-registry";

    inherit rev;

    hash = "sha256-t+i9IuBH94PpfriIAaqqWYZHxKJJDOedJ3BQXGEPp0A=";

    hash = "sha256-dCDybwIfzC79Mobejz/5XbEMQXkPuO8HejjannA6k/M=";

  };



  vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc=";

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

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


buildGoModule rec {

  pname = "gitlab-pages";

  version = "16.10.6";

  version = "16.11.4";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-pages";

    rev = "v${version}";

    hash = "sha256-30ojS+TBIJ4Qzg1jh2Bpdd2s2Yo2S+UqxRRdvNBvB/k=";

    hash = "sha256-6Fh1IKCs2Bg7Eg44kbCMM8YhLmwWvdZnXp39fphLzcE=";

  };



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