commit 462b1e4473d3d322a8ddc3a335ebc8959e645ce8 · pyrox.dev/nixpkgs

+4

nixos/tests/mongodb.nix

···

       37
       37
        
                 mongodb-3_6

     

       38
       38
        
                 mongodb-4_0

     

       39
       39
        
                 mongodb-4_2

     

       40
       40
       +
                 mongodb-4_4

     

       41
       41
       +
                 mongodb-5_0

     

       40
       42
        
               ];

     

       41
       43
        
             };

     

       42
       44
        
           };

     
···

       48
       50
        
             + runMongoDBTest pkgs.mongodb-3_6

     

       49
       51
        
             + runMongoDBTest pkgs.mongodb-4_0

     

       50
       52
        
             + runMongoDBTest pkgs.mongodb-4_2

     

       53
       53
       +
             + runMongoDBTest pkgs.mongodb-4_4

     

       54
       54
       +
             + runMongoDBTest pkgs.mongodb-5_0

     

       51
       55
        
             + ''

     

       52
       56
        
               node.shutdown()

     

       53
       57
        
             '';

+14

pkgs/servers/nosql/mongodb/4.4.nix

···

       1
       1
       +
       { stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         buildMongoDB = callPackage ./mongodb.nix {

     

       5
       5
       +
           inherit sasl boost Security CoreFoundation cctools;

     

       6
       6
       +
         };

     

       7
       7
       +
       in

     

       8
       8
       +
       buildMongoDB {

     

       9
       9
       +
         version = "4.4.10";

     

       10
       10
       +
         sha256 = "1rn9w3wwb2kbixqx39zb7cczzw5qjbh7d9yhlbivrs0f9bywl8nx";

     

       11
       11
       +
         patches = [

     

       12
       12
       +
           ./forget-build-dependencies-4-4.patch

     

       13
       13
       +
         ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-4.patch ];

     

       14
       14
       +
       }

+23

pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-4.patch

···

       1
       1
       +
       --- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp

     

       2
       2
       +
       --- b/src/third_party/asio-master/asio/include/asio/detail/config.hpp

     

       3
       3
       +
       @@ -831,20 +831,8 @@

     

       4
       4
       +
        #     endif // (__cplusplus >= 201402)

     

       5
       5
       +
        #    endif // (_LIBCPP_VERSION < 7000)

     

       6
       6
       +
        #   else // defined(ASIO_HAS_CLANG_LIBCXX)

     

       7
       7
       +
       -#    if (__cplusplus >= 201402)

     

       8
       8
       +
       -#     if __has_include(<experimental/string_view>)

     

       9
       9
       +
       -#      define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1

     

       10
       10
       +
       -#     endif // __has_include(<experimental/string_view>)

     

       11
       11
       +
       -#    endif // (__cplusplus >= 201402)

     

       12
       12
       +
        #   endif // // defined(ASIO_HAS_CLANG_LIBCXX)

     

       13
       13
       +
        #  endif // defined(__clang__)

     

       14
       14
       +
       -#  if defined(__GNUC__)

     

       15
       15
       +
       -#   if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)

     

       16
       16
       +
       -#    if (__cplusplus >= 201402)

     

       17
       17
       +
       -#     define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1

     

       18
       18
       +
       -#    endif // (__cplusplus >= 201402)

     

       19
       19
       +
       -#   endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)

     

       20
       20
       +
       -#  endif // defined(__GNUC__)

     

       21
       21
       +
        # endif // !defined(ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)

     

       22
       22
       +
        #endif // !defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)

     

       23
       23
       +

+33

pkgs/servers/nosql/mongodb/forget-build-dependencies-4-4.patch

···

       1
       1
       +
       --- a/site_scons/mongo/generators.py

     

       2
       2
       +
       +++ b/site_scons/mongo/generators.py

     

       3
       3
       +
       @@ -34,30 +34,12 @@ def default_buildinfo_environment_data():

     

       4
       4
       +
                    False,

     

       5
       5
       +
                ),

     

       6
       6
       +
                (

     

       7
       7
       +
       -            'ccflags',

     

       8
       8
       +
       -            '$CCFLAGS',

     

       9
       9
       +
       -            True,

     

       10
       10
       +
       -            False,

     

       11
       11
       +
       -        ),

     

       12
       12
       +
       -        (

     

       13
       13
       +
                    'cxx',

     

       14
       14
       +
                    '$CXX_VERSION',

     

       15
       15
       +
                    True,

     

       16
       16
       +
                    False,

     

       17
       17
       +
                ),

     

       18
       18
       +
                (

     

       19
       19
       +
       -            'cxxflags',

     

       20
       20
       +
       -            '$CXXFLAGS',

     

       21
       21
       +
       -            True,

     

       22
       22
       +
       -            False,

     

       23
       23
       +
       -        ),

     

       24
       24
       +
       -        (

     

       25
       25
       +
       -            'linkflags',

     

       26
       26
       +
       -            '$LINKFLAGS',

     

       27
       27
       +
       -            True,

     

       28
       28
       +
       -            False,

     

       29
       29
       +
       -        ),

     

       30
       30
       +
       -        (

     

       31
       31
       +
                    'target_arch',

     

       32
       32
       +
                    '$TARGET_ARCH',

     

       33
       33
       +
                    True,

+11 -7

pkgs/servers/nosql/mongodb/mongodb.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp

     

       2
       2
       -
       , sasl, openssl, libpcap, curl, Security, CoreFoundation, cctools }:

     

       2
       2
       +
       , sasl, openssl, libpcap, python3, curl, Security, CoreFoundation, cctools, xz }:

     

       3
       3
        
       

     

       4
       4
        
       # Note:

     

       5
       5
        
       # The command line tools are written in Go as part of a different package (mongodb-tools)

     
···

       8
       8
        
       

     

       9
       9
        
       { version, sha256, patches ? []

     

       10
       10
        
       , license ? lib.licenses.sspl

     

       11
       11
       -
       }@args:

     

       11
       11
       +
       }:

     

       12
       12
        
       

     

       13
       13
        
       let

     

       14
       14
        
         variants = if versionAtLeast version "4.2"

     

       15
       15
        
           then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]);

     

       16
       16
       -
                   scons = sconsPackages.scons_latest;

     

       16
       16
       +
                   scons = sconsPackages.scons_3_1_2.override { python = python3; }; # 4.2 < mongodb <= 5.0.x needs scons 3.x built with python3

     

       17
       17
        
                   mozjsVersion = "60";

     

       18
       18
        
                   mozjsReplace = "defined(HAVE___SINCOS)";

     

       19
       19
        
                 }

     
···

       44
       44
        
           inherit sha256;

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
       -
         nativeBuildInputs = [ variants.scons ];

     

       47
       47
       +
         nativeBuildInputs = [ variants.scons ]

     

       48
       48
       +
           ++ lib.optionals (versionAtLeast version "4.4") [ xz ];

     

       49
       49
       +
       

     

       48
       50
        
         buildInputs = [

     

       49
       51
        
           boost

     

       50
       52
        
           curl

     
···

       70
       72
        
               --replace "env = Environment(" "env = Environment(ENV = os.environ,"

     

       71
       73
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       72
       74
        
           substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0

     

       73
       73
       -
       

     

       74
       75
        
           substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder

     

       75
       76
        
           substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder

     

       76
       77
        
           substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder

     
···

       95
       96
        
           "--use-sasl-client"

     

       96
       97
        
           "--disable-warnings-as-errors"

     

       97
       98
        
           "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld

     

       98
       98
       -
         ] ++ map (lib: "--use-system-${lib}") system-libraries;

     

       99
       99
       +
         ] ++ lib.optionals (versionAtLeast version "4.4") [ "--link-model=static" ]

     

       100
       100
       +
           ++ map (lib: "--use-system-${lib}") system-libraries;

     

       99
       101
        
       

     

       100
       102
        
         preBuild = ''

     

       101
       103
        
           sconsFlags+=" CC=$CC"

     
···

       119
       121
        
           runHook postInstallCheck

     

       120
       122
        
         '';

     

       121
       123
        
       

     

       122
       122
       -
         prefixKey = "--prefix=";

     

       124
       124
       +
         installTargets = if (versionAtLeast version "4.4") then "install-core" else "install";

     

       125
       125
       +
       

     

       126
       126
       +
         prefixKey = if (versionAtLeast version "4.4") then "DESTDIR=" else "--prefix=";

     

       123
       127
        
       

     

       124
       128
        
         enableParallelBuilding = true;

     

       125
       129

+7

pkgs/top-level/all-packages.nix

···

       21788
       21788
        
           inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;

     

       21789
       21789
        
         };

     

       21790
       21790
        
       

     

       21791
       21791
       +
         mongodb-4_4 = callPackage ../servers/nosql/mongodb/4.4.nix {

     

       21792
       21792
       +
           sasl = cyrus_sasl;

     

       21793
       21793
       +
           boost = boost17x.override { enableShared = false; };

     

       21794
       21794
       +
           inherit (darwin) cctools;

     

       21795
       21795
       +
           inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;

     

       21796
       21796
       +
         };

     

       21797
       21797
       +
       

     

       21791
       21798
        
         nginx-sso = callPackage ../servers/nginx-sso { };

     

       21792
       21799
        
       

     

       21793
       21800
        
         percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };