diff options
| author | Robin Gloster <mail@glob.in> | 2018-09-25 02:06:08 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-09-25 03:53:32 +0200 |
| commit | 96c1765baca98724a768835bfe35ccbaf9668ecb (patch) | |
| tree | 6a1c1d5a8451f48c70704766e9300d6e28c36802 | |
| parent | f17f59ca8e5cecdeea51381f9249bf979bf4ea66 (diff) | |
| download | nixlib-96c1765baca98724a768835bfe35ccbaf9668ecb.tar nixlib-96c1765baca98724a768835bfe35ccbaf9668ecb.tar.gz nixlib-96c1765baca98724a768835bfe35ccbaf9668ecb.tar.bz2 nixlib-96c1765baca98724a768835bfe35ccbaf9668ecb.tar.lz nixlib-96c1765baca98724a768835bfe35ccbaf9668ecb.tar.xz nixlib-96c1765baca98724a768835bfe35ccbaf9668ecb.tar.zst nixlib-96c1765baca98724a768835bfe35ccbaf9668ecb.zip | |
gitlab-workhorse: 6.0.0 -> 6.1.0
| -rw-r--r-- | pkgs/applications/version-management/gitlab-workhorse/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch | 9 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 8bfd1d07411f..1fe8c844ebf0 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -2,27 +2,20 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "6.0.0"; + version = "6.1.0"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0bg6rci69953h6zpdlv7pmjg751i31ykk6vggxb0ir0a6m8i3vn6"; + sha256 = "0h0mqalia4ldb2icr2h6x75pnr5jb5y23pi4kv4ri3w3ddnl74bq"; }; buildInputs = [ git go ]; - patches = [ ./remove-hardcoded-paths.patch ./deterministic-build.patch ]; + patches = [ ./remove-hardcoded-paths.patch ]; - buildPhase = '' - make PREFIX=$out - ''; - - installPhase = '' - mkdir -p $out/bin - make install PREFIX=$out - ''; + makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ]; meta = with stdenv.lib; { homepage = http://www.gitlab.com/; diff --git a/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch deleted file mode 100644 index e9c42089bed4..000000000000 --- a/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/Makefile 2018-08-31 09:41:32.784419122 +0200 -+++ b/Makefile 2018-08-31 09:31:22.384313577 +0200 -@@ -1,5 +1,5 @@ - PREFIX=/usr/local --VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S) -+VERSION=6.0.0 - BUILD_DIR = $(shell pwd) - export GOPATH=${BUILD_DIR}/_build - export PATH:=${GOPATH}/bin:${PATH} |