Skip to content

Commit 8ade221

Browse files
committed
httplz: 1.12.5 -> 1.12.6
1 parent 8501a16 commit 8ade221

2 files changed

Lines changed: 6 additions & 20 deletions

File tree

pkgs/tools/networking/httplz/default.nix

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,26 @@
11
{ lib
22
, rustPlatform
33
, fetchCrate
4-
, fetchpatch
54
, installShellFiles
65
, makeWrapper
76
, pkg-config
87
, ronn
98
, openssl
109
, stdenv
11-
, libiconv
12-
, Security
10+
, darwin
1311
}:
1412

1513
rustPlatform.buildRustPackage rec {
1614
pname = "httplz";
17-
version = "1.12.5";
15+
version = "1.12.6";
1816

1917
src = fetchCrate {
2018
inherit version;
2119
pname = "https";
22-
sha256 = "sha256-+nCqMTLrBYNQvoKo1PzkyzRCkKdlE88+NYoJcIlAJts=";
20+
sha256 = "sha256-qkhou4Rmv31zwyL8aM7U0YUZwOb3KQMHdOQsOrRI1TA=";
2321
};
2422

25-
patches = [
26-
# https://github.com/thecoshman/http/pull/151
27-
(fetchpatch {
28-
name = "fix-rust-1.65-compile.patch";
29-
url = "https://github.com/thecoshman/http/commit/6e4c8e97cce09d0d18d4936f90aa643659d813fc.patch";
30-
hash = "sha256-mXclXfp2Nzq6Pr9VFmxiOzECGZEQRNOAcXoKhiOyuFs=";
31-
})
32-
];
33-
34-
cargoSha256 = "sha256-odiVIfNJPpagoASnYvdOosHXa37gbQM8Zmvtnao0pAs=";
23+
cargoSha256 = "sha256-BuNCKtK9ePV0d9o/DlW098Y4DWTIl0YKyryXMv09Woc=";
3524

3625
nativeBuildInputs = [
3726
installShellFiles
@@ -41,8 +30,7 @@ rustPlatform.buildRustPackage rec {
4130
];
4231

4332
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
44-
libiconv
45-
Security
33+
darwin.apple_sdk.frameworks.Security
4634
];
4735

4836
cargoBuildFlags = [ "--bin" "httplz" ];

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8454,9 +8454,7 @@ with pkgs;
84548454

84558455
httping = callPackage ../tools/networking/httping { };
84568456

8457-
httplz = callPackage ../tools/networking/httplz {
8458-
inherit (darwin.apple_sdk.frameworks) Security;
8459-
};
8457+
httplz = callPackage ../tools/networking/httplz { };
84608458

84618459
httpfs2 = callPackage ../tools/filesystems/httpfs { };
84628460

0 commit comments

Comments
 (0)