From 27f4615cd178ec7bda20b9c8806536cfa2e0c830 Mon Sep 17 00:00:00 2001 From: xecarlox94 Date: Mon, 2 Jun 2025 00:07:53 +0100 Subject: [PATCH] finishing automated setup --- flake.nix | 5 +++-- nix/templates/haskell/flake.nix | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index c80ee80..54b13e1 100644 --- a/flake.nix +++ b/flake.nix @@ -97,8 +97,7 @@ sed -i 's/base.*$/base, p2prc/' "$PROJECT_DIR".cabal cabal2nix . > ./cabal.nix; - - # TODO: add cabal2nix shell.nix generator + cabal2nix . --shell > shell.nix git add . clear @@ -107,6 +106,8 @@ echo -e "cd $PROJECT_DIR\n" echo -e "nix flake init -t github:akilan1999/p2p-rendering-computation#haskell" + echo -e "nix develop" + echo -e "nix run" ''; }; diff --git a/nix/templates/haskell/flake.nix b/nix/templates/haskell/flake.nix index 4e62eb6..8e2f16b 100644 --- a/nix/templates/haskell/flake.nix +++ b/nix/templates/haskell/flake.nix @@ -28,7 +28,7 @@ devShells.default = pkgs.haskellPackages.shellFor { packages = p: [ - (p.callPackage ./cabal.nix { }) + (p.callPackage ./shell.nix { }) ]; buildInputs = with pkgs; [ @@ -41,6 +41,7 @@ # TODO: add cabal2nix shell command shellHook = '' cabal2nix . > ./cabal.nix + cabal2nix . --shell > ./shell.nix ''; }; }