72f5a68 · typeable/cabal2nix

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

@@ -1,4 +1,4 @@

1−module Distribution.Nixpkgs.Haskell.FromCabal.Hackage ( readHashedHackage, module Distribution.Hackage.DB ) where

1+module Distribution.Nixpkgs.Haskell.Hackage ( readHashedHackage, module Distribution.Hackage.DB ) where

2

3import Data.ByteString.Lazy ( ByteString )

4import Data.Digest.Pure.SHA ( sha256, showDigest )

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

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

1{-# LANGUAGE OverloadedStrings #-}

2

3−module Distribution.Nixpkgs.Haskell.FromCabal.HackageGit ( Hackage, readHackage, module Data.Map ) where

3+module Distribution.Nixpkgs.Haskell.HackageGit ( Hackage, readHackage, module Data.Map ) where

4

5import Control.Monad

6import Data.Aeson

src/Internal/HaskellPackage.hs+1−1

@@ -2,7 +2,7 @@ module Internal.HaskellPackage

2 ( Package(..), getPackage, sourceFromHackage

3 ) where

4

5−import qualified Distribution.Nixpkgs.Haskell.FromCabal.Hackage as DB

5+import qualified Distribution.Nixpkgs.Haskell.Hackage as DB

6import qualified Control.Exception as Exception

7import Control.Monad

8import Control.Monad.IO.Class

src/hackage2nix.hs+1−1

@@ -5,7 +5,7 @@ module Main ( main ) where

5

6import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )

7import Distribution.Nixpkgs.Haskell.FromCabal.Flags

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

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

9import Distribution.Nixpkgs.Haskell.Constraint

10import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102

11import Internal.HaskellPackage