diff options
| -rw-r--r-- | pkgs/applications/version-management/gitlab-workhorse/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 723d2faeb26..8bfd1d07411 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitLab, git, go }: - stdenv.mkDerivation rec { - version = "4.2.0"; name = "gitlab-workhorse-${version}"; + version = "6.0.0"; + srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "11n43mfp7a59iq8k7sh9bnww3bq56ml2p6752csclg77xii6dzyy"; + sha256 = "0bg6rci69953h6zpdlv7pmjg751i31ykk6vggxb0ir0a6m8i3vn6"; }; buildInputs = [ git go ]; - patches = [ ./remove-hardcoded-paths.patch ]; + patches = [ ./remove-hardcoded-paths.patch ./deterministic-build.patch ]; buildPhase = '' make PREFIX=$out diff --git a/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch new file mode 100644 index 00000000000..e9c42089bed --- /dev/null +++ b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch @@ -0,0 +1,9 @@ +--- 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} |