Use more recent nixpkgs and ensure secp256k1 is in scope for cardano-…

…crypto-class
input-output-hk · May 23, 2022 · c052038 · c052038
1 parent fd7b2c7
commit c052038
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -8,16 +8,17 @@
     (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
   pkgs = import nixpkgsSrc (nixpkgsArgs // {
     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 ] ];
   }];
 }