public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next'

Browse Source 
Rebuild on Hydra seems OK-ish.
mongodb.nix needed some conflict resolution (scons versions);
all four versions seem to build fine.
This commit is contained in:
Vladimír Čunát
2020-07-25 16:18:40 +02:00
parent fdbae69e8c 744b380a0e
commit 2b7c0dcdaa
104 changed files with 1077 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/nosql/mongodb/mongodb.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, scons, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
{ stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
, sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }:
# Note:
@@ -13,12 +13,12 @@ with stdenv.lib;
let
variants = if versionAtLeast version "4.2"
then { python = python38.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]);
scons = scons;
scons = sconsPackages.scons_latest;
mozjsVersion = "60";
mozjsReplace = "defined(HAVE___SINCOS)";
}
else { python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
scons = scons.py2;
scons = sconsPackages.scons_3_1_2;
mozjsVersion = "45";
mozjsReplace = "defined(HAVE_SINCOS)";
};