checks: Move most of the code to flake.nix

This will basically allow us to treat `checks.nix` like something that supports having its dependencies injected by `callPackages`, allowing us to simplify the expression a bit. It will also allow other scripts to get the check names trivially.

Author: jtojnar

checks.nix

@@ -1,158 +1,96 @@
 {
-  system,
-  packages,
-  pkgs,
+  lib,
+  php,
+  runCommand,
 }:
 
-let
-  phpPackages = builtins.filter (name: builtins.match "php[0-9]+" name != null) (builtins.attrNames packages);
-
-  checks = {
-    php = {
-      description = "Build PHP";
-      drv = { php, ... }: php;
-    };
-
-    imagick = {
-      description = "Build Imagick extension";
-      drv = { php, ... }: php.extensions.imagick;
-    };
-
-    redis = {
-      description = "Build Redis extension";
-      drv = { php, ... }: php.extensions.redis;
-    };
-
-    redis3 = {
-      description = "Build Redis 3 extension";
-      enabled = { php, lib, ... }: lib.versionOlder php.version "8";
-      drv = { php, ... }: php.extensions.redis3;
-    };
-
-    mysql = {
-      description = "Build MySQL extension";
-      enabled = { php, lib, ... }: lib.versionOlder php.version "7";
-      drv = { php, ... }: php.extensions.mysql;
-    };
-
-    xdebug = {
-      description = "Build Xdebug extension";
-      drv = { php, ... }: php.extensions.xdebug;
-    };
+{
+  php = {
+    description = "Build PHP";
+    drv = php;
+  };
 
-    tidy = {
-      description = "Build Tidy extension";
-      drv = { php, ... }: php.extensions.tidy;
-    };
+  imagick = {
+    description = "Build Imagick extension";
+    drv = php.extensions.imagick;
+  };
 
-    composer-phar = {
-      description = "Check that composer PHAR works";
-      drv =
-        { pkgs, php, ... }:
-        pkgs.runCommand
-          "composer-phar-check"
-          {
-            buildInputs = [
-              php.packages.composer
-            ];
-          }
-          ''
-            composer --version
-            touch "$out"
-          '';
-    };
+  redis = {
+    description = "Build Redis extension";
+    drv = php.extensions.redis;
+  };
 
-    mysqli-socket-path = {
-      description = "Validate php.extensions.mysqli default unix socket path";
-      drv =
-        { pkgs, php, ... }:
-        pkgs.runCommand
-          "mysqli-socket-path-check"
-          {
-            buildInputs = [
-              (php.withExtensions ({ all, ... }: [
-                all.mysqli
-              ]))
-            ];
-          }
-          ''
-            php -r "echo ini_get('mysqli.default_socket') . PHP_EOL;" | grep /run/mysqld/mysqld.sock
-            touch "$out"
-          '';
-    };
+  redis3 = {
+    description = "Build Redis 3 extension";
+    enabled = lib.versionOlder php.version "8";
+    drv = php.extensions.redis3;
+  };
 
-    pdo_mysql-socket-path = {
-      description = "Validate php.extensions.pdo_mysql default unix socket path";
-      drv =
-        { pkgs, php, ... }:
-        pkgs.runCommand
-          "pdo_mysql-socket-path-check"
-          {
-            buildInputs = [
-              (php.withExtensions ({ all, ... }: [
-                all.pdo_mysql
-              ]))
-            ];
-          }
-          ''
-            php -r "echo ini_get('pdo_mysql.default_socket') . PHP_EOL;" | grep /run/mysqld/mysqld.sock
-            touch "$out"
-          '';
-    };
+  mysql = {
+    description = "Build MySQL extension";
+    enabled = lib.versionOlder php.version "7";
+    drv = php.extensions.mysql;
   };
 
-  inherit (pkgs) lib;
+  xdebug = {
+    description = "Build Xdebug extension";
+    drv = php.extensions.xdebug;
+  };
 
-  /* AttrSet<phpName, AttrSet<checkName, checkDrv>> */
-  checksPerVersion =
-    lib.listToAttrs (
-      builtins.map
-        (phpName:
-          let
-            php = packages.${phpName};
-            phpVersion = lib.versions.majorMinor php.version;
-            args = { inherit lib php pkgs system; };
-            supportedChecks = lib.filterAttrs (_name: { enabled ? lib.const true, ... }: enabled args) checks;
-          in
-          {
-            name = phpName;
-            value =
-              lib.mapAttrs
-                (
-                  _name:
-                  {
-                    description,
-                    drv,
-                    ...
-                  }:
+  tidy = {
+    description = "Build Tidy extension";
+    drv = php.extensions.tidy;
+  };
 
-                  let
-                    check = drv args;
-                  in
-                  check // {
-                    description = "PHP ${phpVersion} – ${description}";
-                  }
-                )
-                supportedChecks;
-          }
-        )
-        phpPackages
-    );
-in
-lib.foldAttrs
-  lib.mergeAttrs
-  {}
-  (
-    lib.mapAttrsToList
-    (
-      phpName:
+  composer-phar = {
+    description = "Check that composer PHAR works";
+    drv =
+      runCommand
+        "composer-phar-check"
+        {
+          buildInputs = [
+            php.packages.composer
+          ];
+        }
+        ''
+          composer --version
+          touch "$out"
+        '';
+  };
 
-      lib.mapAttrs'
-        (
-          name:
+  mysqli-socket-path = {
+    description = "Validate php.extensions.mysqli default unix socket path";
+    drv =
+      runCommand
+        "mysqli-socket-path-check"
+        {
+          buildInputs = [
+            (php.withExtensions ({ all, ... }: [
+              all.mysqli
+            ]))
+          ];
+        }
+        ''
+          php -r "echo ini_get('mysqli.default_socket') . PHP_EOL;" | grep /run/mysqld/mysqld.sock
+          touch "$out"
+        '';
+  };
 
-          lib.nameValuePair "${phpName}-${name}"
-        )
-    )
-    checksPerVersion
-  )
+  pdo_mysql-socket-path = {
+    description = "Validate php.extensions.pdo_mysql default unix socket path";
+    drv =
+      runCommand
+        "pdo_mysql-socket-path-check"
+        {
+          buildInputs = [
+            (php.withExtensions ({ all, ... }: [
+              all.pdo_mysql
+            ]))
+          ];
+        }
+        ''
+          php -r "echo ini_get('pdo_mysql.default_socket') . PHP_EOL;" | grep /run/mysqld/mysqld.sock
+          touch "$out"
+        '';
+  };
+}

flake.nix

@@ -32,9 +32,66 @@
           inherit (pkgs) php php56 php70 php71 php72 php73 php74 php80 php81 php82;
         };
 
-        checks = import ./checks.nix {
-          inherit packages pkgs system;
-        };
+        checks =
+          let
+            phpPackages = builtins.filter (name: builtins.match "php[0-9]+" name != null) (builtins.attrNames packages);
+
+            inherit (pkgs) lib;
+
+
+            /* AttrSet<phpName, AttrSet<checkName, checkDrv>> */
+            checksPerVersion =
+              lib.listToAttrs (
+                builtins.map
+                  (phpName:
+                    let
+                      php = packages.${phpName};
+                      phpVersion = lib.versions.majorMinor php.version;
+                      checks = import ./checks.nix {
+                        inherit lib php;
+                        inherit (pkgs) runCommand;
+                      };
+                      supportedChecks = lib.filterAttrs (_name: { enabled ? true, ... }: enabled) checks;
+                    in
+                    {
+                      name = phpName;
+                      value =
+                        lib.mapAttrs
+                          (
+                            _name:
+                            {
+                              description,
+                              drv,
+                              ...
+                            }:
+
+                            drv // {
+                              description = "PHP ${phpVersion} – ${description}";
+                            }
+                          )
+                          supportedChecks;
+                    }
+                  )
+                  phpPackages
+              );
+          in
+          lib.foldAttrs
+            lib.mergeAttrs
+            {}
+            (
+              lib.mapAttrsToList
+              (
+                phpName:
+
+                lib.mapAttrs'
+                  (
+                    name:
+
+                    lib.nameValuePair "${phpName}-${name}"
+                  )
+              )
+              checksPerVersion
+            );
       }
     ) // {
       overlays.default = import ./pkgs/phps.nix nixpkgs.outPath;