From aa3e98ca07bfd2185b83ab7f9ec0d115efd9ed77 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 29 Jan 2023 22:26:54 -0500 Subject: [PATCH] simple-http-server: 0.6.5 -> 0.6.6 Diff: https://github.com/TheWaWaR/simple-http-server/compare/v0.6.5...v0.6.6 Changelog: https://github.com/TheWaWaR/simple-http-server/releases/tag/v0.6.6 --- pkgs/servers/simple-http-server/default.nix | 19 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index 0940d1a0ece3..e59b9d73d5a8 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -1,21 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9wssSegekRBUXxpru5WGGu6BLX6BFEgV0QliNJToRFg="; + sha256 = "sha256-b+z3rio+kg1Z0B4pqhTlCTtzXgAeCAhinSa9dkIwcaY="; }; - cargoSha256 = "sha256-P8Zr5KTjXD0qHkf6QfyfN39PjokpZUfywhzVjIO5rE8="; + cargoSha256 = "sha256-teBqgQloI/13F7K/+EBKFcHWqcK1wJrNUu5LO8nwQbo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dd49c585961..02925765e6a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38613,9 +38613,7 @@ with pkgs; simplehttp2server = callPackage ../servers/simplehttp2server { }; - simple-http-server = callPackage ../servers/simple-http-server { - inherit (darwin.apple_sdk.frameworks) Security; - }; + simple-http-server = callPackage ../servers/simple-http-server { }; diceware = with python3Packages; toPythonApplication diceware;