Enable more packages

This now builds _all_ packages, by extracting the netlist overlay from the
pre-flake concat-overlay.nix.

- adds graphviz to the packages outputs to get
testing farther (although tests still currently only work in a `devShell`)
- uses `-plugin` instead of `-examples` in the example `homeConfiguration`
- adds `overrides` to `cabalProject2nix`

Author: sellout

flake.nix

@@ -26,9 +26,17 @@
       # These don’t work yet.
       # "ghc942" "ghcHEAD"
     ];
-    excludedPackages = ["concat-hardware"];
-    # need display, graphviz for testing. disable test for now.
-    noCheckPackages = ["concat-graphics" "concat-plugin"];
+    excludedPackages = [];
+    noCheckPackages = [
+      # Only works on Linux and Darwin, and I’m not sure how to expose the
+      # `open` executable on Nix/darwin.
+      "concat-graphics"
+      # Just fails.
+      "concat-hardware"
+      # TODO: Tests pass with `cabal new-test`, but not with `cabal test`, and
+      #       I’m guessing the latter is what `callCabal2nix` uses.
+      "concat-plugin"
+    ];
     noHaddockPackages = ["concat-examples" "concat-inline" "concat-plugin"];
 
     cabalPackages = pkgs: hpkgs:
@@ -46,7 +54,9 @@
             then pkgs.haskell.lib.dontHaddock v1
             else v1;
         in {"${name}" = v2;})
-      (inputs.self.lib.cabalProject2nix ./cabal.project pkgs hpkgs);
+      (inputs.self.lib.cabalProject2nix ./cabal.project pkgs hpkgs (old: {
+        nativeBuildInputs = old.nativeBuildInputs ++ [pkgs.graphviz];
+      }));
   in
     {
       overlays = {
@@ -56,6 +66,14 @@
           inputs.self.overlays.haskell;
 
         haskell = inputs.self.lib.haskellOverlay cabalPackages;
+
+        ## Only needed if you are using `concat-hardware`.
+        netlist-default =
+          inputs.self.lib.overlayHaskellPackages
+          supportedGhcVersions
+          inputs.self.overlays.netlist-haskell;
+
+        netlist-haskell = import ./nix/netlist-overlay.nix;
       };
 
       homeConfigurations =
@@ -73,7 +91,7 @@
                 ({pkgs, ...}: {
                   home.packages = [
                     (pkgs.haskellPackages.ghcWithPackages (hpkgs: [
-                      hpkgs.concat-examples
+                      hpkgs.concat-plugin
                     ]))
                   ];
 
@@ -97,7 +115,10 @@
         inherit system;
         ## NB: This uses `inputs.self.overlays.default` because packages need to
         ##     be able to find other packages in this flake as dependencies.
-        overlays = [inputs.self.overlays.default];
+        overlays = [
+          inputs.self.overlays.netlist-default
+          inputs.self.overlays.default
+        ];
       };
     in {
       packages =

nix/concat-overlay.nix

@@ -1,49 +1,26 @@
-self: super: let
-  netlistSrc = super.fetchFromGitHub {
-    owner = "ku-fpg";
-    repo = "netlist";
-    rev = "0f50a9cfd947885cac7fc392a5295cffe0b3ac31";
-    sha256 = "tg0UMslWZin6EeUbOruC9jt1xsgYIuk9vGi7uBSOUCw=";
-    fetchSubmodules = true;
-  };
-in {
-  haskellPackages = super.haskellPackages.override (old: {
-    overrides =
-      super.lib.composeExtensions (old.overrides or (_: _: {}))
-      (hself: hsuper: let
-        defaultMod = drv:
-          super.haskell.lib.disableLibraryProfiling
-          (super.haskell.lib.dontHaddock drv);
-        callCabal2nix = hself.callCabal2nix;
-      in {
-        # Prerequisites
-        netlist =
-          defaultMod (callCabal2nix "netlist" (netlistSrc + /netlist) {});
-        verilog =
-          defaultMod (callCabal2nix "netlist" (netlistSrc + /verilog) {});
-        netlist-to-verilog =
-          defaultMod
-          (callCabal2nix "netlist" (netlistSrc + /netlist-to-verilog) {});
-        netlist-to-vhdl =
-          defaultMod
-          (callCabal2nix "netlist" (netlistSrc + /netlist-to-vhdl) {});
-
-        # ConCat packages
-        concat-known = defaultMod (callCabal2nix "concat-known" ../known {});
-        concat-satisfy =
-          defaultMod (callCabal2nix "concat-satisfy" ../satisfy {});
-        concat-inline =
-          defaultMod (callCabal2nix "concat-inline" ../inline {});
-        concat-classes =
-          defaultMod (callCabal2nix "concat-classes" ../classes {});
-        concat-plugin =
-          defaultMod (callCabal2nix "concat-plugin" ../plugin {});
-        concat-examples =
-          defaultMod (callCabal2nix "concat-examples" ../examples {});
-        concat-graphics =
-          defaultMod (callCabal2nix "concat-graphics" ../graphics {});
-        concat-hardware =
-          defaultMod (callCabal2nix "concat-hardware" ../hardware {});
-      });
-  });
+self: super: {
+  haskellPackages = super.haskellPackages.extend (self.lib.composeExtensions
+    (import ./nix/netlist-overlay.nix self super)
+    (hself: hsuper: let
+      defaultMod = drv:
+        super.haskell.lib.disableLibraryProfiling
+        (super.haskell.lib.dontHaddock drv);
+      callCabal2nix = hself.callCabal2nix;
+    in {
+      concat-known = defaultMod (callCabal2nix "concat-known" ../known {});
+      concat-satisfy =
+        defaultMod (callCabal2nix "concat-satisfy" ../satisfy {});
+      concat-inline =
+        defaultMod (callCabal2nix "concat-inline" ../inline {});
+      concat-classes =
+        defaultMod (callCabal2nix "concat-classes" ../classes {});
+      concat-plugin =
+        defaultMod (callCabal2nix "concat-plugin" ../plugin {});
+      concat-examples =
+        defaultMod (callCabal2nix "concat-examples" ../examples {});
+      concat-graphics =
+        defaultMod (callCabal2nix "concat-graphics" ../graphics {});
+      concat-hardware =
+        defaultMod (callCabal2nix "concat-hardware" ../hardware {});
+    }));
 }

nix/lib.nix

@@ -111,10 +111,12 @@ in {
       };
   };
 
-  cabalProject2nix = cabalProject: pkgs: hpkgs:
+  cabalProject2nix = cabalProject: pkgs: hpkgs: overrides:
     builtins.mapAttrs
     (name: path:
       bash-strict-mode.lib.shellchecked pkgs
-      (hpkgs.callCabal2nix name "${builtins.dirOf cabalProject}/${path}" {}))
+      ((hpkgs.callCabal2nix name "${builtins.dirOf cabalProject}/${path}" {})
+        .overrideAttrs
+        overrides))
     (parseCabalProject cabalProject);
 }

nix/netlist-overlay.nix

@@ -0,0 +1,16 @@
+final: prev: hfinal: hprev: let
+  netlistSrc = final.fetchFromGitHub {
+    owner = "ku-fpg";
+    repo = "netlist";
+    rev = "0f50a9cfd947885cac7fc392a5295cffe0b3ac31";
+    sha256 = "tg0UMslWZin6EeUbOruC9jt1xsgYIuk9vGi7uBSOUCw=";
+    fetchSubmodules = true;
+  };
+in {
+  netlist = hfinal.callCabal2nix "netlist" (netlistSrc + /netlist) {};
+  verilog = hfinal.callCabal2nix "netlist" (netlistSrc + /verilog) {};
+  netlist-to-verilog =
+    hfinal.callCabal2nix "netlist" (netlistSrc + /netlist-to-verilog) {};
+  netlist-to-vhdl =
+    hfinal.callCabal2nix "netlist" (netlistSrc + /netlist-to-vhdl) {};
+}