Thomas Gerbet
parent
62c0b2b715
commit
84c0cb1471
9 changed files with 10 additions and 69 deletions
|
|
@ -22,7 +22,7 @@ NixOS - not necessarily the latest major release from upstream.
|
|||
|
||||
All available PHP attributes are wrappers around their respective
|
||||
binary PHP package and provide commonly used extensions this way. The
|
||||
real PHP 7.4 package, i.e. the unwrapped one, is available as
|
||||
real PHP 8.1 package, i.e. the unwrapped one, is available as
|
||||
`php81.unwrapped`; see the next section for more details.
|
||||
|
||||
Interactive tools built on PHP are put in `php.packages`; composer is
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@
|
|||
|
||||
- The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream.
|
||||
|
||||
- `php80` is no longer supported due to upstream not supporting this version anymore.
|
||||
|
||||
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
|
||||
|
||||
- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`.
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ let
|
|||
|
||||
phpPackage = mkOption {
|
||||
type = types.package;
|
||||
relatedPackages = [ "php80" "php81" ];
|
||||
relatedPackages = [ "php81" "php82" ];
|
||||
default = pkgs.php81;
|
||||
defaultText = "pkgs.php81";
|
||||
description = lib.mdDoc ''
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ in {
|
|||
};
|
||||
phpPackage = mkOption {
|
||||
type = types.package;
|
||||
relatedPackages = [ "php80" "php81" ];
|
||||
relatedPackages = [ "php81" "php82" ];
|
||||
defaultText = "pkgs.php";
|
||||
description = lib.mdDoc ''
|
||||
PHP package to use for Nextcloud.
|
||||
|
|
|
|||
|
|
@ -593,7 +593,6 @@ in {
|
|||
phosh = handleTest ./phosh.nix {};
|
||||
photoprism = handleTest ./photoprism.nix {};
|
||||
php = handleTest ./php {};
|
||||
php80 = handleTest ./php { php = pkgs.php80; };
|
||||
php81 = handleTest ./php { php = pkgs.php81; };
|
||||
php82 = handleTest ./php { php = pkgs.php82; };
|
||||
phylactery = handleTest ./web-apps/phylactery.nix {};
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
{ callPackage, lib, stdenv, ... }@_args:
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.0.29";
|
||||
hash = "sha256-SAGh8OFxcChnI6tUrNBFrHipZWAh1W8QSmRUPuySLhI=";
|
||||
});
|
||||
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
bcmath
|
||||
calendar
|
||||
curl
|
||||
ctype
|
||||
dom
|
||||
exif
|
||||
fileinfo
|
||||
filter
|
||||
ftp
|
||||
gd
|
||||
gettext
|
||||
gmp
|
||||
iconv
|
||||
imap
|
||||
intl
|
||||
ldap
|
||||
mbstring
|
||||
mysqli
|
||||
mysqlnd
|
||||
opcache
|
||||
openssl
|
||||
pcntl
|
||||
pdo
|
||||
pdo_mysql
|
||||
pdo_odbc
|
||||
pdo_pgsql
|
||||
pdo_sqlite
|
||||
pgsql
|
||||
posix
|
||||
readline
|
||||
session
|
||||
simplexml
|
||||
sockets
|
||||
soap
|
||||
sodium
|
||||
sysvsem
|
||||
sqlite3
|
||||
tokenizer
|
||||
xmlreader
|
||||
xmlwriter
|
||||
zip
|
||||
zlib
|
||||
]))
|
||||
|
|
@ -247,8 +247,7 @@ let
|
|||
++ lib.optional (!ipv6Support) "--disable-ipv6"
|
||||
++ lib.optional systemdSupport "--with-fpm-systemd"
|
||||
++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}"
|
||||
++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts"
|
||||
++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts"
|
||||
++ lib.optional ztsSupport "--enable-zts"
|
||||
|
||||
|
||||
# Sendmail
|
||||
|
|
|
|||
|
|
@ -1263,6 +1263,10 @@ mapAliases ({
|
|||
phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
|
||||
|
||||
# Obsolete PHP version aliases
|
||||
php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21
|
||||
php80Packages = php80; # Added 2023-06-21
|
||||
php80Extensions = php80; # Added 2023-06-21
|
||||
|
||||
php74 = throw "php74 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2022-05-24
|
||||
php74Packages = php74; # Added 2022-05-24
|
||||
php74Extensions = php74; # Added 2022-05-24
|
||||
|
|
|
|||
|
|
@ -17314,16 +17314,6 @@ with pkgs;
|
|||
php81Extensions = recurseIntoAttrs php81.extensions;
|
||||
php81Packages = recurseIntoAttrs php81.packages;
|
||||
|
||||
# Import PHP80 interpreter, extensions and packages
|
||||
php80 = callPackage ../development/interpreters/php/8.0.nix {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
pcre2 = pcre2.override {
|
||||
withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630
|
||||
};
|
||||
};
|
||||
php80Extensions = recurseIntoAttrs php80.extensions;
|
||||
php80Packages = recurseIntoAttrs php80.packages;
|
||||
|
||||
phpactor = callPackage ../development/tools/phpactor { };
|
||||
|
||||
picoc = callPackage ../development/interpreters/picoc { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue