about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2019-10-24 08:30:10 +0000
committerGitHub <noreply@github.com>2019-10-24 08:30:10 +0000
commit3f9774c1d55a491fd5793a47633dec02e8c9abce (patch)
treebabe744e3aeccccb320d7e09def8db49a0f65ee2
parent04cbe1b85bf97eba9c347e41c6f3858ab6bb5266 (diff)
parent671a1182e3ee411a6588ce95410f7d7a1f23d1cc (diff)
downloadnixlib-3f9774c1d55a491fd5793a47633dec02e8c9abce.tar
nixlib-3f9774c1d55a491fd5793a47633dec02e8c9abce.tar.gz
nixlib-3f9774c1d55a491fd5793a47633dec02e8c9abce.tar.bz2
nixlib-3f9774c1d55a491fd5793a47633dec02e8c9abce.tar.lz
nixlib-3f9774c1d55a491fd5793a47633dec02e8c9abce.tar.xz
nixlib-3f9774c1d55a491fd5793a47633dec02e8c9abce.tar.zst
nixlib-3f9774c1d55a491fd5793a47633dec02e8c9abce.zip
Merge pull request #71835 from ruuda/libressl-302
libressl_3_0: 3.0.1 -> 3.0.2
-rw-r--r--pkgs/development/libraries/libressl/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 21e82c7becd6..285d7b607e7b 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -64,11 +64,6 @@ let
 
 in {
 
-  libressl_2_8 = generic {
-    version = "2.8.3";
-    sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v";
-  };
-
   libressl_2_9 = generic {
     version = "2.9.2";
     sha256 = "1m6mz515dcbrbnyz8hrpdfjzdmj1c15vbgnqxdxb89g3z9kq3iy4";
@@ -81,7 +76,7 @@ in {
   };
 
   libressl_3_0 = generic {
-    version = "3.0.1";
-    sha256 = "1js3fddxwzafiyspif0bwmvpp1fz98mkv10q5xaagqzvjw8xnsk4";
+    version = "3.0.2";
+    sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2979ef44986d..91ac481809b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13081,11 +13081,10 @@ in
   openvdb = callPackage ../development/libraries/openvdb {};
 
   inherit (callPackages ../development/libraries/libressl { })
-    libressl_2_8
     libressl_2_9
     libressl_3_0;
 
-  libressl = libressl_2_9;
+  libressl = libressl_3_0;
 
   boringssl = callPackage ../development/libraries/boringssl { };