4c991c0 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Fixed GHC warnings.

commit4c991c021c6000a5b16f12281569afc13e0cac06 authorPeter Simons <simons@cryp.to> dateTue 23 Aug 2011, 13:40 (15 years ago) parent30f3640

3 files changed−15

compare with master

unifiedsplit

src/Cabal2Nix.hs−1 src/Cabal2Nix/Normalize.hs−9 src/Cabal2Nix/Package.hs−5

src/Cabal2Nix.hs−1

@@ -8,7 +8,6 @@ import Distribution.NixOS.Derivation.Meta

99import Control.Exception ( bracket )

1010import Control.Monad ( when )

11−import Data.List ( nub, sort )

1211import Distribution.PackageDescription ( package, packageDescription )

1312import Distribution.PackageDescription.Parse ( parsePackageDescription, ParseResult(..) )

1413import Distribution.Text ( disp )

src/Cabal2Nix/Normalize.hs−9

@@ -2,15 +2,6 @@

33module Cabal2Nix.Normalize ( normalize ) where

5−import Cabal2Nix.License

6−import Cabal2Nix.PostProcess

7−import Data.Maybe

8−import Distribution.Compiler

9−import qualified Distribution.Package as Cabal

10−import qualified Distribution.PackageDescription as Cabal

11−import Distribution.PackageDescription.Configuration

12−import Distribution.System

13−import Distribution.Version

145import Distribution.NixOS.Derivation.Cabal

156import Cabal2Nix.Name

167import Cabal2Nix.CorePackages

src/Cabal2Nix/Package.hs−5

@@ -11,10 +11,6 @@ import Distribution.PackageDescription.Configuration

1111import Distribution.System

1212import Distribution.Version

1313import Distribution.NixOS.Derivation.Cabal

14−import Cabal2Nix.Name

15−import Cabal2Nix.CorePackages

16−import Data.List

17−import Data.Char

1814

1915cabal2nix :: Cabal.GenericPackageDescription -> Derivation

2016cabal2nix cabal = normalize $ postProcess $ MkDerivation

@@ -39,7 +35,6 @@ cabal2nix cabal = normalize $ postProcess $ MkDerivation

3935 where

4036 descr = Cabal.packageDescription cabal

4137 pkg = Cabal.package descr

42− Cabal.PackageName name = Cabal.pkgName pkg

4338 deps = Cabal.buildDepends tpkg

4439 libDeps = map Cabal.libBuildInfo (maybeToList (Cabal.library tpkg))

4540 exeDeps = map Cabal.buildInfo (Cabal.executables tpkg)