From b5b314c13728b09b353104a68ee856f12e6304dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Apr 2018 01:31:03 -0700 Subject: [PATCH 1/2] lmdb: 0.9.21 -> 0.9.22 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lmdb/versions. These checks were done: - built on NixOS - ran `/nix/store/lycr0rb3lgdhnjfsl44wv9vw74gpsh44-lmdb-0.9.22-bin/bin/mdb_stat -V` and found version 0.9.22 - ran `/nix/store/lycr0rb3lgdhnjfsl44wv9vw74gpsh44-lmdb-0.9.22-bin/bin/mdb_copy -V` and found version 0.9.22 - ran `/nix/store/lycr0rb3lgdhnjfsl44wv9vw74gpsh44-lmdb-0.9.22-bin/bin/mdb_dump -V` and found version 0.9.22 - ran `/nix/store/lycr0rb3lgdhnjfsl44wv9vw74gpsh44-lmdb-0.9.22-bin/bin/mdb_load -V` and found version 0.9.22 - found 0.9.22 with grep in /nix/store/lycr0rb3lgdhnjfsl44wv9vw74gpsh44-lmdb-0.9.22-bin - directory tree listing: https://gist.github.com/f4d443d41dd66aa5f5038de9319c607d --- pkgs/development/libraries/lmdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index d96b5ed6d520..f1dabfc6c20e 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.21"; + version = "0.9.22"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "026a6himvg3y4ssnccdbgr3c2pq3w2d47nayn05v512875z4f2w3"; + sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; From a48f50641c02de6e3555f853163f756c28a6ca83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 1 Apr 2018 11:09:13 +0200 Subject: [PATCH 2/2] lmdb: patch-out hardcoded compiler --- pkgs/development/libraries/lmdb/default.nix | 3 +++ .../libraries/lmdb/hardcoded-compiler.patch | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/lmdb/hardcoded-compiler.patch diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index f1dabfc6c20e..0bb3a67d9502 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; + patches = [ ./hardcoded-compiler.patch ]; + patchFlags = "-p3"; + outputs = [ "bin" "out" "dev" ]; makeFlags = [ "prefix=$(out)" "CC=cc" ] diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch new file mode 100644 index 000000000000..ddb247b7f113 --- /dev/null +++ b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch @@ -0,0 +1,26 @@ +commit 029031a68873bc3784a8561bd8e049efbd34f9d0 (HEAD) +Author: Vladimír Čunát +Date: Sun Apr 1 11:05:31 2018 +0200 + + make: gcc -> $(CC) + +diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile +index f254511..612484e 100644 +--- a/libraries/liblmdb/Makefile ++++ b/libraries/liblmdb/Makefile +@@ -102,13 +102,13 @@ COV_OBJS=xmdb.o xmidl.o + + coverage: xmtest + for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \ +- gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ ++ $(CC) -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ + rm -rf testdb; mkdir testdb; ./x$$j; done + gcov xmdb.c + gcov xmidl.c + + xmtest: mtest.o xmdb.o xmidl.o +- gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) ++ $(CC) -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) + + xmdb.o: mdb.c lmdb.h midl.h + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@