diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f6a49c..31298e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [master] + branches: [main] pull_request: jobs: diff --git a/flake.lock b/flake.lock index 21cb4e4..b4815ff 100644 --- a/flake.lock +++ b/flake.lock @@ -66,24 +66,6 @@ "type": "github" } }, - "easy-purescript-nix": { - "inputs": { - "flake-utils": "flake-utils_2" - }, - "locked": { - "lastModified": 1763814099, - "narHash": "sha256-YazeA9u0JdxykexV6HHG5DMtsnwqXoiAcWPjncO1XHM=", - "owner": "justinwoo", - "repo": "easy-purescript-nix", - "rev": "8fcd84f54d75d9007b2f1c7c9da5af843105a55f", - "type": "github" - }, - "original": { - "owner": "justinwoo", - "repo": "easy-purescript-nix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -117,34 +99,32 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, + "flake-compat_3": { + "flake": false, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "flake-utils_2": { + "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -153,9 +133,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -547,11 +527,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -691,22 +671,22 @@ }, "pslua": { "inputs": { - "easy-purescript-nix": "easy-purescript-nix", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "haskellNix": "haskellNix", "nixpkgs": [ "pslua", "haskellNix", "nixpkgs-unstable" ], + "purescript-overlay": "purescript-overlay", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1781519566, - "narHash": "sha256-ptELm3Q4290+1grRnJS7JJgCbzvcKM6CyL9yt4qEmQM=", + "lastModified": 1782301667, + "narHash": "sha256-TmNX4Lcjnc+JRum3A6/CQTA1WmnqGr1yTm5oxwKYZdw=", "owner": "purescript-lua", "repo": "purescript-lua", - "rev": "62e36537ecafd35081f521a7d49a7b1ae2e13ff7", + "rev": "319831dd95c3fb71974f51ffe4d5008477a64bf4", "type": "github" }, "original": { @@ -718,6 +698,28 @@ "purescript-overlay": { "inputs": { "flake-compat": "flake-compat_2", + "nixpkgs": [ + "pslua", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780972251, + "narHash": "sha256-PwHYPpfLP+WjSwj765zJ1N0Xp4ET3+8vRqxJ031ua3M=", + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "rev": "1cf88ab9d83596db0e0c0d304a16809c410e2917", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "type": "github" + } + }, + "purescript-overlay_2": { + "inputs": { + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ] @@ -741,7 +743,7 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "pslua": "pslua", - "purescript-overlay": "purescript-overlay", + "purescript-overlay": "purescript-overlay_2", "treefmt-nix": "treefmt-nix_2" } }, @@ -791,21 +793,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/treefmt.toml b/treefmt.toml deleted file mode 100644 index 3ef86f0..0000000 --- a/treefmt.toml +++ /dev/null @@ -1,4 +0,0 @@ -[formatter.lua] -command = "lua-format" -options = ["--in-place"] -includes = ["src/**/*.lua", "test/**/*.lua", "dist/*.lua"]