From a2b9980e2c77aa95ec6d38d567223cc0775a3230 Mon Sep 17 00:00:00 2001
From: Simon Jakobi <simon.jakobi@gmail.com>
Date: Mon, 25 May 2020 19:28:26 +0200
Subject: [PATCH 1/2] Fix build failure in Nix.Var (#587)

The `Refl` constructor had previously been re-exported from
`Data.GADT.Compare`.

This also replaces the dependency on `dependent-sum` with `some`,
where the `Data.GADT.Compare` module is now defined.

Tested by building locally with GHC 8.4.4, 8.6.5 and 8.8.3 in `cabal`.

Fixes #585.
---
 hnix.cabal     | 3 +--
 src/Nix/Var.hs | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hnix.cabal b/hnix.cabal
index b0618b79b..885f2570f 100644
--- a/hnix.cabal
+++ b/hnix.cabal
@@ -860,7 +860,6 @@ library
     , contravariant >= 1.5 && < 1.6
     , data-fix >= 0.2.0 && <  0.3
     , deepseq >=1.4.3 && <1.5
-    , dependent-sum >= 0.4 && < 0.5 || >= 0.6.2.0 && < 0.8
     , deriving-compat >=0.3 && <0.6
     , directory >= 1.3.1 && < 1.4
     , exceptions >= 0.10.0 && < 0.11
@@ -891,6 +890,7 @@ library
     , semialign >= 1 && < 1.2
     , semialign-indexed >= 1 && < 1.2
     , semigroups >=0.18 && <0.19 || >= 0.19.1 && < 0.20
+    , some >= 1.0.1 && < 1.1
     , split >= 0.2.3 && < 0.3
     , syb >= 0.7 && < 0.8
     , template-haskell
@@ -995,7 +995,6 @@ test-suite hnix-tests
     , cryptohash-sha512
     , data-fix
     , deepseq >=1.4.3 && <1.5
-    , dependent-sum
     , directory
     , exceptions
     , filepath
diff --git a/src/Nix/Var.hs b/src/Nix/Var.hs
index 73c2ee678..cae8cac92 100644
--- a/src/Nix/Var.hs
+++ b/src/Nix/Var.hs
@@ -12,6 +12,7 @@ import           Data.GADT.Compare
 import           Data.IORef
 import           Data.Maybe
 import           Data.STRef
+import           Type.Reflection ((:~:)(Refl))
 
 import           Unsafe.Coerce
 

From 86b5da1fa1893055c12c416bc09081cd50b093b1 Mon Sep 17 00:00:00 2001
From: Anton Latukha <anton.latukha@gmail.com>
Date: Mon, 25 May 2020 21:47:02 +0300
Subject: [PATCH 2/2] Repl.hs: import: Repline: hide options (#582)

Report: https://github.com/haskell-nix/hnix/issues/538#issue-581377935

M  main/Repl.hs
---
 main/Repl.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/Repl.hs b/main/Repl.hs
index f97aed0c5..c1382d9b5 100644
--- a/main/Repl.hs
+++ b/main/Repl.hs
@@ -53,7 +53,7 @@ import           Control.Monad.Reader
 import           Control.Monad.State.Strict
 
 import           System.Console.Haskeline.MonadException
-import           System.Console.Repline
+import           System.Console.Repline        hiding ( options )
 import           System.Environment
 import           System.Exit