removed redundant code from flake

This commit is contained in:
2025-05-25 23:45:44 +01:00
parent fa5b7a27d5
commit cd8bb2df8c
3 changed files with 29 additions and 38 deletions

View File

@@ -1,6 +1,5 @@
{ {
description = "Nix flake for P2PRC Haskell library"; description = "Nix flake for P2PRC Haskell library";
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@@ -22,6 +21,19 @@
haskell.compiler.ghc98 haskell.compiler.ghc98
zlib.dev zlib.dev
]; ];
shellHook = ''
pwd
cd ../../
echo "building package"
pwd
nix build .
echo "building package"
pwd
cd Bindings/Haskell
pwd
echo "done!!!!"
'';
}; };
} }
); );

23
flake.lock generated
View File

@@ -57,32 +57,11 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"gomod2nix": "gomod2nix", "gomod2nix": "gomod2nix",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"p2prc-hs": "p2prc-hs"
} }
}, },
"systems": { "systems": {

View File

@@ -12,12 +12,6 @@
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
p2prc-hs = {
url = "path:./Bindings/Haskell";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
}; };
outputs = outputs =
@@ -25,7 +19,6 @@
nixpkgs, nixpkgs,
flake-utils, flake-utils,
gomod2nix, gomod2nix,
p2prc-hs,
... ...
}: }:
let let
@@ -42,20 +35,29 @@
(flake-utils.lib.eachDefaultSystem ( (flake-utils.lib.eachDefaultSystem (
system: system:
let 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. # 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. # This has no effect on other platforms.
callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage; 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 in
{ {
packages.default = callPackage ./. { }; packages.default = p2prcFinalPackage;
packages.p2prc-hs = pkgs.haskellPackages.callPackage ./Bindings/Haskell/project.nix { };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
@@ -68,8 +70,6 @@
]; ];
}; };
devShells.p2prc-hs = p2prc-hs.devShell.${system};
} }
)); ));
} }