public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: 11.6.3 -> 11.7.4

Browse Source
This commit is contained in:
Jeff Slight
2019-02-06 00:30:29 +01:00
committed by Florian Klink
parent dfce20e4e3
commit 8c043d3c7b
13 changed files with 346 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+2 -4
View File
@@ -3,19 +3,17 @@
stdenv.mkDerivation rec {
name = "gitlab-workhorse-${version}";
version = "7.6.0";
version = "8.0.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "13wr2az3bp6qnb05505sb5qn0fl2syaclc40dwjcdwwmhaalj2m4";
sha256 = "1aslcadag1q2rdirf9m0dl5vfaz8v3yy1232mvyjyvy1wb51pf4q";
};
buildInputs = [ git go ];
patches = [ ./remove-hardcoded-paths.patch ];
makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ];
meta = with stdenv.lib; {
pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch
-12
View File
@@ -1,12 +0,0 @@
diff --git a/internal/git/command.go b/internal/git/command.go
index 0e5496c..5778294 100644
--- a/internal/git/command.go
+++ b/internal/git/command.go
@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
cmd.Env = []string{
fmt.Sprintf("HOME=%s", os.Getenv("HOME")),
fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
+ fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")),
fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")),
fmt.Sprintf("GL_PROTOCOL=http"),
}