Skip to content

Commit 787bf34

Browse files
committed
nix: update to php 8.2
1 parent f0489f6 commit 787bf34

File tree

3 files changed

+66
-184
lines changed

3 files changed

+66
-184
lines changed

flake.lock

+55-176
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+9-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939
pkgs = import nixpkgs {inherit system;};
4040
mkNodePackage = mk-node-package.lib."${system}".mkNodePackage;
4141

42-
php81WithExtensions = with pkgs; (php81.buildEnv {
42+
php = pkgs.php; # PHP 8.2
43+
phpPackages = pkgs.phpPackages; # PHP 8.2
44+
45+
phpWithExtensions = php.buildEnv {
4346
extensions = {
4447
enabled,
4548
all,
@@ -52,8 +55,8 @@
5255
extraConfig = ''
5356
xdebug.mode=debug
5457
'';
55-
});
56-
composer = with pkgs; (php81Packages.composer.override {php = php81WithExtensions;});
58+
};
59+
composer = phpPackages.composer.override {php = phpWithExtensions;};
5760

5861
caCertificates = pkgs.runCommand "ca-certificates" {} ''
5962
mkdir -p $out/etc/ssl/certs $out/etc/pki/tls/certs
@@ -201,7 +204,7 @@
201204
};
202205
in {
203206
defaultPackage = panel;
204-
devShell = import ./shell.nix {inherit composer php81WithExtensions pkgs;};
207+
devShell = import ./shell.nix {inherit composer phpWithExtensions pkgs;};
205208

206209
packages = {
207210
inherit panel;
@@ -224,7 +227,7 @@
224227
mysql80
225228
nodejs_18
226229
nodePackages.yarn
227-
php81WithExtensions
230+
phpWithExtensions
228231
];
229232
pathsToLink = ["/bin" "/etc"];
230233
};
@@ -242,7 +245,7 @@
242245
caCertificates
243246
caddy
244247
configs
245-
php81WithExtensions
248+
phpWithExtensions
246249

247250
panel
248251
];

shell.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
composer ? null,
3-
php81WithExtensions ? null,
3+
phpWithExtensions ? null,
44
pkgs ? import <nixpkgs> {},
55
}:
66
with pkgs;
@@ -10,7 +10,7 @@ with pkgs;
1010
composer
1111
nodejs_18
1212
nodePackages.yarn
13-
php81WithExtensions
13+
phpWithExtensions
1414
];
1515

1616
shellHook = ''

0 commit comments

Comments
 (0)