feat: use devx shell for haskell deps

input-output-hk · Sep 20, 2024 · 5a8658c · 5a8658c
1 parent d7dc6de
commit 5a8658c
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 11 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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
@@ -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