BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "foundationdb: add 5.2.5 release, and new 6.0.0 snapshot"

Browse source 
This reverts commit 1fa2503f9d.
Broke ofborg evals due to missing required argument sdvend49
This commit is contained in:
Sarah Brofeldt 2018-07-02 16:08:54 +02:00
parent 1fa2503f9d
commit 6abb68d47a
4 changed files with 47 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
pkgs/servers/foundationdb/default.nix
View file

@ -1,42 +1,17 @@
{ stdenv49
, lib, fetchurl, fetchFromGitHub
{ stdenv, fetchurl, fetchFromGitHub
, which, findutils, m4, gawk
, python, openjdk, mono58, libressl
, python, openjdk, mono58, libressl_2_6
, boost16x
}:
let
# hysterical raisins dictate a version of boost this old. however,
# we luckily do not need to build anything, we just need the header
# files.
boost152 = stdenv49.mkDerivation rec {
name = "boost-headers-1.52.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
};
configurePhase = ":";
buildPhase = ":";
installPhase = "mkdir -p $out/include && cp -R boost $out/include/";
};
makeFdb =
{ version
, branch
, sha256
, rev, sha256
# the revision can be inferred from the fdb tagging policy
, rev ? "refs/tags/${version}"
# in theory newer versions of fdb support newer compilers, but they
# don't :( maybe one day
, stdenv ? stdenv49
# in theory newer versions of fdb support newer boost versions, but they
# don't :( maybe one day
, boost ? boost152
# fdb 6.0+ support boost 1.6x+, so default to it
, boost ? boost16x
}: stdenv.mkDerivation rec {
name = "foundationdb-${version}";
inherit version;
@ -48,20 +23,14 @@ let
};
nativeBuildInputs = [ gawk which m4 findutils mono58 ];
buildInputs = [ python openjdk libressl boost ];
buildInputs = [ python openjdk libressl_2_6 boost ];
patches =
[ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags
(if lib.versionAtLeast version "5.2"
then ./ldflags.patch
else ./ldflags-5.1.patch)
] ++
# for 6.0+, we do NOT need to apply this version fix, since we can specify
# it ourselves. see configurePhase
(lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch);
[ ./fix-scm-version.patch
./ldflags.patch
];
postPatch = ''
# note: this does not do anything for 6.0+
substituteInPlace ./build/scver.mk \
--subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \
--subst-var-by NIXOS_FDB_SCBRANCH "${branch}"
@ -82,13 +51,7 @@ let
enableParallelBuilding = true;
makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ];
# on 6.0 and later, we can specify all this information manually
configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''
export SOURCE_CONTROL=GIT
export SCBRANCH="${branch}"
export VERSION_ID="${rev}"
'';
configurePhase = ":";
installPhase = ''
mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
@ -122,24 +85,45 @@ let
};
};
# hysterical raisins dictate a version of boost this old. however,
# we luckily do not need to build anything, we just need the header
# files.
boost152 = stdenv.mkDerivation rec {
name = "boost-headers-1.52.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
};
configurePhase = ":";
buildPhase = ":";
installPhase = "mkdir -p $out/include && cp -R boost $out/include/";
};
in with builtins; {
foundationdb51 = makeFdb rec {
foundationdb51 = makeFdb {
version = "5.1.7";
branch = "release-5.1";
rev = "9ad8d02386d4a6a5efecf898df80f2747695c627";
sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06";
boost = boost152;
};
foundationdb52 = makeFdb rec {
version = "5.2.5";
branch = "release-5.2";
sha256 = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7";
version = "5.2.0pre1488_${substring 0 8 rev}";
branch = "master";
rev = "18f345487ed8d90a5c170d813349fa625cf05b4e";
sha256 = "0mz30fxj6q99cvjzg39s5zm992i6h2l2cb70lc58bdhsz92dz3vc";
boost = boost152;
};
foundationdb60 = makeFdb rec {
version = "6.0.0pre2227_${substring 0 8 rev}";
version = "6.0.0pre1636_${substring 0 8 rev}";
branch = "master";
rev = "8caa6eaecf1eeec0298fc77db334761b0c1d1523";
sha256 = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll";
rev = "1265a7b6d5e632dd562b3012e70f0727979806bd";
sha256 = "0z1i5bkbszsbn8cc48rlhr29m54n2s0gq3dln0n7f97gf58mi5yf";
};
}

90
pkgs/servers/foundationdb/ldflags-5.1.patch
View file

@ -1,90 +0,0 @@
diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
index 0b6eac8..b1891ca 100644
--- a/FDBLibTLS/local.mk
+++ b/FDBLibTLS/local.mk
@@ -1,6 +1,5 @@
FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR)
-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto
-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt
+FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto
FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map
# The plugin isn't a typical library, so it feels more sensible to have a copy
diff --git a/bindings/c/local.mk b/bindings/c/local.mk
index 44f0c31..7aea5a4 100644
--- a/bindings/c/local.mk
+++ b/bindings/c/local.mk
@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
CLEAN_TARGETS += fdb_c_tests_clean
ifeq ($(PLATFORM),linux)
- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
+ fdb_c_LIBS += lib/libstdc++.a
+ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
fdb_c_tests_LIBS += -lpthread
endif
diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
index 2ef4fcb..6e59625 100644
--- a/bindings/flow/tester/local.mk
+++ b/bindings/flow/tester/local.mk
@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
@rm -rf bindings/flow/bin
ifeq ($(PLATFORM),linux)
- fdb_flow_tester_LIBS += -ldl -lpthread -lrt
- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
+ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
else ifeq ($(PLATFORM),osx)
fdb_flow_tester_LDFLAGS += -lc++
endif
diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
index 033fe7d..865fc92 100644
--- a/fdbbackup/local.mk
+++ b/fdbbackup/local.mk
@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS)
fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
ifeq ($(PLATFORM),linux)
- fdbbackup_LIBS += -ldl -lpthread -lrt
- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
+ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
# GPerfTools profiler (uncomment to use)
# fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
diff --git a/fdbcli/local.mk b/fdbcli/local.mk
index 81a4a42..892c079 100644
--- a/fdbcli/local.mk
+++ b/fdbcli/local.mk
@@ -22,14 +22,13 @@
fdbcli_CFLAGS := $(fdbclient_CFLAGS)
fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl
+fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
fdbcli_STATIC_LIBS :=
fdbcli_GENERATED_SOURCES += versions.h
ifeq ($(PLATFORM),linux)
- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
- fdbcli_LIBS += -lpthread -lrt
+ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
else ifeq ($(PLATFORM),osx)
fdbcli_LDFLAGS += -lc++
endif
diff --git a/fdbserver/local.mk b/fdbserver/local.mk
index 78cad1b..36f2c0f 100644
--- a/fdbserver/local.mk
+++ b/fdbserver/local.mk
@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS)
fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
ifeq ($(PLATFORM),linux)
- fdbserver_LIBS += -ldl -lpthread -lrt
- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
+ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
# GPerfTools profiler (uncomment to use)
# fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1

14
pkgs/servers/foundationdb/ldflags.patch
View file

@ -1,9 +1,9 @@
diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
index 5e6b9cfb..73f4e5f3 100644
index 0b6eac8..b1891ca 100644
--- a/FDBLibTLS/local.mk
+++ b/FDBLibTLS/local.mk
@@ -1,6 +1,5 @@
FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Ifdbrpc
FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR)
-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto
-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt
+FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto
@ -11,7 +11,7 @@ index 5e6b9cfb..73f4e5f3 100644
# The plugin isn't a typical library, so it feels more sensible to have a copy
diff --git a/bindings/c/local.mk b/bindings/c/local.mk
index 44f0c31b..7aea5a4f 100644
index 44f0c31..7aea5a4 100644
--- a/bindings/c/local.mk
+++ b/bindings/c/local.mk
@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
@ -26,7 +26,7 @@ index 44f0c31b..7aea5a4f 100644
endif
diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
index 2ef4fcb7..6e59625c 100644
index 2ef4fcb..6e59625 100644
--- a/bindings/flow/tester/local.mk
+++ b/bindings/flow/tester/local.mk
@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
@ -40,7 +40,7 @@ index 2ef4fcb7..6e59625c 100644
fdb_flow_tester_LDFLAGS += -lc++
endif
diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
index 033fe7d4..865fc923 100644
index 033fe7d..865fc92 100644
--- a/fdbbackup/local.mk
+++ b/fdbbackup/local.mk
@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS)
@ -54,7 +54,7 @@ index 033fe7d4..865fc923 100644
# GPerfTools profiler (uncomment to use)
# fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
diff --git a/fdbcli/local.mk b/fdbcli/local.mk
index 81a4a42e..892c079c 100644
index 81a4a42..892c079 100644
--- a/fdbcli/local.mk
+++ b/fdbcli/local.mk
@@ -22,14 +22,13 @@
@ -75,7 +75,7 @@ index 81a4a42e..892c079c 100644
fdbcli_LDFLAGS += -lc++
endif
diff --git a/fdbserver/local.mk b/fdbserver/local.mk
index 78cad1bf..36f2c0f7 100644
index 78cad1b..36f2c0f 100644
--- a/fdbserver/local.mk
+++ b/fdbserver/local.mk
@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS)

4
pkgs/top-level/all-packages.nix
View file

@ -2522,9 +2522,7 @@ with pkgs;
fuseiso = callPackage ../tools/filesystems/fuseiso { };
fdbPackages = callPackage ../servers/foundationdb {
stdenv49 = overrideCC stdenv gcc49;
};
fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; };
inherit (fdbPackages)
foundationdb51