mongodb: 2.6.8 -> 3.0.1

+16 -17
+16 -17
pkgs/servers/nosql/mongodb/default.nix
··· 1 1 { stdenv, fetchurl, scons, boost, gperftools, pcre, snappy 2 - , libyamlcpp, sasl, openssl, libpcap }: 2 + , zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger 3 + }: 3 4 4 5 with stdenv.lib; 5 6 6 - let version = "2.6.8"; 7 + let version = "3.0.1"; 7 8 system-libraries = [ 8 9 "pcre" 10 + "wiredtiger" 9 11 "boost" 10 12 "snappy" 13 + "zlib" 14 + # "v8" 11 15 # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs) 12 16 "yaml" 13 - # "v8" 14 - ] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ]; 17 + ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; 15 18 buildInputs = [ 16 19 sasl boost gperftools pcre snappy 17 - libyamlcpp sasl openssl libpcap 20 + zlib libyamlcpp sasl openssl libpcap wiredtiger 18 21 ]; 19 22 20 23 other-args = concatStringsSep " " ([ 24 + "--c++11=on" 21 25 "--ssl" 26 + #"--rocksdb" # Don't have this packaged yet 27 + "--wiredtiger=on" 28 + "--js-engine=v8-3.25" 22 29 "--use-sasl-client" 30 + "--variant-dir=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld 23 31 "--extrapath=${concatStringsSep "," buildInputs}" 24 32 ] ++ map (lib: "--use-system-${lib}") system-libraries); 25 33 ··· 28 36 29 37 src = fetchurl { 30 38 url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; 31 - sha256 = "01hs65xswggy628hxka2f63qvwz5rfhqlkb05kr20wz1kl6zd5qr"; 39 + sha256 = "04qjw7b98h37g8rcih7va3rvg2z95ly38bg181a4nfkak50hd638"; 32 40 }; 33 41 34 42 nativeBuildInputs = [ scons ]; 35 43 inherit buildInputs; 36 44 37 45 postPatch = '' 38 - # fix yaml-cpp detection 39 - sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct 40 - 41 - # bug #482576 42 - sed -i -e "/-Werror/d" src/third_party/v8/SConscript 43 - 44 - # fix inclusion of std::swap 45 - sed -i '1i #include <algorithm>' src/mongo/shell/linenoise_utf8.h 46 - 47 46 # fix environment variable reading 48 47 substituteInPlace SConstruct \ 49 - --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" 48 + --replace "env = Environment(" "env = Environment(ENV = os.environ," 50 49 ''; 51 50 52 51 buildPhase = '' 53 - scons all --release ${other-args} 52 + scons core --release ${other-args} 54 53 ''; 55 54 56 55 installPhase = ''