From 43afe45c4a8279a0e0df11ca17179987bc45c30e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 30 Nov 2024 23:15:16 -0500
Subject: [PATCH 1/5] skim: format with nixfmt

---
 pkgs/by-name/sk/skim/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 4e09f021cc5f..979b011a3544 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, stdenv
-, fetchCrate
-, rustPlatform
-, installShellFiles
+{
+  lib,
+  stdenv,
+  fetchCrate,
+  installShellFiles,
+  rustPlatform,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -16,7 +17,10 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  outputs = [ "out" "vim" ];
+  outputs = [
+    "out"
+    "vim"
+  ];
 
   cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos=";
 
@@ -49,7 +53,7 @@ rustPlatform.buildRustPackage rec {
     description = "Command-line fuzzy finder written in Rust";
     homepage = "https://github.com/lotabout/skim";
     license = licenses.mit;
-    mainProgram = "sk";
     maintainers = with maintainers; [ dywedir ];
+    mainProgram = "sk";
   };
 }

From 38383e40957f955e7fcb31a6a4b0f1063b98df9e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 30 Nov 2024 23:40:46 -0500
Subject: [PATCH 2/5] skim: modernize

---
 pkgs/by-name/sk/skim/package.nix | 57 ++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 979b011a3544..195f2deb0b69 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -3,6 +3,8 @@
   stdenv,
   fetchCrate,
   installShellFiles,
+  nix-update-script,
+  runtimeShell,
   rustPlatform,
 }:
 
@@ -10,50 +12,57 @@ rustPlatform.buildRustPackage rec {
   pname = "skim";
   version = "0.10.4";
 
+  outputs = [
+    "out"
+    "man"
+    "vim"
+  ];
+
   src = fetchCrate {
     inherit pname version;
     hash = "sha256-C2yK+SO8Tpw3BxXXu1jeDzYJ2548RZa7NFWaE0SdNJ0=";
   };
 
-  nativeBuildInputs = [ installShellFiles ];
-
-  outputs = [
-    "out"
-    "vim"
-  ];
-
-  cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos=";
-
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  postInstall = ''
-    install -D -m 555 bin/sk-tmux -t $out/bin
+  cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos=";
 
-    install -D -m 444 plugin/skim.vim -t $vim/plugin
+  nativeBuildInputs = [ installShellFiles ];
 
-    install -D -m 444 shell/* -t $out/share/skim
-
-    installManPage man/man1/*
-
-    cat <<SCRIPT > $out/bin/sk-share
-    #! ${stdenv.shell}
+  postBuild = ''
+    cat <<SCRIPT > sk-share
+    #! ${runtimeShell}
     # Run this script to find the skim shared folder where all the shell
     # integration scripts are living.
     echo $out/share/skim
     SCRIPT
-    chmod +x $out/bin/sk-share
   '';
 
-  # https://github.com/lotabout/skim/issues/440
-  doCheck = !stdenv.hostPlatform.isAarch64;
+  postInstall = ''
+    installBin bin/sk-tmux
+    install -D -m 444 plugin/skim.vim -t $vim/plugin
+    install -D -m 444 shell/* -t $out/share/skim
 
-  meta = with lib; {
+    installBin sk-share
+    installManPage $(find man -type f)
+  '';
+
+  # Doc tests are broken on aarch64
+  # https://github.com/lotabout/skim/issues/440
+  cargoTestFlags = lib.optional stdenv.hostPlatform.isAarch64 "--all-targets";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Command-line fuzzy finder written in Rust";
     homepage = "https://github.com/lotabout/skim";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dywedir ];
+    changelog = "https://github.com/skim-rs/skim/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dywedir ];
     mainProgram = "sk";
   };
 }

From 8e1248bdd745f05c1e7b2b79efe9f7b116d37c2e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 30 Nov 2024 23:47:18 -0500
Subject: [PATCH 3/5] skim: 0.10.4 -> 0.15.0

Diff: https://diff.rs/skim/0.10.4/0.15.0

Changelog: https://github.com/skim-rs/skim/releases/tag/v0.15.0
---
 pkgs/by-name/sk/skim/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 195f2deb0b69..663bed914799 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchCrate,
+  fetchFromGitHub,
   installShellFiles,
   nix-update-script,
   runtimeShell,
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.10.4";
+  version = "0.15.0";
 
   outputs = [
     "out"
@@ -18,16 +18,18 @@ rustPlatform.buildRustPackage rec {
     "vim"
   ];
 
-  src = fetchCrate {
-    inherit pname version;
-    hash = "sha256-C2yK+SO8Tpw3BxXXu1jeDzYJ2548RZa7NFWaE0SdNJ0=";
+  src = fetchFromGitHub {
+    owner = "skim-rs";
+    repo = "skim";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Y/MVjwpNyYXjQWB3s8WRblCukBr0z81k3gf3bf58KGE=";
   };
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  cargoHash = "sha256-jBcgoWbmBOgU7M71lr4OXOe2S6NAXl+I8D+ZtT45Vos=";
+  cargoHash = "sha256-llpNnZdIFHCmyyVla+tZOgpMTavu/m3ZGFZaS5EbiVo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 6f34fc5d4ecf8f57c2a2f573a34b71f188485513 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 30 Nov 2024 23:41:21 -0500
Subject: [PATCH 4/5] skim: add getchoo to maintainers

---
 pkgs/by-name/sk/skim/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 663bed914799..f2699098db37 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -64,7 +64,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/lotabout/skim";
     changelog = "https://github.com/skim-rs/skim/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ dywedir ];
+    maintainers = with lib.maintainers; [
+      dywedir
+      getchoo
+    ];
     mainProgram = "sk";
   };
 }

From 1e658170c88fdf9ed9e6a4240874dad7aaf39a4d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 30 Nov 2024 23:48:10 -0500
Subject: [PATCH 5/5] skim: add version test

---
 pkgs/by-name/sk/skim/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index f2699098db37..ff5ab7bcb3da 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -6,6 +6,8 @@
   nix-update-script,
   runtimeShell,
   rustPlatform,
+  skim,
+  testers,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -56,6 +58,7 @@ rustPlatform.buildRustPackage rec {
   cargoTestFlags = lib.optional stdenv.hostPlatform.isAarch64 "--all-targets";
 
   passthru = {
+    tests.version = testers.testVersion { package = skim; };
     updateScript = nix-update-script { };
   };