about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-07-20 19:31:08 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-07-20 19:31:08 +0200
commit3e8a565a04cef3a40dc7b1c29e464a1fc6e00232 (patch)
treed70e3b15287ddeb509f2efb3bad975c595f73fc0 /pkgs/top-level
parent31437ccf7a1ee6cf1b7ead988f3bd38647b1ff02 (diff)
downloadnixlib-3e8a565a04cef3a40dc7b1c29e464a1fc6e00232.tar
nixlib-3e8a565a04cef3a40dc7b1c29e464a1fc6e00232.tar.gz
nixlib-3e8a565a04cef3a40dc7b1c29e464a1fc6e00232.tar.bz2
nixlib-3e8a565a04cef3a40dc7b1c29e464a1fc6e00232.tar.lz
nixlib-3e8a565a04cef3a40dc7b1c29e464a1fc6e00232.tar.xz
nixlib-3e8a565a04cef3a40dc7b1c29e464a1fc6e00232.tar.zst
nixlib-3e8a565a04cef3a40dc7b1c29e464a1fc6e00232.zip
libressl: refactor, drop 2.4, 2.5.4 -> 2.5.5, init 2.6
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b5824e55732..3297ab19704a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9601,14 +9601,11 @@ with pkgs;
 
   openslp = callPackage ../development/libraries/openslp {};
 
-  libressl = libressl_2_5;
-  libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
-    fetchurl = fetchurlBoot;
-  };
-  libressl_2_5 = callPackage ../development/libraries/libressl/2.5.nix {
-    fetchurl = fetchurlBoot;
-  };
+  inherit (callPackages ../development/libraries/libressl { })
+    libressl_2_5
+    libressl_2_6;
 
+  libressl = libressl_2_5;
 
   boringssl = callPackage ../development/libraries/boringssl { };