diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-25 16:18:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-25 16:18:40 +0200 |
| commit | 2b7c0dcdaab946153b0eaba5f2420f15ea27b0d6 (patch) | |
| tree | e31db6c54aeeef9fafd8a31f7335b9fb02dfd2ba /pkgs/servers | |
| parent | fdbae69e8ce4cf3bfe2c39713586cbea270a608c (diff) | |
| parent | 744b380a0ec4ec9c2a958e5d1c42ac5da2f9759e (diff) | |
| download | nixpkgs-2b7c0dcdaab946153b0eaba5f2420f15ea27b0d6.tar nixpkgs-2b7c0dcdaab946153b0eaba5f2420f15ea27b0d6.tar.gz nixpkgs-2b7c0dcdaab946153b0eaba5f2420f15ea27b0d6.tar.bz2 nixpkgs-2b7c0dcdaab946153b0eaba5f2420f15ea27b0d6.tar.lz nixpkgs-2b7c0dcdaab946153b0eaba5f2420f15ea27b0d6.tar.xz nixpkgs-2b7c0dcdaab946153b0eaba5f2420f15ea27b0d6.tar.zst nixpkgs-2b7c0dcdaab946153b0eaba5f2420f15ea27b0d6.zip | |
Merge branch 'staging-next'
Rebuild on Hydra seems OK-ish. mongodb.nix needed some conflict resolution (scons versions); all four versions seem to build fine.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/gpsd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/nosql/mongodb/mongodb.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 4e0d08324a0..5f9beb4b834 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus-glib +{ fetchurl, stdenv, sconsPackages, pkgconfig, dbus, dbus-glib , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - scons.py2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc + sconsPackages.scons_3_1_2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc python2Packages.python python2Packages.wrapPython ]; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 1a0ede0ed6d..f57ff746198 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -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)"; }; |