summary refs log tree commit diff
path: root/pkgs/development/libraries/openssl
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-03-25 18:14:01 +0000
committerGitHub <noreply@github.com>2021-03-25 18:14:01 +0000
commit7c9222212f37f17ec9708d721d65c48c09717a26 (patch)
tree2673d281bf526ca79d248fcbde98e486386c8c92 /pkgs/development/libraries/openssl
parent4dc869e40380e8346a8d076ac3dd1e3ee0b2603b (diff)
parent06733bcf290555154666410f2fb30ee4a2aba6c0 (diff)
downloadnixpkgs-7c9222212f37f17ec9708d721d65c48c09717a26.tar
nixpkgs-7c9222212f37f17ec9708d721d65c48c09717a26.tar.gz
nixpkgs-7c9222212f37f17ec9708d721d65c48c09717a26.tar.bz2
nixpkgs-7c9222212f37f17ec9708d721d65c48c09717a26.tar.lz
nixpkgs-7c9222212f37f17ec9708d721d65c48c09717a26.tar.xz
nixpkgs-7c9222212f37f17ec9708d721d65c48c09717a26.tar.zst
nixpkgs-7c9222212f37f17ec9708d721d65c48c09717a26.zip
Merge master into staging-next
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 d203d693af0..fda0c71655a 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -180,8 +180,8 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1j";
-    sha256 = "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma";
+    version = "1.1.1k";
+    sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9";
     patches = [
       ./1.1/nix-ssl-cert-file.patch