diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-26 07:38:19 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-26 07:39:18 +0000 |
| commit | b6dabe3df0581e92cb4d02dc706a22bf98a1f98b (patch) | |
| tree | 6050c5b444e4fd175743df2b32e77ec514b183cb | |
| parent | b9a4da47c0f08ae17c8892a98df276036f720520 (diff) | |
| download | nixpkgs-b6dabe3df0581e92cb4d02dc706a22bf98a1f98b.tar nixpkgs-b6dabe3df0581e92cb4d02dc706a22bf98a1f98b.tar.gz nixpkgs-b6dabe3df0581e92cb4d02dc706a22bf98a1f98b.tar.bz2 nixpkgs-b6dabe3df0581e92cb4d02dc706a22bf98a1f98b.tar.lz nixpkgs-b6dabe3df0581e92cb4d02dc706a22bf98a1f98b.tar.xz nixpkgs-b6dabe3df0581e92cb4d02dc706a22bf98a1f98b.tar.zst nixpkgs-b6dabe3df0581e92cb4d02dc706a22bf98a1f98b.zip | |
openssl_1_1_0: init at 1.1.0
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8c0ad107d77..d1796480f52 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -17,7 +17,7 @@ let }; patches = - [ ./use-etc-ssl-certs.patch ] + optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch ++ optional (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) @@ -114,4 +114,9 @@ in { sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; }; + openssl_1_1_0 = common { + version = "1.1.0"; + sha256 = "10lcpmnxap9nw8ymdglys93cgkwd1lf1rz4fhq5whwhlmkwrzipm"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66f1667dc32..36a2c629042 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9006,7 +9006,8 @@ in }; }) openssl_1_0_1 - openssl_1_0_2; + openssl_1_0_2 + openssl_1_1_0; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { cryptodevHeaders = linuxPackages.cryptodev.override { |