dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

rustls-ffi: 0.13.0 -> 0.14.1 (#352584)
Some checks failed
Eval / Attributes (push) Has been cancelled
Details
Eval / Outpaths (push) Has been cancelled
Details
Eval / Process (push) Has been cancelled
Details
Eval / Tag (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Sandro 2024-11-30 17:45:05 +01:00 committed by GitHub
commit f4a5f018f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/by-name/ru/rustls-ffi/package.nix
View File

@ -15,19 +15,19 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rustls-ffi"; pname = "rustls-ffi";
version = "0.13.0"; version = "0.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rustls"; owner = "rustls";
repo = "rustls-ffi"; repo = "rustls-ffi";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-Bc9bVZ2pDsG118l/SlElZpgh9F1JEgPF8LzBX7d4mhE="; hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
src = finalAttrs.src; src = finalAttrs.src;
name = "${finalAttrs.pname}-${finalAttrs.version}"; name = "${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-gDQ9AFrJuV7SrzKCAHQBkKj6clXuPLO0DHhnvcBqRLs="; hash = "sha256-IaOhQfDEgLhGmes0xzhLVym29aP691TY0EXdOIgXEMA=";
}; };
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = { passthru.tests = {
curl = curl.override { opensslSupport = false; rustlsSupport = true; rustls-ffi = finalAttrs.finalPackage; }; curl = curl.override { opensslSupport = false; rustlsSupport = true; rustls-ffi = finalAttrs.finalPackage; };
apacheHttpd = apacheHttpd.override { modTlsSupport = true; rustls-ffi = finalAttrs.finalPackage; };
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
}; };

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -2,7 +2,6 @@
, nixosTests , nixosTests
, proxySupport ? true , proxySupport ? true
, sslSupport ? true, openssl , sslSupport ? true, openssl
, modTlsSupport ? false, rustls-ffi, Foundation
, http2Support ? true, nghttp2 , http2Support ? true, nghttp2
, ldapSupport ? true, openldap , ldapSupport ? true, openldap
, libxml2Support ? true, libxml2 , libxml2Support ? true, libxml2
@ -40,8 +39,6 @@ stdenv.mkDerivation rec {
buildInputs = [ perl libxcrypt zlib ] ++ buildInputs = [ perl libxcrypt zlib ] ++
lib.optional brotliSupport brotli ++ lib.optional brotliSupport brotli ++
lib.optional sslSupport openssl ++ lib.optional sslSupport openssl ++
lib.optional modTlsSupport rustls-ffi ++
lib.optional (modTlsSupport && stdenv.hostPlatform.isDarwin) Foundation ++
lib.optional ldapSupport openldap ++ # there is no --with-ldap flag lib.optional ldapSupport openldap ++ # there is no --with-ldap flag
lib.optional libxml2Support libxml2 ++ lib.optional libxml2Support libxml2 ++
lib.optional http2Support nghttp2 ++ lib.optional http2Support nghttp2 ++
@ -70,7 +67,6 @@ stdenv.mkDerivation rec {
"--includedir=${placeholder "dev"}/include" "--includedir=${placeholder "dev"}/include"
(lib.enableFeature proxySupport "proxy") (lib.enableFeature proxySupport "proxy")
(lib.enableFeature sslSupport "ssl") (lib.enableFeature sslSupport "ssl")
(lib.enableFeature modTlsSupport "tls")
(lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
"--docdir=$(doc)/share/doc" "--docdir=$(doc)/share/doc"

4
pkgs/top-level/all-packages.nix
View File

@ -11514,9 +11514,7 @@ with pkgs;
alerta-server = callPackage ../servers/monitoring/alerta { }; alerta-server = callPackage ../servers/monitoring/alerta { };
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
inherit (darwin.apple_sdk.frameworks) Foundation;
};
apacheHttpd = apacheHttpd_2_4; apacheHttpd = apacheHttpd_2_4;
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {