diff --git a/flake.lock b/flake.lock index 3f6dcc1f..57e5dac0 100644 --- a/flake.lock +++ b/flake.lock @@ -170,6 +170,36 @@ "type": "github" } }, + "devx": { + "inputs": { + "flake-utils": "flake-utils", + "haskellNix": [ + "haskell-nix" + ], + "iohk-nix": [ + "iohk-nix" + ], + "nixpkgs": [ + "devx", + "haskellNix", + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1726865550, + "narHash": "sha256-Fa/rvCzffF+J8pNhpfikPCMF1Lsga9UqaTsZc47tu7E=", + "owner": "tgunnoe", + "repo": "devx", + "rev": "ed7fa452f1dba8335f3842dc09ffedc6f29d17f6", + "type": "github" + }, + "original": { + "owner": "tgunnoe", + "ref": "update", + "repo": "devx", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -254,6 +284,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ghc-8.6.5-iohk": { "flake": false, "locked": { @@ -899,6 +947,7 @@ "CHaP": "CHaP", "blank": "blank", "cardano-node": "cardano-node", + "devx": "devx", "flake-compat": "flake-compat", "hackage": "hackage", "haskell-nix": "haskell-nix", @@ -1005,6 +1054,21 @@ "type": "github" } }, + "systems": { + "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/flake.nix b/flake.nix index f631b8bd..5caf313f 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,11 @@ inputs.hackage.follows = "hackage"; inputs.hydra.follows = "blank"; }; - + devx = { + url = "github:tgunnoe/devx/update"; + inputs.haskellNix.follows = "haskell-nix"; + inputs.iohk-nix.follows = "iohk-nix"; + }; # Used to provide the cardano-node and cardano-cli executables. cardano-node = { url = "github:input-output-hk/cardano-node/9.1.0"; @@ -77,6 +81,7 @@ inputs.haskell-nix.overlay inputs.iohk-nix.overlays.crypto inputs.iohk-nix.overlays.haskell-nix-extra + inputs.purescript-overlay.overlays.default ( self: super: { diff --git a/nix/offchain.nix b/nix/offchain.nix index 148c095b..ee990da1 100644 --- a/nix/offchain.nix +++ b/nix/offchain.nix @@ -49,8 +49,8 @@ let nativeBuildInputs = with pkgs; [ purescript-psa - inputs'.purescript-overlay.packages.purs - pkgs.spago + purs + spago nodejs-18_x ]; diff --git a/nix/shells.nix b/nix/shells.nix index b92fd729..ea01993b 100644 --- a/nix/shells.nix +++ b/nix/shells.nix @@ -29,6 +29,7 @@ in ]; inputsFrom = [ onchain.devShells.default + inputs'.devx.devShells.ghc96-minimal-iog ]; packages = with pkgs; [ @@ -39,12 +40,12 @@ in self.packages.kupo self.packages.ogmios - cabal-install - haskellPackages.apply-refact - haskellPackages.cabal-fmt - haskellPackages.fourmolu - haskellPackages.hoogle - ghcid + #cabal-install + # haskellPackages.apply-refact + # haskellPackages.cabal-fmt + # haskellPackages.fourmolu + # haskellPackages.hoogle + #ghcid watchexec @@ -65,8 +66,8 @@ in # Purescript purescript-psa pscid - inputs'.purescript-overlay.packages.purs - inputs'.purescript-overlay.packages.purs-tidy + purs + purs-tidy self.packages.spago2nix # no aarch64-darwin for spago 0.21 (stable) from purescript-overlay's spago