Merge pull request #183 from mlabs-haskell/bladyjoker/flake-lang-migration

flake-lang.nix migration

Author: jaredponn

docs/plutarch/build.nix

@@ -1,8 +1,8 @@
 { inputs, ... }:
 {
-  perSystem = { config, ... }:
+  perSystem = { config, system, ... }:
     let
-      hsFlake = config.lbf-nix.haskellPlutusFlake {
+      hsFlake = inputs.flake-lang.lib.${system}.haskellPlutusFlake {
         src = ./.;
 
         name = "plutarch-example";

extras/build.nix

@@ -1,4 +1,4 @@
-{ config, inputs, flake-parts-lib, lib, ... }: {
+{ config, flake-parts-lib, lib, ... }: {
 
   # Makes a system agnostic option (dunno why I needed this).
   options.lbf-nix = lib.mkOption {
@@ -23,7 +23,7 @@
 
     # Makes a per system `lbf-nix` option.
     perSystem = flake-parts-lib.mkPerSystemOption
-      ({ pkgs, config, pkgsForCtl, pkgsForHaskellNix, ... }: {
+      ({ pkgs, config, ... }: {
 
         options.lbf-nix = lib.mkOption {
           type = lib.types.anything;
@@ -38,16 +38,6 @@
             buildInputs = config.settings.shell.tools;
           };
 
-          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 pkgsForCtl;
-
-            haskellData = import ./haskell-data.nix pkgs;
-            haskellFlake = import ./flake-haskell.nix pkgsForHaskellNix;
-            haskellPlutusFlake = import ./flake-haskell-plutus.nix inputs.cardano-haskell-packages pkgsForHaskellNix;
-          };
-
           # Makes it available in the per system `lib` argument.
           _module.args.lib = lib // {
             inherit (config) lbf-nix;