diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-02 11:07:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-02 11:10:26 +0200 |
| commit | c1ffc65d1a0fdcb69b447711f9896077df550dd7 (patch) | |
| tree | 69d124e1fed0d3a8de59e1fdb27a072608a4f4e0 /pkgs/development/interpreters | |
| parent | f7781f52933ff4a83d1396f6255dfa91e727dc7c (diff) | |
| parent | a22ba5f05b3fb1acd2ad870262a3583aee471c73 (diff) | |
| download | nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.gz nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.bz2 nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.lz nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.xz nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.zst nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.zip | |
Merge branch 'master' into staging
This apparently fixes some broken src fetches (gnuradio, twisted).
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/3.7/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/1.8.5.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index 9cc0377f925f..410d07ebc61c 100644 --- 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 = '' diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 8e51b9b7d58e..f333aa0b96d0 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "gcc6.patch"; - url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e"; + url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch"; sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99"; }) ] ++ stdenv.lib.optionals stdenv.isAarch32 [ |