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

temporary fix to test remote flake init

Browse Source
This commit is contained in:
xecarlox94
2025-05-29 23:52:14 +01:00
parent e04e918328
commit a07a412c72
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nix/templates/haskell/flake.lock generated
View File

@@ -63,11 +63,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748190013, "lastModified": 1748370509,
"narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -100,11 +100,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1748386148, "lastModified": 1748558171,
"narHash": "sha256-bbm2KWAWE2jdYl06xwNg8A3Frz1+ujiziKaeh+GGGQg=", "narHash": "sha256-XKoPzOrfrED387rJZRHlPZDcrDyzCMFz9BSCWwZNCEQ=",
"owner": "xecarlox94", "owner": "xecarlox94",
"repo": "p2p-rendering-computation", "repo": "p2p-rendering-computation",
"rev": "85806ab035b22d451de5531c18c07461df1d7c77", "rev": "e04e918328eb411517680ea3d36d19b3b9f8d4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@@ -25,8 +25,8 @@
# TODO: p2prc overlays into a single list # TODO: p2prc overlays into a single list
overlays = [ overlays = [
p2prc-flake.overlays.${system}.default p2prc-flake.overlays.default
p2prc-flake.overlays.${system}.bindings p2prc-flake.overlays.bindings
]; ];
}; };
@@ -62,13 +62,13 @@
in in
'' ''
cabal init # cabal init
# sed -i 's/base.*$/base, p2prc/' haskell.cabal # sed -i 's/base.*$/base, p2prc/' haskell.cabal
cabal2nix . > ./cabal.nix; # cabal2nix . > ./cabal.nix;
cabal run # cabal run
''; '';
}; };
@@ -78,11 +78,13 @@
default = pkgs.haskellPackages.callPackage ./cabal.nix { }; default = pkgs.haskellPackages.callPackage ./cabal.nix { };
}; };
devShells.default = pkgs.haskellPackages.shellFor { devShells.default = pkgs.mkShell {
packages = p: [ # devShells.default = pkgs.haskellPackages.shellFor {
(p.callPackage ./cabal.nix { })
]; # packages = p: [
# (p.callPackage ./cabal.nix { })
# ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
p2prc-flake.packages.${system}.default p2prc-flake.packages.${system}.default