git.iko.soy/typeable/cabal2nix
on master help sign in
swap
722a3776 ahead, 0 behind
5 files changed+15−16
since splitsnapshots
unifiedsplit
.travis.yml+7−7 cabal2nix.cabal+5−5 hackage2nix/Main.hs+1−1 src/Cabal2nix.hs+1−2 src/Distribution/Nixpkgs/Haskell/Derivation.hs+1−1
.travis.yml+7−7
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.9.20200125
7+# version: 0.9.20200306
88#
99version: ~> 1.0
1010language: c
@@ -32,14 +32,14 @@ jobs:
3232 - compiler: ghc-8.10.1
3333 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.2"]}}
3434 os: linux
35− - compiler: ghc-8.8.2
36− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.2","cabal-install-3.0"]}}
35+ - compiler: ghc-8.8.3
36+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.0"]}}
3737 os: linux
3838 - compiler: ghc-8.6.5
3939 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
4040 os: linux
4141 allow_failures:
42− - compiler: ghc-8.8.2
42+ - compiler: ghc-8.8.3
4343 - compiler: ghc-8.10.1
4444before_install:
4545 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
@@ -114,8 +114,8 @@ install:
114114 - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
115115 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
116116 - rm cabal.project.freeze
117− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
118− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
117+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
118+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
119119script:
120120 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
121121 # Packaging...
@@ -157,5 +157,5 @@ script:
157157 - rm -f cabal.project.local
158158 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
159159
160−# REGENDATA ("0.9.20200125",["--installed=+all -Cabal","--hlint","--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","-o",".travis.yml","cabal2nix.cabal","--head-hackage","--head-hackage-jobs","> 8.8"])
160+# REGENDATA ("0.9.20200306",["--installed=+all -Cabal","--hlint","--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","-o",".travis.yml","cabal2nix.cabal","--head-hackage","--head-hackage-jobs","> 8.8"])
161161# EOF
cabal2nix.cabal+5−5
@@ -1,5 +1,5 @@
11name: cabal2nix
2−version: 2.15.0
2+version: 2.15.1
33synopsis: Convert Cabal files into Nix build instructions.
44description:
55 Convert Cabal files into Nix build instructions. Users of Nix can install the latest
@@ -27,7 +27,7 @@ author: Peter Simons, Andres Loeh, Benno Fünfstück, Mateusz Kowalc
2727 gebbert, laMudri, Александр Цамутали
2828maintainer: Peter Simons <simons@cryp.to>
2929stability: stable
30−tested-with: GHC == 8.6.5, GHC == 8.8.2, GHC == 8.10.1
30+tested-with: GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.1
3131category: Distribution, Nix
3232homepage: https://github.com/nixos/cabal2nix#readme
3333bug-reports: https://github.com/nixos/cabal2nix/issues
@@ -61,7 +61,7 @@ library
6161 other-modules: Paths_cabal2nix
6262 hs-source-dirs: src
6363 build-depends: base > 4.11
64− , Cabal > 3
64+ , Cabal == 3.0.*
6565 , aeson > 1
6666 , ansi-wl-pprint
6767 , bytestring
@@ -110,7 +110,7 @@ executable hackage2nix
110110 Paths_cabal2nix
111111 hs-source-dirs: hackage2nix
112112 build-depends: base < 5
113− , Cabal > 2.4
113+ , Cabal
114114 , aeson
115115 , bytestring
116116 , cabal2nix
@@ -135,7 +135,7 @@ test-suite regression-test
135135 main-is: Main.hs
136136 hs-source-dirs: test
137137 build-depends: base
138− , Cabal > 2.4
138+ , Cabal
139139 , cabal2nix
140140 , containers
141141 , directory
hackage2nix/Main.hs+1−1
@@ -10,7 +10,7 @@ import Control.Monad
1010import Control.Monad.Par.Combinator
1111import Control.Monad.Par.IO
1212import Control.Monad.Trans ( liftIO )
13−import Data.List
13+import Data.List ( intercalate )
1414import Data.Map.Strict ( Map )
1515import qualified Data.Map.Strict as Map
1616import Data.Maybe
src/Cabal2nix.hs+1−2
@@ -11,10 +11,9 @@ module Cabal2nix
1111import Control.Exception ( bracket )
1212import Control.Lens
1313import Control.Monad
14−import Data.List
14+import Data.List ( intercalate, isPrefixOf )
1515import Data.List.Split
1616import Data.Maybe ( fromMaybe, isJust, listToMaybe )
17−import Data.Monoid ( (<>) )
1817import qualified Data.Set as Set
1918import Data.String
2019import Data.Time
src/Distribution/Nixpkgs/Haskell/Derivation.hs+1−1
@@ -15,7 +15,7 @@ module Distribution.Nixpkgs.Haskell.Derivation
1515
1616import Control.DeepSeq
1717import Control.Lens
18−import Data.List
18+import Data.List ( isPrefixOf )
1919import Data.Set ( Set )
2020import qualified Data.Set as Set
2121import Data.Set.Lens