Commit 248ffcef authored by Thomas Gerbet's avatar Thomas Gerbet
Browse files

rustls-ffi: 0.10.0 -> 0.13.0 

Switched to the recently introduced cargo-c build in order
to get pkg-config/.so config.

Changelog:
https://github.com/rustls/rustls-ffi/blob/v0.13.0/CHANGELOG.md
parent d5491008

pkgs/by-name/ru/rustls-ffi/package.nix

0 → 100644
+68 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, cargo

, rustPlatform

, cargo-c

, validatePkgConfig

, rust

, libiconv

, darwin

, curl

, apacheHttpd

, testers

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "rustls-ffi";

  version = "0.13.0";



  src = fetchFromGitHub {

    owner = "rustls";

    repo = "rustls-ffi";

    rev = "v${finalAttrs.version}";

    hash = "sha256-Bc9bVZ2pDsG118l/SlElZpgh9F1JEgPF8LzBX7d4mhE=";

  };



  cargoDeps = rustPlatform.fetchCargoTarball {

    src = finalAttrs.src;

    name = "${finalAttrs.pname}-${finalAttrs.version}";

    hash = "sha256-gDQ9AFrJuV7SrzKCAHQBkKj6clXuPLO0DHhnvcBqRLs=";

  };



  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];



  nativeBuildInputs = [ cargo rustPlatform.cargoSetupHook cargo-c validatePkgConfig ];



  buildPhase = ''

    runHook preBuild

    ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}

    runHook postBuild

  '';



  installPhase = ''

    runHook preInstall

    ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}

    runHook postInstall

  '';



  checkPhase = ''

    runHook preCheck

    ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget}

    runHook postCheck

  '';



  passthru.tests = {

    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;

  };



  meta = with lib; {

    description = "C-to-rustls bindings";

    homepage = "https://github.com/rustls/rustls-ffi/";

    pkgConfigModules = [ "rustls" ];

    license = with lib.licenses; [ mit asl20 isc ];

    maintainers = [ maintainers.lesuisse ];

  };

})

pkgs/development/libraries/rustls-ffi/Cargo.lock

deleted100644 → 0
+0 −369
Original line number Diff line number Diff line 
# This file is automatically @generated by Cargo.

# It is not intended for manual editing.

version = 3



[[package]]

name = "base64"

version = "0.13.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"



[[package]]

name = "bumpalo"

version = "3.13.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"



[[package]]

name = "cc"

version = "1.0.79"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"



[[package]]

name = "cfg-if"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"



[[package]]

name = "equivalent"

version = "1.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"



[[package]]

name = "hashbrown"

version = "0.14.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"



[[package]]

name = "indexmap"

version = "2.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"

dependencies = [

 "equivalent",

 "hashbrown",

]



[[package]]

name = "js-sys"

version = "0.3.64"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"

dependencies = [

 "wasm-bindgen",

]



[[package]]

name = "libc"

version = "0.2.147"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"



[[package]]

name = "log"

version = "0.4.19"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"



[[package]]

name = "memchr"

version = "2.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"



[[package]]

name = "num_enum"

version = "0.5.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"

dependencies = [

 "num_enum_derive",

]



[[package]]

name = "num_enum_derive"

version = "0.5.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"

dependencies = [

 "proc-macro-crate",

 "proc-macro2",

 "quote",

 "syn 1.0.109",

]



[[package]]

name = "once_cell"

version = "1.18.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"



[[package]]

name = "proc-macro-crate"

version = "1.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"

dependencies = [

 "once_cell",

 "toml_edit",

]



[[package]]

name = "proc-macro2"

version = "1.0.64"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"

dependencies = [

 "unicode-ident",

]



[[package]]

name = "quote"

version = "1.0.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"

dependencies = [

 "proc-macro2",

]



[[package]]

name = "ring"

version = "0.16.20"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"

dependencies = [

 "cc",

 "libc",

 "once_cell",

 "spin",

 "untrusted",

 "web-sys",

 "winapi",

]



[[package]]

name = "rustls"

version = "0.21.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d"

dependencies = [

 "log",

 "ring",

 "rustls-webpki",

 "rustversion",

 "sct",

]



[[package]]

name = "rustls-ffi"

version = "0.10.0"

dependencies = [

 "libc",

 "log",

 "num_enum",

 "rustls",

 "rustls-pemfile",

 "sct",

 "webpki",

]



[[package]]

name = "rustls-pemfile"

version = "0.2.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"

dependencies = [

 "base64",

]



[[package]]

name = "rustls-webpki"

version = "0.100.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"

dependencies = [

 "ring",

 "untrusted",

]



[[package]]

name = "rustversion"

version = "1.0.13"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"



[[package]]

name = "sct"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"

dependencies = [

 "ring",

 "untrusted",

]



[[package]]

name = "spin"

version = "0.5.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"



[[package]]

name = "syn"

version = "1.0.109"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"

dependencies = [

 "proc-macro2",

 "quote",

 "unicode-ident",

]



[[package]]

name = "syn"

version = "2.0.25"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2"

dependencies = [

 "proc-macro2",

 "quote",

 "unicode-ident",

]



[[package]]

name = "toml_datetime"

version = "0.6.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"



[[package]]

name = "toml_edit"

version = "0.19.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"

dependencies = [

 "indexmap",

 "toml_datetime",

 "winnow",

]



[[package]]

name = "unicode-ident"

version = "1.0.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"



[[package]]

name = "untrusted"

version = "0.7.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"



[[package]]

name = "wasm-bindgen"

version = "0.2.87"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"

dependencies = [

 "cfg-if",

 "wasm-bindgen-macro",

]



[[package]]

name = "wasm-bindgen-backend"

version = "0.2.87"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"

dependencies = [

 "bumpalo",

 "log",

 "once_cell",

 "proc-macro2",

 "quote",

 "syn 2.0.25",

 "wasm-bindgen-shared",

]



[[package]]

name = "wasm-bindgen-macro"

version = "0.2.87"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"

dependencies = [

 "quote",

 "wasm-bindgen-macro-support",

]



[[package]]

name = "wasm-bindgen-macro-support"

version = "0.2.87"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.25",

 "wasm-bindgen-backend",

 "wasm-bindgen-shared",

]



[[package]]

name = "wasm-bindgen-shared"

version = "0.2.87"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"



[[package]]

name = "web-sys"

version = "0.3.64"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"

dependencies = [

 "js-sys",

 "wasm-bindgen",

]



[[package]]

name = "webpki"

version = "0.22.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"

dependencies = [

 "ring",

 "untrusted",

]



[[package]]

name = "winapi"

version = "0.3.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"

dependencies = [

 "winapi-i686-pc-windows-gnu",

 "winapi-x86_64-pc-windows-gnu",

]



[[package]]

name = "winapi-i686-pc-windows-gnu"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"



[[package]]

name = "winapi-x86_64-pc-windows-gnu"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"



[[package]]

name = "winnow"

version = "0.4.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529"

dependencies = [

 "memchr",

]

pkgs/development/libraries/rustls-ffi/default.nix

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, apacheHttpd, curl }:



rustPlatform.buildRustPackage rec {

  pname = "rustls-ffi";

  version = "0.10.0";



  src = fetchFromGitHub {

    owner = "rustls";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc=";

  };



  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ];



  cargoLock.lockFile = ./Cargo.lock;

  postPatch = ''

    cp ${./Cargo.lock} Cargo.lock

  '';



  installPhase = ''

    runHook preInstall



    make install DESTDIR=${placeholder "out"}



    runHook postInstall

  '';



  passthru.tests = {

    apacheHttpd = apacheHttpd.override { modTlsSupport = true; };

    # Currently broken notably because of https://github.com/curl/curl/issues/13248

    # curl = curl.override { opensslSupport = false; rustlsSupport = true; };

  };



  meta = with lib; {

    description = "C-to-rustls bindings";

    homepage = "https://github.com/rustls/rustls-ffi/";

    license = with lib.licenses; [ mit asl20 isc ];

    maintainers = [ maintainers.lesuisse ];

  };

}

pkgs/tools/networking/curl/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ stdenv.mkDerivation (finalAttrs: { 
    maintainers = with maintainers; [ lovek323 ];

    platforms = platforms.all;

    # Fails to link against static brotli or gss

    broken = (stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport || stdenv.hostPlatform.system == "x86_64-darwin")) || rustlsSupport;

    broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport || stdenv.hostPlatform.system == "x86_64-darwin");

    pkgConfigModules = [ "libcurl" ];

    mainProgram = "curl";

  };

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -24005,10 +24005,6 @@ with pkgs; 














  rustc-demangle = callPackage ../development/libraries/rustc-demangle { };



























  rustls-ffi = callPackage ../development/libraries/rustls-ffi {













    inherit (darwin.apple_sdk.frameworks) Security;













  };



























  s2geometry = callPackage ../development/libraries/s2geometry { };





























  safefile = callPackage ../development/libraries/safefile { };