From 9c67ad09c761e8b9000f4d1625b288510023f19d Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 22 Jun 2023 15:12:11 +1200 Subject: [PATCH 1/2] Workaround for --override-input CHaP This helps haskell.nix find the package source correctly. --- flake.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index a9c487c211..ae6c8f0ba9 100644 --- a/flake.nix +++ b/flake.nix @@ -66,7 +66,13 @@ inputMap = { "https://input-output-hk.github.io/cardano-haskell-packages" = inputs.CHaP; }; - + # Also currently needed to make `nix flake lock --update-input CHaP` work. + cabalProjectLocal = '' + repository cardano-haskell-packages-local + url: file:${inputs.CHaP} + secure: True + active-repositories: hackage.haskell.org, cardano-haskell-packages-local + ''; # tools we want in our shell, from hackage shell.tools = { From 2c29490383e1784a1bb5539f6fc82b1b51c2ce80 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 22 Jun 2023 15:32:36 -0400 Subject: [PATCH 2/2] flake: expose project --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index ae6c8f0ba9..c6987f54d5 100644 --- a/flake.nix +++ b/flake.nix @@ -123,6 +123,7 @@ ); in nixpkgs.lib.recursiveUpdate flake rec { + project = cabalProject; # add a required job, that's basically all hydraJobs. hydraJobs = nixpkgs.callPackages inputs.iohkNix.utils.ciJobsAggregates