Nixpkgs: metrics build failure (due to closures.lapp) blocks nixpkgs-unstable

[FRidh]

Describe the bug
metrics build failure blocks nixpkgs-unstable. The failure is caused by closures.lapp in nixos/release.nix.

To Reproduce
https://hydra.nixos.org/build/118001230

[FRidh]

Caused by closures.lapp.

$ nix-build nixos/release.nix -A closures.lapp --show-trace
error: while evaluating anonymous function at /home/freddy/Code/libraries/nixpkgs/nixos/release.nix:92:49, called from /home/freddy/Code/libraries/nixpkgs/lib/attrsets.nix:292:43:
while evaluating 'hydraJob' at /home/freddy/Code/libraries/nixpkgs/lib/customisation.nix:171:14, called from /home/freddy/Code/libraries/nixpkgs/nixos/release.nix:92:57:
while evaluating the attribute 'drvPath' at /home/freddy/Code/libraries/nixpkgs/lib/customisation.nix:188:13:
while evaluating the attribute 'drvPath' at /home/freddy/Code/libraries/nixpkgs/lib/customisation.nix:155:13:
while evaluating the attribute 'activationScript' of the derivation 'nixos-system-nixos-20.09pre130979.gfedcba' at /home/freddy/Code/libraries/nixpkgs/nixos/modules/system/activation/top-level.nix:95:5:
while evaluating the attribute 'system.activationScripts.script' at /home/freddy/Code/libraries/nixpkgs/nixos/modules/system/activation/activation-script.nix:68:9:
while evaluating 'textClosureMap' at /home/freddy/Code/libraries/nixpkgs/lib/strings-with-deps.nix:70:35, called from /home/freddy/Code/libraries/nixpkgs/nixos/modules/system/activation/activation-script.nix:89:18:
while evaluating 'id' at /home/freddy/Code/libraries/nixpkgs/lib/trivial.nix:14:5, called from undefined position:
while evaluating the attribute 'text' at /home/freddy/Code/libraries/nixpkgs/nixos/modules/system/activation/activation-script.nix:9:5:
while evaluating the attribute 'text' at /home/freddy/Code/libraries/nixpkgs/lib/strings-with-deps.nix:77:38:
while evaluating the attribute 'sources' of the derivation 'etc' at /home/freddy/Code/libraries/nixpkgs/nixos/modules/system/etc/etc.nix:12:5:
while evaluating anonymous function at /home/freddy/Code/libraries/nixpkgs/nixos/modules/system/etc/etc.nix:20:20, called from undefined position:
while evaluating the attribute 'source' at undefined position:
while evaluating anonymous function at /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:84:45, called from undefined position:
while evaluating the attribute 'value' at /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:383:9:
while evaluating the option `environment.etc.dbus-1.source':
while evaluating the attribute 'mergedValue' at /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:415:5:
while evaluating anonymous function at /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:417:17, called from /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:417:12:
while evaluating 'check' at /home/freddy/Code/libraries/nixpkgs/lib/types.nix:251:15, called from /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:417:22:
while evaluating the attribute 'serviceDirectories' of the derivation 'dbus-1' at /home/freddy/Code/libraries/nixpkgs/pkgs/build-support/trivial-builders.nix:7:7:
while evaluating anonymous function at /home/freddy/Code/libraries/nixpkgs/lib/types.nix:263:14, called from undefined position:
while evaluating the attribute 'value' at /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:428:27:
while evaluating anonymous function at /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:417:17, called from /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:417:12:
while evaluating 'check' at /home/freddy/Code/libraries/nixpkgs/lib/types.nix:251:15, called from /home/freddy/Code/libraries/nixpkgs/lib/modules.nix:417:22:
while evaluating the attribute 'passAsFile' of the derivation 'system-path' at /home/freddy/Code/libraries/nixpkgs/pkgs/build-support/trivial-builders.nix:7:7:
while evaluating anonymous function at /home/freddy/Code/libraries/nixpkgs/pkgs/build-support/buildenv/default.nix:65:21, called from undefined position:
attribute 'dev' missing, at /home/freddy/Code/libraries/nixpkgs/pkgs/build-support/buildenv/default.nix:65:30

Maybe related to the recent PHP changes? cc @etu

[etu]

I find it weird how that would have worked before, but it was a long time ago I used apache and I've never used it on NixOS.

But with this change it seems to build:

diff --git a/nixos/release.nix b/nixos/release.nix
index d31fbd11e5c..cf16986b213 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -314,9 +314,9 @@ in rec {
     lapp = makeClosure ({ pkgs, ... }:
       { services.httpd.enable = true;
         services.httpd.adminAddr = "[email protected]";
+        services.httpd.enablePHP = true;
         services.postgresql.enable = true;
         services.postgresql.package = pkgs.postgresql;
-        environment.systemPackages = [ pkgs.php ];
       });
   };
 }

[FRidh]

Thanks. Pushed 5a0a47050b900581dd7ad8243bfadb14d9ce8f27

[FRidh]

Test passed.