Unverified Commit d55af0bf authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #218932 from figsoda/miniserve 

miniserve: 0.22.0 -> 0.23.0
parents df5d925b 7773d61a

pkgs/tools/misc/miniserve/default.nix

+12 −6
Original line number Diff line number Diff line
@@ -3,33 +3,37 @@ 
, fetchFromGitHub

, installShellFiles

, stdenv

, Security

, darwin

, curl

}:



rustPlatform.buildRustPackage rec {

  pname = "miniserve";

  version = "0.22.0";

  version = "0.23.0";



  src = fetchFromGitHub {

    owner = "svenstaro";

    repo = "miniserve";

    rev = "v${version}";

    hash = "sha256-pi+dBJE+EqQpyZAkIV7duK1g378J6BgjIiFcjV5H1fQ=";

    hash = "sha256-iI9J1BGD7/SDLoJ2WfizAEHUXBJH4DiUbfGingef9lM=";

  };



  cargoSha256 = "sha256-nRTGKW33NO2vRkvpNVk4pT1DrHPEsSfhwf8y5pJ+n9U=";

  cargoSha256 = "sha256-qvV7rJx0Yrv5CLRqSshGf1JUL6nW5KDb7Sv7B6M6WDs=";



  nativeBuildInputs = [

    installShellFiles

  ];



  buildInputs = lib.optionals stdenv.isDarwin [

    Security

    darwin.apple_sdk.frameworks.Security

  ];



  nativeCheckInputs = [

    curl

  ];



  checkFlags = [

    "--skip=bind_ipv4_ipv6::case_2"

    "--skip=cant_navigate_up_the_root"

    "--skip=qrcode_hidden_in_tty_when_disabled"

    "--skip=qrcode_shown_in_tty_when_enabled"

  ];
@@ -44,6 +48,8 @@ rustPlatform.buildRustPackage rec { 
      --zsh <($out/bin/miniserve --print-completions zsh)

  '';



  __darwinAllowLocalNetworking = true;



  meta = with lib; {

    description = "CLI tool to serve files and directories over HTTP";

    homepage = "https://github.com/svenstaro/miniserve";

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -5241,9 +5241,7 @@ with pkgs; 














  miniscript = callPackage ../applications/blockchains/miniscript { };



























  miniserve = callPackage ../tools/misc/miniserve {













    inherit (darwin.apple_sdk.frameworks) Security;













  };













  miniserve = callPackage ../tools/misc/miniserve { };





























  mkspiffs = callPackage ../tools/filesystems/mkspiffs { };