Skip to content

Commit afce3ce

Browse files
authored
Merge pull request #51 from alexfmpe/ghc-9.6
Build with ghc 9.6
2 parents c5a175e + c3dc3e7 commit afce3ce

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

nix-thunk.cabal

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ author: Obsidian Systems LLC
99
bug-reports: https://github.com/obsidiansystems/nix-thunk
1010
synopsis: Lightweight dependency management with Nix
1111
description:
12-
nix-thunk lets you manage source code depencies in a lightweight and reproducible way, using Nix. Each source repository is represented by a stub directory, which refers to the original Git repository. nix-thunk can easily update these dependencies.
12+
nix-thunk lets you manage source code dependencies in a lightweight and reproducible way, using Nix. Each source repository is represented by a stub directory, which refers to the original Git repository. nix-thunk can easily update these dependencies.
1313
.
1414
If you need to make improvements to the original repositories, nix-thunk can unpack them in-place, so that changes can be tested right away, and then pack them back up when you're done. This makes it easy to send a pull request to the upstream repo while your project continues on a fork, then switch back to upstream once your pull request has been merged.
1515

@@ -31,30 +31,30 @@ library
3131
default-language: Haskell2010
3232
ghc-options: -Wall
3333
build-depends:
34-
aeson >=1.4.4.0 && <1.6
34+
aeson >=1.4.4.0 && <2.3
3535
, aeson-pretty >=0.8.7 && <0.9
36-
, base >=4.12.0.0 && <4.15
37-
, bytestring >=0.10.8.2 && <0.11
36+
, base >=4.12.0.0 && <4.19
37+
, bytestring >=0.10.8.2 && <0.12
3838
, cli-extras >=0.2.1.0 && <0.3
3939
, cli-git >=0.2.0.0 && <0.3
4040
, cli-nix >=0.2.0.0 && <0.3
4141
, containers >=0.6.0.1 && <0.7
42-
, cryptonite >=0.25 && <0.30
42+
, cryptonite >=0.25 && <0.31
4343
, data-default >=0.7.1.1 && <0.8
4444
, directory >=1.3.3.0 && <1.4
4545
, either >=5.0.1.1 && <5.1
4646
, exceptions >=0.10.3 && <0.11
4747
, extra >=1.6.18 && <1.8
4848
, filepath >=1.4.2.1 && <1.5
49-
, github >=0.25 && <0.28
49+
, github >=0.25 && <0.30
5050
, here >=1.2.13 && <1.3
51-
, lens >=4.17.1 && <4.20
52-
, logging-effect >=1.3.4 && <1.4
53-
, megaparsec >=7.0.5 && <9.1
54-
, memory >=0.14 && <0.16
51+
, lens >=4.17.1 && <5.4
52+
, logging-effect >=1.3.4 && <1.5
53+
, megaparsec >=7.0.5 && <9.7
54+
, memory >=0.14 && <0.19
5555
, modern-uri >=0.3.1.0 && <0.4
5656
, monad-logger >=0.3.30 && <0.4
57-
, mtl >=2.2.2 && <2.3
57+
, mtl >=2.2.2 && <2.4
5858
, optparse-applicative >=0.14.3.0 && <0.17
5959
, temporary >=1.3 && <1.4
6060
, text >=1.2.3.1 && <1.3
@@ -67,7 +67,7 @@ executable nix-thunk
6767
main-is: src-bin/nix-thunk.hs
6868
default-language: Haskell2010
6969
build-depends:
70-
base >=4.12.0.0 && <4.15
70+
base >=4.12.0.0 && <4.19
7171
, cli-extras >=0.2.1.0 && <0.3
7272
, nix-thunk
7373
, optparse-applicative >=0.14.3.0 && <0.17

src/Nix/Thunk/Internal.hs

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import Control.Monad.Catch (MonadCatch, MonadMask, handle)
3535
import Control.Monad.Except
3636
import Control.Monad.Extra (findM)
3737
import Control.Monad.Fail (MonadFail)
38+
import Control.Monad.IO.Class (MonadIO(liftIO))
3839
import Control.Monad.Log (MonadLog)
3940
import Crypto.Hash (Digest, HashAlgorithm, SHA1, digestFromByteString)
4041
import Data.Aeson ((.=))

0 commit comments

Comments
 (0)