Unverified Commit 7afa3f21 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #284687 from r-ryantm/auto-update/xh 

xh: 0.20.1 -> 0.21.0
parents f9c6b14d 50390e91

pkgs/tools/networking/xh/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -5,29 +5,29 @@ 
, pkg-config

, withNativeTls ? true

, stdenv

, Security

, darwin

, openssl

}:



rustPlatform.buildRustPackage rec {

  pname = "xh";

  version = "0.20.1";

  version = "0.21.0";



  src = fetchFromGitHub {

    owner = "ducaale";

    repo = "xh";

    rev = "v${version}";

    sha256 = "sha256-e3AGegW0V7JK6iLy0PaMwSeA9+2wSouzX5QIYUg8HCk=";

    sha256 = "sha256-nsxXNlDycn7W7X+AthYCFQu8i2bEPQv7r2LCbc3gFrE=";

  };



  cargoSha256 = "sha256-JE8SKxc7fKlK637NCZnTKkbF4GNrrvJQ/2kGxK4WXpg=";

  cargoHash = "sha256-THj8tE12P/K+t/R1xUxo042FIX6JP3riCvm2a8zVEzw=";



  buildFeatures = lib.optional withNativeTls "native-tls";



  nativeBuildInputs = [ installShellFiles pkg-config ];



  buildInputs = lib.optionals withNativeTls

    (if stdenv.isDarwin then [ Security ] else [ openssl ]);

    (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.SystemConfiguration ] else [ openssl ]);



  # Get openssl-sys to use pkg-config

  OPENSSL_NO_VENDOR = 1;

pkgs/top-level/all-packages.nix

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














  ht = callPackage ../applications/editors/ht { };



























  xh = callPackage ../tools/networking/xh {













    inherit (darwin.apple_sdk.frameworks) Security;













  };













  xh = callPackage ../tools/networking/xh { };





























  hubstaff = callPackage ../applications/misc/hubstaff { };