summary refs log tree commit diff
path: root/pkgs/development/libraries/openssl
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-10-26 08:17:14 +0100
committerVladimír Čunát <v@cunat.cz>2020-10-26 08:19:17 +0100
commit336bc8283bd4ef288e60c5fdb1b67196b9ea5c85 (patch)
tree8812d7fef1d0ed89d4507279511f35e2c050097c /pkgs/development/libraries/openssl
parent309ce3f8a1127a5dff1dcc2512777122d49529d4 (diff)
downloadnixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.gz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.bz2
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.lz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.xz
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.tar.zst
nixpkgs-336bc8283bd4ef288e60c5fdb1b67196b9ea5c85.zip
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
Diffstat (limited to 'pkgs/development/libraries/openssl')
-rw-r--r--pkgs/development/libraries/openssl/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 1fc38dd8aaa..c4a9a4a0180 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -160,8 +160,8 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1g";
-    sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x";
+    version = "1.1.1h";
+    sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
     patches = [
       ./1.1/nix-ssl-cert-file.patch