d19c848 · typeable/cabal2nix

src/Distribution/Nixpkgs/Haskell/FromCabal/Generate.hs → src/Distribution/Nixpkgs/Haskell/FromCabal.hsrenamed+1−1

@@ -1,6 +1,6 @@

1{-# LANGUAGE RecordWildCards #-}

2

3−module Distribution.Nixpkgs.Haskell.FromCabal.Generate ( cabal2nix, cabal2nix' ) where

3+module Distribution.Nixpkgs.Haskell.FromCabal ( cabal2nix, cabal2nix' ) where

4

5import Distribution.Nixpkgs.Haskell.FromCabal.Flags

6import Distribution.Nixpkgs.Haskell.FromCabal.License

src/cabal2nix.hs+1−1

@@ -3,7 +3,7 @@

3

4module Main ( main ) where

5

6−import Distribution.Nixpkgs.Haskell.FromCabal.Generate ( cabal2nix )

6+import Distribution.Nixpkgs.Haskell.FromCabal ( cabal2nix )

7import Distribution.Nixpkgs.Haskell.FromCabal.Normalize ( normalize )

8import Internal.HaskellPackage

9import Control.Exception ( bracket )

src/hackage2nix.hs+1−1

@@ -4,7 +4,7 @@

4module Main ( main ) where

5

6import Distribution.Nixpkgs.Haskell.FromCabal.Flags ( configureCabalFlags )

7−import Distribution.Nixpkgs.Haskell.FromCabal.Generate ( cabal2nix' )

7+import Distribution.Nixpkgs.Haskell.FromCabal ( cabal2nix' )

8import Distribution.Nixpkgs.Haskell.FromCabal.HackageGit ( readHackage, Hackage )

9import Internal.HaskellPackage

10import Control.Arrow ( second )