d67ab62 · typeable/cabal2nix

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

compare with master

unifiedsplit

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

1−module Cabal2Nix.CorePackages ( corePackages, coreBuildTools ) where

1+module Distribution.Nixpkgs.Haskell.FromCabal.CorePackages ( corePackages, coreBuildTools ) where

2

3-- | List of packages shipped with ghc and therefore at the moment not in

4-- 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

2

3import Distribution.Package

4import Distribution.PackageDescription

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

@@ -1,12 +1,12 @@

1{-# LANGUAGE RecordWildCards #-}

2

3−module Cabal2Nix.Generate ( cabal2nix, cabal2nix' ) where

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

4

5−import Cabal2Nix.Flags

5+import Distribution.Nixpkgs.Haskell.FromCabal.Flags

6−import Cabal2Nix.License

6+import Distribution.Nixpkgs.Haskell.FromCabal.License

7−import Cabal2Nix.Name

7+import Distribution.Nixpkgs.Haskell.FromCabal.Name

8−import Cabal2Nix.Normalize

8+import Distribution.Nixpkgs.Haskell.FromCabal.Normalize

9−import Cabal2Nix.PostProcess

9+import Distribution.Nixpkgs.Haskell.FromCabal.PostProcess

10import Internal.Lens

11import Data.Maybe

12import 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

2

3import Data.ByteString.Lazy ( ByteString )

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

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

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

1{-# LANGUAGE OverloadedStrings #-}

2

3−module Cabal2Nix.HackageGit ( Hackage, readHackage, module Data.Map ) where

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

4

5import Control.Monad

6import 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

2

3import Distribution.Nixpkgs.License

4import Distribution.License ( License(..) )

@@ -27,4 +27,4 @@ fromCabalLicense (Apache Nothing) = Known "stdenv.lib.lice

27fromCabalLicense (Apache (Just (Version [2,0] []))) = Known "stdenv.lib.licenses.asl20"

28fromCabalLicense ISC = Known "stdenv.lib.licenses.isc"

29fromCabalLicense 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

2

3import Data.Char

4

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

2

3−import Cabal2Nix.CorePackages

3+import Distribution.Nixpkgs.Haskell.FromCabal.CorePackages

4−import Cabal2Nix.Name

4+import Distribution.Nixpkgs.Haskell.FromCabal.Name

5import Data.Function

6import Data.List

7import Data.Set ( Set )

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

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

1{-# LANGUAGE OverloadedStrings #-}

2

3−module Cabal2Nix.PostProcess ( postProcess ) where

3+module Distribution.Nixpkgs.Haskell.FromCabal.PostProcess ( postProcess ) where

4

5import Control.Lens

6import Data.Maybe

src/Internal/HaskellPackage.hs+1−1

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

2 ( Package(..), getPackage, sourceFromHackage

3 ) where

4

5−import qualified Cabal2Nix.Hackage as DB

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

6import qualified Control.Exception as Exception

7import Control.Monad

8import Control.Monad.IO.Class

src/cabal2nix.hs+2−2

@@ -2,8 +2,8 @@

2

3module Main ( main ) where

4

5−import Cabal2Nix.Generate ( cabal2nix )

5+import Distribution.Nixpkgs.Haskell.FromCabal.Generate ( cabal2nix )

6−import Cabal2Nix.Normalize ( normalize )

6+import Distribution.Nixpkgs.Haskell.FromCabal.Normalize ( normalize )

7import Internal.HaskellPackage

8import Control.Exception ( bracket )

9import Control.Lens

src/hackage2nix.hs+3−3

@@ -3,9 +3,9 @@

3

4module Main ( main ) where

5

6−import Cabal2Nix.Flags ( configureCabalFlags )

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

7−import Cabal2Nix.Generate ( cabal2nix' )

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

8−import Cabal2Nix.HackageGit ( readHackage, Hackage )

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

9import Internal.HaskellPackage

10import Control.Arrow ( second )

11import Control.Monad