Skip to content

openssl: 3.0.8 -> 3.1.0 #221206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ajs124 wants to merge 2 commits into from
Closed

openssl: 3.0.8 -> 3.1.0 #221206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32871d3
openssl: 3.0.8 -> 3.1.0
ajs124 Mar 14, 2023
6105d95
openssl: sha256 -> hash
ajs124 Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...elopment/libraries/openssl/3.0/legacy.cnf → ...evelopment/libraries/openssl/3/legacy.cnf
View file
Open in desktop
File renamed without changes.
0 ...aries/openssl/3.0/nix-ssl-cert-file.patch → ...braries/openssl/3/nix-ssl-cert-file.patch
View file
Open in desktop
File renamed without changes.
0 ....0/openssl-disable-kernel-detection.patch → .../3/openssl-disable-kernel-detection.patch
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions pkgs/development/libraries/openssl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
# files.

let
common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }:
common = { version, hash, patches ? [], withDocs ? false, extraMeta ? {} }:
stdenv.mkDerivation (finalAttrs: {
pname = "openssl";
inherit version;

src = fetchurl {
url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz";
inherit sha256;
inherit hash;
};

inherit patches;
Expand Down Expand Up @@ -229,7 +229,7 @@ in {

openssl_1_1 = common {
version = "1.1.1t";
sha256 = "sha256-je6bJL2x3L8MPR6bAvuPa/IhZegH9Fret8lndTaFnTs=";
hash = "sha256-je6bJL2x3L8MPR6bAvuPa/IhZegH9Fret8lndTaFnTs=";
patches = [
./1.1/nix-ssl-cert-file.patch

Expand All @@ -241,14 +241,14 @@ in {
};

openssl_3 = common {
version = "3.0.8";
sha256 = "sha256-bBPSvzj98x6sPOKjRwc2c/XWMmM5jx9p0N9KQSU+Sz4=";
version = "3.1.0";
hash = "sha256-qqklrZgodFxMrZ2e/rJz3sqCDyzc8sOsfXwSErfEl7Q=";
patches = [
./3.0/nix-ssl-cert-file.patch
./3/nix-ssl-cert-file.patch

# openssl will only compile in KTLS if the current kernel supports it.
# This patch disables build-time detection.
./3.0/openssl-disable-kernel-detection.patch
./3/openssl-disable-kernel-detection.patch

(if stdenv.hostPlatform.isDarwin
then ./use-etc-ssl-certs-darwin.patch
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/quictls/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
};

patches = [
../openssl/3.0/nix-ssl-cert-file.patch
../openssl/3/nix-ssl-cert-file.patch

# openssl will only compile in KTLS if the current kernel supports it.
# This patch disables build-time detection.
../openssl/3.0/openssl-disable-kernel-detection.patch
../openssl/3/openssl-disable-kernel-detection.patch

(if stdenv.hostPlatform.isDarwin
then ../openssl/use-etc-ssl-certs-darwin.patch
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22856,7 +22856,7 @@ with pkgs;
openssl = openssl_3;

openssl_legacy = openssl.override {
conf = ../development/libraries/openssl/3.0/legacy.cnf;
conf = ../development/libraries/openssl/3/legacy.cnf;
};

inherit (callPackages ../development/libraries/openssl { })
Expand Down