about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2016-08-01 17:31:24 +0200
committerMichael Raskin <7c6f434c@mail.ru>2016-08-01 17:32:10 +0200
commit9c15bb703155d480a70be4f7d202ba20a1e9a6e4 (patch)
tree6a8506755b913634bf1a355ac69e18fd8ab27e34 /pkgs/top-level
parent93bac07b38d6d46c599e5440bd05c5bc7cf4c6ab (diff)
downloadnixlib-9c15bb703155d480a70be4f7d202ba20a1e9a6e4.tar
nixlib-9c15bb703155d480a70be4f7d202ba20a1e9a6e4.tar.gz
nixlib-9c15bb703155d480a70be4f7d202ba20a1e9a6e4.tar.bz2
nixlib-9c15bb703155d480a70be4f7d202ba20a1e9a6e4.tar.lz
nixlib-9c15bb703155d480a70be4f7d202ba20a1e9a6e4.tar.xz
nixlib-9c15bb703155d480a70be4f7d202ba20a1e9a6e4.tar.zst
nixlib-9c15bb703155d480a70be4f7d202ba20a1e9a6e4.zip
Revert "libreoffice: reinstante and use curl 7.48 before the removal of a required feature. CVE's not fixed because of that decision: a Windows-specific DLL substitution and a mbedSSL/PolarSSL specific insufficient certificate validation"
This reverts commit 8fd84fcb870b3d55f6760ede5bb46aa57bbec64e.

While I was testing my solution, @obadz have committed a different and
hopefully a better one.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix9
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79ae2523ff69..c35136b1637c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1235,14 +1235,6 @@ in
     scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
   };
 
-  curl_7_48 = callPackage ../tools/networking/curl/7.48.nix rec {
-    fetchurl = fetchurlBoot;
-    http2Support = !stdenv.isDarwin;
-    zlibSupport = true;
-    sslSupport = zlibSupport;
-    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
-  };
-
   curl3 = callPackage ../tools/networking/curl/7.15.nix rec {
     zlibSupport = true;
     sslSupport = zlibSupport;
@@ -13728,7 +13720,6 @@ in
     harfbuzz = harfbuzz.override {
       withIcu = true; withGraphite2 = true;
     };
-    curl = curl_7_48;
   });