From 2c2dd63442ac33020956da91c5280e2aca83667c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 7 Jul 2021 12:41:00 -0400
Subject: [PATCH] be consistent in using the nixpkgs with the extra overlay
---
default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/default.nix b/default.nix
index e5b794c..b984f83 100644
--- a/default.nix
+++ b/default.nix
@@ -11,7 +11,7 @@ let
# niv add input-output-hk/haskell.nix -n haskellNix
# 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,
# hence you will be more likely to get cache hits when using these.
# But you can also just use your own, e.g. '<nixpkgs>'.
@@ -21,8 +21,8 @@ let
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 {
+ pkgs = pkgs'.appendOverlays [(import ./oldnix/overlay.nix)];
+in pkgs.haskell-nix.project {
# 'cleanGit' cleans a source directory based on the files known by git
src = pkgs.haskell-nix.haskellLib.cleanGit {
name = "PaymentServer";
--
GitLab