Move the Hackage and HackageGit modules out of the "FromCabal" hierarchy.
commit72f5a681221278002537e60895b24a51e76a906a
authorPeter Simons <simons@cryp.to>
dateFri 28 Aug 2015, 14:04 (11 years ago)
parent4f5a724
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
22
33import Data.ByteString.Lazy ( ByteString )
44import 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 @@
11{-# LANGUAGE OverloadedStrings #-}
22
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
44
55import Control.Monad
66import Data.Aeson
src/Internal/HaskellPackage.hs+1−1
@@ -2,7 +2,7 @@ module Internal.HaskellPackage
22 ( Package(..), getPackage, sourceFromHackage
33 ) where
44
5−import qualified Distribution.Nixpkgs.Haskell.FromCabal.Hackage as DB
5+import qualified Distribution.Nixpkgs.Haskell.Hackage as DB
66import qualified Control.Exception as Exception
77import Control.Monad
88import Control.Monad.IO.Class
src/hackage2nix.hs+1−1
@@ -5,7 +5,7 @@ module Main ( main ) where
55
66import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )
77import Distribution.Nixpkgs.Haskell.FromCabal.Flags
8−import Distribution.Nixpkgs.Haskell.FromCabal.HackageGit ( readHackage, Hackage )
8+import Distribution.Nixpkgs.Haskell.HackageGit ( readHackage, Hackage )
99import Distribution.Nixpkgs.Haskell.Constraint
1010import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102
1111import Internal.HaskellPackage