Edit travis config and package deps to match nixos'

diff --git a/.travis.yml b/.travis.yml
index 999bd37b224fae0d0f4c57a32d35a01a3b243a9f..a4d9702e2cf8f9d17bc62d89a2e09a7341abe1bb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,48 @@
-language: haskell
+# NB: don't set `language: haskell` here
+language: c
+
+# See also https://github.com/hvr/multi-ghc-travis for more information
+
+# The following lines enable several GHC versions and/or HP versions
+# to be tested; often it's enough to test only against the last
+# release of a major GHC version. Setting HPVER implictly sets
+# GHCVER. Omit lines with versions you don't need/want testing for.
+env:
+ - CABALVER=1.22 GHCVER=7.10.1
+
+# Note: the distinction between `before_install` and `install` is not
+#       important.
+before_install:
+ - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo apt-get update
+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+
+install:
+ - cabal --version
+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - travis_retry cabal update
+ - cabal install --only-dependencies --enable-tests --enable-benchmarks
+
+# Here starts the actual work to be performed for the package under
+# test; any command which exits with a non-zero exit code causes the
+# build to fail.
+script:
+ # -v2 provides useful information for debugging
+ - cabal configure --enable-tests --enable-benchmarks -v2
+
+ # this builds all libraries and executables
+ # (including tests/benchmarks)
+ - cabal build
+
+ - cabal test
+ - cabal check
+
+ # tests that a source-distribution can be generated
+ - cabal sdist
+
+ # check that the generated source-distribution can be built & installed
+ - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
+   (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
+
+# EOF

diff --git a/default.nix b/default.nix
index 10ee0b9b3b14a9bef49759f410a731cea0e6a042..b9cfdb7c2ffc8eaf15799bc092b114e349c0ba1b 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, attoparsec, base, base64-bytestring, byteable
-, bytestring, cereal, cipher-aes, cryptohash, deepseq, hex, stdenv
-, tasty, tasty-hunit, tasty-quickcheck
+, bytestring, cereal, cipher-aes, cryptohash, deepseq, hex
+, QuickCheck, stdenv, tasty, tasty-hunit, tasty-quickcheck
 }:
 mkDerivation {
   pname = "hmacaroons";
@@ -12,7 +12,7 @@ mkDerivation {
   ];
   testDepends = [
     attoparsec base base64-bytestring byteable bytestring cereal
-    cryptohash hex tasty tasty-hunit tasty-quickcheck
+    cryptohash hex QuickCheck tasty tasty-hunit tasty-quickcheck
   ];
   homepage = "https://github.com/jtanguy/hmacaroons";
   description = "Haskell implementation of macaroons";

diff --git a/hmacaroons.cabal b/hmacaroons.cabal
index 5590af61f440292797d79cec60e19de301f59309..41020cadab1019e962a19858017103d2ee921ca7 100644 (file)
--- a/hmacaroons.cabal
+++ b/hmacaroons.cabal
@@ -115,4 +115,5 @@ test-suite test
                   tasty >= 0.10,
                   tasty-hunit >= 0.9,
                   tasty-quickcheck >= 0.8,
+                  QuickCheck < 2.8,
                   hmacaroons