From a07a412c723355529c39bbd5568ece437b95135b Mon Sep 17 00:00:00 2001 From: xecarlox94 Date: Thu, 29 May 2025 23:52:14 +0100 Subject: [PATCH] temporary fix to test remote flake init --- nix/templates/haskell/flake.lock | 12 ++++++------ nix/templates/haskell/flake.nix | 20 +++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/nix/templates/haskell/flake.lock b/nix/templates/haskell/flake.lock index 3b6da3a..84f90a8 100644 --- a/nix/templates/haskell/flake.lock +++ b/nix/templates/haskell/flake.lock @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1748386148, - "narHash": "sha256-bbm2KWAWE2jdYl06xwNg8A3Frz1+ujiziKaeh+GGGQg=", + "lastModified": 1748558171, + "narHash": "sha256-XKoPzOrfrED387rJZRHlPZDcrDyzCMFz9BSCWwZNCEQ=", "owner": "xecarlox94", "repo": "p2p-rendering-computation", - "rev": "85806ab035b22d451de5531c18c07461df1d7c77", + "rev": "e04e918328eb411517680ea3d36d19b3b9f8d4d4", "type": "github" }, "original": { diff --git a/nix/templates/haskell/flake.nix b/nix/templates/haskell/flake.nix index 2ba7f0c..6ba17f7 100644 --- a/nix/templates/haskell/flake.nix +++ b/nix/templates/haskell/flake.nix @@ -25,8 +25,8 @@ # TODO: p2prc overlays into a single list overlays = [ - p2prc-flake.overlays.${system}.default - p2prc-flake.overlays.${system}.bindings + p2prc-flake.overlays.default + p2prc-flake.overlays.bindings ]; }; @@ -62,13 +62,13 @@ in '' - cabal init + # cabal init # 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 { }; }; - devShells.default = pkgs.haskellPackages.shellFor { + devShells.default = pkgs.mkShell { - packages = p: [ - (p.callPackage ./cabal.nix { }) - ]; + # devShells.default = pkgs.haskellPackages.shellFor { + + # packages = p: [ + # (p.callPackage ./cabal.nix { }) + # ]; buildInputs = with pkgs; [ p2prc-flake.packages.${system}.default