From 50bb886acc6f240980c9b010c89c58434d7d0fa5 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 5 Dec 2022 01:42:15 -0500
Subject: [PATCH] the-way: 0.17.1 -> 0.18.0, add figsoda as a maintainer, use
 nextest

Diff: https://github.com/out-of-cheese-error/the-way/compare/v0.17.1...v0.18.0

Changelog: https://github.com/out-of-cheese-error/the-way/blob/v0.18.0/CHANGELOG.md
---
 pkgs/development/tools/the-way/default.nix | 25 +++++++++++-----------
 pkgs/top-level/all-packages.nix            |  4 +---
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix
index 2e54aeb3046d..f17cd980d919 100644
--- a/pkgs/development/tools/the-way/default.nix
+++ b/pkgs/development/tools/the-way/default.nix
@@ -1,23 +1,23 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }:
+{ lib, rustPlatform, fetchCrate, installShellFiles, stdenv, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "the-way";
-  version = "0.17.1";
+  version = "0.18.0";
 
-  src = fetchFromGitHub {
-    owner = "out-of-cheese-error";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-Imo1CUk2H4/K9w/FnIBEkKFXd7OIAuApejcNY+rs7JU=";
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-UgD9ulJtRlNuux80FQhgLYjJ6OsyWXZCBGY9qdmd9Jk=";
   };
 
+  cargoSha256 = "sha256-z5+71I/q1+vz2CPAU06yjRSjpKyT6npjPi48lu21NZs=";
+
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = lib.optionals stdenv.isDarwin  [ AppKit Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.AppKit
+  ];
 
-  cargoSha256 = "sha256-3ZiNRXrb3gpXXOxztf0eimJE16PpQTD/OWFmeTDIr2w=";
-  checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ];
-  dontUseCargoParallelTests = true;
+  useNextest = true;
 
   postInstall = ''
     $out/bin/the-way config default tmp.toml
@@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Terminal code snippets manager";
     homepage = "https://github.com/out-of-cheese-error/the-way";
+    changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ numkem ];
+    maintainers = with maintainers; [ figsoda numkem ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b721e3997ba..f3bcaead836d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6635,9 +6635,7 @@ with pkgs;
 
   teamocil = callPackage ../tools/misc/teamocil { };
 
-  the-way = callPackage ../development/tools/the-way {
-    inherit (darwin.apple_sdk.frameworks) AppKit Security;
-  };
+  the-way = callPackage ../development/tools/the-way { };
 
   timeline = callPackage ../applications/office/timeline { };