lol

Merge pull request #218932 from figsoda/miniserve

miniserve: 0.22.0 -> 0.23.0

authored by

Mario Rodas and committed by
GitHub
d55af0bf df5d925b

+13 -9
+12 -6
pkgs/tools/misc/miniserve/default.nix
··· 3 , fetchFromGitHub 4 , installShellFiles 5 , stdenv 6 - , Security 7 }: 8 9 rustPlatform.buildRustPackage rec { 10 pname = "miniserve"; 11 - version = "0.22.0"; 12 13 src = fetchFromGitHub { 14 owner = "svenstaro"; 15 repo = "miniserve"; 16 rev = "v${version}"; 17 - hash = "sha256-pi+dBJE+EqQpyZAkIV7duK1g378J6BgjIiFcjV5H1fQ="; 18 }; 19 20 - cargoSha256 = "sha256-nRTGKW33NO2vRkvpNVk4pT1DrHPEsSfhwf8y5pJ+n9U="; 21 22 nativeBuildInputs = [ 23 installShellFiles 24 ]; 25 26 buildInputs = lib.optionals stdenv.isDarwin [ 27 - Security 28 ]; 29 30 checkFlags = [ 31 "--skip=bind_ipv4_ipv6::case_2" 32 - "--skip=cant_navigate_up_the_root" 33 "--skip=qrcode_hidden_in_tty_when_disabled" 34 "--skip=qrcode_shown_in_tty_when_enabled" 35 ]; ··· 43 --fish <($out/bin/miniserve --print-completions fish) \ 44 --zsh <($out/bin/miniserve --print-completions zsh) 45 ''; 46 47 meta = with lib; { 48 description = "CLI tool to serve files and directories over HTTP";
··· 3 , fetchFromGitHub 4 , installShellFiles 5 , stdenv 6 + , darwin 7 + , curl 8 }: 9 10 rustPlatform.buildRustPackage rec { 11 pname = "miniserve"; 12 + version = "0.23.0"; 13 14 src = fetchFromGitHub { 15 owner = "svenstaro"; 16 repo = "miniserve"; 17 rev = "v${version}"; 18 + hash = "sha256-iI9J1BGD7/SDLoJ2WfizAEHUXBJH4DiUbfGingef9lM="; 19 }; 20 21 + cargoSha256 = "sha256-qvV7rJx0Yrv5CLRqSshGf1JUL6nW5KDb7Sv7B6M6WDs="; 22 23 nativeBuildInputs = [ 24 installShellFiles 25 ]; 26 27 buildInputs = lib.optionals stdenv.isDarwin [ 28 + darwin.apple_sdk.frameworks.Security 29 + ]; 30 + 31 + nativeCheckInputs = [ 32 + curl 33 ]; 34 35 checkFlags = [ 36 "--skip=bind_ipv4_ipv6::case_2" 37 "--skip=qrcode_hidden_in_tty_when_disabled" 38 "--skip=qrcode_shown_in_tty_when_enabled" 39 ]; ··· 47 --fish <($out/bin/miniserve --print-completions fish) \ 48 --zsh <($out/bin/miniserve --print-completions zsh) 49 ''; 50 + 51 + __darwinAllowLocalNetworking = true; 52 53 meta = with lib; { 54 description = "CLI tool to serve files and directories over HTTP";
+1 -3
pkgs/top-level/all-packages.nix
··· 5241 5242 miniscript = callPackage ../applications/blockchains/miniscript { }; 5243 5244 - miniserve = callPackage ../tools/misc/miniserve { 5245 - inherit (darwin.apple_sdk.frameworks) Security; 5246 - }; 5247 5248 mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; 5249
··· 5241 5242 miniscript = callPackage ../applications/blockchains/miniscript { }; 5243 5244 + miniserve = callPackage ../tools/misc/miniserve { }; 5245 5246 mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; 5247