pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #179341 from alyssais/openssl_3_0

openssl_3: rename from openssl_3_0

authored by

Martin Weinelt and committed by
GitHub 0ea46a10 9cbcd62a

+7 -6
+1 -1
pkgs/development/libraries/openssl/default.nix
··· 200 200 withDocs = true; 201 201 }; 202 202 203 - openssl_3_0 = common { 203 + openssl_3 = common { 204 204 version = "3.0.3"; 205 205 sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs="; 206 206 patches = [
+2 -2
pkgs/servers/misc/oven-media-engine/default.nix
··· 5 5 , bc 6 6 , pkg-config 7 7 , perl 8 - , openssl_3_0 8 + , openssl_3 9 9 , zlib 10 10 , ffmpeg 11 11 , libvpx ··· 32 32 enableParallelBuilding = true; 33 33 34 34 nativeBuildInputs = [ bc pkg-config perl ]; 35 - buildInputs = [ openssl_3_0 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ]; 35 + buildInputs = [ openssl_3 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ]; 36 36 37 37 preBuild = '' 38 38 patchShebangs core/colorg++
+1
pkgs/top-level/aliases.nix
··· 990 990 openmpt123 = libopenmpt; # Added 2021-09-05 991 991 opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 992 992 openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 993 + openssl_3_0 = openssl_3; # Added 2022-06-27 993 994 orchis = orchis-theme; # Added 2021-06-09 994 995 osxfuse = macfuse-stubs; # Added 2021-03-20 995 996 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02
+3 -3
pkgs/top-level/all-packages.nix
··· 20183 20183 20184 20184 inherit (callPackages ../development/libraries/openssl { }) 20185 20185 openssl_1_1 20186 - openssl_3_0; 20186 + openssl_3; 20187 20187 20188 20188 opensubdiv = callPackage ../development/libraries/opensubdiv { }; 20189 20189 ··· 22274 22274 22275 22275 nginxStable = callPackage ../servers/http/nginx/stable.nix { 22276 22276 zlib = zlib-ng.override { withZlibCompat = true; }; 22277 - openssl = openssl_3_0; 22277 + openssl = openssl_3; 22278 22278 pcre = pcre2; 22279 22279 withPerl = false; 22280 22280 # We don't use `with` statement here on purpose! ··· 22284 22284 22285 22285 nginxMainline = callPackage ../servers/http/nginx/mainline.nix { 22286 22286 zlib = zlib-ng.override { withZlibCompat = true; }; 22287 - openssl = openssl_3_0; 22287 + openssl = openssl_3; 22288 22288 pcre = pcre2; 22289 22289 withKTLS = true; 22290 22290 withPerl = false;