Skip to content

Commit

Permalink
php80: init at 8.0.29
Browse files Browse the repository at this point in the history
This is a consequence of PR NixOS/nixpkgs#239049
  • Loading branch information
drupol committed Jun 26, 2023
1 parent 0983b1d commit 9b93846
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 3 deletions.
2 changes: 2 additions & 0 deletions pkgs/package-overrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@ in
];
in
ourPatches ++ upstreamPatches;

buildInputs = attrs.buildInputs ++ (if (lib.versionAtLeast prev.php.version "8.1") then [ pkgs.openssl ] else [ pkgs.openssl_1_1 ]);
});

pdo = prev.extensions.pdo.overrideAttrs (attrs: {
Expand Down
58 changes: 58 additions & 0 deletions pkgs/php/8.0.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{ prev, mkPhp }:

let
base = mkPhp {
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
]
)
)
4 changes: 1 addition & 3 deletions pkgs/phps.nix
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,7 @@ in

php74 = import ./php/7.4.nix { inherit prev mkPhp; };

php80 = prev.php80.override {
inherit packageOverrides;
};
php80 = import ./php/8.0.nix { inherit prev mkPhp; };

php81 = prev.php81.override {
inherit packageOverrides;
Expand Down

0 comments on commit 9b93846

Please sign in to comment.