From b10a6095263e624894e40bfd288cc1b7b56ce011 Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 5 Jul 2023 06:57:00 +0000 Subject: [PATCH] snipe-it: Pin to PHP 8.1 This fixes the build failure for Snipe-IT after 3bb38590495 bumped the default PHP version to 8.2. Resolves #241556 --- pkgs/servers/web-apps/snipe-it/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index 8a231c33d25..c2ff95f93da 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -5,11 +5,13 @@ , dataDir ? "/var/lib/snipe-it" , mariadb , nixosTests +, php +, phpPackages }: let package = (import ./composition.nix { - inherit pkgs; + inherit pkgs php phpPackages; inherit (stdenv.hostPlatform) system; noDev = true; # Disable development dependencies }).overrideAttrs (attrs : { @@ -44,6 +46,7 @@ in package.override rec { }; passthru.tests = nixosTests.snipe-it; + passthru.phpPackage = php; meta = with lib; { description = "A free open source IT asset/license management system"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 808fe4a51a4..df8c5d5324f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26748,7 +26748,10 @@ with pkgs; smcroute = callPackage ../servers/smcroute { }; - snipe-it = callPackage ../servers/web-apps/snipe-it { }; + snipe-it = callPackage ../servers/web-apps/snipe-it { + php = php81; + phpPackages = php81Packages; + }; sogo = callPackage ../servers/web-apps/sogo { };