From e8559fb1b1467a3f4dba13d48ce782b67632524e Mon Sep 17 00:00:00 2001 From: Jacco Krijnen Date: Thu, 19 Apr 2018 22:39:36 +0100 Subject: [PATCH 1/4] Fix build by changing build-type to Simple, meaning that the tests are not run anymore. The tests were written with an old version (<2.0) of QuickCheck (which requires base <4) --- permutation.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/permutation.cabal b/permutation.cabal index ba77f27..0c7ef73 100644 --- a/permutation.cabal +++ b/permutation.cabal @@ -24,7 +24,7 @@ copyright: (c) 2008. Patrick Perry author: Patrick Perry maintainer: Sophie Taylor cabal-version: >= 1.2.3 -build-type: Custom +build-type: Simple tested-with: GHC ==7.8.1 extra-source-files: examples/Enumerate.hs @@ -56,7 +56,7 @@ library Data.Permute.Base Data.Permute.IOBase - build-depends: base < 5 && >=4, QuickCheck + build-depends: base < 5 && >=4 extensions: BangPatterns, FlexibleContexts, FunctionalDependencies, From 5f229d177bf0225d47cb956c48c9b34d8593ec8e Mon Sep 17 00:00:00 2001 From: Jacco Krijnen Date: Thu, 19 Apr 2018 23:38:47 +0100 Subject: [PATCH 2/4] Add source-repository to make cabal check happy --- permutation.cabal | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/permutation.cabal b/permutation.cabal index 0c7ef73..8ccc493 100644 --- a/permutation.cabal +++ b/permutation.cabal @@ -23,7 +23,7 @@ license-file: LICENSE copyright: (c) 2008. Patrick Perry author: Patrick Perry maintainer: Sophie Taylor -cabal-version: >= 1.2.3 +cabal-version: >= 1.6 build-type: Simple tested-with: GHC ==7.8.1 @@ -39,6 +39,10 @@ extra-source-files: examples/Enumerate.hs tests/Makefile NEWS +source-repository head + type: git + location: git://github.com/spacekitteh/permutation + library hs-source-dirs: lib exposed-modules: Data.Choose From 08333665910934f91e02a09749df2617152ad564 Mon Sep 17 00:00:00 2001 From: Jacco Krijnen Date: Thu, 19 Apr 2018 23:59:59 +0100 Subject: [PATCH 3/4] Remove travis GHCVER=6.12.3 which is not available in ppa:hvr/ghc --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 682a2d5..9cca7e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ # release of a major GHC version. Setting HPVER implictly sets # GHCVER. Omit lines with versions you don't need/want testing for. env: - - GHCVER=6.12.3 - GHCVER=7.0.1 - GHCVER=7.0.2 - GHCVER=7.0.3 From f83247a958deffeb4afeaace52d35fda2480aa7e Mon Sep 17 00:00:00 2001 From: Jacco Krijnen Date: Fri, 20 Apr 2018 00:18:01 +0100 Subject: [PATCH 4/4] Bump version number --- permutation.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/permutation.cabal b/permutation.cabal index 8ccc493..6a4755a 100644 --- a/permutation.cabal +++ b/permutation.cabal @@ -1,5 +1,5 @@ name: permutation -version: 0.5.0.5 +version: 0.5.0.6 homepage: https://github.com/spacekitteh/permutation synopsis: A library for permutations and combinations. description: