ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2026-11-03 13:54:54 +01:00
Code Issues Projects Releases Wiki Activity

Another try to fix the failing checks

Browse Source 
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@gmail.com>
This commit is contained in:
Stefan Ellmauthaler 2026-10-23 20:47:15 +02:00
parent 6b98d28756
commit 007ff75d85
No known key found for this signature in database
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
flake.nix
View File

@ -161,38 +161,33 @@
flake-utils-plus = genPkgOverlay inputs.flake-utils-plus "fup-repl"; flake-utils-plus = genPkgOverlay inputs.flake-utils-plus "fup-repl";
glpi-inventory = inputs.glpi-inventory.overlays.default; glpi-inventory = inputs.glpi-inventory.overlays.default;
php-security-fix = final: prev: let php-security-fix = final: prev: let
disablePhpTests = pkgSet: prev.lib.mapAttrs (name: pkg: lib = prev.lib;
if prev.lib.isDerivation pkg then
pkg.overrideAttrs (old: { doCheck = false; checkPhase = ""; })
else pkg
) pkgSet;
in {
php83 = prev.php83.overrideAttrs (old: rec {
version = "8.3.36";
doCheck = false;
checkPhase = "";
src = prev.fetchurl {
url = "https://www.php.net/distributions/php-${version}.tar.xz";
sha256 = "1zcj2qxkmjc9aw81sv4al583fiy2haq9dvls5vbw9i9llcx6jm6x";
};
});
php84 = prev.php84.overrideAttrs (old: rec { patchPhp = php: version: sha256:
version = "8.4.4"; (php.override {
doCheck = false; packageOverrides = pfinal: pprev: {
checkPhase = ""; extensions = pprev.extensions // (lib.mapAttrs
src = prev.fetchurl { (name: ext:
url = "https://www.php.net/distributions/php-${version}.tar.xz"; if lib.isDerivation ext
sha256 = "1b41jr2v7ncdcjn6zjq21ig6v20inchv5jlyf6zdhkc9rjick9h5"; then ext.overrideAttrs (_: { doCheck = false; })
}; else ext)
}); pprev.extensions);
};
# Auch das Extension-Paketset zwingen, Tests wegzulassen }).overrideAttrs (old: {
php83Packages = disablePhpTests prev.php83Packages; inherit version;
php84Packages = disablePhpTests prev.php84Packages; doCheck = false;
src = prev.fetchurl {
php = final.php83; url = "https://www.php.net/distributions/php-${version}.tar.xz";
}; inherit sha256;
};
});
in {
php83 = patchPhp prev.php83 "8.3.36"
"1zcj2qxkmjc9aw81sv4al583fiy2haq9dvls5vbw9i9llcx6jm6x";
php84 = patchPhp prev.php84 "8.4.4"
"1b41jr2v7ncdcjn6zjq21ig6v20inchv5jlyf6zdhkc9rjick9h5";
php = final.php83;
};
}; };
outputsBuilder = channels: { outputsBuilder = channels: {