From 7e5edff4c25310b8cebf22576ad87798f8b1e870 Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Tue, 18 Jun 2019 10:26:03 +0200
Subject: [PATCH] Fix package for release

---
 default.nix  | 6 ++++--
 package.yaml | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index ab6c76e..41a84c3 100644
--- a/default.nix
+++ b/default.nix
@@ -9,10 +9,11 @@ with rec
   haskellPackages = pkgs.haskellPackages.override
     { overrides = _: haskellPackages:
         { niv =
+            pkgs.haskell.lib.failOnAllWarnings (
             pkgs.haskell.lib.disableExecutableProfiling (
             pkgs.haskell.lib.disableLibraryProfiling (
             pkgs.haskell.lib.generateOptparseApplicativeCompletion "niv" (
-            haskellPackages.callCabal2nix "niv" niv-source {})));
+            haskellPackages.callCabal2nix "niv" niv-source {}))));
         };
     };
 
@@ -26,6 +27,7 @@ with rec
       };
     pkgs.writeScript "cabal-upload"
     ''
+      #!${pkgs.stdenv.shell}
       cabal upload "$@" "${niv-sdist}/niv-${niv-version}.tar.gz"
     '';
 
@@ -40,7 +42,7 @@ with rec
 
           repl_niv() {
             shopt -s globstar
-            ghci -Wall app/Niv.hs src/**/*.hs
+            ghci -clear-package-db -global-package-db -Wall app/Niv.hs src/**/*.hs
           }
 
           echo "To start a REPL session for the test suite, run:"
diff --git a/package.yaml b/package.yaml
index 193d746..d41fe53 100644
--- a/package.yaml
+++ b/package.yaml
@@ -11,7 +11,6 @@ description: Easy dependency management for Nix projects.
 
 ghc-options:
     - -Wall
-    - -Werror
 
     # For macOS: https://github.com/gibiansky/IHaskell/issues/942
     - -optP-Wno-nonportable-include-path
@@ -22,7 +21,7 @@ extra-source-files:
 dependencies:
     - aeson
     - aeson-pretty
-    - base
+    - base < 5
     - bytestring
     - directory
     - file-embed