From 30d2218e65e975c6ce5887d757f454f15af75a98 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Tue, 23 Jul 2019 14:57:09 +0200
Subject: Fix nix build and add to travis

---
 release.nix | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'release.nix')

diff --git a/release.nix b/release.nix
index d025a5b..a1e7605 100644
--- a/release.nix
+++ b/release.nix
@@ -1,12 +1,28 @@
 let
+  composeExtensionsList =
+    pkgs.lib.fold pkgs.lib.composeExtensions (_: _: {});
+  makeOverrides =
+    function: names: haskellPackagesNew: haskellPackagesOld:
+    let
+      toPackage = name: {
+        inherit name;
+        value = function haskellPackagesOld.${name};
+      };
+      
+    in
+      builtins.listToAttrs (map toPackage names);
   config = {
     packageOverrides = pkgs: rec {
       haskellPackages = pkgs.haskellPackages.override {
-        overrides = haskellPackagesNew: haskellPackagesOld: rec {
-          hedgehog-fn = haskellPackagesNew.callPackage ./nix/hedgehog-fn.nix {};
-          tomland = haskellPackagesNew.callPackage ./nix/tomland.nix {};
-          parser-combinators = haskellPackagesNew.callPackage ./nix/parser-combinators.nix {};
-        };
+        overrides = composeExtensionsList [
+          (haskellPackagesNew: haskellPackagesOld: rec {
+            hedgehog-fn = haskellPackagesNew.callPackage ./nix/hedgehog-fn.nix {};
+            tomland = haskellPackagesNew.callPackage ./nix/tomland.nix {};
+            parser-combinators = haskellPackagesNew.callPackage ./nix/parser-combinators.nix {};
+            tasty-hedgehog = haskellPackagesNew.callPackage ./nix/tasty-hedgehog.nix {};
+          })
+          (makeOverrides pkgs.haskell.lib.dontCheck ["tomland"])
+        ];
       };
     };
   };
-- 
cgit