cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #179341 from alyssais/openssl_3_0

Browse source 
openssl_3: rename from openssl_3_0
This commit is contained in:
Martin Weinelt 2022-06-27 20:32:20 +02:00 committed by GitHub
commit 0ea46a10b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/openssl/default.nix
View file

@ -200,7 +200,7 @@ in {
withDocs = true; withDocs = true;
}; };
openssl_3_0 = common { openssl_3 = common {
version = "3.0.3"; version = "3.0.3";
sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs="; sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs=";
patches = [ patches = [

4
pkgs/servers/misc/oven-media-engine/default.nix
View file

@ -5,7 +5,7 @@
, bc , bc
, pkg-config , pkg-config
, perl , perl
, openssl_3_0 , openssl_3
, zlib , zlib
, ffmpeg , ffmpeg
, libvpx , libvpx
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ bc pkg-config perl ]; 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 = '' preBuild = ''
patchShebangs core/colorg++ patchShebangs core/colorg++

1
pkgs/top-level/aliases.nix
View file

@ -990,6 +990,7 @@ mapAliases ({
openmpt123 = libopenmpt; # Added 2021-09-05 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 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 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 orchis = orchis-theme; # Added 2021-06-09
osxfuse = macfuse-stubs; # Added 2021-03-20 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 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02

6
pkgs/top-level/all-packages.nix
View file

@ -20183,7 +20183,7 @@ with pkgs;
inherit (callPackages ../development/libraries/openssl { }) inherit (callPackages ../development/libraries/openssl { })
openssl_1_1 openssl_1_1
openssl_3_0; openssl_3;
opensubdiv = callPackage ../development/libraries/opensubdiv { }; opensubdiv = callPackage ../development/libraries/opensubdiv { };
@ -22274,7 +22274,7 @@ with pkgs;
nginxStable = callPackage ../servers/http/nginx/stable.nix { nginxStable = callPackage ../servers/http/nginx/stable.nix {
zlib = zlib-ng.override { withZlibCompat = true; }; zlib = zlib-ng.override { withZlibCompat = true; };
openssl = openssl_3_0; openssl = openssl_3;
pcre = pcre2; pcre = pcre2;
withPerl = false; withPerl = false;
# We don't use `with` statement here on purpose! # We don't use `with` statement here on purpose!
@ -22284,7 +22284,7 @@ with pkgs;
nginxMainline = callPackage ../servers/http/nginx/mainline.nix { nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
zlib = zlib-ng.override { withZlibCompat = true; }; zlib = zlib-ng.override { withZlibCompat = true; };
openssl = openssl_3_0; openssl = openssl_3;
pcre = pcre2; pcre = pcre2;
withKTLS = true; withKTLS = true;
withPerl = false; withPerl = false;