Unverified Commit 6251e94f authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

gitlab: 18.2.2 -> 18.2.5 (#437844)

parents 0da27b15 a481b621
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
}:

let
  version = "18.2.2";
  version = "18.2.5";
  package_version = "v${lib.versions.major version}";
  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";

@@ -21,7 +21,7 @@ let
      owner = "gitlab-org";
      repo = "gitaly";
      rev = "v${version}";
      hash = "sha256-+OmduG9neb15m3i57qPfE42HI4w/zgmA5T6bhlwzrT0=";
      hash = "sha256-/AyWxFUyNC0RCM4WMSlPrlh9okyZBacR2sPyzl9y4D0=";
    };

    vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";
+4 −10
Original line number Diff line number Diff line
@@ -6,24 +6,18 @@

buildGoModule rec {
  pname = "gitlab-container-registry";
  version = "4.26.0";
  rev = "v${version}-gitlab";
  version = "4.27.0";
  rev = "v${version}-gitlab-ahmed-master-test";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "container-registry";
    inherit rev;
    hash = "sha256-XACKJW5sRXNM4Q24DXEVtjzhVfxoBd+JWHJr1s01ocA=";
    hash = "sha256-lcM0HjseQ4N7rndDx95aC6MWb+Ggwz3UIhSvbC8oxus=";
  };

  patches = [
    # https://gitlab.com/gitlab-org/container-registry/-/merge_requests/2447
    # Can be removed with next released when merged
    ./fix-broken-urlcache-tests.diff
  ];

  vendorHash = "sha256-J4p3vXLmDFYl/z6crqanlmG1FB4Dq04HLx9IhC3usQ4=";
  vendorHash = "sha256-ALPK9h5Isniis7QPz9DXokeBd+hWMDJ7ts9/sGNrFMk=";

  checkFlags =
    let
+2 −2
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@

buildGoModule rec {
  pname = "gitlab-pages";
  version = "18.2.2";
  version = "18.2.5";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-pages";
    rev = "v${version}";
    hash = "sha256-PPa9SYyE3G+peP2xSpNw7WDDO7WiWKSRpd5tBODkA0g=";
    hash = "sha256-21IsNcVkhtncum2miTOjuCcM681qYa+8e/5CCEiqz/Q=";
  };

  vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";
+3 −3
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@

buildGoModule rec {
  pname = "gitlab-shell";
  version = "14.43.0";
  version = "14.44.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-shell";
    rev = "v${version}";
    hash = "sha256-JBcfsOLutxHUk5z+vXP8CnVSmJazhqJk4fZ0vONIswo=";
    hash = "sha256-y3CTfYN2QCWm2n534Bb8uS0Bzn4BsBuMtxAyuU3f+oI=";
  };

  buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
    ./remove-hardcoded-locations.patch
  ];

  vendorHash = "sha256-zuxgWBrrftkNjMhAXs8cAcQmb8RLQqvnFhU0HnUUcTA=";
  vendorHash = "sha256-flLt2LdcSDIuoUr4mwfv6LOV9GPewf+o0rb8kyBsgSk=";

  subPackages = [
    "cmd/gitlab-shell"
+7 −7
Original line number Diff line number Diff line
{
  "version": "18.2.2",
  "repo_hash": "0fqpfprxmgxaz5g0d5z4gsir1zj9fkhli7iq1ahx413ymsiqrxd0",
  "version": "18.2.5",
  "repo_hash": "1q9scfy1r9570gvm3dyrsg2cmpyx94a33w6418q1gy0msiqncnqd",
  "yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
  "owner": "gitlab-org",
  "repo": "gitlab",
  "rev": "v18.2.2-ee",
  "rev": "v18.2.5-ee",
  "passthru": {
    "GITALY_SERVER_VERSION": "18.2.2",
    "GITLAB_PAGES_VERSION": "18.2.2",
    "GITLAB_SHELL_VERSION": "14.43.0",
    "GITALY_SERVER_VERSION": "18.2.5",
    "GITLAB_PAGES_VERSION": "18.2.5",
    "GITLAB_SHELL_VERSION": "14.44.0",
    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
    "GITLAB_WORKHORSE_VERSION": "18.2.2"
    "GITLAB_WORKHORSE_VERSION": "18.2.5"
  }
}
Loading