Merge pull request #213501 from figsoda/http
simple-http-server: 0.6.5 -> 0.6.6
This commit is contained in:
commit
a2722defa1
|
@ -1,21 +1,30 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }:
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "simple-http-server";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheWaWaR";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9wssSegekRBUXxpru5WGGu6BLX6BFEgV0QliNJToRFg=";
|
||||
sha256 = "sha256-b+z3rio+kg1Z0B4pqhTlCTtzXgAeCAhinSa9dkIwcaY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-P8Zr5KTjXD0qHkf6QfyfN39PjokpZUfywhzVjIO5rE8=";
|
||||
cargoSha256 = "sha256-teBqgQloI/13F7K/+EBKFcHWqcK1wJrNUu5LO8nwQbo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
# Currently no tests are implemented, so we avoid building the package twice
|
||||
doCheck = false;
|
||||
|
|
|
@ -38617,9 +38617,7 @@ with pkgs;
|
|||
|
||||
simplehttp2server = callPackage ../servers/simplehttp2server { };
|
||||
|
||||
simple-http-server = callPackage ../servers/simple-http-server {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
simple-http-server = callPackage ../servers/simple-http-server { };
|
||||
|
||||
diceware = with python3Packages; toPythonApplication diceware;
|
||||
|
||||
|
|
Loading…
Reference in a new issue