Unverified Commit 85215385 authored by Elis Hirwing's avatar Elis Hirwing Committed by GitHub
Browse files

Merge pull request #125916 from jtojnar/php-cleanups 

php: Simplify generic.nix
parents 6f3c1d66 c0d04fe5

.github/CODEOWNERS

+2 −2
Original line number Diff line number Diff line
@@ -199,9 +199,9 @@ 
/doc/languages-frameworks/php.section.md @NixOS/php

/nixos/tests/php                         @NixOS/php

/pkgs/build-support/build-pecl.nix       @NixOS/php

/pkgs/development/interpreters/php       @NixOS/php

/pkgs/development/interpreters/php       @NixOS/php @jtojnar

/pkgs/development/php-packages           @NixOS/php

/pkgs/top-level/php-packages.nix         @NixOS/php

/pkgs/top-level/php-packages.nix         @NixOS/php @jtojnar



# Podman, CRI-O modules and related

/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq

pkgs/development/interpreters/php/7.4.nix

+2 −4
Original line number Diff line number Diff line 
{ callPackage, lib, stdenv, nixosTests, ... }@_args:

{ callPackage, lib, stdenv, ... }@_args:



let

  generic = (import ./generic.nix) _args;



  base = callPackage generic (_args // {

  base = callPackage ./generic.nix (_args // {

    version = "7.4.20";

    sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha";

  });

pkgs/development/interpreters/php/8.0.nix

+2 −4
Original line number Diff line number Diff line 
{ callPackage, lib, stdenv, nixosTests, ... }@_args:

{ callPackage, lib, stdenv, ... }@_args:



let

  generic = (import ./generic.nix) _args;



  base = callPackage generic (_args // {

  base = callPackage ./generic.nix (_args // {

    version = "8.0.7";

    sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj";

  });

pkgs/development/interpreters/php/generic.nix

+244 −245
Original line number Diff line number Diff line 
# We have tests for PCRE and PHP-FPM in nixos/tests/php/ or

# both in the same attribute named nixosTests.php



{ callPackage, lib, stdenv, nixosTests, ... }:



let

  generic =

    { callPackage, lib, stdenv, nixosTests, fetchurl, makeWrapper
@@ -33,6 +31,7 @@ let 
    , valgrindSupport ? !stdenv.isDarwin

    , ztsSupport ? apxs2Support

    }@args:



    let

      # buildEnv wraps php to provide additional extensions and

      # configuration. Its usage is documented in