From cd8bb2df8c1c43c5720cb676f12f4c90a043cb78 Mon Sep 17 00:00:00 2001
From: xecarlox94 <jf94.uk@gmail.com>
Date: Sun, 25 May 2025 23:45:44 +0100
Subject: [PATCH] removed redundant code from flake

---
 Bindings/Haskell/flake.nix | 14 +++++++++++++-
 flake.lock                 | 23 +----------------------
 flake.nix                  | 30 +++++++++++++++---------------
 3 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/Bindings/Haskell/flake.nix b/Bindings/Haskell/flake.nix
index f9edff9..efef6ed 100644
--- a/Bindings/Haskell/flake.nix
+++ b/Bindings/Haskell/flake.nix
@@ -1,6 +1,5 @@
 {
   description = "Nix flake for P2PRC Haskell library";
-
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
   };
@@ -22,6 +21,19 @@
               haskell.compiler.ghc98
               zlib.dev
             ];
+
+            shellHook = ''
+              pwd
+              cd ../../
+              echo "building package"
+              pwd
+              nix build .
+              echo "building package"
+              pwd
+              cd Bindings/Haskell
+              pwd
+              echo "done!!!!"
+            '';
           };
         }
     );
diff --git a/flake.lock b/flake.lock
index f94af6e..2e10b9c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,32 +57,11 @@
         "type": "github"
       }
     },
-    "p2prc-hs": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-rg64vJj97NRXMCphUrZ1FlMZPQU0OtW9C9vZrA/kpKw=",
-        "path": "./Bindings/Haskell",
-        "type": "path"
-      },
-      "original": {
-        "path": "./Bindings/Haskell",
-        "type": "path"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "gomod2nix": "gomod2nix",
-        "nixpkgs": "nixpkgs",
-        "p2prc-hs": "p2prc-hs"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 7c6477f..cbd2594 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,12 +12,6 @@
       inputs.flake-utils.follows = "flake-utils";
     };
 
-    p2prc-hs = {
-      url = "path:./Bindings/Haskell";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-
   };
 
   outputs =
@@ -25,7 +19,6 @@
       nixpkgs,
       flake-utils,
       gomod2nix,
-      p2prc-hs,
       ...
     }:
     let
@@ -42,20 +35,29 @@
     (flake-utils.lib.eachDefaultSystem (
         system:
           let
-            pkgs = import nixpkgs {
-              inherit system;
-              overlays = [ gomod2nix.overlays.default mainOverlay ];
-            };
 
             # The current default sdk for macOS fails to compile go projects, so we use a newer one for now.
             # This has no effect on other platforms.
             callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage;
+
+            p2prcFinalPackage = callPackage ./. { };
+
+            pkgs = import nixpkgs {
+              inherit system;
+              overlays = [
+                gomod2nix.overlays.default
+                mainOverlay
+                (final: prev: {
+                  p2prc = p2prcFinalPackage;
+                })
+              ];
+            };
+
           in
           {
 
-            packages.default = callPackage ./. { };
+            packages.default = p2prcFinalPackage;
 
-            packages.p2prc-hs = pkgs.haskellPackages.callPackage ./Bindings/Haskell/project.nix { };
 
             devShells.default = pkgs.mkShell {
               buildInputs = with pkgs; [
@@ -68,8 +70,6 @@
               ];
             };
 
-            devShells.p2prc-hs = p2prc-hs.devShell.${system};
-
           }
       ));
 }