philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #125916 from jtojnar/php-cleanups 

php: Simplify generic.nix
master
Elis Hirwing 2021-06-08 10:09:14 +02:00 committed by GitHub
parent 6f3c1d66ae c0d04fe53c
commit 8521538585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 216 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/CODEOWNERS vendored
View File

@ -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

6
pkgs/development/interpreters/php/7.4.nix
View File

@ -1,9 +1,7 @@
{ 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";
});

6
pkgs/development/interpreters/php/8.0.nix
View File

@ -1,9 +1,7 @@
{ 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";
});

3
pkgs/development/interpreters/php/generic.nix
View File

@ -1,8 +1,6 @@
# 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