Skip to content

Commit

Permalink
Merge #922: Updating deps
Browse files Browse the repository at this point in the history
* `relude` previous history: #900, #902 & 1.0 changelog: https://hackage.haskell.org/package/relude-1.0.0.1/changelog.

* `base16-bytestring` used only in library.

* `semialign-indexed` deprecated.

* Removed some imports of packages that are not used (at least directly) in executable/tests/bench.

* Added Nixpkgs overrides according to new versions & revision. The same would must be done after HNix release in the Nixpkgs derivation declaration.

etc.
  • Loading branch information
Anton-Latukha committed May 6, 2021
2 parents c0d7379 + 7f74dad commit fe785a1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 25 deletions.
2 changes: 2 additions & 0 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ let
overrides = self: super: {

ref-tf = super.ref-tf_0_5;
semialign = super.semialign_1_2;
relude = super.relude_1_0_0_1;

};

Expand Down
28 changes: 3 additions & 25 deletions hnix.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -439,10 +439,9 @@ library
, process >= 1.6.3 && < 1.7
, ref-tf >= 0.5 && < 0.6
, regex-tdfa >= 1.2.3 && < 1.4
, relude >= 0.7.0 && < 1.0.0
, relude >= 0.7.0 && < 1.1.0
, scientific >= 0.3.6 && < 0.4
, semialign >= 1 && < 1.2
, semialign-indexed >= 1 && < 1.2
, semialign >= 1 && < 1.3
, serialise >= 0.2.1 && < 0.3
, some >= 1.0.1 && < 1.1
, split >= 0.2.3 && < 0.3
Expand All @@ -453,7 +452,7 @@ library
-- * orphan instances for TH missing instances
-- aka Lift Text, Bytestring, Vector, Containers,
-- we use Lift Text particulrarly for GHC 8.6
, th-lift-instances
, th-lift-instances >= 0.1 && < 0.2
, text >= 1.2.3 && < 1.3
, these >= 1.0.1 && < 1.2
, time >= 1.8.0 && < 1.9 || >= 1.9.3 && < 1.10
Expand Down Expand Up @@ -485,8 +484,6 @@ executable hnix
build-depends:
aeson
, base
, base16-bytestring
, bytestring
, comonad
, containers
, data-fix
Expand All @@ -496,7 +493,6 @@ executable hnix
, free
, haskeline >= 0.8.0.0 && < 0.9
, hnix
, mtl
, optparse-applicative
, pretty-show
, prettyprinter
Expand All @@ -505,10 +501,7 @@ executable hnix
, repline >= 0.4.0.0 && < 0.5
, serialise
, template-haskell
, text
, time
, transformers
, unordered-containers
mixins:
base hiding (Prelude)
, relude (Relude as Prelude)
Expand Down Expand Up @@ -548,18 +541,14 @@ test-suite hnix-tests
Diff
, Glob
, base
, base16-bytestring
, bytestring
, containers
, data-fix
, deepseq
, directory
, exceptions
, filepath
, hedgehog
, hnix
, megaparsec
, mtl
, neat-interpolation
, optparse-applicative
, pretty-show
Expand All @@ -573,11 +562,8 @@ test-suite hnix-tests
, tasty-th
, serialise
, template-haskell
, text
, time
, transformers
, unix
, unordered-containers
default-extensions:
OverloadedStrings
if flag(optimize)
Expand All @@ -601,24 +587,16 @@ benchmark hnix-benchmarks
ghc-options: -Wall
build-depends:
base
, base16-bytestring
, bytestring
, containers
, criterion
, data-fix
, deepseq
, exceptions
, filepath
, hnix
, mtl
, optparse-applicative
, relude
, serialise
, template-haskell
, text
, time
, transformers
, unordered-containers
default-extensions:
OverloadedStrings
if flag(optimize)
Expand Down
1 change: 1 addition & 0 deletions tests/EvalTests.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

module EvalTests (tests, genEvalCompareTests) where

import Prelude hiding (lookupEnv)
import Control.Monad.Catch
import Data.List ((\\))
import qualified Data.Set as S
Expand Down
1 change: 1 addition & 0 deletions tests/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

module Main where

import Prelude hiding (lookupEnv)
import Relude.Unsafe (read)
import qualified Control.Exception as Exc
import GHC.Err (errorWithoutStackTrace)
Expand Down

0 comments on commit fe785a1

Please sign in to comment.