Commit c2c6d8c0 authored by ajs124's avatar ajs124 Committed by Yaya
Browse files

gitlab: 16.3.4 -> 16.4.1

parent 122beeb8

pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch

+9 −7
Original line number Diff line number Diff line 
From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001

From 054e2e2092e3f20267a5d2046978df6d33c72712 Mon Sep 17 00:00:00 2001

From: Yaya <mak@nyantec.com>

Date: Tue, 23 May 2023 13:49:18 +0000

Subject: [PATCH] Remove unsupported database names



The only supported ones are main, ci, main_clusterwide.

---

 config/database.yml.postgresql | 35 ----------------------------------

 1 file changed, 35 deletions(-)

 config/database.yml.postgresql | 37 ----------------------------------

 1 file changed, 37 deletions(-)



diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql

index b210b9c412bc..900612080416 100644

index da9f458ff..2d6d44e37 100644

--- a/config/database.yml.postgresql

+++ b/config/database.yml.postgresql

@@ -26,13 +26,6 @@ production:
@@ -54,8 +54,8 @@ index b210b9c412bc..900612080416 100644 
 

 # Warning: The database defined as "test" will be erased and

 # re-generated from your development database when you run "rake".

@@ -117,17 +96,3 @@ test: &test

     prepared_statements: false

@@ -119,19 +98,3 @@ test: &test

     reaping_frequency: nil

     variables:

       statement_timeout: 15s

-  geo:
@@ -65,6 +65,7 @@ index b210b9c412bc..900612080416 100644 
-    username: postgres

-    password:

-    host: localhost

-    reaping_frequency: nil

-  embedding:

-    adapter: postgresql

-    encoding: unicode
@@ -72,6 +73,7 @@ index b210b9c412bc..900612080416 100644 
-    username: postgres

-    password:

-    host: localhost

-    reaping_frequency: nil

-- 

2.38.4

2.40.1

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

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

  "version": "16.3.4",

  "repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=",

  "yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088",

  "version": "16.4.1",

  "repo_hash": "sha256-gIoHv+Zt0WgxxL1GLz1iaK1g3uJNMbp+Umo6FbWEggY=",

  "yarn_hash": "0106yyiy00cag36mgckiwfdvhz23fsnskigpd533kjrl32qr9d6l",

  "owner": "gitlab-org",

  "repo": "gitlab",

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

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

  "passthru": {

    "GITALY_SERVER_VERSION": "16.3.4",

    "GITLAB_PAGES_VERSION": "16.3.4",

    "GITLAB_SHELL_VERSION": "14.26.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10",

    "GITLAB_WORKHORSE_VERSION": "16.3.4"

    "GITALY_SERVER_VERSION": "16.4.1",

    "GITLAB_PAGES_VERSION": "16.4.1",

    "GITLAB_SHELL_VERSION": "14.28.0",

    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.9",

    "GITLAB_WORKHORSE_VERSION": "16.4.1"

  }

}

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

+5 −13
Original line number Diff line number Diff line
@@ -3,17 +3,10 @@ 
, fetchFromGitHub

, buildGoModule

, pkg-config



# libgit2 + dependencies

, libgit2

, http-parser

, openssl

, pcre

, zlib

}:



let

  version = "16.3.4";

  version = "16.4.1";

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

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

      repo = "gitaly";

      rev = "v${version}";

      hash = "sha256-5fNRoxWNBky7dJLFg+OyshfIcAqCAj41hvfrQRPIuzg=";

      hash = "sha256-t3d72l/Na0qv+jezT/YhAUbG9DSSe9pyixQjTALTxvk=";

    };



    vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0=";

    vendorHash = "sha256-Nlq1l1f389DC854rFznEu2Viv0T7Y1cD1Ht0o2N304o=";



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



    tags = [ "static,system_libgit2" ];

    tags = [ "static" ];



    nativeBuildInputs = [ pkg-config ];

    buildInputs = [ libgit2 openssl zlib pcre http-parser ];



    doCheck = false;

  };
@@ -42,7 +34,7 @@ let 
  auxBins = buildGoModule ({

    pname = "gitaly-aux";



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

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

  } // commonOpts);

in

buildGoModule ({

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

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


buildGoModule rec {

  pname = "gitlab-container-registry";

  version = "3.83.0";

  version = "3.84.0";

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



  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "container-registry";

    inherit rev;

    sha256 = "sha256-HYyPe4x8hwtKAr0r4dGUbIyiLRQKtlWQ4Pt2mtbQmZM=";

    sha256 = "sha256-VdLovX3/y0fME74YlpPxjNPAwFpr1urAHJYO24VJ4AE=";

  };



  vendorHash = "sha256-OX8drOl8D30gYFnLzZe9i1whguXe0QFhsLpP9G9seuk=";

  vendorHash = "sha256-ZFQixOgcB8GqgZPIbjMJEYOlg9cD+wAMZF7mwWaNSXI=";



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

  version = "4.3.9";



  # nixpkgs-update: no auto update

  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "gitlab-elasticsearch-indexer";

    rev = "v${version}";

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

    sha256 = "sha256-/jo44MlLWZCSUWFW2rJSqugNYZCXEs5pfj0f6fZs4zg=";

  };



  vendorHash = "sha256-SEYHROFFaR7m7K6l4+zipX0QNYWpbf8qI4pAp1pKAsY=";

  vendorHash = "sha256-TQ6E5eckZNVL6zzaS9m0izWnQitqfpc4MAEoQOVasnA=";



  buildInputs = [ icu ];

  nativeBuildInputs = [ pkg-config ];