diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2022-04-09 15:26:24 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2022-04-09 15:50:40 +0200 |
| commit | 936167ca50bc22718b66b74db06da17b1197b21e (patch) | |
| tree | 11668971f7cc25a90fe15f5f63f1a96e93afb66f | |
| parent | 59355e813fb01487011d0b6d1408b5c789434fc1 (diff) | |
chore: allow attoparsec 0.14.*, base 4.15
| -rw-r--r-- | emoji-generic.cabal | 8 | ||||
| -rw-r--r-- | emoji-generic.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/emoji-generic.cabal b/emoji-generic.cabal index 7b91839..75b38c0 100644 --- a/emoji-generic.cabal +++ b/emoji-generic.cabal @@ -23,9 +23,9 @@ library , Text.Emoji.Text -- other-modules: -- other-extensions: - build-depends: base >=4.13 && <4.15 + build-depends: base >=4.13 && <5 , text ^>=1.2 - , attoparsec ^>=0.13.2.0 + , attoparsec >=0.13.2.0 && < 0.15 , file-embed , utf8-light ^>=0.4.2 hs-source-dirs: src @@ -36,12 +36,12 @@ test-suite test type: exitcode-stdio-1.0 main-is: Main.hs hs-source-dirs: test - build-depends: base >=4.13 && <4.15 + build-depends: base >=4.13 && <5 , emoji-generic , tasty >=1.2.3 && <1.5 , tasty-smallcheck ^>=0.8.1 , smallcheck >=1.1.5 && <1.4 , tasty-hunit ^>=0.10.0.2 - , attoparsec ^>=0.13.2.0 + , attoparsec >=0.13 && < 0.15 , text ^>=1.2 default-language: Haskell2010 diff --git a/emoji-generic.nix b/emoji-generic.nix index 4bedfc7..a2cf7af 100644 --- a/emoji-generic.nix +++ b/emoji-generic.nix @@ -1,4 +1,4 @@ -{ mkDerivation, attoparsec, base, file-embed, smallcheck, stdenv +{ mkDerivation, attoparsec, base, file-embed, lib, smallcheck , tasty, tasty-hunit, tasty-smallcheck, text, utf8-light }: mkDerivation { @@ -12,5 +12,5 @@ mkDerivation { attoparsec base smallcheck tasty tasty-hunit tasty-smallcheck text ]; description = "A generic Emoji library"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; } |