From 44604d165275b2f954ed22cb7cc819ed3bc8ec3c Mon Sep 17 00:00:00 2001 From: provokateurin Date: Mon, 1 Dec 2025 23:15:57 +0100 Subject: [PATCH 1/2] chore(deps): Update flake to 25.11 and haze to 2.1.3 Signed-off-by: provokateurin --- flake.lock | 52 ++++++++++++++++++++++++++-------------------------- flake.nix | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 453cf116e90..779816d84e0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1742394900, - "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", "owner": "ipetkov", "repo": "crane", - "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1748868585, - "narHash": "sha256-DrrbahOQAwvNM8l5EuGxxkVS7X5/S59zcG0N9ZWQFhk=", + "lastModified": 1764593611, + "narHash": "sha256-6SdexcO69Dlu14YN2xuB1A6JHWSrcqMj7Na9oK7IT2M=", "owner": "nix-community", "repo": "flakelight", - "rev": "dfbecd12d99c1bf82906521a6a7d5b75d2aa1ca2", + "rev": "0d63256401341f528dd628f1a8e96d3afecade7a", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1756917470, - "narHash": "sha256-pKCABwNBrydxa7fScvq+5WDVgjR0QGqtU1MI025k+Tg=", + "lastModified": 1764617178, + "narHash": "sha256-46vihXpm0fr/l+BUlj4dJYg2cblWRi7zZhsYPka+3Uw=", "ref": "refs/heads/main", - "rev": "43481a596050a6e4e1f4541ef28f356687d76174", - "revCount": 301, + "rev": "35967a8912660b80e9f47d52c2bd8e2d7d49e8e2", + "revCount": 320, "type": "git", "url": "https://codeberg.org/icewind/haze.git" }, @@ -86,31 +86,31 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1747926214, - "narHash": "sha256-e/7klyoQpe9wsYeQIUfm/9Yqa78et24L+nSpsCz937k=", - "owner": "icewind1991", - "repo": "mill-scale", - "rev": "394979573123e5d4762d29cc78b5e11b3d35cc6b", - "type": "github" + "lastModified": 1763591898, + "narHash": "sha256-aHSMj7CIa9EJYxdf05wOWRGp0KRsT/TAox7uwVSdDb8=", + "ref": "refs/heads/main", + "rev": "2d9b2da2c9f384f93ef977c48f8ee35ce586529b", + "revCount": 66, + "type": "git", + "url": "https://codeberg.org/icewind/mill-scale.git" }, "original": { - "owner": "icewind1991", - "repo": "mill-scale", - "type": "github" + "type": "git", + "url": "https://codeberg.org/icewind/mill-scale.git" } }, "nixpkgs": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1742697269, - "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", + "lastModified": 1761964689, + "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", + "rev": "63d22578600f70d293aede6bc737efef60ebd97f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2288886342e..a131280d1d5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; flake-utils.url = "github:numtide/flake-utils"; haze = { url = "git+https://codeberg.org/icewind/haze.git"; From af6286fbf5d7d147356705c7176fae9751b87ffa Mon Sep 17 00:00:00 2001 From: provokateurin Date: Sat, 6 Dec 2025 14:49:05 +0100 Subject: [PATCH 2/2] fix(flake): Allow using EOL PHP versions Signed-off-by: provokateurin --- flake.lock | 43 ++++++++++++++++++++++++++++++++++++++++++- flake.nix | 16 ++++++++++++++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 779816d84e0..0cc50c5f340 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -115,11 +131,36 @@ "type": "github" } }, + "phps": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1763965909, + "narHash": "sha256-Hx/ZHl8Tc8C6gP2xN0zAl7txk1sUZA98NrflyJuw+70=", + "owner": "fossar", + "repo": "nix-phps", + "rev": "8b3b0250e31d56283a8fa1b66dbd78fb21fa4893", + "type": "github" + }, + "original": { + "owner": "fossar", + "repo": "nix-phps", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", "haze": "haze", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "phps": "phps" } }, "rust-overlay": { diff --git a/flake.nix b/flake.nix index a131280d1d5..b947815af2c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,26 @@ { + nixConfig = { + extra-substituters = [ "https://fossar.cachix.org" ]; + extra-trusted-public-keys = [ "fossar.cachix.org-1:Zv6FuqIboeHPWQS7ysLCJ7UT7xExb4OE8c4LyGb5AsE=" ]; + }; + inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; flake-utils.url = "github:numtide/flake-utils"; + phps = { + url = "github:fossar/nix-phps"; + inputs = { + nixpkgs.follows = "nixpkgs"; + utils.follows = "flake-utils"; + }; + }; haze = { url = "git+https://codeberg.org/icewind/haze.git"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { nixpkgs, flake-utils, haze, ... }: + outputs = { nixpkgs, flake-utils, phps, haze, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -18,7 +30,7 @@ devShells.default = let php_version = lib.strings.concatStrings (builtins.match ".*PHP_VERSION_ID < ([0-9])0([0-9])00.*" (builtins.readFile ./lib/versioncheck.php)); - php = pkgs.pkgs."php${php_version}".buildEnv { + php = phps.packages.${system}."php${php_version}".buildEnv { # Based off https://docs.nextcloud.com/server/latest/admin_manual/installation/php_configuration.html extensions = ({ enabled, all }: enabled ++ (with all; [ # Required