From 3d31818f1aaed19d5b2646f065ab4311bd5b46c3 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 20:10:58 +0200
Subject: [PATCH] php: Drop usage of isPhp73 and isPhp74
These variables have bad names that doesn't really make full sense
---
pkgs/development/php-packages/phpmd/default.nix | 4 +++-
pkgs/development/php-packages/pinba/default.nix | 5 ++++-
pkgs/development/php-packages/pthreads/default.nix | 6 +++++-
pkgs/top-level/php-packages.nix | 9 +++------
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix
index ffdb877d76e..fd7390498ba 100644
--- a/pkgs/development/php-packages/phpmd/default.nix
+++ b/pkgs/development/php-packages/phpmd/default.nix
@@ -1,7 +1,9 @@
-{ mkDerivation, fetchurl, pkgs, lib, php, isPhp74 }:
+{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "phpmd";
version = "2.8.2";
+
+ isPhp74 = lib.versionAtLeast php.version "7.4";
in
mkDerivation {
inherit pname version;
diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix
index b7d478eb39f..0880c2a46e2 100644
--- a/pkgs/development/php-packages/pinba/default.nix
+++ b/pkgs/development/php-packages/pinba/default.nix
@@ -1,6 +1,9 @@
-{ buildPecl, lib, fetchFromGitHub, isPhp73 }:
+{ buildPecl, lib, fetchFromGitHub, php }:
let
pname = "pinba";
+
+ isPhp73 = lib.versionAtLeast php.version "7.3";
+
version = if isPhp73 then "1.1.2-dev" else "1.1.1";
src = fetchFromGitHub ({
diff --git a/pkgs/development/php-packages/pthreads/default.nix b/pkgs/development/php-packages/pthreads/default.nix
index 60cd706e12c..31b32e82967 100644
--- a/pkgs/development/php-packages/pthreads/default.nix
+++ b/pkgs/development/php-packages/pthreads/default.nix
@@ -1,6 +1,10 @@
-{ buildPecl, lib, fetchFromGitHub, isPhp73, isPhp74, pcre' }:
+{ buildPecl, lib, fetchFromGitHub, php, pcre' }:
let
pname = "pthreads";
+
+ isPhp73 = lib.versionAtLeast php.version "7.3";
+ isPhp74 = lib.versionAtLeast php.version "7.4";
+
version = if isPhp73 then "3.2.0-dev" else "3.2.0";
src = fetchFromGitHub ({
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index dee3200391b..d4518b60d24 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -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.