Skip to content

Commit

Permalink
Merge #3203
Browse files Browse the repository at this point in the history
3203: Update haskell.nix version now that we can cross-compile secp256k1 r=sevanspowell a=sevanspowell

- Haskell.nix issue 1402
(input-output-hk/haskell.nix#1402) has been fixed, allowing us to cross-compile.
- Therefore update haskell.nix to the latest version, removing workaround.


Co-authored-by: Samuel Evans-Powell <mail@sevanspowell.net>
  • Loading branch information
iohk-bors[bot] and sevanspowell authored Mar 30, 2022
2 parents 8c5697b + 637dc14 commit ef89091
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 6 deletions.
82 changes: 78 additions & 4 deletions flake.lock

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

3 changes: 1 addition & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
nixpkgs.follows = "haskellNix/nixpkgs-2111";
hostNixpkgs.follows = "nixpkgs";
haskellNix = {
# FIXME: Workaround for https://github.com/input-output-hk/haskell.nix/issues/1402
url = "github:input-output-hk/haskell.nix/308c937bfc68071d8ab0206b44e0f3dde35a401e";
url = "github:input-output-hk/haskell.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils";
Expand Down
3 changes: 3 additions & 0 deletions nix/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,9 @@ haskell-nix: haskell-nix.stackProject' [

({ lib, pkgs, ... }: {
# Use our forked libsodium from iohk-nix crypto overlay.
packages.plutus-tx.components.library.pkgconfig = lib.mkForce [ [ pkgs.libsodium-vrf ] ];
packages.byron-spec-ledger.components.library.pkgconfig = lib.mkForce [ [ pkgs.libsodium-vrf ] ];
packages.cardano-wallet-cli.components.library.pkgconfig = lib.mkForce [ [ pkgs.libsodium-vrf ] ];
packages.cardano-crypto-praos.components.library.pkgconfig = lib.mkForce [ [ pkgs.libsodium-vrf ] ];
packages.cardano-crypto-class.components.library.pkgconfig = lib.mkForce [ [ pkgs.libsodium-vrf ] ];
})
Expand Down

0 comments on commit ef89091

Please sign in to comment.