Merge master into staging-next

2019-09-06 22:46:05 +02:00
parent f9237f3152 cfe51be04f
commit 66bc7fc1b3
80 changed files with 2426 additions and 1695 deletions
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -6,7 +6,7 @@
 # Dependencies
 , bzip2
 , zlib
-, openssl
+, openssl_1_0_2
 , expat
 , libffi
 , ncurses
@@ -44,7 +44,7 @@ let
  deps = [
    bzip2
    zlib
-    openssl
+    openssl_1_0_2
    expat
    libffi
    ncurses