httplz: 1.5.2 -> 1.6.0, add openssl to PATH

This commit is contained in:
WilliButz 2019-09-14 11:57:14 +02:00
parent aaf514d322
commit 91bb6cf407
No known key found for this signature in database
GPG Key ID: 92582A10F1179CB2
3 changed files with 252 additions and 454 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,25 +1,36 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkgconfig, darwin, libiconv }: { stdenv, lib, fetchFromGitHub, makeWrapper, rustPlatform
, openssl, pkgconfig, darwin, libiconv }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "httplz"; pname = "httplz";
version = "1.5.2"; version = "1.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thecoshman"; owner = "thecoshman";
repo = "http"; repo = "http";
rev = "v${version}"; rev = "v${version}";
sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6"; sha256 = "1y9mlbympb19i3iw7s7jm7lvkpcl4w0sig6jnd4w3ykhkdhzh6di";
}; };
buildInputs = [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [
openssl pkgconfig
] ++ lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security
];
cargoBuildFlags = [ "--bin httplz" ]; cargoBuildFlags = [ "--bin httplz" ];
cargoPatches = [ ./cargo-lock.patch ]; cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "18qr3sy4zj4lwbzrz98d82kwagfbzkmrxk5sxl7w9vhdzy2diskw"; cargoSha256 = "1bxh7p2a04lpghqms8cx1f1cq5nbcx6cxh5ac7i72d5vzy4v07nl";
postInstall = ''
wrapProgram $out/bin/httplz \
--prefix PATH : "${openssl}/bin"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A basic http server for hosting a folder fast and simply"; description = "A basic http server for hosting a folder fast and simply";
homepage = https://github.com/thecoshman/http; homepage = "https://github.com/thecoshman/http";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ bbigras ]; maintainers = with maintainers; [ bbigras ];
}; };

View File

@ -3855,7 +3855,7 @@ in
httping = callPackage ../tools/networking/httping {}; httping = callPackage ../tools/networking/httping {};
httplz = callPackage ../tools/networking/httplz { openssl = openssl_1_0_2; }; httplz = callPackage ../tools/networking/httplz { };
httpfs2 = callPackage ../tools/filesystems/httpfs { }; httpfs2 = callPackage ../tools/filesystems/httpfs { };