BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #222349 from figsoda/httplz

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/tools/networking/httplz/default.nix
View file

@ -1,37 +1,26 @@
{ lib { lib
, rustPlatform , rustPlatform
, fetchCrate , fetchCrate
, fetchpatch
, installShellFiles , installShellFiles
, makeWrapper , makeWrapper
, pkg-config , pkg-config
, ronn , ronn
, openssl , openssl
, stdenv , stdenv
, libiconv , darwin
, Security
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "httplz"; pname = "httplz";
version = "1.12.5"; version = "1.12.6";
src = fetchCrate { src = fetchCrate {
inherit version; inherit version;
pname = "https"; pname = "https";
sha256 = "sha256-+nCqMTLrBYNQvoKo1PzkyzRCkKdlE88+NYoJcIlAJts="; sha256 = "sha256-qkhou4Rmv31zwyL8aM7U0YUZwOb3KQMHdOQsOrRI1TA=";
}; };
patches = [ cargoSha256 = "sha256-BuNCKtK9ePV0d9o/DlW098Y4DWTIl0YKyryXMv09Woc=";
# 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=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
@ -41,8 +30,7 @@ rustPlatform.buildRustPackage rec {
]; ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security
Security
]; ];
cargoBuildFlags = [ "--bin" "httplz" ]; cargoBuildFlags = [ "--bin" "httplz" ];

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

@ -8456,9 +8456,7 @@ with pkgs;
httping = callPackage ../tools/networking/httping { }; httping = callPackage ../tools/networking/httping { };
httplz = callPackage ../tools/networking/httplz { httplz = callPackage ../tools/networking/httplz { };
inherit (darwin.apple_sdk.frameworks) Security;
};
httpfs2 = callPackage ../tools/filesystems/httpfs { }; httpfs2 = callPackage ../tools/filesystems/httpfs { };