From 9910485a9febcc21bb36b62de831bad8d6832eee Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Fri, 31 May 2024 22:46:48 +0100
Subject: [PATCH] catppuccin-catwalk: 0.1.0 -> 1.3.1

---
 .../ca/catppuccin-catwalk/package.nix}        | 38 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 22 insertions(+), 18 deletions(-)
 rename pkgs/{development/tools/misc/catppuccin-catwalk/default.nix => by-name/ca/catppuccin-catwalk/package.nix} (64%)

diff --git a/pkgs/development/tools/misc/catppuccin-catwalk/default.nix b/pkgs/by-name/ca/catppuccin-catwalk/package.nix
similarity index 64%
rename from pkgs/development/tools/misc/catppuccin-catwalk/default.nix
rename to pkgs/by-name/ca/catppuccin-catwalk/package.nix
index 848ead3d7ed4..52d5f2a55861 100644
--- a/pkgs/development/tools/misc/catppuccin-catwalk/default.nix
+++ b/pkgs/by-name/ca/catppuccin-catwalk/package.nix
@@ -1,27 +1,33 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, rustPlatform
-, installShellFiles
-, pkg-config
-, libwebp
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+  pkg-config,
+  libwebp,
 }:
-
+let
+  version = "1.3.1";
+in
 rustPlatform.buildRustPackage {
   pname = "catppuccin-catwalk";
-  version = "0.1.0";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "toolbox";
-    rev = "b38153e94622bab574224bb24a6ae953b3a849da";
-    hash = "sha256-zZRl6Xem41pBQmEoK24YR4TKiQ84nU5phBih2TF8G8g=";
+    rev = "refs/tags/catwalk-v${version}";
+    hash = "sha256-Mk4Kv1EfaDiqLUa+aOPeoM4jFlKoUau+VuqmnazRgGI=";
   };
 
   buildAndTestSubdir = "catwalk";
-  cargoHash = "sha256-KoxivYLzJEjWbxIkizrMpmVwUF7bfVxl13H774lzQRg=";
+  cargoHash = "sha256-qxY8CUOl7fF4afJyFjGeOVk7GX/cewC/hAaJf6m5tfA=";
 
-  nativeBuildInputs = [ installShellFiles pkg-config ];
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ];
   buildInputs = [ libwebp ];
 
   postInstall = ''
@@ -38,11 +44,11 @@ rustPlatform.buildRustPackage {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/catppuccin/toolbox/tree/main/catwalk";
     description = "A CLI for Catppuccin that takes in four showcase images and displays them all at once";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ryanccn ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ryanccn ];
     mainProgram = "catwalk";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79dca219819a..fb16233f8ab5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -419,8 +419,6 @@ with pkgs;
 
   catatonit = callPackage ../applications/virtualization/catatonit { };
 
-  catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { };
-
   catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { };
 
   catppuccin-kde = callPackage ../data/themes/catppuccin-kde { };