diff options
| author | Florian Klink <flokli@flokli.de> | 2018-11-23 13:22:50 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2018-11-23 13:22:50 +0100 |
| commit | 8b51e837b993d3b8ed3165c4245297b72f032b68 (patch) | |
| tree | aaf3c3963c1d0932aa26efbbc044d84c6f6391b9 /pkgs/applications/version-management/gitlab/gitlab-workhorse | |
| parent | d768e3967fd02771e1c428bbd239cd3b344ff729 (diff) | |
gitlab-workhorse: drop deterministic-build.patch
we already set VERSION in makeFlags below.
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitlab-workhorse')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitlab-workhorse/deterministic-build.patch | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 3fab965bf547..956515897a61 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ git go ]; - patches = [ ./remove-hardcoded-paths.patch ./deterministic-build.patch ]; + patches = [ ./remove-hardcoded-paths.patch ]; makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deterministic-build.patch b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deterministic-build.patch deleted file mode 100644 index da6dc5493ac5..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deterministic-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2018-10-08 12:45:15.206269937 +0200 -+++ b/Makefile 2018-10-08 12:45:24.435366307 +0200 -@@ -6,7 +6,7 @@ - BIN_BUILD_DIR := $(TARGET_DIR)/bin - PKG_BUILD_DIR := $(TARGET_DIR)/src/$(PKG) - COVERAGE_DIR := $(TARGET_DIR)/cover --VERSION := $(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S) -+VERSION := 6.1.1 - GOBUILD := go build -ldflags "-X main.Version=$(VERSION)" - EXE_ALL := gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse - INSTALL := install |