forked from mirrors/nixpkgs
simple-http-server: 0.6.2 -> 0.6.3, remove patches
also add figsoda as a maintainer
This commit is contained in:
parent
5a60312b2c
commit
95f4d35f6d
3 changed files with 5 additions and 1256 deletions
|
@ -1,26 +0,0 @@
|
||||||
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
1220
pkgs/servers/simple-http-server/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -1,22 +1,17 @@
|
||||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
|
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "simple-http-server";
|
pname = "simple-http-server";
|
||||||
version = "0.6.2";
|
version = "0.6.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TheWaWaR";
|
owner = "TheWaWaR";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ndLFN9FZZA+zsb+bjZ3gMvQJqo6I92erGOQ44H+/LCg=";
|
sha256 = "sha256-qhYsfbzEBbWii4r/G0trU7XiAMPrX/guRshyZE2xeJk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock.lockFile = ./Cargo.lock;
|
cargoSha256 = "sha256-aldAez28SZM4A8niIHk85pKeRzpxaZiQhV9Ch5dyblI=";
|
||||||
|
|
||||||
patches = [ ./0001-cargo-remove-vendored-openssl.patch ];
|
|
||||||
postPatch = ''
|
|
||||||
cp ${./Cargo.lock} Cargo.lock
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
@ -29,6 +24,6 @@ rustPlatform.buildRustPackage rec {
|
||||||
description = "Simple HTTP server in Rust";
|
description = "Simple HTTP server in Rust";
|
||||||
homepage = "https://github.com/TheWaWaR/simple-http-server";
|
homepage = "https://github.com/TheWaWaR/simple-http-server";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ mephistophiles ];
|
maintainers = with maintainers; [ figsoda mephistophiles ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue