Skip to content

Commit

Permalink
bump CHaP
Browse files Browse the repository at this point in the history
  • Loading branch information
mgmeier committed Dec 5, 2024
1 parent 62a82eb commit 94f5c85
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 91 deletions.
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repository cardano-haskell-packages

index-state:
, hackage.haskell.org 2024-10-24T18:39:40Z
, cardano-haskell-packages 2024-10-24T07:10:59Z
, cardano-haskell-packages 2024-11-27T20:49:28Z

packages: ./.

Expand Down
182 changes: 98 additions & 84 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
iohkNix.url = "github:input-output-hk/iohk-nix";
flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs";

CHaP.url = "github:input-output-hk/cardano-haskell-packages?ref=repo";
CHaP.url = "github:intersectmbo/cardano-haskell-packages?ref=repo";
CHaP.flake = false;

# cicero
Expand All @@ -22,7 +22,7 @@
outputs = inputs: let
supportedSystems = [
"x86_64-linux"
#"x86_64-darwin"
"x86_64-darwin"
#"aarch64-linux"
#"aarch64-darwin"
];
Expand Down Expand Up @@ -53,7 +53,7 @@
# nix flake lock --update-input CHaP
#
inputMap = {
"https://input-output-hk.github.io/cardano-haskell-packages" = inputs.CHaP;
"https://chap.intersectmbo.org/" = inputs.CHaP;
};

# tools we want in our shell
Expand All @@ -78,9 +78,6 @@
# specific enough, or doesn't allow setting these.
modules = [
({pkgs, ...}: {
# Use our forked libsodium from iohk-nix crypto overlay.
packages.cardano-crypto-class.components.library.pkgconfig = lib.mkForce [[pkgs.libsodium-vrf pkgs.secp256k1]];
packages.cardano-crypto-praos.components.library.pkgconfig = lib.mkForce [[pkgs.libsodium-vrf]];
packages.ekg-forward = {
configureFlags = ["--ghc-option=-Werror"];
components = {
Expand Down

0 comments on commit 94f5c85

Please sign in to comment.