From 0f4f52cb8b8a1c85588f619cbb96fe10d88e74e5 Mon Sep 17 00:00:00 2001 From: xecarlox94 Date: Mon, 26 May 2025 00:06:11 +0100 Subject: [PATCH] working on haskell development shell --- Bindings/Haskell/flake.nix | 16 +++------------- flake.nix | 6 +++++- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Bindings/Haskell/flake.nix b/Bindings/Haskell/flake.nix index efef6ed..cc71ac1 100644 --- a/Bindings/Haskell/flake.nix +++ b/Bindings/Haskell/flake.nix @@ -2,10 +2,11 @@ description = "Nix flake for P2PRC Haskell library"; inputs = { flake-utils.url = "github:numtide/flake-utils"; + p2prc-main = "path:../../"; }; outputs = - { nixpkgs, flake-utils, ... }: + { nixpkgs, flake-utils, p2prc-main-go, ... }: flake-utils.lib.eachDefaultSystem ( system: let @@ -20,20 +21,9 @@ cabal-install haskell.compiler.ghc98 zlib.dev + p2prc-main-go.packages.${system}.default ]; - shellHook = '' - pwd - cd ../../ - echo "building package" - pwd - nix build . - echo "building package" - pwd - cd Bindings/Haskell - pwd - echo "done!!!!" - ''; }; } ); diff --git a/flake.nix b/flake.nix index cbd2594..d4c94f7 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,11 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; + + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; gomod2nix = { url = "github:nix-community/gomod2nix";