git.iko.soy/typeable/cabal2nix
on master help sign in
swap
722a3774 ahead, 0 behind
4 files changed+6−7
since splitsnapshots
unifiedsplit
cabal2nix.cabal+3−3 hackage2nix/Main.hs+1−1 src/Cabal2nix.hs+1−2 src/Distribution/Nixpkgs/Haskell/Derivation.hs+1−1
cabal2nix.cabal+3−3
@@ -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