git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix: simplify the code by committing to recent versions of our dependencies
commitd6bac1cbd7dde054bd1a806ec924155dd050042d authorPeter Simons <simons@cryp.to> dateTue 5 Mar 2019, 20:31 (8 years ago) parentd1d8208
2 files changed+5−9
compare with master
unifiedsplit
cabal2nix.cabal+4−4 hackage2nix/Main.hs+1−5
cabal2nix.cabal+4−4
@@ -107,8 +107,8 @@ library
107107 Distribution.Nixpkgs.Haskell.PackageSourceSpec
108108 other-modules: Paths_cabal2nix
109109 hs-source-dirs: src
110− build-depends: base < 5
111− , Cabal > 2.2
110+ build-depends: base > 4.11
111+ , Cabal > 2.4
112112 , aeson
113113 , ansi-wl-pprint
114114 , bytestring
@@ -159,7 +159,7 @@ executable hackage2nix
159159 Paths_cabal2nix
160160 hs-source-dirs: hackage2nix
161161 build-depends: base < 5
162− , Cabal > 2.2
162+ , Cabal > 2.4
163163 , aeson
164164 , bytestring
165165 , cabal2nix
@@ -185,7 +185,7 @@ test-suite regression-test
185185 main-is: Main.hs
186186 hs-source-dirs: test
187187 build-depends: base
188− , Cabal > 2.2
188+ , Cabal > 2.4
189189 , cabal2nix
190190 , containers
191191 , directory
hackage2nix/Main.hs+1−5
@@ -1,6 +1,5 @@
11{-# LANGUAGE OverloadedStrings #-}
22{-# LANGUAGE RecordWildCards #-}
3−{-# LANGUAGE CPP #-}
43
54module Main ( main ) where
65
@@ -15,9 +14,6 @@ import Data.List
1514import Data.Map.Strict ( Map )
1615import qualified Data.Map.Strict as Map
1716import Data.Maybe
18−#if !MIN_VERSION_base(4,11,0)
19−import Data.Monoid
20−#endif
2117import Data.Set ( Set )
2218import qualified Data.Set as Set
2319import Data.String
@@ -30,7 +26,7 @@ import Distribution.Nixpkgs.Haskell.FromCabal.Flags
3026import Distribution.Nixpkgs.Meta
3127import Distribution.Nixpkgs.PackageMap
3228import Distribution.Package
33−import Distribution.PackageDescription hiding ( options, buildDepends, extraLibs, buildTools, homepage )
29+import Distribution.PackageDescription hiding ( options, extraLibs, buildTools, homepage )
3430import Distribution.System
3531import Distribution.Text
3632import Distribution.Version