diff options
author | figsoda <figsoda@pm.me> | 2023-02-20 16:58:12 -0500 |
---|---|---|
committer | figsoda <figsoda@pm.me> | 2023-02-20 17:08:58 -0500 |
commit | c04117d475f60154029660d0e52b7b0a4f55bcd8 (patch) | |
tree | f040b95ff3776c19ba9c88d39008f4052bbfc961 /pkgs/tools/networking/xh | |
parent | 5ab8b5ae26e6a4b781bdebdfd131c054f0b96e70 (diff) | |
download | nixpkgs-c04117d475f60154029660d0e52b7b0a4f55bcd8.tar nixpkgs-c04117d475f60154029660d0e52b7b0a4f55bcd8.tar.gz nixpkgs-c04117d475f60154029660d0e52b7b0a4f55bcd8.tar.bz2 nixpkgs-c04117d475f60154029660d0e52b7b0a4f55bcd8.tar.lz nixpkgs-c04117d475f60154029660d0e52b7b0a4f55bcd8.tar.xz nixpkgs-c04117d475f60154029660d0e52b7b0a4f55bcd8.tar.zst nixpkgs-c04117d475f60154029660d0e52b7b0a4f55bcd8.zip |
xh: 0.17.0 -> 0.18.0, add figsoda as a maintainer
Diff: https://github.com/ducaale/xh/compare/v0.17.0...v0.18.0 Changelog: https://github.com/ducaale/xh/blob/v0.18.0/CHANGELOG.md
Diffstat (limited to 'pkgs/tools/networking/xh')
-rw-r--r-- | pkgs/tools/networking/xh/default.nix | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index f806b46b694..06cda849002 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -1,41 +1,40 @@ -{ stdenv -, lib -, pkg-config +{ lib , rustPlatform , fetchFromGitHub , installShellFiles +, pkg-config , withNativeTls ? true +, stdenv , Security -, libiconv -, openssl }: +, openssl +}: rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-4rFtbCfx6QFdp62FPjOYAhSWM03g3rXsF4pD22+EhcA="; + sha256 = "sha256-2qZ+FGc8Y8HLJaQluVv036NG77lvaqsc3I5cmkD+r/M="; }; - cargoSha256 = "sha256-av/F1FHMd0o9NvwA2Q9mqSd89ZEqmUaVxC+JmSwEHhI="; + cargoSha256 = "sha256-0lPEZ8Th3PAw6AEnb+ciKMhi5wysFCvYwiHd9/o8VVc="; buildFeatures = lib.optional withNativeTls "native-tls"; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = lib.optionals withNativeTls - (if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]); + (if stdenv.isDarwin then [ Security ] else [ openssl ]); # Get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; postInstall = '' - installShellCompletion --cmd xh \ - --bash completions/xh.bash \ - --fish completions/xh.fish \ + installShellCompletion \ + completions/xh.{bash,fish} \ --zsh completions/_xh installManPage doc/xh.1 @@ -43,7 +42,6 @@ rustPlatform.buildRustPackage rec { install -m444 -Dt $out/share/doc/xh README.md CHANGELOG.md - # https://github.com/ducaale/xh#xh-and-xhs ln -s $out/bin/xh $out/bin/xhs ''; @@ -61,6 +59,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ducaale/xh"; changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ payas ]; + maintainers = with maintainers; [ figsoda payas ]; }; } |