diff --git a/flake.nix b/flake.nix index cd0136e..ed912a8 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ in { packages = forAllSystems (system: pkgs: { default = self.packages.${system}.pvv-nettsiden; - pvv-nettsiden = pkgs.callPackage ./nix/package.nix { php = pkgs.php82; }; + pvv-nettsiden = pkgs.callPackage ./nix/package.nix { php = pkgs.php84; }; }); overlays.default = final: prev: { diff --git a/nix/shell.nix b/nix/shell.nix index f879160..fd5a2d7 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -1,13 +1,13 @@ { pkgs }: let - phpEnv = pkgs.php82.buildEnv { + phpEnv = pkgs.php84.buildEnv { extensions = { enabled, all }: enabled ++ (with all; [ iconv mbstring pdo_mysql pdo_sqlite ]); }; in pkgs.mkShellNoCC { buildInputs = with pkgs; [ phpEnv - php82Packages.composer + php84Packages.composer sqlite git