diff options
| author | Servilio Afre Puentes <afrepues@sharcnet.ca> | 2017-11-06 14:39:03 -0500 |
|---|---|---|
| committer | Servilio Afre Puentes <afrepues@sharcnet.ca> | 2017-11-06 14:50:53 -0500 |
| commit | fa0148abf83873b27667346f95b9f76fa09b7a31 (patch) | |
| tree | 2ceff4639ef9111db35a98831d2c9bdab81ab7bf /pkgs/applications/version-management | |
| parent | c9bb6ac1fd13d5e7a346f5b3c65b07441530705b (diff) | |
| download | nixlib-fa0148abf83873b27667346f95b9f76fa09b7a31.tar nixlib-fa0148abf83873b27667346f95b9f76fa09b7a31.tar.gz nixlib-fa0148abf83873b27667346f95b9f76fa09b7a31.tar.bz2 nixlib-fa0148abf83873b27667346f95b9f76fa09b7a31.tar.lz nixlib-fa0148abf83873b27667346f95b9f76fa09b7a31.tar.xz nixlib-fa0148abf83873b27667346f95b9f76fa09b7a31.tar.zst nixlib-fa0148abf83873b27667346f95b9f76fa09b7a31.zip | |
gitlab-workhorse: 3.0.0 -> 3.2.0
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/gitlab-workhorse/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index a91a15e66b85..1f3407eddcf5 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.2.0"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0lz3bgwww640c7gh97vf40a8h6cz4znscl0r00z6iiwkc0xxzp7j"; + sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch index 37f3d2deef54..d8313ecb433a 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch +++ b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch @@ -2,11 +2,11 @@ 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 -@@ -16,6 +16,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd { +@@ -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_ID=%s", gl_id), + fmt.Sprintf("GL_PROTOCOL=http"), } |