git.iko.soy/typeable/nixpkgs
on master help sign in
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

commite9bec1adf6d4147d7b15d6b636ec5bf4294c457b authorNathan Smyth <nathan.smyth@mongodb.com> dateThu 3 May 2018, 17:42 (9 years ago) parent9ee46bf
3 files changed+26−20
lib/licenses.nix+7 pkgs/servers/nosql/mongodb/default.nix+16−13 pkgs/servers/nosql/mongodb/forget-build-dependencies.patch+3−7
lib/licenses.nix+7
@@ -649,6 +649,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
649649 url = http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright;
650650 };
651651
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+
652659 tcltk = spdx {
653660 spdxId = "TCL";
654661 fullName = "TCL/TK License";
pkgs/servers/nosql/mongodb/default.nix+16−13
@@ -1,5 +1,5 @@
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
33}:
44
55# Note:
@@ -7,7 +7,8 @@
77
88with stdenv.lib;
99
10−let version = "3.4.10";
10+let version = "4.0.4";
11+ python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
1112 system-libraries = [
1213 "pcre"
1314 #"asio" -- XXX use package?
@@ -19,6 +20,7 @@ let version = "3.4.10";
1920 #"stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs).
2021 "yaml"
2122 ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
23+ inherit (stdenv.lib) systems subtractLists;
2224
2325in stdenv.mkDerivation {
2426 pname = "mongodb";
@@ -26,14 +28,14 @@ in stdenv.mkDerivation {
2628
2729 src = fetchurl {
2830 url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
29− sha256 = "1wz2mhl9z0b1bdkg6m8v8mvw9k60mdv5ybq554xn3yjj9z500f24";
31+ sha256 = "1qycwr9f99b5cy4nf54yv2y724xis3lwd2h6iv2pfp36qnhsvfh2";
3032 };
3133
3234 nativeBuildInputs = [ scons ];
3335 buildInputs = [
3436 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 ];
3739
3840 patches =
3941 [
@@ -41,11 +43,6 @@ in stdenv.mkDerivation {
4143 # keeping dependencies to build inputs in the final output.
4244 # We remove the build flags from buildInfo data.
4345 ./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− })
4946 ];
5047
5148 postPatch = ''
@@ -89,6 +86,11 @@ in stdenv.mkDerivation {
8986 preInstall = ''
9087 mkdir -p $out/lib
9188 '';
89+
90+ postInstall = ''
91+ rm $out/bin/install_compass
92+ '';
93+
9294 prefixKey = "--prefix=";
9395
9496 enableParallelBuilding = true;
@@ -98,9 +100,10 @@ in stdenv.mkDerivation {
98100 meta = {
99101 description = "A scalable, high-performance, open source NoSQL database";
100102 homepage = http://www.mongodb.org;
101− license = licenses.agpl3;
103+ license = licenses.sspl;
104+ broken = stdenv.hostPlatform.isAarch64; #g++ has internal compiler errors
102105
103106 maintainers = with maintainers; [ bluescreen303 offline cstrahan ];
104− platforms = platforms.unix;
107+ platforms = subtractLists systems.doubles.i686 systems.doubles.unix;
105108 };
106109}
pkgs/servers/nosql/mongodb/forget-build-dependencies.patch+3−7
@@ -1,8 +1,6 @@
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():
64 ('distmod', '$MONGO_DISTMOD', True, True,),
75 ('distarch', '$MONGO_DISTARCH', True, True,),
86 ('cc', '$CC_VERSION', True, False,),
@@ -13,5 +11,3 @@
1311 ('target_arch', '$TARGET_ARCH', True, True,),
1412 ('target_os', '$TARGET_OS', True, False,),
1513 )
16−
17− # If you want buildInfo and --version to be relatively empty, set