Commit 24c72d8d authored by ajs124's avatar ajs124 Committed by Yureka
Browse files

gitlab: 16.5.4 -> 16.7.0

parent 07ea0d4e

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

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

  "version": "16.5.4",

  "repo_hash": "sha256-N+5w42aIMnulItzx7ksK4Olkpr4AwN2ojcYs+xJfjeY=",

  "yarn_hash": "03ryyk7dw7s8yjdx9wdrvllaydb0w5an06agkwf5npgr6x1bz3yv",

  "version": "16.7.0",

  "repo_hash": "sha256-l5TkjkVny2zQLUfbscG6adkmkC1KjxMAeFbSyUA1UbI=",

  "yarn_hash": "1qxz2p969qg7kzyvhwxws5zwdw986gdq9gxllzi58c5c56jz49zf",

  "owner": "gitlab-org",

  "repo": "gitlab",

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

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

  "passthru": {

    "GITALY_SERVER_VERSION": "16.5.4",

    "GITLAB_PAGES_VERSION": "16.5.4",

    "GITLAB_SHELL_VERSION": "14.29.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.4.0",

    "GITLAB_WORKHORSE_VERSION": "16.5.4"

    "GITALY_SERVER_VERSION": "16.7.0",

    "GITLAB_PAGES_VERSION": "16.7.0",

    "GITLAB_SHELL_VERSION": "14.32.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.5.0",

    "GITLAB_WORKHORSE_VERSION": "16.7.0"

  }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ let 
    buildPhase = ''

      runHook preBuild



      bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production

      bundle exec rake gettext:compile RAILS_ENV=production NODE_ENV=production

      bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production

      bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production

      bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production

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.5.4";

  version = "16.7.0";

  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-6XXXTeLw7+ScWUB81Pno8BZkkSFJ12SnZKu8430yQKo=";

      hash = "sha256-YLynUHE1lb0dfsZsalz91jSSk1Y5r7kqT2AcE27xf04=";

    };



    vendorHash = "sha256-QLt/12P6OLpLqCINROLmzhoRpLGrB9WzME7FzhIcb0Q=";

    vendorHash = "sha256-btWHZMy1aBSsUVs30IqrdBCO79XQvTMXxkxYURF2Nqs=";



    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
@@ -10,10 +10,10 @@ buildGoModule rec { 
    owner = "gitlab-org";

    repo = "container-registry";

    inherit rev;

    sha256 = "sha256-egslb+8+RsDjpL5xQpdCU3QwFH59grRCkODQnAkZe/0=";

    hash = "sha256-vQ5bP2S1McZxD+Mjw0y/+GB8ntv8nQynM1cIWtUK7pU=";

  };



  vendorHash = "sha256-IFXIr0xYJCKM5VUHQV+4S/+FEAhFEjbMaU+9JWIh8cA=";

  vendorHash = "sha256-rDmmCwz/+FBzbREKIqwQulcOKwd4Y6/MITyNpB+pfwQ=";



  patches = [

    ./Disable-inmemory-storage-driver-test.patch

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.4.0";

  version = "4.5.0";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-elasticsearch-indexer";

    rev = "v${version}";

    sha256 = "sha256-Qywf5ACxXqY1iUZCsROTLmWeM8gFcqZvnClRo5DlnjY=";

    sha256 = "sha256-6Y2ARnFjbz6nFhWGRhzgAY8s0aX24oLMY1016oRD9oo=";

  };



  vendorHash = "sha256-2dUlztXnr7OH/gQ0Q4jQpuO1MdkOy1O4BNGiY223DAA=";

  vendorHash = "sha256-jpjfQl2z5yPnlGEYW6KKBfd4quchT+bU/RU6vwaB4gQ=";



  buildInputs = [ icu ];

  nativeBuildInputs = [ pkg-config ];