Merge pull request #186 from mlabs-haskell/jared/bladyjoker/flake-lang-migration-purescript

Flake lang migration purescript

Author: bladyjoker

extras/build.nix

@@ -23,7 +23,7 @@
 
     # Makes a per system `lbf-nix` option.
     perSystem = flake-parts-lib.mkPerSystemOption
-      ({ pkgs, config, pkgsForCtl, pkgsForRust, ... }: {
+      ({ pkgs, config, pkgsForRust, ... }: {
 
         options.lbf-nix = lib.mkOption {
           type = lib.types.anything;
@@ -40,9 +40,6 @@
 
           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;
-
             rustFlake = import ./flake-rust.nix pkgsForRust;
           };
 

extras/flake-purescript.nix

@@ -4,7 +4,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs";
 
     # flake-lang.nix
-    flake-lang.url = "github:mlabs-haskell/flake-lang.nix?ref=bladyjoker/migrate-haskellFlake";
+    flake-lang.url = "github:mlabs-haskell/flake-lang.nix";
 
     # Nix
 

flake.lock

@@ -1,9 +1,9 @@
-_:
+{ inputs, ... }:
 {
-  perSystem = { pkgs, config, ... }:
+  perSystem = { pkgs, config, system, ... }:
 
     let
-      pursFlake = config.lbf-nix.purescriptFlake {
+      pursFlake = inputs.flake-lang.lib.${system}.purescriptFlake {
         inherit pkgs;
         src = ./.;
         projectName = "lbr-plutus";

flake.nix

@@ -1,9 +1,9 @@
-_:
+{ inputs, ... }:
 {
-  perSystem = { pkgs, config, ... }:
+  perSystem = { pkgs, config, system, ... }:
 
     let
-      pursFlake = config.lbf-nix.purescriptFlake {
+      pursFlake = inputs.flake-lang.lib.${system}.purescriptFlake {
         inherit pkgs;
         src = ./.;
         projectName = "lbr-prelude";

runtimes/purescript/lbr-plutus/build.nix

@@ -1,9 +1,9 @@
-_:
+{ inputs, ... }:
 {
-  perSystem = { pkgs, config, ... }:
+  perSystem = { pkgs, config, system, ... }:
 
     let
-      pursFlake = config.lbf-nix.purescriptFlake {
+      pursFlake = inputs.flake-lang.lib.${system}.purescriptFlake {
         src = ./.;
         projectName = "lbt-plutus";
         strictComp = true;

runtimes/purescript/lbr-prelude/build.nix

@@ -1,9 +1,9 @@
-_:
+{ inputs, ... }:
 {
-  perSystem = { pkgs, config, ... }:
+  perSystem = { pkgs, config, system, ... }:
 
     let
-      pursFlake = config.lbf-nix.purescriptFlake {
+      pursFlake = inputs.flake-lang.lib.${system}.purescriptFlake {
         src = ./.;
         projectName = "lbt-prelude";
         strictComp = true;