forked from mirrors/nixpkgs
openssl_3: rename from openssl_3_0
With their new versioning scheme, OpenSSL have committed[1] to API and ABI compatibility for the whole 3.x.x release series, so we shouldn't be overly specific in our attribute name. [1]: https://www.openssl.org/blog/blog/2018/11/28/version/
This commit is contained in:
parent
b213d85ced
commit
fd6a8fb894
|
@ -200,7 +200,7 @@ in {
|
|||
withDocs = true;
|
||||
};
|
||||
|
||||
openssl_3_0 = common {
|
||||
openssl_3 = common {
|
||||
version = "3.0.3";
|
||||
sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs=";
|
||||
patches = [
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
, bc
|
||||
, pkg-config
|
||||
, perl
|
||||
, openssl_3_0
|
||||
, openssl_3
|
||||
, zlib
|
||||
, ffmpeg
|
||||
, libvpx
|
||||
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ bc pkg-config perl ];
|
||||
buildInputs = [ openssl_3_0 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ];
|
||||
buildInputs = [ openssl_3 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs core/colorg++
|
||||
|
|
|
@ -990,6 +990,7 @@ mapAliases ({
|
|||
openmpt123 = libopenmpt; # Added 2021-09-05
|
||||
opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22
|
||||
openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22
|
||||
openssl_3_0 = openssl_3; # Added 2022-06-27
|
||||
orchis = orchis-theme; # Added 2021-06-09
|
||||
osxfuse = macfuse-stubs; # Added 2021-03-20
|
||||
otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02
|
||||
|
|
|
@ -20179,7 +20179,7 @@ with pkgs;
|
|||
|
||||
inherit (callPackages ../development/libraries/openssl { })
|
||||
openssl_1_1
|
||||
openssl_3_0;
|
||||
openssl_3;
|
||||
|
||||
opensubdiv = callPackage ../development/libraries/opensubdiv { };
|
||||
|
||||
|
@ -22253,7 +22253,7 @@ with pkgs;
|
|||
|
||||
nginxStable = callPackage ../servers/http/nginx/stable.nix {
|
||||
zlib = zlib-ng.override { withZlibCompat = true; };
|
||||
openssl = openssl_3_0;
|
||||
openssl = openssl_3;
|
||||
pcre = pcre2;
|
||||
withPerl = false;
|
||||
# We don't use `with` statement here on purpose!
|
||||
|
@ -22263,7 +22263,7 @@ with pkgs;
|
|||
|
||||
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
|
||||
zlib = zlib-ng.override { withZlibCompat = true; };
|
||||
openssl = openssl_3_0;
|
||||
openssl = openssl_3;
|
||||
pcre = pcre2;
|
||||
withKTLS = true;
|
||||
withPerl = false;
|
||||
|
|
Loading…
Reference in a new issue