simple-http-server: 0.6.1 -> 0.6.2
This commit also removes vendored openssl from Cargo.toml Co-authored-by: Winter <winter@winter.cafe> Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
This commit is contained in:
parent
4f460a0226
commit
913baaaabd
|
@ -0,0 +1,26 @@
|
||||||
|
From 7e90a58be65bc9d81e53dfba39a44fdd2c7a79a4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maxim Zhukov <mussitantesmortem@gmail.com>
|
||||||
|
Date: Sat, 23 Jul 2022 08:44:07 +0300
|
||||||
|
Subject: [PATCH] cargo: remove vendored openssl
|
||||||
|
|
||||||
|
Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
|
||||||
|
---
|
||||||
|
Cargo.toml | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Cargo.toml b/Cargo.toml
|
||||||
|
index 341c722..81665fb 100644
|
||||||
|
--- a/Cargo.toml
|
||||||
|
+++ b/Cargo.toml
|
||||||
|
@@ -23,7 +23,7 @@ url = "2.1.0"
|
||||||
|
hyper-native-tls = { version = "0.3.0", optional = true }
|
||||||
|
mime_guess = "2.0"
|
||||||
|
open = "1"
|
||||||
|
-openssl = { version = "0.10", features = ["vendored"] }
|
||||||
|
+openssl = { version = "0.10" }
|
||||||
|
# Iron crates
|
||||||
|
iron = "0.6.1"
|
||||||
|
iron-cors = "0.8.0"
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
1220
pkgs/servers/simple-http-server/Cargo.lock
generated
Normal file
1220
pkgs/servers/simple-http-server/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
@ -2,20 +2,25 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "simple-http-server";
|
pname = "simple-http-server";
|
||||||
version = "0.6.1";
|
version = "0.6.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TheWaWaR";
|
owner = "TheWaWaR";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "01a129i1ph3m8k6zkdcqnnkqbhlqpk7qvvdsz2i2kas54csbgsww";
|
sha256 = "sha256-ndLFN9FZZA+zsb+bjZ3gMvQJqo6I92erGOQ44H+/LCg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "050avk6wff8v1dlsfvxwvldmmgfakdxmhglv2bhvc2f3q8cf1d5d";
|
cargoLock.lockFile = ./Cargo.lock;
|
||||||
|
|
||||||
|
patches = [ ./0001-cargo-remove-vendored-openssl.patch ];
|
||||||
|
postPatch = ''
|
||||||
|
cp ${./Cargo.lock} Cargo.lock
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ];
|
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
# Currently no tests are implemented, so we avoid building the package twice
|
# Currently no tests are implemented, so we avoid building the package twice
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
Loading…
Reference in a new issue