From c052038a0c54e4188778c83fa02ed1d627f1e359 Mon Sep 17 00:00:00 2001 From: Sebastian Nagel Date: Fri, 29 Apr 2022 20:56:25 +0200 Subject: [PATCH] Use more recent nixpkgs and ensure secp256k1 is in scope for cardano-crypto-class --- cabal.project | 2 +- default.nix | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index 22917fb84fe..5e38eb1b503 100644 --- a/cabal.project +++ b/cabal.project @@ -188,7 +188,7 @@ source-repository-package type: git location: https://github.com/input-output-hk/plutus tag: 5cc518f1202930ad52b8ba838af32af084c0e754 - --sha256: 0000000000000000000000000000000000000000000000000000 + --sha256: 0w9v0n7rv2bmp0m4nrvxxncic7b23v3m4f89k31x0cawqzvhysbf subdir: plutus-core plutus-ledger-api diff --git a/default.nix b/default.nix index 6bd8b93734e..077c9a59090 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,8 @@ (builtins.fetchTarball "https://github.com/input-output-hk/iohk-nix/archive/62d853d3216083ecadc8e7f192498bebad4eee76.tar.gz") { } -, nixpkgsSrc ? haskellNix.sources.nixpkgs-2111 + # nixpkgs-unstable as also used by cardano-node, cardano-ledger et al +, nixpkgsSrc ? builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/1882c6b7368fd284ad01b0a5b5601ef136321292.tar.gz" , nixpkgsArgs ? haskellNix.nixpkgsArgs }: let @@ -16,8 +17,8 @@ let overlays = # Haskell.nix (https://github.com/input-output-hk/haskell.nix) haskellNix.overlays - # needed for cardano-api which uses a patched libsodium - ++ iohkNix.overlays.crypto; + # needed for cardano-crypto-class which uses a patched libsodium + ++ iohkNix.overlays.crypto; }); in pkgs.haskell-nix.project { @@ -45,7 +46,7 @@ pkgs.haskell-nix.project { packages.cardano-config.components.library.build-tools = [ pkgs.buildPackages.buildPackages.gitMinimal ]; # https://github.com/input-output-hk/iohk-nix/pull/488 - packages.cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf ] ]; + packages.cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 ] ]; packages.cardano-crypto-praos.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf ] ]; }]; }