Upgrade nix deps and PHP versions

Remove PHP 7.4 due to lack of upstream support. Add 8.2.
This commit is contained in:
John Shaffer 2023-01-07 17:51:31 -06:00
parent a4552b2a2c
commit adac0a2156
4 changed files with 20 additions and 24 deletions

View file

@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["7.4", "8.0", "8.1"]
php: ["8.0", "8.1", "8.2"]
wordpress: [ { "version": "5.9.2", "sha256": "12wzqrh21sh6pgvs0ayabcv66psq9a8cfz3qk43r5kjn5bfz4rbp" } ]

name: PHP ${{ matrix.php }}, WordPress ${{ matrix.wordpress.version }}

View file

@ -1,34 +1,30 @@
{ sources ? import ../nix/sources.nix, pkgs ? import sources.nixpkgs { } }:
let
inherit (pkgs) fetchurl;
let inherit (pkgs) fetchurl;
in with pkgs;
let
getEnv = name: default: (
if "" == builtins.getEnv name
then default
else builtins.getEnv name
);
getEnv = name: default:
(if "" == builtins.getEnv name then default else builtins.getEnv name);
composerPackages = {
"7.4" = php74Packages.composer;
"8.0" = php80Packages.composer;
"8.1" = php81Packages.composer;
"8.2" = php82Packages.composer;
};
phpPackages = {
"7.4" = pkgs.php74;
"8.0" = pkgs.php80;
"8.1" = pkgs.php81;
"8.2" = pkgs.php82;
};
phpVersion = getEnv "PHP_VERSION" "7.4";
phpVersion = getEnv "PHP_VERSION" "8.0";
composer = lib.getAttr phpVersion composerPackages;
php = lib.getAttr phpVersion phpPackages;
wordpress = ( pkgs.wordpress.overrideAttrs( oldAttrs: rec {
version = getEnv "WORDPRESS_VERSION" "6.0.1";
src = fetchurl {
url = "https://wordpress.org/wordpress-${version}.tar.gz";
sha256 = getEnv "WORDPRESS_SHA256" "f678596804aa89d7cdc9280862938464eab25aeaebfefa91ae175e15aa3ef054";
};
})
);
wordpress = (pkgs.wordpress.overrideAttrs (oldAttrs: rec {
version = getEnv "WORDPRESS_VERSION" "6.0.1";
src = fetchurl {
url = "https://wordpress.org/wordpress-${version}.tar.gz";
sha256 = getEnv "WORDPRESS_SHA256"
"f678596804aa89d7cdc9280862938464eab25aeaebfefa91ae175e15aa3ef054";
};
}));
in with pkgs; [
(clojure.override { jdk = jdk17_headless; })
composer

View file

@ -4,7 +4,7 @@ set -ouex

cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"

for PHP_VERSION in "7.4" "8.0" "8.1"; do
for PHP_VERSION in "8.0" "8.1" "8.2"; do
# shellcheck disable=SC2043
for WP in "6.0.1=f678596804aa89d7cdc9280862938464eab25aeaebfefa91ae175e15aa3ef054"; do
WORDPRESS_VERSION="${WP%=*}"

View file

@ -1,14 +1,14 @@
{
"nixpkgs": {
"branch": "release-22.05",
"branch": "release-22.11",
"description": "Nix Packages collection",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "342fa101f4c9efe15ad306dc1eafc5ec5ba42727",
"sha256": "1kras851gmrv0q96fd9dadcw92kh9h0p0rngzq9xp2balac9arh4",
"rev": "9f11a2df77cb945c115ae2a65f53f38121597d73",
"sha256": "0vihy3khca946b995yfq08i6x60ww083wb9cx19mqq3l6yjzlglr",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/342fa101f4c9efe15ad306dc1eafc5ec5ba42727.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/9f11a2df77cb945c115ae2a65f53f38121597d73.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}