From 225b64d40cdde4ca26a6114c9703b115165854e3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 6 Jul 2023 14:16:58 +0200
Subject: [PATCH] sheldon: 0.6.6 -> 0.7.3

---
 pkgs/tools/misc/sheldon/default.nix | 50 ++++++++++++++++-------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix
index 8f2c458fe1d..73e9cb57d36 100644
--- a/pkgs/tools/misc/sheldon/default.nix
+++ b/pkgs/tools/misc/sheldon/default.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, fetchCrate
+, fetchFromGitHub
 , rustPlatform
 , pkg-config
 , openssl
@@ -11,37 +11,43 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sheldon";
-  version = "0.6.6";
+  version = "0.7.3";
 
-  src = fetchCrate {
-    inherit pname version;
-    sha256 = "sha256-NjNBTjSaFoh+DAJfcM4G3+Meih1czLxs/RMmMwrXqD4=";
+  src = fetchFromGitHub {
+    owner = "rossmacarthur";
+    repo = pname;
+    rev = version;
+    hash = "sha256-vGFR8NL3bOCUuNr0KQuAbjQMxvFbN/T9aVmf7Wxt9JU=";
   };
 
-  cargoSha256 = "sha256-uRcaHuDLQm6OYqt01kLbW/mfZnL4HaDabaweaw1EOfs=";
+  cargoSha256 = "sha256-wVB+yL+h90f7NnASDaX5gxT5z45M8I1rxIJwY8uyB4k=";
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
   nativeBuildInputs = [ installShellFiles pkg-config ];
 
   # Needs network connection
   checkFlags = [
-    "--skip cli::tests::raw_opt_help"
-    "--skip lock::tests::external_plugin_lock_git_with_matches"
-    "--skip lock::tests::external_plugin_lock_git_with_matches_error"
-    "--skip lock::tests::external_plugin_lock_git_with_matches_not_each"
-    "--skip lock::tests::external_plugin_lock_git_with_uses"
-    "--skip lock::tests::external_plugin_lock_remote"
-    "--skip lock::tests::git_checkout_resolve_branch"
-    "--skip lock::tests::git_checkout_resolve_rev"
-    "--skip lock::tests::git_checkout_resolve_tag"
+    "--skip lock::plugin::tests::external_plugin_lock_git_with_matches"
+    "--skip lock::plugin::tests::external_plugin_lock_git_with_matches_not_each"
+    "--skip lock::plugin::tests::external_plugin_lock_git_with_uses"
+    "--skip lock::plugin::tests::external_plugin_lock_remote"
+    "--skip lock::source::git::tests::git_checkout_resolve_branch"
+    "--skip lock::source::git::tests::git_checkout_resolve_rev"
+    "--skip lock::source::git::tests::git_checkout_resolve_tag"
+    "--skip lock::source::git::tests::lock_git_and_reinstall"
+    "--skip lock::source::git::tests::lock_git_https_with_checkout"
+    "--skip lock::source::local::tests::lock_local"
+    "--skip lock::source::remote::tests::lock_remote_and_reinstall"
+    "--skip lock::source::tests::lock_with_git"
+    "--skip lock::source::tests::lock_with_remote"
     "--skip lock::tests::locked_config_clean"
-    "--skip lock::tests::source_lock_git_and_reinstall"
-    "--skip lock::tests::source_lock_git_git_with_checkout"
-    "--skip lock::tests::source_lock_git_https_with_checkout"
-    "--skip lock::tests::source_lock_local"
-    "--skip lock::tests::source_lock_remote_and_reinstall"
-    "--skip lock::tests::source_lock_with_git"
-    "--skip lock::tests::source_lock_with_remote"
+    "--skip directories_default"
+    "--skip directories_old"
+    "--skip directories_xdg_from_env"
+    "--skip lock_and_source_github"
+    "--skip lock_and_source_hooks"
+    "--skip lock_and_source_inline"
+    "--skip lock_and_source_profiles"
   ];
 
   postInstall = ''