mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 17:49:58 +03:00
gitlab-workhorse: 6.1.0 -> 6.1.1, make build deterministic
This commit is contained in:
parent
908a75a3ae
commit
998d4e4e2c
@ -2,18 +2,18 @@
|
|||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gitlab-workhorse-${version}";
|
name = "gitlab-workhorse-${version}";
|
||||||
|
|
||||||
version = "6.1.0";
|
version = "6.1.1";
|
||||||
|
|
||||||
srcs = fetchFromGitLab {
|
srcs = fetchFromGitLab {
|
||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitlab-workhorse";
|
repo = "gitlab-workhorse";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0h0mqalia4ldb2icr2h6x75pnr5jb5y23pi4kv4ri3w3ddnl74bq";
|
sha256 = "1dwvk86bfsqgkp0mwz71yis3i7aypjf96r3hsjkgpd27hwbjgxbr";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ git go ];
|
buildInputs = [ git go ];
|
||||||
|
|
||||||
patches = [ ./remove-hardcoded-paths.patch ];
|
patches = [ ./remove-hardcoded-paths.patch ./deterministic-build.patch ];
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ];
|
makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ];
|
||||||
|
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
--- 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
|
Loading…
Reference in New Issue
Block a user