public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php: Drop usage of isPhp73 and isPhp74

Browse Source 
These variables have bad names that doesn't really make full sense
This commit is contained in:
Elis Hirwing
2020-10-11 20:10:58 +02:00
parent 6d0abdd9c1
commit 3d31818f1a
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/php-packages.nix
+3 -6
View File
@@ -19,13 +19,10 @@ let
pname = "php-${pname}";
});
isPhp73 = pkgs.lib.versionAtLeast php.version "7.3";
isPhp74 = pkgs.lib.versionAtLeast php.version "7.4";
pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;
callPackage = pkgs.newScope {
inherit mkDerivation php isPhp73 isPhp74 buildPecl pcre';
inherit mkDerivation php buildPecl pcre';
};
in
{
@@ -99,7 +96,7 @@ in
internalDeps = [ php.extensions.tokenizer ];
meta.maintainers = lib.teams.php.members;
meta.broken = isPhp73; # Runtime failure on 7.3, build error on 7.4
meta.broken = lib.versionAtLeast php.version "7.3"; # Runtime failure on 7.3, build error on 7.4
};
pdo_oci = buildPecl rec {
@@ -179,7 +176,7 @@ in
nativeBuildInputs = [ pkgs.pkgconfig ];
meta.maintainers = lib.teams.php.members;
meta.broken = isPhp73;
meta.broken = lib.versionAtLeast php.version "7.3";
};
} // (let
# Function to build a single php extension based on the php version.