Move the Cabal2Nix/* modules into the Distribution/Nixpkgs/Haskell/FromCabal/* hierarchy.
commitd67ab62e81a9a2213329d84a5ee40bda19c6232f
authorPeter Simons <simons@cryp.to>
dateFri 21 Aug 2015, 00:11 (11 years ago)
parent6c0348c
src/Cabal2Nix/CorePackages.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/CorePackages.hsrenamed+1−1
@@ -1,4 +1,4 @@
1−module Cabal2Nix.CorePackages ( corePackages, coreBuildTools ) where
1+module Distribution.Nixpkgs.Haskell.FromCabal.CorePackages ( corePackages, coreBuildTools ) where
22
33-- | List of packages shipped with ghc and therefore at the moment not in
44-- nixpkgs. This should probably be configurable at first. Later, it might
src/Cabal2Nix/Flags.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hsrenamed+1−1
@@ -1,4 +1,4 @@
1−module Cabal2Nix.Flags ( configureCabalFlags ) where
1+module Distribution.Nixpkgs.Haskell.FromCabal.Flags ( configureCabalFlags ) where
22
33import Distribution.Package
44import Distribution.PackageDescription
src/Cabal2Nix/Generate.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/Generate.hsrenamed+6−6
@@ -1,12 +1,12 @@
11{-# LANGUAGE RecordWildCards #-}
22
3−module Cabal2Nix.Generate ( cabal2nix, cabal2nix' ) where
3+module Distribution.Nixpkgs.Haskell.FromCabal.Generate ( cabal2nix, cabal2nix' ) where
44
5−import Cabal2Nix.Flags
6−import Cabal2Nix.License
7−import Cabal2Nix.Name
8−import Cabal2Nix.Normalize
9−import Cabal2Nix.PostProcess
5+import Distribution.Nixpkgs.Haskell.FromCabal.Flags
6+import Distribution.Nixpkgs.Haskell.FromCabal.License
7+import Distribution.Nixpkgs.Haskell.FromCabal.Name
8+import Distribution.Nixpkgs.Haskell.FromCabal.Normalize
9+import Distribution.Nixpkgs.Haskell.FromCabal.PostProcess
1010import Internal.Lens
1111import Data.Maybe
1212import qualified Data.Set as Set
src/Cabal2Nix/Hackage.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/Hackage.hsrenamed+1−1
@@ -1,4 +1,4 @@
1−module Cabal2Nix.Hackage ( readHashedHackage, module Distribution.Hackage.DB ) where
1+module Distribution.Nixpkgs.Haskell.FromCabal.Hackage ( readHashedHackage, module Distribution.Hackage.DB ) where
22
33import Data.ByteString.Lazy ( ByteString )
44import Data.Digest.Pure.SHA ( sha256, showDigest )
src/Cabal2Nix/HackageGit.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/HackageGit.hsrenamed+1−1
@@ -1,6 +1,6 @@
11{-# LANGUAGE OverloadedStrings #-}
22
3−module Cabal2Nix.HackageGit ( Hackage, readHackage, module Data.Map ) where
3+module Distribution.Nixpkgs.Haskell.FromCabal.HackageGit ( Hackage, readHackage, module Data.Map ) where
44
55import Control.Monad
66import Data.Aeson
src/Cabal2Nix/License.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/License.hsrenamed+2−2
@@ -1,4 +1,4 @@
1−module Cabal2Nix.License ( fromCabalLicense ) where
1+module Distribution.Nixpkgs.Haskell.FromCabal.License ( fromCabalLicense ) where
22
33import Distribution.Nixpkgs.License
44import Distribution.License ( License(..) )
@@ -27,4 +27,4 @@ fromCabalLicense (Apache Nothing) = Known "stdenv.lib.lice
2727fromCabalLicense (Apache (Just (Version [2,0] []))) = Known "stdenv.lib.licenses.asl20"
2828fromCabalLicense ISC = Known "stdenv.lib.licenses.isc"
2929fromCabalLicense OtherLicense = Unknown Nothing
30−fromCabalLicense l = error $ "Cabal2Nix.License.fromCabalLicense: unknown license " ++ show l
30+fromCabalLicense l = error $ "Distribution.Nixpkgs.Haskell.FromCabal.License.fromCabalLicense: unknown license " ++ show l
src/Cabal2Nix/Name.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hsrenamed+1−1
@@ -1,4 +1,4 @@
1−module Cabal2Nix.Name ( toNixName, toNixName', libNixName, buildToolNixName ) where
1+module Distribution.Nixpkgs.Haskell.FromCabal.Name ( toNixName, toNixName', libNixName, buildToolNixName ) where
22
33import Data.Char
44
src/Cabal2Nix/Normalize.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/Normalize.hsrenamed+3−3
@@ -1,7 +1,7 @@
1−module Cabal2Nix.Normalize ( normalize, normalizeCabalFlags ) where
1+module Distribution.Nixpkgs.Haskell.FromCabal.Normalize ( normalize, normalizeCabalFlags ) where
22
3−import Cabal2Nix.CorePackages
4−import Cabal2Nix.Name
3+import Distribution.Nixpkgs.Haskell.FromCabal.CorePackages
4+import Distribution.Nixpkgs.Haskell.FromCabal.Name
55import Data.Function
66import Data.List
77import Data.Set ( Set )
src/Cabal2Nix/PostProcess.hs → src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hsrenamed+1−1
@@ -1,6 +1,6 @@
11{-# LANGUAGE OverloadedStrings #-}
22
3−module Cabal2Nix.PostProcess ( postProcess ) where
3+module Distribution.Nixpkgs.Haskell.FromCabal.PostProcess ( postProcess ) where
44
55import Control.Lens
66import Data.Maybe
src/Internal/HaskellPackage.hs+1−1
@@ -2,7 +2,7 @@ module Internal.HaskellPackage
22 ( Package(..), getPackage, sourceFromHackage
33 ) where
44
5−import qualified Cabal2Nix.Hackage as DB
5+import qualified Distribution.Nixpkgs.Haskell.FromCabal.Hackage as DB
66import qualified Control.Exception as Exception
77import Control.Monad
88import Control.Monad.IO.Class
src/cabal2nix.hs+2−2
@@ -2,8 +2,8 @@
22
33module Main ( main ) where
44
5−import Cabal2Nix.Generate ( cabal2nix )
6−import Cabal2Nix.Normalize ( normalize )
5+import Distribution.Nixpkgs.Haskell.FromCabal.Generate ( cabal2nix )
6+import Distribution.Nixpkgs.Haskell.FromCabal.Normalize ( normalize )
77import Internal.HaskellPackage
88import Control.Exception ( bracket )
99import Control.Lens
src/hackage2nix.hs+3−3
@@ -3,9 +3,9 @@
33
44module Main ( main ) where
55
6−import Cabal2Nix.Flags ( configureCabalFlags )
7−import Cabal2Nix.Generate ( cabal2nix' )
8−import Cabal2Nix.HackageGit ( readHackage, Hackage )
6+import Distribution.Nixpkgs.Haskell.FromCabal.Flags ( configureCabalFlags )
7+import Distribution.Nixpkgs.Haskell.FromCabal.Generate ( cabal2nix' )
8+import Distribution.Nixpkgs.Haskell.FromCabal.HackageGit ( readHackage, Hackage )
99import Internal.HaskellPackage
1010import Control.Arrow ( second )
1111import Control.Monad