Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

mongodb: 3.4.10 -> 4.0.4

fix: Adding libtool to allow darwin compiles

Libtool seems to be required for mongodb to compile on darwin.

fix: Marking MongoDB as broken on aarch64

fix: Adding libtools to the pkg imports

Update mongodb to 4.0.4

(cherry picked from commit e9bec1adf6d4147d7b15d6b636ec5bf4294c457b)

authored by Nathan Smyth and committed by Maximilian Bosch ac23e503 7a7952bc

Changed files
+26 -20
lib
pkgs
+7
lib/licenses.nix
··· 649 649 url = http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright; 650 650 }; 651 651 652 + sspl = { 653 + shortName = "SSPL"; 654 + fullName = "Server Side Public License"; 655 + url = https://www.mongodb.com/licensing/server-side-public-license; 656 + free = false; 657 + }; 658 + 652 659 tcltk = spdx { 653 660 spdxId = "TCL"; 654 661 fullName = "TCL/TK License";
+16 -13
pkgs/servers/nosql/mongodb/default.nix
··· 1 - { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy 2 - , zlib, libyamlcpp, sasl, openssl, libpcap, Security 1 + { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib, 2 + libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, libtool, curl 3 3 }: 4 4 5 5 # Note: ··· 7 7 8 8 with stdenv.lib; 9 9 10 - let version = "3.4.10"; 10 + let version = "4.0.4"; 11 + python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); 11 12 system-libraries = [ 12 13 "pcre" 13 14 #"asio" -- XXX use package? ··· 19 20 #"stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs). 20 21 "yaml" 21 22 ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; 23 + inherit (stdenv.lib) systems subtractLists; 22 24 23 25 in stdenv.mkDerivation { 24 26 pname = "mongodb"; ··· 26 28 27 29 src = fetchurl { 28 30 url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; 29 - sha256 = "1wz2mhl9z0b1bdkg6m8v8mvw9k60mdv5ybq554xn3yjj9z500f24"; 31 + sha256 = "1qycwr9f99b5cy4nf54yv2y724xis3lwd2h6iv2pfp36qnhsvfh2"; 30 32 }; 31 33 32 34 nativeBuildInputs = [ scons ]; 33 35 buildInputs = [ 34 36 sasl boost gperftools pcre-cpp snappy 35 - zlib libyamlcpp sasl openssl.dev openssl.out libpcap 36 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; 37 + zlib libyamlcpp sasl openssl.dev openssl.out libpcap python curl 38 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libtool ]; 37 39 38 40 patches = 39 41 [ ··· 41 43 # keeping dependencies to build inputs in the final output. 42 44 # We remove the build flags from buildInfo data. 43 45 ./forget-build-dependencies.patch 44 - (fetchpatch { 45 - url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb; 46 - name = "boost160.patch"; 47 - sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8"; 48 - }) 49 46 ]; 50 47 51 48 postPatch = '' ··· 89 86 preInstall = '' 90 87 mkdir -p $out/lib 91 88 ''; 89 + 90 + postInstall = '' 91 + rm $out/bin/install_compass 92 + ''; 93 + 92 94 prefixKey = "--prefix="; 93 95 94 96 enableParallelBuilding = true; ··· 98 100 meta = { 99 101 description = "A scalable, high-performance, open source NoSQL database"; 100 102 homepage = http://www.mongodb.org; 101 - license = licenses.agpl3; 103 + license = licenses.sspl; 104 + broken = stdenv.hostPlatform.isAarch64; #g++ has internal compiler errors 102 105 103 106 maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; 104 - platforms = platforms.unix; 107 + platforms = subtractLists systems.doubles.i686 systems.doubles.unix; 105 108 }; 106 109 }
+3 -7
pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
··· 1 - --- a/site_scons/mongo_scons_utils.py 2 - +++ b/site_scons/mongo_scons_utils.py 3 - @@ -84,14 +84,11 @@ 4 - def default_buildinfo_environment_data(): 5 - return ( 1 + --- a/site_scons/mongo/generators.py 2 + +++ b/site_scons/mongo/generators.py 3 + @@ -18,10 +18,7 @@ def default_buildinfo_environment_data(): 6 4 ('distmod', '$MONGO_DISTMOD', True, True,), 7 5 ('distarch', '$MONGO_DISTARCH', True, True,), 8 6 ('cc', '$CC_VERSION', True, False,), ··· 13 11 ('target_arch', '$TARGET_ARCH', True, True,), 14 12 ('target_os', '$TARGET_OS', True, False,), 15 13 ) 16 - 17 - # If you want buildInfo and --version to be relatively empty, set