4c991c0 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

on master help sign in

Fixed GHC warnings.

4c991c0Peter Simons15 years ago

src/Cabal2Nix.hs−1

compare with master

unifiedsplit

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

9import Control.Exception ( bracket )

10import Control.Monad ( when )

11−import Data.List ( nub, sort )

12import Distribution.PackageDescription ( package, packageDescription )

11import Distribution.PackageDescription ( package, packageDescription )

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

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

14import Distribution.Text ( disp )

13import Distribution.Text ( disp )

src/Cabal2Nix/Normalize.hs−9

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

3module 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

14import Distribution.NixOS.Derivation.Cabal

5import Distribution.NixOS.Derivation.Cabal

15import Cabal2Nix.Name

6import Cabal2Nix.Name

16import Cabal2Nix.CorePackages

7import Cabal2Nix.CorePackages

src/Cabal2Nix/Package.hs−5

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

11import Distribution.System

12import Distribution.Version

13import Distribution.NixOS.Derivation.Cabal

14−import Cabal2Nix.Name

15−import Cabal2Nix.CorePackages

16−import Data.List

17−import Data.Char

19cabal2nix :: Cabal.GenericPackageDescription -> Derivation

15cabal2nix :: Cabal.GenericPackageDescription -> Derivation

20cabal2nix cabal = normalize $ postProcess $ MkDerivation

16cabal2nix cabal = normalize $ postProcess $ MkDerivation

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

39 where

35 where

40 descr = Cabal.packageDescription cabal

36 descr = Cabal.packageDescription cabal

41 pkg = Cabal.package descr

37 pkg = Cabal.package descr

42− Cabal.PackageName name = Cabal.pkgName pkg

43 deps = Cabal.buildDepends tpkg

38 deps = Cabal.buildDepends tpkg

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

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

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

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