Merge master into staging-next

pkgs/tools/networking/ht-rust/default.nix

@@ -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 ];
-  };
-}

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 ];
+  };
+}