Skip to content
Snippets Groups Projects
Commit f71b14d6 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

does this get the overlay used?

parent 1f90e09a
No related branches found
No related tags found
1 merge request!93Update to a newer Haskell.nix
...@@ -11,7 +11,7 @@ let ...@@ -11,7 +11,7 @@ let
# niv add input-output-hk/haskell.nix -n haskellNix # niv add input-output-hk/haskell.nix -n haskellNix
# Import nixpkgs and pass the haskell.nix provided nixpkgsArgs # Import nixpkgs and pass the haskell.nix provided nixpkgsArgs
pkgs' = import pkgs = import
# haskell.nix provides access to the nixpkgs pins which are used by our CI, # haskell.nix provides access to the nixpkgs pins which are used by our CI,
# hence you will be more likely to get cache hits when using these. # hence you will be more likely to get cache hits when using these.
# But you can also just use your own, e.g. '<nixpkgs>'. # But you can also just use your own, e.g. '<nixpkgs>'.
...@@ -19,14 +19,14 @@ let ...@@ -19,14 +19,14 @@ let
# These arguments passed to nixpkgs, include some patches and also # These arguments passed to nixpkgs, include some patches and also
# the haskell.nix functionality itself as an overlay. # the haskell.nix functionality itself as an overlay.
haskellNix.nixpkgsArgs; haskellNix.nixpkgsArgs;
# Help it find the non-Haskell dependency libchallenge_bypass_ristretto_ffi.
pkgs = pkgs'.appendOverlays [(import ./oldnix/overlay.nix)];
in pkgs.haskell-nix.project { in pkgs.haskell-nix.project {
# 'cleanGit' cleans a source directory based on the files known by git # 'cleanGit' cleans a source directory based on the files known by git
src = pkgs.haskell-nix.haskellLib.cleanGit { src = pkgs.haskell-nix.haskellLib.cleanGit {
name = "PaymentServer"; name = "PaymentServer";
src = ./.; src = ./.;
}; };
modules = []; modules = [{
# Help it find the non-Haskell dependency libchallenge_bypass_ristretto_ffi.
pkgs = pkgs.extend (import ./oldnix/overlay.nix);
}];
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment