Merge #845 Update http-client & parser-combinators

Author: Anton-Latukha

hnix.cabal

@@ -414,7 +414,7 @@ library
     , hashing >= 0.1.0 && < 0.2
     , hnix-store-core >= 0.4.0 && < 0.5
     , hnix-store-remote >= 0.4.0 && < 0.5
-    , http-client >= 0.5.14 && < 0.6 || >= 0.6.4 && < 0.7
+    , http-client >= 0.5.14 && < 0.6 || >= 0.6.4 && < 0.8
     , http-client-tls >= 0.3.5 && < 0.4
     , http-types >= 0.12.2 && < 0.13
     , lens-family >= 1.2.2 && < 2.2
@@ -427,7 +427,7 @@ library
     , mtl >= 2.2.2 && < 2.3
     , neat-interpolation >= 0.4 && < 0.6
     , optparse-applicative >= 0.14.3 && < 0.17
-    , parser-combinators >= 1.0.1 && < 1.3
+    , parser-combinators >= 1.0.1 && < 1.4
     , prettyprinter >= 1.7.0 && < 1.8
     , process >= 1.6.3 && < 1.7
     , ref-tf >= 0.4.0 && < 0.5

src/Nix/Fresh.hs

@@ -1,10 +1,8 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveFunctor #-}
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
 
@@ -13,21 +11,35 @@
 
 module Nix.Fresh where
 
-import           Control.Applicative
-import           Control.Monad.Base
-import           Control.Monad.Catch
+import           Control.Applicative        ( Alternative )
+import           Control.Monad.Base   ( MonadBase(..) )
+import           Control.Monad.Catch  ( MonadCatch
+                              , MonadMask
+                              , MonadThrow
+                              )
 import           Control.Monad.Except
+                              ( MonadFix
+                              , MonadIO
+                              , MonadPlus
+                              , MonadTrans(..)
+                              )
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail
 #endif
-import           Control.Monad.Reader
+import           Control.Monad.Reader ( ReaderT(..)
+                              , MonadReader(ask)
+                              )
 import           Control.Monad.Ref
-import           Control.Monad.ST
-import           Data.Typeable
+                              ( MonadAtomicRef(..)
+                              , MonadRef(writeRef, readRef)
+                              )
+import           Control.Monad.ST     ( ST )
+import           Data.Typeable     ( Typeable )
 
 import           Nix.Var
 import           Nix.Thunk
 
+
 newtype FreshIdT i m a = FreshIdT { unFreshIdT :: ReaderT (Var m i) m a }
   deriving
     ( Functor
@@ -72,7 +84,7 @@ runFreshIdT i m = runReaderT (unFreshIdT m) i
 -- Orphan instance needed by Infer.hs and Lint.hs
 
 -- Since there's no forking, it's automatically atomic.
---  NOTE: MonadAtomicRef (ST s) can be upstreamed to `ref-tf`
+--  2021-02-09: NOTE: Submitted upstream: https://github.com/mainland/ref-tf/pull/4
 instance MonadAtomicRef (ST s) where
   atomicModifyRef r f = do
     v <- readRef r