diff options
| author | Austin Seipp <aseipp@pobox.com> | 2018-04-20 06:35:35 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-04-23 12:12:53 -0500 |
| commit | 617db2df96a75f7808d544b57aa97d9859377e84 (patch) | |
| tree | 35105eef6743f90a2e7fffaa5abbb94bcc3cac67 /pkgs/servers/foundationdb/fix-scm-version.patch | |
| parent | bf6641ede5b058ff23311fcb44783c22a1b9f131 (diff) | |
| download | nixlib-617db2df96a75f7808d544b57aa97d9859377e84.tar nixlib-617db2df96a75f7808d544b57aa97d9859377e84.tar.gz nixlib-617db2df96a75f7808d544b57aa97d9859377e84.tar.bz2 nixlib-617db2df96a75f7808d544b57aa97d9859377e84.tar.lz nixlib-617db2df96a75f7808d544b57aa97d9859377e84.tar.xz nixlib-617db2df96a75f7808d544b57aa97d9859377e84.tar.zst nixlib-617db2df96a75f7808d544b57aa97d9859377e84.zip | |
foundationdb: init at 5.1.7
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/servers/foundationdb/fix-scm-version.patch')
| -rw-r--r-- | pkgs/servers/foundationdb/fix-scm-version.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/servers/foundationdb/fix-scm-version.patch b/pkgs/servers/foundationdb/fix-scm-version.patch new file mode 100644 index 000000000000..0e0df7ade82b --- /dev/null +++ b/pkgs/servers/foundationdb/fix-scm-version.patch @@ -0,0 +1,42 @@ +diff --git a/build/scver.mk b/build/scver.mk +index bdae8be..7539864 100644 +--- a/build/scver.mk ++++ b/build/scver.mk +@@ -98,33 +98,10 @@ endif + GITPRESENT := $(wildcard $(FDBDIR)/.git) + HGPRESENT := $(wildcard $(FDBDIR)/.hg) + +-# Use Git, if not missing +-ifneq ($(GITPRESENT),) +- SCVER := $(shell cd "$(FDBDIR)" && git --version 2>/dev/null) +- ifneq ($(SCVER),) +- VERSION_ID := $(shell cd "$(FDBDIR)" && git rev-parse --verify HEAD) +- SOURCE_CONTROL := GIT +- SCBRANCH := $(shell cd "$(FDBDIR)" && git rev-parse --abbrev-ref HEAD) +- else +-$(error Missing git executable on $(PLATFORM) ) +- endif +-# Otherwise, use Mercurial +-else +- # Otherwise, use Mercurial, if not missing +- ifneq ($(HGPRESENT),) +- SCVER := $(shell cd "$(FDBDIR)" && hg --version 2>/dev/null) +- ifdef SCVER +- VERSION_ID := $(shell cd "$(FDBDIR)" && hg id -n) +- SOURCE_CONTROL := MERCURIAL +- SCBRANCH := $(shell cd "$(FDBDIR)" && hg branch) +- else +-$(error Missing hg executable on $(PLATFORM)) +- endif +- else +- FDBFILES := (shell ls -la $(FDBDIR)) +-$(error Missing source control information for source on $(PLATFORM) in directory: $(FDBDIR) with files: $(FDBFILES)) +- endif +-endif ++# NixOS-specific non-VCS packaging, filled out by the nix build ++SOURCE_CONTROL := GIT ++VERSION_ID := @NIXOS_FDB_VERSION_ID@ ++SCBRANCH := @NIXOS_FDB_SCBRANCH@ + + # Set the RELEASE variable based on the KVRELEASE variable. + ifeq ($(KVRELEASE),1) |