From 26c7f9104bd6fd5042d309db6d89a9e1ad6bbdf0 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Sat, 15 Jun 2019 15:55:08 +0100
Subject: [PATCH 1/2] Add completions and disable profiling

---
 default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index e6d7eec..6278b1c 100644
--- a/default.nix
+++ b/default.nix
@@ -8,7 +8,12 @@ with rec
   niv-source = gitignoreSource ./.;
   haskellPackages = pkgs.haskellPackages.override
     { overrides = _: haskellPackages:
-        { niv = haskellPackages.callCabal2nix "niv" niv-source {}; };
+        { niv =
+            pkgs.haskell.lib.disableExecutableProfiling (
+            pkgs.haskell.lib.disableLibraryProfiling (
+            pkgs.haskell.lib.generateOptparseApplicativeCompletion "niv" (
+            haskellPackages.callCabal2nix "niv" niv-source {})));
+        };
     };
 
   niv = haskellPackages.niv;

From a1065ac1f519989551e8fe50811e36e44133bf7d Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Sun, 16 Jun 2019 08:53:52 +0000
Subject: [PATCH 2/2] Fix CircleCI retry

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d75ce1e..abc30c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,7 +35,9 @@ jobs:
             until bash <(curl https://nixos.org/nix/install)
             do
               echo "Nix install failed, retrying"
-              rm -rf /nix
+              sudo rm -rf /nix
+              sudo mkdir -p /nix
+              sudo chown circleci /nix
             done
             echo '. /home/circleci/.nix-profile/etc/profile.d/nix.sh' >> $BASH_ENV