Skip to content

Commit 9d63f95

Browse files
jwiegleyjwiegley
committed
Merge remote-tracking branch 'sjakobi/ghc-gte-8.4'
2 parents 7180437 + 7603e36 commit 9d63f95

File tree

8 files changed

+37
-139
lines changed

8 files changed

+37
-139
lines changed

‎hnix.cabal‎

Lines changed: 32 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -489,26 +489,29 @@ library
489489
build-depends:
490490
aeson >= 1.4.2 && < 1.5
491491
, array >=0.4 && <0.6
492-
, base >=4.9 && <5
492+
, base >=4.11 && <5
493493
, binary >= 0.8.5 && < 0.9
494494
, bytestring >= 0.10.8 && < 0.11
495495
, comonad >= 5.0.4 && < 5.1
496496
, containers >= 0.5.11.0 && < 0.7
497497
, contravariant >= 1.5 && < 1.6
498498
, data-fix >= 0.2.0 && < 0.3
499-
, deepseq >=1.4.2 && <1.5
499+
, deepseq >=1.4.3 && <1.5
500500
, dependent-sum >= 0.4 && < 0.5 || >= 0.6.2.0 && < 0.7
501501
, deriving-compat >=0.3 && <0.6
502502
, directory >= 1.3.1 && < 1.4
503503
, exceptions >= 0.10.0 && < 0.11
504504
, filepath >= 1.4.2 && < 1.5
505505
, free >= 5.1 && < 5.2
506+
, hashable >=1.2.5 && < 1.4
506507
, hashing >= 0.1.0 && < 0.2
507508
, hnix-store-core >= 0.1.0 && < 0.2
508509
, http-client >= 0.5.14 && < 0.6 || >= 0.6.4 && < 0.7
509510
, http-client-tls >= 0.3.5 && < 0.4
510511
, http-types >= 0.12.2 && < 0.13
511512
, interpolate >= 0.2.0 && < 0.3
513+
, lens-family >=1.2.2
514+
, lens-family-core >=1.2.2
512515
, lens-family-th >= 0.5.0 && < 0.6
513516
, logict >= 0.6.0 && < 0.7 || >= 0.7.0.2 && < 0.8
514517
, megaparsec >=7.0 && <8.1
@@ -539,38 +542,21 @@ library
539542
, xml >= 1.3.14 && < 1.4
540543
if flag(optimize)
541544
ghc-options: -fexpose-all-unfoldings -fspecialise-aggressively -O2
542-
if os(linux) && impl(ghc >= 8.2) && impl(ghc < 8.3)
543-
build-depends:
544-
compact
545545
if !impl(ghcjs)
546+
exposed-modules:
547+
Nix.Options.Parser
546548
build-depends:
547549
base16-bytestring >= 0.1.1 && < 0.2
548550
, cryptohash-md5 >= 0.11.100 && < 0.12
549551
, cryptohash-sha1 >= 0.11.100 && < 0.12
550552
, cryptohash-sha256 >= 0.11.101 && < 0.12
551553
, cryptohash-sha512 >= 0.11.100 && < 0.12
554+
, haskeline >= 0.7.4.2 && < 0.8
555+
, pretty-show >= 1.9.5 && < 1.10
552556
, serialise >= 0.2.1 && < 0.3
553-
if impl(ghc < 8.1)
554-
build-depends:
555-
lens-family ==1.2.1
556-
, lens-family-core ==1.2.1
557-
else
558-
build-depends:
559-
lens-family >=1.2.2
560-
, lens-family-core >=1.2.2
561-
-- if impl(ghc < 8.4.0) && !flag(profiling)
557+
-- if !flag(profiling)
562558
-- build-depends:
563559
-- ghc-datasize
564-
if impl(ghcjs)
565-
build-depends:
566-
hashable >=1.2.4 && <1.3 || >= 1.3.0.0 && < 1.4
567-
else
568-
exposed-modules:
569-
Nix.Options.Parser
570-
build-depends:
571-
hashable >=1.2.5 && <1.3 || >= 1.3.0.0 && < 1.4
572-
, haskeline >= 0.7.4.2 && < 0.8
573-
, pretty-show >= 1.9.5 && < 1.10
574560
default-language: Haskell2010
575561

576562
executable hnix
@@ -584,9 +570,14 @@ executable hnix
584570
build-depends:
585571
aeson
586572
, base
573+
, base16-bytestring
587574
, bytestring
588575
, comonad
589576
, containers
577+
, cryptohash-md5
578+
, cryptohash-sha1
579+
, cryptohash-sha256
580+
, cryptohash-sha512
590581
, data-fix
591582
, deepseq
592583
, exceptions
@@ -601,28 +592,16 @@ executable hnix
601592
, prettyprinter
602593
, ref-tf
603594
, repline
595+
, serialise
604596
, template-haskell
605597
, text
606598
, time
607599
, transformers
608600
, unordered-containers
609601
if flag(optimize)
610602
ghc-options: -fexpose-all-unfoldings -fspecialise-aggressively -O2
611-
if os(linux) && impl(ghc >= 8.2) && impl(ghc < 8.3)
612-
build-depends:
613-
compact
614-
if !impl(ghcjs)
615-
build-depends:
616-
base16-bytestring
617-
, cryptohash-md5
618-
, cryptohash-sha1
619-
, cryptohash-sha256
620-
, cryptohash-sha512
621-
, serialise
622603
if impl(ghcjs)
623604
buildable: False
624-
else
625-
buildable: True
626605
default-language: Haskell2010
627606

628607
test-suite hnix-tests
@@ -643,11 +622,16 @@ test-suite hnix-tests
643622
build-depends:
644623
Diff
645624
, Glob
646-
, base >=4.9 && <5
625+
, base >=4.11 && <5
626+
, base16-bytestring
647627
, bytestring
648628
, containers
629+
, cryptohash-md5
630+
, cryptohash-sha1
631+
, cryptohash-sha256
632+
, cryptohash-sha512
649633
, data-fix
650-
, deepseq >=1.4.2 && <1.5
634+
, deepseq >=1.4.3 && <1.5
651635
, dependent-sum
652636
, directory
653637
, exceptions
@@ -669,6 +653,7 @@ test-suite hnix-tests
669653
, tasty-hunit
670654
, tasty-quickcheck
671655
, tasty-th
656+
, serialise
672657
, template-haskell
673658
, text
674659
, time
@@ -677,21 +662,8 @@ test-suite hnix-tests
677662
, unordered-containers >=0.2.9 && <0.3
678663
if flag(optimize)
679664
ghc-options: -fexpose-all-unfoldings -fspecialise-aggressively -O2
680-
if os(linux) && impl(ghc >= 8.2) && impl(ghc < 8.3)
681-
build-depends:
682-
compact
683-
if !impl(ghcjs)
684-
build-depends:
685-
base16-bytestring
686-
, cryptohash-md5
687-
, cryptohash-sha1
688-
, cryptohash-sha256
689-
, cryptohash-sha512
690-
, serialise
691665
if impl(ghcjs)
692666
buildable: False
693-
else
694-
buildable: True
695667
default-language: Haskell2010
696668

697669
benchmark hnix-benchmarks
@@ -704,38 +676,31 @@ benchmark hnix-benchmarks
704676
benchmarks
705677
ghc-options: -Wall
706678
build-depends:
707-
base >=4.9 && <5
679+
base >=4.11 && <5
680+
, base16-bytestring
708681
, bytestring
709682
, containers
710683
, criterion
684+
, cryptohash-md5
685+
, cryptohash-sha1
686+
, cryptohash-sha256
687+
, cryptohash-sha512
711688
, data-fix
712-
, deepseq >=1.4.2 && <1.5
689+
, deepseq >=1.4.3 && <1.5
713690
, exceptions
714691
, filepath
715692
, hashing
716693
, hnix
717694
, mtl
718695
, optparse-applicative
696+
, serialise
719697
, template-haskell
720698
, text
721699
, time
722700
, transformers
723701
, unordered-containers >=0.2.9 && <0.3
724702
if flag(optimize)
725703
ghc-options: -fexpose-all-unfoldings -fspecialise-aggressively -O2
726-
if os(linux) && impl(ghc >= 8.2) && impl(ghc < 8.3)
727-
build-depends:
728-
compact
729-
if !impl(ghcjs)
730-
build-depends:
731-
base16-bytestring
732-
, cryptohash-md5
733-
, cryptohash-sha1
734-
, cryptohash-sha256
735-
, cryptohash-sha512
736-
, serialise
737704
if impl(ghcjs)
738705
buildable: False
739-
else
740-
buildable: True
741706
default-language: Haskell2010

‎src/Nix/Cache.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module Nix.Cache where
55
import qualified Data.ByteString.Lazy as BS
66
import Nix.Expr.Types.Annotated
77

8-
#if defined (__linux__) && MIN_VERSION_base(4, 10, 0)
8+
#if defined (__linux__)
99
#define USE_COMPACT 1
1010
#endif
1111

‎src/Nix/Effects.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class Monad m => MonadIntrospect m where
7070
instance MonadIntrospect IO where
7171
recursiveSize =
7272
#ifdef MIN_VERSION_ghc_datasize
73-
#if MIN_VERSION_ghc_datasize(0,2,0) && __GLASGOW_HASKELL__ >= 804
73+
#if MIN_VERSION_ghc_datasize(0,2,0)
7474
recursiveSize
7575
#else
7676
\_ -> return 0

‎src/Nix/Effects/Basic.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import Nix.Value.Monad
4747
import System.FilePath
4848

4949
#ifdef MIN_VERSION_ghc_datasize
50-
#if MIN_VERSION_ghc_datasize(0,2,0) && __GLASGOW_HASKELL__ >= 804
50+
#if MIN_VERSION_ghc_datasize(0,2,0)
5151
import GHC.DataSize
5252
#endif
5353
#endif

‎src/Nix/Exec.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import qualified Text.Show.Pretty as PS
6565
#endif
6666

6767
#ifdef MIN_VERSION_ghc_datasize
68-
#if MIN_VERSION_ghc_datasize(0,2,0) && __GLASGOW_HASKELL__ >= 804
68+
#if MIN_VERSION_ghc_datasize(0,2,0)
6969
import GHC.DataSize
7070
#endif
7171
#endif

0 commit comments

Comments
 (0)