Unverified Commit ac13b267 authored by Yaya's avatar Yaya Committed by GitHub
Browse files

gitlab: 18.8.4 -> 18.9.1 (#494006)

parents 57fea25e ad0eb45e

pkgs/by-name/gi/gitaly/dont-clone-git-repo.patch

+7 −7
Original line number Diff line number Diff line 
diff --git a/Makefile b/Makefile

index e75c22e80b..f702da6f80 100644

index e571d0f2bf..3bbb081a55 100644

--- a/Makefile

+++ b/Makefile

@@ -757,12 +757,8 @@

@@ -714,12 +714,8 @@

 # otherwise try to rebuild all targets depending on it whenever we build

 # something else. We thus depend on the Makefile instead.

 ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version

 # something else. We thus depend on the meson.build file instead.

 ${DEPENDENCY_DIR}/git-%/meson.build: ${DEPENDENCY_DIR}/git-%.version

-	${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}"

-	${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL}

-	${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags
@@ -14,6 +14,6 @@ index e75c22e80b..f702da6f80 100644 
-	${Q}${GIT} -C "${@D}" checkout ${GIT_QUIET} --detach FETCH_HEAD

+	cp -r ${GIT_REPO_PATH} "${@D}"

+	chmod -R oga+rw "${@D}"

 ifeq ($(OVERRIDE_GIT_VERSION),)

 	${Q}rm -f "${@D}"/version

 else
 
 	@ # We're doing a shallow clone without any tags, so Git's default way to figure out the version via git-describe(1)

 	@ # will fail. We thus have to help Git a bit: if we're asked to build from a commit directly we extract the

 	@ # current version of Git from "GIT-VERSION-GEN" and append the first 8 characters of the commit ID to it.

pkgs/by-name/gi/gitaly/git-data.json

+3 −3
Original line number Diff line number Diff line 
{

  "version": "2.52-a37bb2ae",

  "rev": "a37bb2ae6c6659cf7cefd0412759fca5202a823d",

  "hash": "sha256-A1FOzmVe2e73pie0WYJPwsKOb5BGNrusGy0wXa9ruvI="

  "version": "2.52-aea8cc3a",

  "rev": "aea8cc3a10c325a22a75e2d4f582db959d3854ae",

  "hash": "sha256-YT5yPnuP4Rv7Q88lzFiPN29K5iGRys1FfHzw4jVmWVg="

}

pkgs/by-name/gi/gitaly/git.nix

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
  pcre2,

  zlib,

  git,

  meson,

  ninja,

  pkg-config,

  openssl,

}:
@@ -44,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [

    git # clones our repo from the store

    meson

    ninja

    pkg-config

  ];

  # git inputs
@@ -54,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: { 
    curl

  ];



  # Meson and ninja are required to build git, but gitaly doesn't use them

  dontUseMesonConfigure = true;

  dontUseNinjaBuild = true;



  # required to support pthread_cancel()

  NIX_LDFLAGS =

    lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"

pkgs/by-name/gi/gitaly/package.nix

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



let

  version = "18.8.5";

  version = "18.9.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-XbKEw21WRkh/kUeoS9Z+/SpEtqjflad2P5vi6U2wSbM=";

      hash = "sha256-H5zAd5/sHrRuEp1v/gMDY/9DyCMWmzpb3Ws6aTfX2k8=";

    };



    vendorHash = "sha256-CSjsxwumKUbp/tSewE8iAp4c3DH6V6fNY4OCgzjvHP0=";

    vendorHash = "sha256-lK0fNBhDGFOZ+sCm1VuvN4CpAb0nAkUl4yL/30tZKBY=";



    ldflags = [

      "-X ${gitaly_package}/internal/version.version=${version}"

pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "gitlab-code-parser";

  version = "0.21.1";

  version = "0.22.0";



  src = fetchFromGitLab {

    owner = "gitlab-org";

    repo = "rust/gitlab-code-parser";

    tag = "v${finalAttrs.version}";

    hash = "sha256-aA1zwauomznayHVGRdoQYaaba8Mq39LzjSwrvVivN2E=";

    hash = "sha256-H2C/OgTdIDuCX2tkDb/kJclrLBaSjkqbRtCNf/OYE4Q=";

  };



  cargoHash = "sha256-oiYV+o30NrLkewfEU0z8OzkaHFWExa2gbExewHBDxSo=";

  cargoHash = "sha256-xOiUO/qGliZwHeGVmr/v318tlO5RvDBoF5cz8BYwXZY=";



  nativeBuildInputs = [

    pkg-config