diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 89e0d92d6c0e..26674a859f2d 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -1,19 +1,20 @@ -{ lib -, dataDir ? "/var/lib/snipe-it" -, fetchFromGitHub -, mariadb -, nixosTests -, php +{ + lib, + dataDir ? "/var/lib/snipe-it", + fetchFromGitHub, + mariadb, + nixosTests, + php84, }: -php.buildComposerProject2 (finalAttrs: { +php84.buildComposerProject2 (finalAttrs: { pname = "snipe-it"; version = "8.0.4"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iS9PfWZlwWfxMkCJS7Lbp2+XxoGJz2yedn4nsu34YhU="; }; @@ -41,10 +42,10 @@ php.buildComposerProject2 (finalAttrs: { passthru = { tests = nixosTests.snipe-it; - phpPackage = php; + phpPackage = php84; }; - meta = with lib; { + meta = { description = "Free open source IT asset/license management system"; longDescription = '' Snipe-IT was made for IT asset management, to enable IT departments to track @@ -54,8 +55,8 @@ php.buildComposerProject2 (finalAttrs: { ''; homepage = "https://snipeitapp.com/"; changelog = "https://github.com/snipe/snipe-it/releases/tag/v${finalAttrs.version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ yayayayaka ]; - platforms = platforms.linux; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ yayayayaka ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d8891d808f0..b1319f5d2667 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11662,10 +11662,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;