diff options
| author | talyz <kim.lindberger@gmail.com> | 2019-10-23 22:47:24 +0200 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2019-10-28 14:56:37 +0100 |
| commit | 5081a6cd56af8f560bac3fd82f6975264f3967ac (patch) | |
| tree | 4cb00599e2734ed4e0bebe028b10b399801da62c /pkgs/applications/version-management/gitlab/gitlab-workhorse | |
| parent | e79bc595321057ed4169f07beacc62f58c05e14d (diff) | |
| download | nixlib-5081a6cd56af8f560bac3fd82f6975264f3967ac.tar nixlib-5081a6cd56af8f560bac3fd82f6975264f3967ac.tar.gz nixlib-5081a6cd56af8f560bac3fd82f6975264f3967ac.tar.bz2 nixlib-5081a6cd56af8f560bac3fd82f6975264f3967ac.tar.lz nixlib-5081a6cd56af8f560bac3fd82f6975264f3967ac.tar.xz nixlib-5081a6cd56af8f560bac3fd82f6975264f3967ac.tar.zst nixlib-5081a6cd56af8f560bac3fd82f6975264f3967ac.zip | |
gitlab: 12.3.5 -> 12.4.0
- gitlab-shell no longer requires ruby for anything else than the install script, so the bundlerEnv stuff could be dropped - gitlab-shell and gitlab-workhorse now report their versions correctly
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitlab-workhorse')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 09a3cee195dd..b8364c1efeba 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,20 +3,19 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.10.0"; + version = "8.14.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "11cfhh48dga5ghfcijb68gbx0nfr5bs3vvp2j1gam9ac37fpvk0x"; + sha256 = "1cqx75h4x4chjvp72kzbln8qkm5p7p2w7x8bdd99g38kf21wxxaq"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; goDeps = ./deps.nix; buildInputs = [ git ]; - - makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" "GOCACHE=$(TMPDIR)/go-cache" ]; + buildFlagsArray = "-ldflags=-X main.Version=${version}"; # gitlab-workhorse depends on an older version of labkit which # contains old, vendored versions of some packages; gitlab-workhorse |