diff options
author | Elis Hirwing <elis@hirwing.se> | 2020-10-11 19:45:22 +0200 |
---|---|---|
committer | Elis Hirwing <elis@hirwing.se> | 2020-10-11 19:45:22 +0200 |
commit | b27b297c5636e499200f394e3fbdd4700e810267 (patch) | |
tree | bd8d3ebaab04bacfdad6e36c242617c939f5a5c1 | |
parent | 63e150560ba4eabe5d35f119a58d0a4b4685e05b (diff) |
php73Extensions.pthreads: Move to separate directory
-rw-r--r-- | pkgs/development/php-packages/pthreads/default.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 21 |
2 files changed, 25 insertions, 20 deletions
diff --git a/pkgs/development/php-packages/pthreads/default.nix b/pkgs/development/php-packages/pthreads/default.nix new file mode 100644 index 000000000000..60cd706e12c9 --- /dev/null +++ b/pkgs/development/php-packages/pthreads/default.nix @@ -0,0 +1,24 @@ +{ buildPecl, lib, fetchFromGitHub, isPhp73, isPhp74, pcre' }: +let + pname = "pthreads"; + version = if isPhp73 then "3.2.0-dev" else "3.2.0"; + + src = fetchFromGitHub ({ + owner = "krakjoe"; + repo = "pthreads"; + } // (if (isPhp73) then { + rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; + sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; + } else { + rev = "v3.2.0"; + sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; + })); +in +buildPecl { + inherit pname version src; + + buildInputs = [ pcre'.dev ]; + + meta.broken = isPhp74; + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7cca6ae5a787..d52fe38923ea 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -128,26 +128,7 @@ in protobuf = callPackage ../development/php-packages/protobuf { }; - pthreads = let - version = "3.2.0"; - src = pkgs.fetchFromGitHub ({ - owner = "krakjoe"; - repo = "pthreads"; - } // (if (isPhp73) then { - rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; - sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; - } else { - rev = "v3.2.0"; - sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; - })); - in buildPecl { - pname = "pthreads"; - inherit version src; - - buildInputs = [ pcre'.dev ]; - - meta.broken = isPhp74; - }; + pthreads = callPackage ../development/php-packages/pthreads { }; rdkafka = buildPecl { version = "4.0.3"; |