Merge pull request #222349 from figsoda/httplz

httplz: 1.12.5 -> 1.12.6
This commit is contained in:
Nick Cao 2023-03-22 16:11:22 +08:00 committed by GitHub
commit 67fe67dfbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 20 deletions

View file

@ -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" ];

View file

@ -8456,9 +8456,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 { };