From 0fc9ac20fe78b0ab6529db83861fb55979e0cb84 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:32:19 +0200 Subject: [PATCH 01/25] phpExtensions.apcu: Move to separate directory --- pkgs/development/php-packages/apcu/default.nix | 17 +++++++++++++++++ pkgs/top-level/php-packages.nix | 16 +--------------- 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/php-packages/apcu/default.nix diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix new file mode 100644 index 00000000000..fab4f534d43 --- /dev/null +++ b/pkgs/development/php-packages/apcu/default.nix @@ -0,0 +1,17 @@ +{ buildPecl, lib, pcre' }: + +buildPecl { + pname = "apcu"; + + version = "5.1.18"; + sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl"; + + buildInputs = [ pcre' ]; + doCheck = true; + checkTarget = "test"; + checkFlagsArray = [ "REPORT_EXIT_STATUS=1" "NO_INTERACTION=1" ]; + makeFlags = [ "phpincludedir=$(dev)/include" ]; + outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index be440a31477..0627c6bbbdd 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -62,21 +62,7 @@ in # or php.withExtensions to extend the functionality of the PHP # interpreter. extensions = { - apcu = buildPecl { - version = "5.1.18"; - pname = "apcu"; - - sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl"; - - buildInputs = [ pcre' ]; - doCheck = true; - checkTarget = "test"; - checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; - makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; - - meta.maintainers = lib.teams.php.members; - }; + apcu = callPackage ../development/php-packages/apcu { }; apcu_bc = buildPecl { version = "1.0.5"; From bf5ca6bbf382d2dbb7f98ae5ba4238e5e5c884d9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:33:23 +0200 Subject: [PATCH 02/25] phpExtensions.apcu_bc: Move to separate directory --- .../php-packages/apcu_bc/default.nix | 18 ++++++++++++++++++ pkgs/top-level/php-packages.nix | 19 +------------------ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/php-packages/apcu_bc/default.nix diff --git a/pkgs/development/php-packages/apcu_bc/default.nix b/pkgs/development/php-packages/apcu_bc/default.nix new file mode 100644 index 00000000000..132a25a2df4 --- /dev/null +++ b/pkgs/development/php-packages/apcu_bc/default.nix @@ -0,0 +1,18 @@ +{ buildPecl, lib, pcre', php }: + +buildPecl { + pname = "apcu_bc"; + + version = "1.0.5"; + sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; + + peclDeps = [ php.extensions.apcu ]; + + buildInputs = [ pcre' ]; + + postInstall = '' + mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so + ''; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0627c6bbbdd..f0f0f60e4eb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -64,24 +64,7 @@ in extensions = { apcu = callPackage ../development/php-packages/apcu { }; - apcu_bc = buildPecl { - version = "1.0.5"; - pname = "apcu_bc"; - - sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; - - peclDeps = [ php.extensions.apcu ]; - - buildInputs = [ - pcre' - ]; - - postInstall = '' - mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so - ''; - - meta.maintainers = lib.teams.php.members; - }; + apcu_bc = callPackage ../development/php-packages/apcu_bc { }; ast = buildPecl { version = "1.0.5"; From 021c6fee6707ba81ed2c6c034aad6b00a7bf4310 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:37:37 +0200 Subject: [PATCH 03/25] phpExtensions.ast: Move to separate directory --- pkgs/development/php-packages/ast/default.nix | 10 ++++++++++ pkgs/top-level/php-packages.nix | 9 +-------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/php-packages/ast/default.nix diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix new file mode 100644 index 00000000000..9df099734aa --- /dev/null +++ b/pkgs/development/php-packages/ast/default.nix @@ -0,0 +1,10 @@ +{ buildPecl, lib }: + +buildPecl { + pname = "ast"; + + version = "1.0.5"; + sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f0f0f60e4eb..11012862206 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -66,14 +66,7 @@ in apcu_bc = callPackage ../development/php-packages/apcu_bc { }; - ast = buildPecl { - version = "1.0.5"; - pname = "ast"; - - sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; - - meta.maintainers = lib.teams.php.members; - }; + ast = callPackage ../development/php-packages/ast { }; blackfire = pkgs.callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; From 649fdcdc4a313161e1f4ad09ed2ccd32e435ba65 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:44:38 +0200 Subject: [PATCH 04/25] phpExtensions.couchbase: Move to separate directory --- .../php-packages/couchbase/default.nix | 48 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 48 +------------------ 2 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/php-packages/couchbase/default.nix diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix new file mode 100644 index 00000000000..a46bbea817a --- /dev/null +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -0,0 +1,48 @@ +{ buildPecl, lib, pkgs, php }: +let + pname = "couchbase"; + version = "2.6.1"; +in +buildPecl { + inherit pname version; + + src = pkgs.fetchFromGitHub { + owner = "couchbase"; + repo = "php-couchbase"; + rev = "v${version}"; + sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; + }; + + configureFlags = [ "--with-couchbase" ]; + + buildInputs = with pkgs; [ libcouchbase zlib ]; + internalDeps = [ php.extensions.json ]; + peclDeps = [ php.extensions.igbinary ]; + + patches = [ + (pkgs.writeText "php-couchbase.patch" '' + --- a/config.m4 + +++ b/config.m4 + @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then + LIBCOUCHBASE_DIR=$PHP_COUCHBASE + else + AC_MSG_CHECKING(for libcouchbase in default path) + - for i in /usr/local /usr; do + + for i in ${pkgs.libcouchbase}; do + if test -r $i/include/libcouchbase/couchbase.h; then + LIBCOUCHBASE_DIR=$i + AC_MSG_RESULT(found in $i) + @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \ + igbinary_inc_path="$phpincludedir" + elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then + igbinary_inc_path="$phpincludedir" + + elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then + + igbinary_inc_path="${php.extensions.igbinary.dev}/include" + fi + if test "$igbinary_inc_path" = ""; then + AC_MSG_WARN([Cannot find igbinary.h]) + '') + ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 11012862206..22ff7df76ff 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -70,53 +70,7 @@ in blackfire = pkgs.callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; - couchbase = buildPecl rec { - version = "2.6.1"; - pname = "couchbase"; - - src = pkgs.fetchFromGitHub { - owner = "couchbase"; - repo = "php-couchbase"; - rev = "v${version}"; - sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; - }; - - configureFlags = [ "--with-couchbase" ]; - - buildInputs = [ - pkgs.libcouchbase - pkgs.zlib - ]; - internalDeps = [ php.extensions.json ]; - peclDeps = [ php.extensions.igbinary ]; - - patches = [ - (pkgs.writeText "php-couchbase.patch" '' - --- a/config.m4 - +++ b/config.m4 - @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then - LIBCOUCHBASE_DIR=$PHP_COUCHBASE - else - AC_MSG_CHECKING(for libcouchbase in default path) - - for i in /usr/local /usr; do - + for i in ${pkgs.libcouchbase}; do - if test -r $i/include/libcouchbase/couchbase.h; then - LIBCOUCHBASE_DIR=$i - AC_MSG_RESULT(found in $i) - @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \ - igbinary_inc_path="$phpincludedir" - elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then - igbinary_inc_path="$phpincludedir" - + elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then - + igbinary_inc_path="${php.extensions.igbinary.dev}/include" - fi - if test "$igbinary_inc_path" = ""; then - AC_MSG_WARN([Cannot find igbinary.h]) - '') - ]; - - meta.maintainers = lib.teams.php.members; - }; + couchbase = callPackage ../development/php-packages/couchbase { }; event = buildPecl { version = "2.5.3"; From ad0965029d72eefb15e9d313facf524ca5af7de3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:51:35 +0200 Subject: [PATCH 05/25] phpExtensions.event: Move to separate directory --- .../php-packages/event/default.nix | 36 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 33 +---------------- 2 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/php-packages/event/default.nix diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix new file mode 100644 index 00000000000..bf90d680c49 --- /dev/null +++ b/pkgs/development/php-packages/event/default.nix @@ -0,0 +1,36 @@ +{ buildPecl, lib, pkgs, php }: +let +in +buildPecl { + pname = "event"; + + version = "2.5.3"; + sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; + + configureFlags = [ + "--with-event-libevent-dir=${pkgs.libevent.dev}" + "--with-event-core" + "--with-event-extra" + "--with-event-pthreads" + ]; + + postPhpize = '' + substituteInPlace configure --replace \ + 'as_fn_error $? "Couldn'\'''t find $phpincludedir/sockets/php_sockets.h. Please check if sockets extension installed" "$LINENO" 5' \ + ':' + ''; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ openssl libevent ]; + internalDeps = [ php.extensions.sockets ]; + + meta = with pkgs.lib; { + description = '' + This is an extension to efficiently schedule I/O, time and signal based + events using the best I/O notification mechanism available for specific platform. + ''; + license = licenses.php301; + homepage = "https://bitbucket.org/osmanov/pecl-event/"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 22ff7df76ff..223bd1fff88 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -72,38 +72,7 @@ in couchbase = callPackage ../development/php-packages/couchbase { }; - event = buildPecl { - version = "2.5.3"; - pname = "event"; - - sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; - - configureFlags = [ - "--with-event-libevent-dir=${pkgs.libevent.dev}" - "--with-event-core" - "--with-event-extra" - "--with-event-pthreads" - ]; - - postPhpize = '' - substituteInPlace configure --replace 'as_fn_error $? "Couldn'\'''t find $phpincludedir/sockets/php_sockets.h. Please check if sockets extension installed" "$LINENO" 5' \ - ':' - ''; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ openssl libevent ]; - internalDeps = [ php.extensions.sockets ]; - - meta = with pkgs.lib; { - description = '' - This is an extension to efficiently schedule I/O, time and signal based - events using the best I/O notification mechanism available for specific platform. - ''; - license = licenses.php301; - homepage = "https://bitbucket.org/osmanov/pecl-event/"; - maintainers = teams.php.members; - }; - }; + event = callPackage ../development/php-packages/event { }; igbinary = buildPecl { version = "3.0.1"; From 6be3b07411553c1f0e6a39369e0cbc6bfd9b9f6b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 17:56:33 +0200 Subject: [PATCH 06/25] phpExtensions.igbinary: Move to separate directory --- pkgs/development/php-packages/igbinary/default.nix | 14 ++++++++++++++ pkgs/top-level/php-packages.nix | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/igbinary/default.nix diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix new file mode 100644 index 00000000000..e9c6de2e5b0 --- /dev/null +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib }: + +buildPecl { + pname = "igbinary"; + + version = "3.0.1"; + sha256 = "1w8jmf1qpggdvq0ndfi86n7i7cqgh1s8q6hys2lijvi37rzn0nar"; + + configureFlags = [ "--enable-igbinary" ]; + makeFlags = [ "phpincludedir=$(dev)/include" ]; + outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 223bd1fff88..113081686a9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -74,18 +74,7 @@ in event = callPackage ../development/php-packages/event { }; - igbinary = buildPecl { - version = "3.0.1"; - pname = "igbinary"; - - sha256 = "1w8jmf1qpggdvq0ndfi86n7i7cqgh1s8q6hys2lijvi37rzn0nar"; - - configureFlags = [ "--enable-igbinary" ]; - makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; - - meta.maintainers = lib.teams.php.members; - }; + igbinary = callPackage ../development/php-packages/igbinary { }; imagick = buildPecl { version = "3.4.4"; From ba173b438a21105a85fbf3f46e6ce67ec4ad6b4d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 18:00:01 +0200 Subject: [PATCH 07/25] phpExtensions.imagick: Move to separate directory --- pkgs/development/php-packages/imagick/default.nix | 14 ++++++++++++++ pkgs/top-level/php-packages.nix | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/imagick/default.nix diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix new file mode 100644 index 00000000000..63524fb2d06 --- /dev/null +++ b/pkgs/development/php-packages/imagick/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs, pcre' }: + +buildPecl { + pname = "imagick"; + + version = "3.4.4"; + sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; + + configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 113081686a9..7656ffe7deb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -76,18 +76,7 @@ in igbinary = callPackage ../development/php-packages/igbinary { }; - imagick = buildPecl { - version = "3.4.4"; - pname = "imagick"; - - sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; - - configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pcre' ]; - - meta.maintainers = lib.teams.php.members; - }; + imagick = callPackage ../development/php-packages/imagick { }; mailparse = buildPecl { version = "3.0.3"; From f8180fed9adebd7dac00f7764c3bb14f8c96bfe3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:00:38 +0200 Subject: [PATCH 08/25] phpExtensions.mailparse: Move to separate directory --- .../php-packages/mailparse/default.nix | 15 +++++++++++++++ pkgs/top-level/php-packages.nix | 13 +------------ 2 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/mailparse/default.nix diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix new file mode 100644 index 00000000000..4ec6f77df45 --- /dev/null +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -0,0 +1,15 @@ +{ buildPecl, lib, php }: + +buildPecl { + pname = "mailparse"; + + version = "3.0.3"; + sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz"; + + internalDeps = [ php.extensions.mbstring ]; + postConfigure = '' + echo "#define HAVE_MBSTRING 1" >> config.h + ''; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7656ffe7deb..584a114c02f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -78,18 +78,7 @@ in imagick = callPackage ../development/php-packages/imagick { }; - mailparse = buildPecl { - version = "3.0.3"; - pname = "mailparse"; - sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz"; - - internalDeps = [ php.extensions.mbstring ]; - postConfigure = '' - echo "#define HAVE_MBSTRING 1" >> config.h - ''; - - meta.maintainers = lib.teams.php.members; - }; + mailparse = callPackage ../development/php-packages/mailparse { }; maxminddb = buildPecl rec { pname = "maxminddb"; From df08b0fc00f38c95f1bce7cfa06299f948fecd0e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:05:50 +0200 Subject: [PATCH 09/25] phpExtensions.maxminddb: Move to separate directory --- .../php-packages/maxminddb/default.nix | 24 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 21 +--------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/php-packages/maxminddb/default.nix diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix new file mode 100644 index 00000000000..e3a9584db1c --- /dev/null +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -0,0 +1,24 @@ +{ buildPecl, lib, pkgs }: +let + pname = "maxminddb"; + version = "1.7.0"; +in +buildPecl { + inherit pname version; + + src = pkgs.fetchFromGitHub { + owner = "maxmind"; + repo = "MaxMind-DB-Reader-php"; + rev = "v${version}"; + sha256 = "16msc9s15y43lxw89kj51aldlkd57dc8gms199i51jc984b68ljc"; + }; + + buildInputs = [ pkgs.libmaxminddb ]; + sourceRoot = "source/ext"; + + meta = with pkgs.lib; { + description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 584a114c02f..f213e300acb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -80,26 +80,7 @@ in mailparse = callPackage ../development/php-packages/mailparse { }; - maxminddb = buildPecl rec { - pname = "maxminddb"; - version = "1.7.0"; - - src = pkgs.fetchFromGitHub { - owner = "maxmind"; - repo = "MaxMind-DB-Reader-php"; - rev = "v${version}"; - sha256 = "16msc9s15y43lxw89kj51aldlkd57dc8gms199i51jc984b68ljc"; - }; - - buildInputs = [ pkgs.libmaxminddb ]; - sourceRoot = "source/ext"; - - meta = with pkgs.lib; { - description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; - }; - }; + maxminddb = callPackage ../development/php-packages/maxminddb { }; memcached = buildPecl rec { version = "3.1.5"; From 77224fd8e7bea8598acfc758eec7756975380d45 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:10:24 +0200 Subject: [PATCH 10/25] phpExtensions.memcached: Move to separate directory --- .../php-packages/memcached/default.nix | 30 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 27 +---------------- 2 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/php-packages/memcached/default.nix diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix new file mode 100644 index 00000000000..b2d9333f294 --- /dev/null +++ b/pkgs/development/php-packages/memcached/default.nix @@ -0,0 +1,30 @@ +{ buildPecl, lib, fetchgit, php, pkgs }: +let + pname = "memcached"; + version = "3.1.5"; +in +buildPecl { + inherit pname version; + + src = fetchgit { + url = "https://github.com/php-memcached-dev/php-memcached"; + rev = "v${version}"; + sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; + }; + + internalDeps = [ + php.extensions.session + ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + php.extensions.hash + ]; + + configureFlags = [ + "--with-zlib-dir=${pkgs.zlib.dev}" + "--with-libmemcached-dir=${pkgs.libmemcached}" + ]; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ cyrus_sasl zlib ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f213e300acb..010c6f0a714 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -82,32 +82,7 @@ in maxminddb = callPackage ../development/php-packages/maxminddb { }; - memcached = buildPecl rec { - version = "3.1.5"; - pname = "memcached"; - - src = fetchgit { - url = "https://github.com/php-memcached-dev/php-memcached"; - rev = "v${version}"; - sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; - }; - - internalDeps = [ - php.extensions.session - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - php.extensions.hash - ]; - - configureFlags = [ - "--with-zlib-dir=${pkgs.zlib.dev}" - "--with-libmemcached-dir=${pkgs.libmemcached}" - ]; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ cyrus_sasl zlib ]; - - meta.maintainers = lib.teams.php.members; - }; + memcached = callPackage ../development/php-packages/memcached { }; mongodb = buildPecl { pname = "mongodb"; From 4cae064b2c28e679c07d168b2474e11931bcb266 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:14:22 +0200 Subject: [PATCH 11/25] phpExtensions.mongodb: Move to separate directory --- .../php-packages/mongodb/default.nix | 20 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 19 +----------------- 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/php-packages/mongodb/default.nix diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix new file mode 100644 index 00000000000..dd8fa9a6c2b --- /dev/null +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -0,0 +1,20 @@ +{ buildPecl, lib, pkgs, pcre' }: + +buildPecl { + pname = "mongodb"; + + version = "1.6.1"; + sha256 = "1j1w4n33347j9kwvxwsrix3gvjbiqcn1s5v59pp64s536cci8q0m"; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ + cyrus_sasl + icu64 + openssl + snappy + zlib + pcre' + ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 010c6f0a714..7cf385cb6d7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -84,24 +84,7 @@ in memcached = callPackage ../development/php-packages/memcached { }; - mongodb = buildPecl { - pname = "mongodb"; - version = "1.6.1"; - - sha256 = "1j1w4n33347j9kwvxwsrix3gvjbiqcn1s5v59pp64s536cci8q0m"; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ - cyrus_sasl - icu64 - openssl - snappy - zlib - pcre' - ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; - - meta.maintainers = lib.teams.php.members; - }; + mongodb = callPackage ../development/php-packages/mongodb { }; oci8 = buildPecl { version = "2.2.0"; From 1f00056a360dd87983bd27d5e91779ebcb15bd6c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:16:59 +0200 Subject: [PATCH 12/25] phpExtensions.oci8: Move to separate directory --- pkgs/development/php-packages/oci8/default.nix | 17 +++++++++++++++++ pkgs/top-level/php-packages.nix | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/php-packages/oci8/default.nix diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix new file mode 100644 index 00000000000..ea699c2034e --- /dev/null +++ b/pkgs/development/php-packages/oci8/default.nix @@ -0,0 +1,17 @@ +{ buildPecl, lib, pkgs }: + +buildPecl { + pname = "oci8"; + + version = "2.2.0"; + sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; + + buildInputs = [ pkgs.oracle-instantclient ]; + configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7cf385cb6d7..3b8efa0f27d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -86,20 +86,7 @@ in mongodb = callPackage ../development/php-packages/mongodb { }; - oci8 = buildPecl { - version = "2.2.0"; - pname = "oci8"; - - sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; - buildInputs = [ pkgs.oracle-instantclient ]; - configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; - - postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; - - meta.maintainers = lib.teams.php.members; - }; + oci8 = callPackage ../development/php-packages/oci8 { }; pcov = buildPecl { version = "1.0.6"; From 98bc2f4da68237945c7152faa504f7b98a33b0a9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:19:01 +0200 Subject: [PATCH 13/25] phpExtensions.pcov: Move to separate directory --- pkgs/development/php-packages/pcov/default.nix | 12 ++++++++++++ pkgs/top-level/php-packages.nix | 11 +---------- 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/php-packages/pcov/default.nix diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix new file mode 100644 index 00000000000..84fbc4f7a46 --- /dev/null +++ b/pkgs/development/php-packages/pcov/default.nix @@ -0,0 +1,12 @@ +{ buildPecl, lib, pcre' }: + +buildPecl { + pname = "pcov"; + + version = "1.0.6"; + sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; + + buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3b8efa0f27d..7db70aa1054 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -88,16 +88,7 @@ in oci8 = callPackage ../development/php-packages/oci8 { }; - pcov = buildPecl { - version = "1.0.6"; - pname = "pcov"; - - sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; - - buildInputs = [ pcre' ]; - - meta.maintainers = lib.teams.php.members; - }; + pcov = callPackage ../development/php-packages/pcov { }; pcs = buildPecl { version = "1.3.3"; From fd6db7224b07e230c1354388c8c45a9d5e216905 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:24:04 +0200 Subject: [PATCH 14/25] phpExtensions.pdo_sqlsrv: Move to separate directory --- .../php-packages/pdo_sqlsrv/default.nix | 14 ++++++++++++++ pkgs/top-level/php-packages.nix | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/pdo_sqlsrv/default.nix diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix new file mode 100644 index 00000000000..46da3024809 --- /dev/null +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs, php }: + +buildPecl { + pname = "pdo_sqlsrv"; + + version = "5.8.1"; + sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; + + internalDeps = [ php.extensions.pdo ]; + + buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7db70aa1054..ec8f61eb03a 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -120,18 +120,7 @@ in meta.maintainers = lib.teams.php.members; }; - pdo_sqlsrv = buildPecl { - version = "5.8.1"; - pname = "pdo_sqlsrv"; - - sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; - - internalDeps = [ php.extensions.pdo ]; - - buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - - meta.maintainers = lib.teams.php.members; - }; + pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { }; php_excel = buildPecl rec { version = "1.0.2"; From d5ea4254a4230391ccf30f862fda2dd1f7000a63 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:32:05 +0200 Subject: [PATCH 15/25] phpExtensions.php_excel: Move to separate directory --- .../php-packages/php_excel/default.nix | 24 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/php-packages/php_excel/default.nix diff --git a/pkgs/development/php-packages/php_excel/default.nix b/pkgs/development/php-packages/php_excel/default.nix new file mode 100644 index 00000000000..ab6d193fcd4 --- /dev/null +++ b/pkgs/development/php-packages/php_excel/default.nix @@ -0,0 +1,24 @@ +{ buildPecl, fetchurl, lib, pkgs }: +let + pname = "php_excel"; + phpVersion = "php7"; + version = "1.0.2"; +in +buildPecl { + inherit pname version; + + src = fetchurl { + url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; + sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; + }; + + buildInputs = with pkgs; [ libxl ]; + + configureFlags = [ + "--with-excel" + "--with-libxl-incdir=${pkgs.libxl}/include_c" + "--with-libxl-libdir=${pkgs.libxl}/lib" + ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ec8f61eb03a..43d2c966a4e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -122,22 +122,7 @@ in pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { }; - php_excel = buildPecl rec { - version = "1.0.2"; - pname = "php_excel"; - phpVersion = "php7"; - - buildInputs = [ pkgs.libxl ]; - - src = pkgs.fetchurl { - url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; - sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; - }; - - configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; - - meta.maintainers = lib.teams.php.members; - }; + php_excel = callPackage ../development/php-packages/php_excel { }; pinba = let version = if isPhp73 then "1.1.2-dev" else "1.1.1"; From 58c1014f5ad90c1834d77fd154b842dda1c81572 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:36:24 +0200 Subject: [PATCH 16/25] phpExtensions.pinba: Move to separate directory --- .../php-packages/pinba/default.nix | 29 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 27 +---------------- 2 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/php-packages/pinba/default.nix diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix new file mode 100644 index 00000000000..b7d478eb39f --- /dev/null +++ b/pkgs/development/php-packages/pinba/default.nix @@ -0,0 +1,29 @@ +{ buildPecl, lib, fetchFromGitHub, isPhp73 }: +let + pname = "pinba"; + version = if isPhp73 then "1.1.2-dev" else "1.1.1"; + + src = fetchFromGitHub ({ + owner = "tony2001"; + repo = "pinba_extension"; + } // (if (isPhp73) then { + rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; + sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; + } else { + rev = "RELEASE_1_1_1"; + sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; + })); +in +buildPecl { + inherit pname version src; + + meta = with lib; { + description = "PHP extension for Pinba"; + longDescription = '' + Pinba is a MySQL storage engine that acts as a realtime monitoring and + statistics server for PHP using MySQL as a read-only interface. + ''; + homepage = "http://pinba.org/"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 43d2c966a4e..1f1c3b5c736 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -124,32 +124,7 @@ in php_excel = callPackage ../development/php-packages/php_excel { }; - pinba = let - version = if isPhp73 then "1.1.2-dev" else "1.1.1"; - src = pkgs.fetchFromGitHub ({ - owner = "tony2001"; - repo = "pinba_extension"; - } // (if (isPhp73) then { - rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; - sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; - } else { - rev = "RELEASE_1_1_1"; - sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; - })); - in buildPecl { - pname = "pinba"; - inherit version src; - - meta = with pkgs.lib; { - description = "PHP extension for Pinba"; - longDescription = '' - Pinba is a MySQL storage engine that acts as a realtime monitoring and - statistics server for PHP using MySQL as a read-only interface. - ''; - homepage = "http://pinba.org/"; - maintainers = teams.php.members; - }; - }; + pinba = callPackage ../development/php-packages/pinba { }; protobuf = buildPecl { version = "3.11.2"; From 63e150560ba4eabe5d35f119a58d0a4b4685e05b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:39:34 +0200 Subject: [PATCH 17/25] phpExtensions.protobuf: Move to separate directory --- .../php-packages/protobuf/default.nix | 19 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 18 +----------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/php-packages/protobuf/default.nix diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix new file mode 100644 index 00000000000..d577f848283 --- /dev/null +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -0,0 +1,19 @@ +{ buildPecl, lib, pcre' }: + +buildPecl { + pname = "protobuf"; + + version = "3.11.2"; + sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz"; + + buildInputs = [ pcre' ]; + + meta = with lib; { + description = '' + Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. + ''; + license = licenses.bsd3; + homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1f1c3b5c736..7cca6ae5a78 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -126,23 +126,7 @@ in pinba = callPackage ../development/php-packages/pinba { }; - protobuf = buildPecl { - version = "3.11.2"; - pname = "protobuf"; - - sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz"; - - buildInputs = with pkgs; [ pcre' ]; - - meta = with pkgs.lib; { - description = '' - Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. - ''; - license = licenses.bsd3; - homepage = "https://developers.google.com/protocol-buffers/"; - maintainers = teams.php.members; - }; - }; + protobuf = callPackage ../development/php-packages/protobuf { }; pthreads = let version = "3.2.0"; From b27b297c5636e499200f394e3fbdd4700e810267 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:45:22 +0200 Subject: [PATCH 18/25] php73Extensions.pthreads: Move to separate directory --- .../php-packages/pthreads/default.nix | 24 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 21 +--------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/php-packages/pthreads/default.nix diff --git a/pkgs/development/php-packages/pthreads/default.nix b/pkgs/development/php-packages/pthreads/default.nix new file mode 100644 index 00000000000..60cd706e12c --- /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 7cca6ae5a78..d52fe38923e 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"; From 80ba7d0c87afb1e7f818b2044a97b900ecd0d341 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:49:28 +0200 Subject: [PATCH 19/25] phpExtensions.rdkafka: Move to separate directory --- .../php-packages/rdkafka/default.nix | 21 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/php-packages/rdkafka/default.nix diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix new file mode 100644 index 00000000000..f96b1800769 --- /dev/null +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -0,0 +1,21 @@ +{ buildPecl, lib, pkgs, pcre' }: + +buildPecl { + pname = "rdkafka"; + + version = "4.0.3"; + sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; + + buildInputs = [ pkgs.rdkafka pcre' ]; + + postPhpize = '' + substituteInPlace configure \ + --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' + ''; + + meta = with lib; { + description = "Kafka client based on librdkafka"; + homepage = "https://github.com/arnaud-lb/php-rdkafka"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d52fe38923e..390466c0f6b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -130,25 +130,7 @@ in pthreads = callPackage ../development/php-packages/pthreads { }; - rdkafka = buildPecl { - version = "4.0.3"; - pname = "rdkafka"; - - sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; - - buildInputs = with pkgs; [ rdkafka pcre' ]; - - postPhpize = '' - substituteInPlace configure \ - --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' - ''; - - meta = { - description = "Kafka client based on librdkafka"; - homepage = "https://github.com/arnaud-lb/php-rdkafka"; - maintainers = lib.teams.php.members; - }; - }; + rdkafka = callPackage ../development/php-packages/rdkafka { }; redis = buildPecl { version = "5.1.1"; From f5a4a96fad517ecea87d0c767396df8521f44afb Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:53:07 +0200 Subject: [PATCH 20/25] phpExtensions.redis: Move to separate directory --- pkgs/development/php-packages/redis/default.nix | 17 +++++++++++++++++ pkgs/top-level/php-packages.nix | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/php-packages/redis/default.nix diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix new file mode 100644 index 00000000000..6e322aecf2b --- /dev/null +++ b/pkgs/development/php-packages/redis/default.nix @@ -0,0 +1,17 @@ +{ buildPecl, lib, php }: + +buildPecl { + pname = "redis"; + + version = "5.1.1"; + sha256 = "1041zv91fkda73w4c3pj6zdvwjgb3q7mxg6mwnq9gisl80mrs732"; + + internalDeps = with php.extensions; [ + json + session + ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + hash + ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 390466c0f6b..a4658928859 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -132,20 +132,7 @@ in rdkafka = callPackage ../development/php-packages/rdkafka { }; - redis = buildPecl { - version = "5.1.1"; - pname = "redis"; - - sha256 = "1041zv91fkda73w4c3pj6zdvwjgb3q7mxg6mwnq9gisl80mrs732"; - - internalDeps = with php.extensions; [ - json - session - ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ - hash ]; - - meta.maintainers = lib.teams.php.members; - }; + redis = callPackage ../development/php-packages/redis { }; sqlsrv = buildPecl { version = "5.8.1"; From a004e2ca688ae66b2e7762f9907bfa50d1b191a9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:55:31 +0200 Subject: [PATCH 21/25] phpExtensions.sqlsrv: Move to separate directory --- pkgs/development/php-packages/sqlsrv/default.nix | 16 ++++++++++++++++ pkgs/top-level/php-packages.nix | 11 +---------- 2 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/php-packages/sqlsrv/default.nix diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix new file mode 100644 index 00000000000..341152277ca --- /dev/null +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -0,0 +1,16 @@ +{ buildPecl, lib, pkgs }: + +buildPecl { + pname = "sqlsrv"; + + version = "5.8.1"; + sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; + + buildInputs = [ + pkgs.unixODBC + ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ + pkgs.libiconv + ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a4658928859..ab5d4234000 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -134,16 +134,7 @@ in redis = callPackage ../development/php-packages/redis { }; - sqlsrv = buildPecl { - version = "5.8.1"; - pname = "sqlsrv"; - - sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; - - buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - - meta.maintainers = lib.teams.php.members; - }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; v8 = buildPecl { version = "0.2.2"; From e810b999eb377499d568ffc27cc2eaa72b5fae5e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 19:58:03 +0200 Subject: [PATCH 22/25] phpExtensions.xdebug: Move to separate directory --- pkgs/development/php-packages/xdebug/default.nix | 15 +++++++++++++++ pkgs/top-level/php-packages.nix | 14 +------------- 2 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/php-packages/xdebug/default.nix diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix new file mode 100644 index 00000000000..731e0bc0bae --- /dev/null +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -0,0 +1,15 @@ +{ buildPecl, lib }: + +buildPecl { + pname = "xdebug"; + + version = "2.8.1"; + sha256 = "080mwr7m72rf0jsig5074dgq2n86hhs7rdbfg6yvnm959sby72w3"; + + doCheck = true; + checkTarget = "test"; + + zendExtension = true; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ab5d4234000..77d5c279fbe 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -162,19 +162,7 @@ in meta.broken = true; }; - xdebug = buildPecl { - version = "2.8.1"; - pname = "xdebug"; - - sha256 = "080mwr7m72rf0jsig5074dgq2n86hhs7rdbfg6yvnm959sby72w3"; - - doCheck = true; - checkTarget = "test"; - - zendExtension = true; - - meta.maintainers = lib.teams.php.members; - }; + xdebug = callPackage ../development/php-packages/xdebug { }; yaml = buildPecl { version = "2.0.4"; From 6d0abdd9c123b9f588eee6da56dadf6414e0ba1e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 20:00:38 +0200 Subject: [PATCH 23/25] phpExtensions.yaml: Move to separate directory --- pkgs/development/php-packages/yaml/default.nix | 14 ++++++++++++++ pkgs/top-level/php-packages.nix | 15 +-------------- 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/php-packages/yaml/default.nix diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix new file mode 100644 index 00000000000..8ce5c34757f --- /dev/null +++ b/pkgs/development/php-packages/yaml/default.nix @@ -0,0 +1,14 @@ +{ buildPecl, lib, pkgs }: + +buildPecl { + pname = "yaml"; + + version = "2.0.4"; + sha256 = "1036zhc5yskdfymyk8jhwc34kvkvsn5kaf50336153v4dqwb11lp"; + + configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + + meta.maintainers = lib.teams.php.members; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 77d5c279fbe..dee3200391b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -164,20 +164,7 @@ in xdebug = callPackage ../development/php-packages/xdebug { }; - yaml = buildPecl { - version = "2.0.4"; - pname = "yaml"; - - sha256 = "1036zhc5yskdfymyk8jhwc34kvkvsn5kaf50336153v4dqwb11lp"; - - configureFlags = [ - "--with-yaml=${pkgs.libyaml}" - ]; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - - meta.maintainers = lib.teams.php.members; - }; + yaml = callPackage ../development/php-packages/yaml { }; zmq = buildPecl { version = "1.1.3"; From 3d31818f1aaed19d5b2646f065ab4311bd5b46c3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 11 Oct 2020 20:10:58 +0200 Subject: [PATCH 24/25] 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. From 7557bf0ca7fc500d5b26a674702fcfb2f782a20b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 12 Oct 2020 16:46:40 +0200 Subject: [PATCH 25/25] CODEOWNERS: Add php-packages path to PHP team --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 556dcd770ca..17777b05872 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -192,6 +192,7 @@ /nixos/tests/php @NixOS/php /pkgs/build-support/build-pecl.nix @NixOS/php /pkgs/development/interpreters/php @NixOS/php +/pkgs/development/php-packages @NixOS/php /pkgs/top-level/php-packages.nix @NixOS/php # Podman, CRI-O modules and related