From 8ade2218efcb5077bc730012929b9e6eb835a1e9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 21 Mar 2023 08:39:50 -0400 Subject: [PATCH] httplz: 1.12.5 -> 1.12.6 --- pkgs/tools/networking/httplz/default.nix | 22 +++++----------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index d3279214997..db2663bc54c 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -1,37 +1,26 @@ { lib , rustPlatform , fetchCrate -, fetchpatch , installShellFiles , makeWrapper , pkg-config , ronn , openssl , stdenv -, libiconv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.12.5"; + version = "1.12.6"; src = fetchCrate { inherit version; pname = "https"; - sha256 = "sha256-+nCqMTLrBYNQvoKo1PzkyzRCkKdlE88+NYoJcIlAJts="; + sha256 = "sha256-qkhou4Rmv31zwyL8aM7U0YUZwOb3KQMHdOQsOrRI1TA="; }; - patches = [ - # https://github.com/thecoshman/http/pull/151 - (fetchpatch { - name = "fix-rust-1.65-compile.patch"; - url = "https://github.com/thecoshman/http/commit/6e4c8e97cce09d0d18d4936f90aa643659d813fc.patch"; - hash = "sha256-mXclXfp2Nzq6Pr9VFmxiOzECGZEQRNOAcXoKhiOyuFs="; - }) - ]; - - cargoSha256 = "sha256-odiVIfNJPpagoASnYvdOosHXa37gbQM8Zmvtnao0pAs="; + cargoSha256 = "sha256-BuNCKtK9ePV0d9o/DlW098Y4DWTIl0YKyryXMv09Woc="; nativeBuildInputs = [ installShellFiles @@ -41,8 +30,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - libiconv - Security + darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "--bin" "httplz" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db2f3cb8a31..4ebb957f205 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8454,9 +8454,7 @@ with pkgs; httping = callPackage ../tools/networking/httping { }; - httplz = callPackage ../tools/networking/httplz { - inherit (darwin.apple_sdk.frameworks) Security; - }; + httplz = callPackage ../tools/networking/httplz { }; httpfs2 = callPackage ../tools/filesystems/httpfs { };