diff options
| author | figsoda <figsoda@pm.me> | 2024-01-29 15:47:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 15:47:09 -0500 |
| commit | 7afa3f21a523c505a2f4178c17b9dcf0ae423a90 (patch) | |
| tree | 7e36babb3a844de77cb397ce81e519ca3b3d235e /pkgs | |
| parent | f9c6b14dbd0cab8fffef82cea7ba9ff2988c9f09 (diff) | |
| parent | 50390e918369d1715180035c117282a2a432540e (diff) | |
Merge pull request #284687 from r-ryantm/auto-update/xh
xh: 0.20.1 -> 0.21.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/xh/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 63ca778c6db47..a2cbf816fab7d 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a10f517af4ba..98a4ad7a2175d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |