From 7a95b9b6ae979f65eba21ea7716373f2e9bc0776 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Nov 2020 11:20:03 +0000 Subject: [PATCH 1/2] microserver: 0.1.8 -> 0.2.0 --- pkgs/servers/microserver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix index 9132ef9672bd..09c64921ec63 100644 --- a/pkgs/servers/microserver/default.nix +++ b/pkgs/servers/microserver/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "microserver"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "robertohuertasm"; repo = "microserver"; rev = "v${version}"; - sha256 = "1i9689ra5jnmhkxabrx4zcp5f422w9ql9m4xzldqwmpnckm736v6"; + sha256 = "1bbbdajh74wh2fbidasim2mzmzqjrgi02v8b0g7vbhpdnlim6ixz"; }; - cargoSha256 = "1yn3xmmhpixiviayicl2szlzfjx5crffp3pq75d5nz6ky3miai9l"; + cargoSha256 = "0cyxa200iz7knkma4zi3mzky3g0kibbxd5303psk2rl2rppir0f7"; meta = with stdenv.lib; { homepage = "https://github.com/robertohuertasm/microserver"; From ffb8c1c4ec9b77d4acfa9b991d41ffd1f8f2d5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Nov 2020 19:23:03 +0100 Subject: [PATCH 2/2] microserver: Fix compilation on Darwin --- pkgs/servers/microserver/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix index 09c64921ec63..618b6f75e7b7 100644 --- a/pkgs/servers/microserver/default.nix +++ b/pkgs/servers/microserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "microserver"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0cyxa200iz7knkma4zi3mzky3g0kibbxd5303psk2rl2rppir0f7"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + meta = with stdenv.lib; { homepage = "https://github.com/robertohuertasm/microserver"; description = "Simple ad-hoc server with SPA support";