Merge branch 'master' into staging

This apparently fixes some broken src fetches (gnuradio, twisted).
2018-07-02 11:07:38 +02:00
parent f7781f5293 a22ba5f05b
commit c1ffc65d1a
197 changed files with 7027 additions and 2265 deletions
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -80,6 +80,7 @@ in stdenv.mkDerivation {
    "--without-ensurepip"
    "--with-system-expat"
    "--with-system-ffi"
+    "--with-openssl=${openssl.dev}"
  ];

  preConfigure = ''