Merge pull request #104689 from petabyteboy/feature/gitlab-13-6-1

gitlab: 13.6.0 -> 13.6.1
This commit is contained in:
Florian Klink 2020-11-29 22:37:42 +01:00 committed by GitHub
commit a623bc0ba4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 6940 deletions

View file

@ -757,7 +757,7 @@ in {
systemd.services.gitaly = {
after = [ "network.target" "gitlab.service" ];
requires = [ "gitlab.service" ];
bindsTo = [ "gitlab.service" ];
wantedBy = [ "multi-user.target" ];
path = with pkgs; [
openssh

View file

@ -1,11 +1,11 @@
{
"version": "13.6.0",
"repo_hash": "1flri1cgx8drwf46x4sja366aiiif0ww807xrrcxa05pxj0mx8k5",
"version": "13.6.1",
"repo_hash": "0kfh9ngykrnvvjpx4m69pfyfvsvvqfxzlxhm8dgx9ypz4bpmr947",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v13.6.0-ee",
"rev": "v13.6.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "13.6.0",
"GITALY_SERVER_VERSION": "13.6.1",
"GITLAB_PAGES_VERSION": "1.30.0",
"GITLAB_SHELL_VERSION": "13.13.0",
"GITLAB_WORKHORSE_VERSION": "8.54.0"

View file

@ -1,5 +1,7 @@
{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby,
bundlerEnv, pkgconfig, libgit2_0_27 }:
{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby
, bundlerEnv, pkgconfig
# libgit2 + dependencies
, libgit2, openssl, zlib, pcre, http-parser }:
let
rubyEnv = bundlerEnv rec {
@ -18,27 +20,27 @@ let
};
};
};
in buildGoPackage rec {
version = "13.6.0";
in buildGoModule rec {
version = "13.6.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1b3vjg5sxrg8cfxn1nh8j26h847kxrfnn2chbb5v3ivhp1kp6zh2";
sha256 = "02w7pf7l9sr2nk8ky9b0d5b4syx3d9my65h2kzvh2afk7kv35h5y";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r";
passthru = {
inherit rubyEnv;
};
buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ];
goDeps = ./deps.nix;
preBuild = "rm -rf go/src/gitlab.com/gitlab-org/labkit/vendor";
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
doCheck = false;
postInstall = ''
mkdir -p $ruby

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, buildGoPackage, ruby }:
{ stdenv, fetchFromGitLab, buildGoModule, ruby }:
buildGoPackage rec {
buildGoModule rec {
pname = "gitlab-shell";
version = "13.13.0";
src = fetchFromGitLab {
@ -14,17 +14,13 @@ buildGoPackage rec {
patches = [ ./remove-hardcoded-locations.patch ];
goPackagePath = "gitlab.com/gitlab-org/gitlab-shell";
goDeps = ./deps.nix;
preBuild = ''
rm -rf "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor"
'';
vendorSha256 = "16fa3bka0008x2yazahc6xxcv4fa6yqg74kk64v8lrp7snbvjf4d";
postInstall = ''
cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin
cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
cp -r "$NIX_BUILD_TOP/source"/{support,VERSION} $out/
'';
doCheck = false;
meta = with stdenv.lib; {
description = "SSH access and repository management app for GitLab";

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, git, buildGoPackage }:
{ stdenv, fetchFromGitLab, git, buildGoModule }:
buildGoPackage rec {
buildGoModule rec {
pname = "gitlab-workhorse";
version = "8.54.0";
@ -12,10 +12,10 @@ buildGoPackage rec {
sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz";
};
goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
goDeps = ./deps.nix;
vendorSha256 = "0wi6vj9phwh0bsdk2lrgq807nb90iivlm0bkdjkim06jq068mizj";
buildInputs = [ git ];
buildFlagsArray = "-ldflags=-X main.Version=${version}";
doCheck = false;
meta = with stdenv.lib; {
homepage = "http://www.gitlab.com/";

File diff suppressed because it is too large Load diff