Exposes lbf-nix

Author: bladyjoker

docs/plutarch/build.nix

@@ -1,15 +1,15 @@
 { inputs, ... }:
 {
-  perSystem = { pkgs, config, ... }:
+  perSystem = { config, ... }:
     let
-      project = { lib, ... }: {
+      hsFlake = config.lbf-nix.haskellPlutusFlake {
         src = ./.;
 
         name = "plutarch-example";
 
         inherit (config.settings.haskell) index-state compiler-nix-name;
 
-        extraHackage = [
+        dependencies = [
           # Load Plutarch support
           "${config.packages.lbf-prelude-plutarch}"
           "${config.packages.lbf-plutus-plutarch}"
@@ -22,49 +22,18 @@
           "${inputs.plutarch}/plutarch-extra"
         ];
 
-        modules = [
-          (_: {
-            packages = {
-              allComponent.doHoogle = true;
-              allComponent.doHaddock = true;
-
-              # Enable strict compilation
-              plutarch-example.configureFlags = [ "-f-dev" ];
-            };
-          })
-        ];
-
-        shell = {
-
-          withHoogle = true;
-
-          exactDeps = true;
-
-          nativeBuildInputs = config.settings.shell.tools ++ [ config.packages.lbf-plutus-to-plutarch ];
-
-          tools = {
-            cabal = { };
-            haskell-language-server = { };
-          };
-
-          shellHook = lib.mkForce config.settings.shell.hook;
-        };
+        devShellTools = config.settings.shell.tools;
+        devShellHook = config.settings.shell.hook;
       };
-      hsNixFlake = (pkgs.haskell-nix.cabalProject' [
-        inputs.mlabs-tooling.lib.mkHackageMod
-        inputs.mlabs-tooling.lib.moduleMod
-        project
-      ]).flake { };
-
     in
 
     {
-      devShells.dev-plutarch-example = hsNixFlake.devShell;
+      devShells.dev-plutarch-example = hsFlake.devShell;
 
       packages = {
-        plutarch-example-cli = hsNixFlake.packages."plutarch-example:exe:plutarch-example";
+        plutarch-example-cli = hsFlake.packages."plutarch-example:exe:plutarch-example";
 
-        lbf-plutarch-example-api = config.overlayAttrs.lbf-nix.lbfPlutarch {
+        lbf-plutarch-example-api = config.lbf-nix.lbfPlutarch {
           name = "lbf-plutarch-example-api";
           src = ./api;
           files = [ "Example.lbf" ];

extras/build.nix

@@ -1,20 +1,52 @@
-# TODO(bladyjoker): Using overlayAttrs here as a hack to share functions -.- Do this properly.
-{ inputs, ... }: {
-  imports = [
-    inputs.flake-parts.flakeModules.easyOverlay # Adds perSystem.overlayAttrs
-  ];
-  perSystem = { pkgs, ... }:
-    {
-
-      overlayAttrs = {
-        extras = {
-          purescriptFlake = import ./flake-purescript.nix pkgs;
-          rustFlake = import ./flake-rust.nix pkgs;
-          haskellData = import ./haskell-data.nix pkgs;
-          haskellFlake = import ./flake-haskell.nix pkgs;
-          haskellPlutusFlake = import ./flake-haskell-plutus.nix inputs.cardano-haskell-packages pkgs;
+{ config, inputs, flake-parts-lib, lib, ... }: {
+
+  # Makes a system agnostic option (dunno why I needed this).
+  options.lbf-nix = lib.mkOption {
+    type = lib.types.anything; # probably not the best type
+    default = { };
+  };
+
+  # Makes it available in the system agnostic `lib` argument.
+  config._module.args.lib = config.flake.lib // {
+    inherit (config) lbf-nix;
+  };
+
+  # Sets the above set option to system ones.
+  config.lbf-nix = lib.genAttrs config.systems (system: (config.perSystem { inherit system; }).lbf-nix);
+
+  # Makes `lib.x86_64-linux.xyz` available
+  config.flake.lib = config.lbf-nix;
+
+  options = {
+
+    # Makes a per system `lbf-nix` option.
+    perSystem = flake-parts-lib.mkPerSystemOption
+      ({ pkgs, config, ... }: {
+
+        options.lbf-nix = lib.mkOption {
+          type = lib.types.anything;
+          default = { };
+        };
+
+        # Sets a per system `lbf-nix` option.
+        config = {
+          lbf-nix = {
+            # NOTE(bladyjoker): If you need to add a function the export externally and use internally via config.lbf-nix, add it here.
+            purescriptFlake = import ./flake-purescript.nix pkgs;
+            rustFlake = import ./flake-rust.nix pkgs;
+            haskellData = import ./haskell-data.nix pkgs;
+            haskellFlake = import ./flake-haskell.nix pkgs;
+            haskellPlutusFlake = import ./flake-haskell-plutus.nix inputs.cardano-haskell-packages pkgs;
+          };
+
+          # Makes it available in the per system `lib` argument.
+          _module.args.lib = lib // {
+            inherit (config) lbf-nix;
+          };
+
         };
-      };
 
-    };
+      });
+
+  };
 }

extras/lbf-nix/build.nix

@@ -1,8 +1,4 @@
-# TODO(bladyjoker): Using overlayAttrs here as a hack to share functions -.- Do this properly.
-{ inputs, ... }: {
-  imports = [
-    inputs.flake-parts.flakeModules.easyOverlay # Adds perSystem.overlayAttrs
-  ];
+_: {
   perSystem = { pkgs, config, ... }:
     let
       lbg-haskell = "${config.packages.lbg-haskell}/bin/lbg-haskell";
@@ -12,18 +8,16 @@
     in
     {
 
-      overlayAttrs = {
-        lbf-nix = {
-          lbfBuild = import ./lbf-build.nix pkgs config.packages.lbf;
-          lbfHaskell = import ./lbf-haskell.nix pkgs config.packages.lbf lbg-haskell;
-          lbfPreludeHaskell = import ./lbf-prelude-hs.nix pkgs config.packages.lbf lbg-haskell;
-          lbfPlutusHaskell = import ./lbf-plutus-hs-plutustx.nix pkgs config.packages.lbf lbg-haskell;
-          lbfPlutarch' = import ./lbf-plutarch.nix pkgs config.packages.lbf lbg-plutarch;
-          lbfPlutarch = import ./lbf-plutus-plutarch.nix pkgs config.packages.lbf lbg-plutarch;
-          lbfPurescript = import ./lbf-purescript.nix pkgs config.packages.lbf lbg-purescript;
-          lbfPreludePurescript = import ./lbf-prelude-purescript.nix pkgs config.packages.lbf lbg-purescript;
-          lbfPlutusPurescript = import ./lbf-plutus-purescript.nix pkgs config.packages.lbf lbg-purescript;
-        };
+      lbf-nix = {
+        lbfBuild = import ./lbf-build.nix pkgs config.packages.lbf;
+        lbfHaskell = import ./lbf-haskell.nix pkgs config.packages.lbf lbg-haskell;
+        lbfPreludeHaskell = import ./lbf-prelude-hs.nix pkgs config.packages.lbf lbg-haskell;
+        lbfPlutusHaskell = import ./lbf-plutus-hs-plutustx.nix pkgs config.packages.lbf lbg-haskell;
+        lbfPlutarch' = import ./lbf-plutarch.nix pkgs config.packages.lbf lbg-plutarch;
+        lbfPlutarch = import ./lbf-plutus-plutarch.nix pkgs config.packages.lbf lbg-plutarch;
+        lbfPurescript = import ./lbf-purescript.nix pkgs config.packages.lbf lbg-purescript;
+        lbfPreludePurescript = import ./lbf-prelude-purescript.nix pkgs config.packages.lbf lbg-purescript;
+        lbfPlutusPurescript = import ./lbf-plutus-purescript.nix pkgs config.packages.lbf lbg-purescript;
       };
 
     };