From c1ca9be2ea0159d55ac61eae972ae20cf4fb42f3 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 25 Mar 2025 09:01:36 +0100
Subject: [PATCH] snipe-it: use `php84`, remove custom override

(cherry picked from commit 8608ce0a9f2557e2fcf2892b428a911b429c5697)
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix      | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index 89e0d92d6c0e..9a1cd732c6e9 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -3,10 +3,10 @@
 , fetchFromGitHub
 , mariadb
 , nixosTests
-, php
+, php84
 }:
 
-php.buildComposerProject2 (finalAttrs: {
+php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
   version = "8.0.4";
 
@@ -41,7 +41,7 @@ php.buildComposerProject2 (finalAttrs: {
 
   passthru = {
     tests = nixosTests.snipe-it;
-    phpPackage = php;
+    phpPackage = php84;
   };
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 032ddcc161d2..7fa4f01e6437 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12270,10 +12270,6 @@ with pkgs;
 
   sickgear = callPackage ../servers/sickbeard/sickgear.nix { };
 
-  snipe-it = callPackage ../by-name/sn/snipe-it/package.nix {
-    php = php84;
-  };
-
   spacecookie =
     haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie;