me/p2p-rendering-computation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed p2prc-hs issue

Browse Source
This commit is contained in:
xecarlox94
2025-05-28 22:25:09 +01:00
parent 77ebb76838
commit 0e86459122
3 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@@ -49,3 +49,11 @@ venv
# Nix and Nix flake files
result
result-*
nix/templates/haskell/haskell.cabal
nix/templates/haskell/haskell.cabal
nix/templates/haskell/haskell.cabal
nix/templates/haskell/dist-newstyle
nix/templates/haskell/app
nix/templates/haskell/CHANGELOG.md
nix/templates/haskell/LICENSE
nix/templates/haskell/project.nix

81
flake.nix
View File

@@ -24,54 +24,53 @@
gomod2nix,
...
}:
let
# TODO: merge overlays into a list
bindingsOverlay = import ./nix/overlays/bindings.nix;
coreOverlay = (final: prev: {
p2prc = final.callPackage ./. { };
});
in
(flake-utils.lib.eachDefaultSystem (
system:
let
(flake-utils.lib.eachDefaultSystem (system:
let
# 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;
# TODO: merge overlays into a list
# TODO: create default file in overlays folder to merge all overlays
bindingsOverlay = import ./nix/overlays/bindings.nix;
coreOverlay = (final: prev: {
p2prc = final.callPackage ./. { };
});
# 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;
pkgs = import nixpkgs {
inherit system;
overlays = [
gomod2nix.overlays.default
bindingsOverlay
coreOverlay
];
};
pkgs = import nixpkgs {
inherit system;
overlays = [
gomod2nix.overlays.default
bindingsOverlay
coreOverlay
];
};
in
{
in
{
packages.default = callPackage ./. { };
packages.default = callPackage ./. { };
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
go
gopls
gotools
go-tools
gomod2nix.packages.${system}.default
sqlite-interactive
];
};
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
go
gopls
gotools
go-tools
gomod2nix.packages.${system}.default
sqlite-interactive
];
};
overlays = {
# TODO: merge all overlays into a single one
default = coreOverlay;
bindings = bindingsOverlay;
};
overlays = {
# TODO: merge all overlays into a single one
default = coreOverlay;
bindings = bindingsOverlay;
};
}
));
}
));
}

1
nix/templates/haskell/flake.nix
View File

@@ -69,6 +69,7 @@
buildInputs = [
p2prc-flake.packages.${system}.default
initProject
pkgs.haskellPackages.p2prc
];
shellHook = ''