From 403ad72ddbaabc7b420c2528ddea0108dc916e2e Mon Sep 17 00:00:00 2001 From: xecarlox94 Date: Mon, 26 May 2025 21:08:11 +0100 Subject: [PATCH] fixing environment --- Bindings/Haskell/flake.lock | 6 +++--- Bindings/Haskell/flake.nix | 2 +- Bindings/Haskell/lib/CLI.hs | 2 +- Bindings/Haskell/p2prc.cabal | 28 ++++++++++++++-------------- flake.lock | 6 +++--- flake.nix | 9 ++++++++- 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Bindings/Haskell/flake.lock b/Bindings/Haskell/flake.lock index 71c1df5..280d45f 100644 --- a/Bindings/Haskell/flake.lock +++ b/Bindings/Haskell/flake.lock @@ -97,12 +97,12 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-bQH3tqwK4eSRrJckF8wHfulBa4c5lcOIcCOiyDGUx2U=", - "path": "../../", + "narHash": "sha256-5qbaxawuLsg8iu9076zlAbLtTFSNJaTz7WERS5rWRxU=", + "path": "/nix/store/lg694r23fzc6v5ai3qqcszq1fp44djg2-source", "type": "path" }, "original": { - "path": "../../", + "path": "/nix/store/lg694r23fzc6v5ai3qqcszq1fp44djg2-source", "type": "path" } }, diff --git a/Bindings/Haskell/flake.nix b/Bindings/Haskell/flake.nix index 2f27a15..6bfd4f0 100644 --- a/Bindings/Haskell/flake.nix +++ b/Bindings/Haskell/flake.nix @@ -2,7 +2,7 @@ description = "Nix flake for P2PRC Haskell library"; inputs = { flake-utils.url = "github:numtide/flake-utils"; - p2prc-main.url = "path:../../"; + p2prc-main.url = "../../"; }; outputs = { nixpkgs, flake-utils, p2prc-main, ... }: diff --git a/Bindings/Haskell/lib/CLI.hs b/Bindings/Haskell/lib/CLI.hs index 43fb4d8..0896c3c 100644 --- a/Bindings/Haskell/lib/CLI.hs +++ b/Bindings/Haskell/lib/CLI.hs @@ -116,5 +116,5 @@ eitherErrorDecode esa = -- assumes the program is ran inside the haskell module in p2prc's repo -- assumes that last path segment is "haskell" and that p2prc binary's name is "p2p-rendering-computation" p2prcCmdName :: String -p2prcCmdName = "p2prc" +p2prcCmdName = "p2p-rendering-computation" diff --git a/Bindings/Haskell/p2prc.cabal b/Bindings/Haskell/p2prc.cabal index db4897b..3d188de 100644 --- a/Bindings/Haskell/p2prc.cabal +++ b/Bindings/Haskell/p2prc.cabal @@ -27,20 +27,20 @@ extra-doc-files: README.md common warnings ghc-options: -Wall --- executable p2prc --- --- import: warnings --- --- hs-source-dirs: src --- --- main-is: Main.hs --- --- other-extensions: OverloadedStrings --- --- build-depends: base --- , p2prc --- --- default-language: GHC2021 +executable p2prc + + import: warnings + + hs-source-dirs: src + + main-is: Main.hs + + other-extensions: OverloadedStrings + + build-depends: base + , p2prc + + default-language: GHC2021 library diff --git a/flake.lock b/flake.lock index 2e10b9c..34a3bc4 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1f17d18..048ae52 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ }); in { - overlays.default = bindingsOverlay; + # overlays.default = bindingsOverlay; } // (flake-utils.lib.eachDefaultSystem ( @@ -69,6 +69,13 @@ ]; }; + overlays = { + default = [ + bindingsOverlay + coreOverlay + ]; + }; + } )); }