From 3c85d545724a7987effbd6bc1ca0b54935b8e6eb Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 6 Nov 2024 19:08:05 -0500
Subject: hyfetch: 1.99.0-unstable-2024-10-23 -> 1.99.0-unstable-2024-10-29
 (#123)

* jellyfin-rpc: drop

it's been merged into nixpkgs

* hyfetch: 1.99.0-unstable-2024-10-23 -> 1.99.0-unstable-2024-10-29
---
 pkgs/hyfetch/package.nix      | 28 ++++++++++++----------------
 pkgs/jellyfin-rpc/package.nix | 39 ---------------------------------------
 2 files changed, 12 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/jellyfin-rpc/package.nix

diff --git a/pkgs/hyfetch/package.nix b/pkgs/hyfetch/package.nix
index 597999b..16afb7d 100644
--- a/pkgs/hyfetch/package.nix
+++ b/pkgs/hyfetch/package.nix
@@ -21,28 +21,21 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "hyfetch";
-  version = "1.99.0-unstable-2024-10-23";
+  version = "1.99.0-unstable-2024-10-29";
 
   src = fetchFromGitHub {
     owner = "hykilpikonna";
     repo = "hyfetch";
-    rev = "b5b49ecbc095ac20e49c0783121c885752df9001";
-    hash = "sha256-W1oMzLACGDvcl8du4L3TuUn79i6HFUFuPEJhc3IPD0E=";
+    rev = "e630b7837fd4d09fadf377413e1ffa44fa80f9b6";
+    hash = "sha256-WPJzLm27Ourt5KddMCwt7TuuFTz4TIIm5yd5E8NiQmI=";
   };
 
-  # https://github.com/hykilpikonna/hyfetch/pull/361
-  #
-  # Upstream will call `neowofetch` with Bash (from the PATH) by default
-  # We know `neowofetch` has a shebang though, so run it directly to avoid
-  # adding Bash to the wrapper
-  #
-  # Yes, this introduces 2 warnings
-  postPatch = ''
-    substituteInPlace crates/hyfetch/src/neofetch_util.rs \
-      --replace-fail 'command.arg(neofetch_path)' 'let mut command = Command::new(neofetch_path)'
-  '';
+  cargoHash = "sha256-PfPTlmqTxVk4EIzLzaLD6UoD/z43TxtjDmv32bAPwT8=";
 
-  cargoHash = "sha256-4Tz6hqzjlCT5PSa1AzWGU6mBHWxMcsJm9+Uzmsvurps=";
+  outputs = [
+    "out"
+    "man"
+  ];
 
   strictDeps = true;
 
@@ -57,7 +50,10 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optional withColor "color"
     ++ lib.optional withMacchina "macchina";
 
-  cargoBuildFlags = [ "--package hyfetch" ];
+  cargoBuildFlags = [
+    "--package"
+    "hyfetch"
+  ];
   cargoTestFlags = cargoBuildFlags;
 
   postInstall = ''
diff --git a/pkgs/jellyfin-rpc/package.nix b/pkgs/jellyfin-rpc/package.nix
deleted file mode 100644
index e0120e9..0000000
--- a/pkgs/jellyfin-rpc/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  nix-update-script,
-  rustPlatform,
-  versionCheckHook,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "jellyfin-rpc";
-  version = "1.3.0";
-
-  src = fetchFromGitHub {
-    owner = "Radiicall";
-    repo = "jellyfin-rpc";
-    rev = "refs/tags/${version}";
-    hash = "sha256-sr82lTOr6RUvYD0CVZMyyRAFjai1oLnRWIszuu7/jE0=";
-  };
-
-  cargoHash = "sha256-KHbYM7aWgch+DWF46DpFCCt7JoKR0sasuFO3xPOytWA=";
-
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  doInstallCheck = true;
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = {
-    description = "Displays the content you're currently watching on Discord";
-    homepage = "https://github.com/Radiicall/jellyfin-rpc";
-    changelog = "https://github.com/Radiicall/jellyfin-rpc/releases/tag/${version}";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ getchoo ];
-    mainProgram = "jellyfin-rpc";
-  };
-}
-- 
cgit v1.2.3