Skip to content

Flake lang migration purescript #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Flake lang migration purescript #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c501c05
flake-lang update
Feb 3, 2024
70c8488
Migrate purescriptFlake to `flake-lang.nix`
Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions extras/build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
};

Expand Down
42 changes: 0 additions & 42 deletions extras/flake-purescript.nix
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions runtimes/purescript/lbr-plutus/build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
6 changes: 3 additions & 3 deletions runtimes/purescript/lbr-prelude/build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
6 changes: 3 additions & 3 deletions testsuites/lbt-plutus/lbt-plutus-purescript/build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions testsuites/lbt-prelude/lbt-prelude-purescript/build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down