Commit 190e3881 authored by Leona Maroni's avatar Leona Maroni Committed by Yaya
Browse files
parent 86fc7533
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@

stdenv.mkDerivation rec {
  pname = "gitaly-git";
  version = "2.49.0.gl2";
  version = "2.50.1.gl1";

  # `src` attribute for nix-update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "git";
    rev = "v${version}";
    hash = "sha256-VFqUz79RvkOE4CS8GUZTPhah2AbvrlyHr4iYhWqh61Y=";
    hash = "sha256-q+xQAVsatw0vS4iIgAxciAVVMr33BjG0yM4AvZrXB+8=";
    leaveDotGit = true;
    # The build system clones the repo from the store (since it always expects
    # to be able to clone in the makefiles) and it looks like nix doesn't leave
+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
}:

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

@@ -21,10 +21,10 @@ let
      owner = "gitlab-org";
      repo = "gitaly";
      rev = "v${version}";
      hash = "sha256-/AyWxFUyNC0RCM4WMSlPrlh9okyZBacR2sPyzl9y4D0=";
      hash = "sha256-qZ/0SGkDj98CqqX6XTbbZEkhnTF/Sjzd7p2muBuP+xE=";
    };

    vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";
    vendorHash = "sha256-JFGzGwYi4owq0oVLucm7UGuq8PE4FH9Gp8HyBRoE6cs=";

    ldflags = [
      "-X ${gitaly_package}/internal/version.version=${version}"
+3 −3
Original line number Diff line number Diff line
@@ -6,17 +6,17 @@

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

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

  vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";
  vendorHash = "sha256-WCdpccNeVCEvo158uSyDlsGxneU72zKiV7J7JPhtPBw=";
  subPackages = [ "." ];

  ldflags = [
+7 −7
Original line number Diff line number Diff line
{
  "version": "18.2.5",
  "repo_hash": "1q9scfy1r9570gvm3dyrsg2cmpyx94a33w6418q1gy0msiqncnqd",
  "yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
  "version": "18.3.1",
  "repo_hash": "1csg5q3f0fp145905idqkhsshs8rdbmfgc0nx2ihvxkdmzvd0p3d",
  "yarn_hash": "0g1iafhfdgshy7d6p27qy042j8xyf6gj4rws9wrzdh51fmv4p3bj",
  "owner": "gitlab-org",
  "repo": "gitlab",
  "rev": "v18.2.5-ee",
  "rev": "v18.3.1-ee",
  "passthru": {
    "GITALY_SERVER_VERSION": "18.2.5",
    "GITLAB_PAGES_VERSION": "18.2.5",
    "GITALY_SERVER_VERSION": "18.3.1",
    "GITLAB_PAGES_VERSION": "18.3.1",
    "GITLAB_SHELL_VERSION": "14.44.0",
    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
    "GITLAB_WORKHORSE_VERSION": "18.2.5"
    "GITLAB_WORKHORSE_VERSION": "18.3.1"
  }
}
+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ in
buildGoModule rec {
  pname = "gitlab-workhorse";

  version = "18.2.5";
  version = "18.3.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {

  sourceRoot = "${src.name}/workhorse";

  vendorHash = "sha256-A+hCyi4P0JkBY2NYGWSpMsHjEgD43g9ZlPrxWL9Vx7Q=";
  vendorHash = "sha256-Nev8UXAjvxWItGT3LLcq0cs0wKKXWR6ml+1YBDiYJm4=";
  buildInputs = [ git ];
  ldflags = [ "-X main.Version=${version}" ];
  doCheck = false;
Loading