xh: 0.5.0 -> 0.7.0, rename from ht-rust

4 files changed, 33 insertions, 35 deletions

diff --git a/pkgs/tools/networking/ht-rust/default.nix b/pkgs/tools/networking/ht-rust/default.nix
deleted file mode 100644
index 629cf4ed11e1..000000000000
--- a/pkgs/tools/networking/ht-rust/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "ht-rust";
-  version = "0.5.0";
-
-  src = fetchFromGitHub {
-    owner = "ducaale";
-    repo = "ht";
-    rev = "v${version}";
-    sha256 = "cr/iavCRdFYwVR6Iemm1hLKqd0OFG1iDmxpQ9fiwOmU=";
-  };
-
-  cargoSha256 = "uB23/9AjPwCwf9ljE8ai7zJQZqE0SoBPzRqqBOXa9QA=";
-
-  buildInputs = [ ] ++ lib.optional stdenv.isDarwin Security;
-
-  # Symlink to avoid conflict with pre-existing ht package
-  postInstall = ''
-    ln -s $out/bin/ht $out/bin/ht-rust
-  '';
-
-  doInstallCheck = true;
-  postInstallCheck = ''
-    $out/bin/ht-rust --help > /dev/null
-  '';
-
-  meta = with lib; {
-    description = "Yet another HTTPie clone in Rust";
-    homepage = "https://github.com/ducaale/ht";
-    license = licenses.mit;
-    maintainers = [ maintainers.payas ];
-  };
-}
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix
new file mode 100644
index 000000000000..b7246959017a
--- /dev/null
+++ b/pkgs/tools/networking/xh/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "xh";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "ducaale";
+    repo = "xh";
+    rev = "v${version}";
+    sha256 = "0b7q0xbfbrhvpnxbm9bd1ncdza9k2kcmcir3qhqzb2pgsb5b5njx";
+  };
+
+  cargoSha256 = "02fgqys9qf0jzs2n230pyj151v6xbm6wm2rd9qm5gsib6zaq7gfa";
+
+  buildInputs = lib.optional stdenv.isDarwin Security;
+
+  checkFlagsArray = [ "--skip=basic_options" ];
+
+  doInstallCheck = true;
+  postInstallCheck = ''
+    $out/bin/xh --help > /dev/null
+  '';
+
+  meta = with lib; {
+    description = "Yet another HTTPie clone in Rust";
+    homepage = "https://github.com/ducaale/xh";
+    license = licenses.mit;
+    maintainers = with maintainers; [ payas SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 77ca1204bf41..e04626749d69 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -270,6 +270,7 @@ mapAliases ({
   hepmc = hepmc2; # added 2019-08-05
   hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11
   hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
+  ht-rust = xh; # added 2021-02-13
   htmlTidy = html-tidy;  # added 2014-12-06
   iana_etc = iana-etc;  # added 2017-03-08
   icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 698ec43fcdce..7cf19080a6e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22708,7 +22708,7 @@ in
 
   ht = callPackage ../applications/editors/ht { };
 
-  ht-rust = callPackage ../tools/networking/ht-rust {
+  xh = callPackage ../tools/networking/xh {
     inherit (darwin.apple_sdk.frameworks) Security;
   };