563f8db · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Move "Regex" and "PrettyPrinting" modules into the "Internal" hierarchy.

commit563f8db41fc10e5aa50d89694c55aecdb8cb834d authorPeter Simons <simons@cryp.to> dateThu 20 Aug 2015, 23:42 (11 years ago) parentfb1c3f8

11 files changed+14−14

compare with master

unifiedsplit

src/Cabal2Nix/Normalize.hs+3−3 src/Distribution/Nixpkgs/Haskell.hs+2−2 src/Distribution/Nixpkgs/License.hs+1−1 src/Distribution/Nixpkgs/Meta.hs+1−1 src/Distribution/Nixpkgs/PackageMap.hs+1−1 src/Distribution/Nixpkgs/Util/PrettyPrinting.hs → src/Internal/PrettyPrinting.hs+1−1 src/Distribution/Nixpkgs/Util/Regex.hs → src/Internal/Regex.hs+1−1 src/Language/Nix/Identifier.hs+1−1 src/Language/Nix/Path.hs+1−1 src/cabal2nix.hs+1−1 src/hackage2nix.hs+1−1

src/Cabal2Nix/Normalize.hs+3−3

@@ -2,18 +2,18 @@ module Cabal2Nix.Normalize ( normalize, normalizeCabalFlags ) where

33import Cabal2Nix.CorePackages

44import Cabal2Nix.Name

5−import Internal.Lens

65import Data.Function

76import Data.List

87import Data.Set ( Set )

98import qualified Data.Set as Set

10−import Language.Nix.Identifier ( Identifier, ident )

119import Distribution.Nixpkgs.Haskell

1210import Distribution.Nixpkgs.Meta

13−import Distribution.Nixpkgs.Util.Regex ( regsubmatch )

1411import Distribution.Package

1512import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )

1613import Distribution.Simple.Utils ( lowercase )

14+import Internal.Lens

15+import Internal.Regex ( regsubmatch )

16+import Language.Nix.Identifier ( Identifier, ident )

1717

1818normalize :: Derivation -> Derivation

1919normalize drv = drv

src/Distribution/Nixpkgs/Haskell.hs+2−2

@@ -14,7 +14,6 @@ module Distribution.Nixpkgs.Haskell

1414 where

1515

1616import Control.DeepSeq.Generics

17−import Internal.Lens

1817import Data.List

1918import Data.Set ( Set )

2019import qualified Data.Set as Set

@@ -22,10 +21,11 @@ import Data.Set.Lens

2221import Distribution.Nixpkgs.Fetch

2322import Distribution.Nixpkgs.Haskell.OrphanInstances ( )

2423import Distribution.Nixpkgs.Meta

25−import Distribution.Nixpkgs.Util.PrettyPrinting

2624import Distribution.Package

2725import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )

2826import GHC.Generics ( Generic )

27+import Internal.Lens

28+import Internal.PrettyPrinting

2929import Language.Nix.Identifier

3030

3131data BuildInfo = BuildInfo

src/Distribution/Nixpkgs/License.hs+1−1

@@ -9,8 +9,8 @@ module Distribution.Nixpkgs.License ( License(..) ) where

1010import Control.DeepSeq.Generics

1111import Data.Maybe

12−import Distribution.Nixpkgs.Util.PrettyPrinting

1312import GHC.Generics ( Generic )

13+import Internal.PrettyPrinting

1414

1515-- | The representation for licenses used in Nix derivations. Known

1616-- licenses are Nix expressions -- such as @stdenv.lib.licenses.bsd3@

src/Distribution/Nixpkgs/Meta.hs+1−1

@@ -15,7 +15,7 @@ module Distribution.Nixpkgs.Meta

1515import Control.DeepSeq.Generics

1616import Internal.Lens

1717import Distribution.Nixpkgs.License

18−import Distribution.Nixpkgs.Util.PrettyPrinting

18+import Internal.PrettyPrinting

1919import GHC.Generics ( Generic )

2020import Data.Set ( Set )

2121import qualified Data.Set as Set

src/Distribution/Nixpkgs/PackageMap.hs+1−1

@@ -12,7 +12,7 @@ import Internal.Lens

1212import Language.Nix.Identifier

1313import Language.Nix.Path

1414import Data.Maybe

15−import Distribution.Nixpkgs.Util.PrettyPrinting

15+import Internal.PrettyPrinting

1616

1717type PackageMap = Map Identifier (Set Path)

1818

src/Distribution/Nixpkgs/Util/PrettyPrinting.hs → src/Internal/PrettyPrinting.hsrenamed+1−1

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

11-- | Internal pretty-printing helpers for Nix expressions.

3−module Distribution.Nixpkgs.Util.PrettyPrinting

3+module Internal.PrettyPrinting

44 ( onlyIf

55 , setattr, toAscList

66 , listattr

src/Distribution/Nixpkgs/Util/Regex.hs → src/Internal/Regex.hsrenamed+1−1

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

1−module Distribution.Nixpkgs.Util.Regex

1+module Internal.Regex

22 ( module Text.Regex.Posix

33 , regsubmatch

44 )

src/Language/Nix/Identifier.hs+1−1

@@ -5,7 +5,7 @@ module Language.Nix.Identifier ( Identifier, ident, quote, needsQuoting ) where

66import Control.DeepSeq.Generics

77import Data.String

8−import Distribution.Nixpkgs.Util.PrettyPrinting ( Pretty(..), text )

8+import Internal.PrettyPrinting ( Pretty(..), text )

99import GHC.Generics ( Generic )

1010import Internal.Lens

1111import Text.Regex.Posix

src/Language/Nix/Path.hs+1−1

@@ -1,7 +1,7 @@

11module Language.Nix.Path ( Path, path ) where

33import Internal.Lens

4−import Distribution.Nixpkgs.Util.PrettyPrinting ( Pretty (..), char, hcat, punctuate )

4+import Internal.PrettyPrinting ( Pretty (..), char, hcat, punctuate )

55import Language.Nix.Identifier

77-- | Paths are non-empty lists of identifiers in Nix.

src/cabal2nix.hs+1−1

@@ -13,7 +13,7 @@ import qualified Data.Set as Set

1313import Distribution.Nixpkgs.Fetch

1414import Distribution.Nixpkgs.Haskell

1515import Distribution.Nixpkgs.Meta

16−import Distribution.Nixpkgs.Util.PrettyPrinting hiding ( (<>) )

16+import Internal.PrettyPrinting hiding ( (<>) )

1717import Distribution.PackageDescription ( FlagName(..), FlagAssignment )

1818import Distribution.Simple.Utils ( lowercase )

1919import Options.Applicative

src/hackage2nix.hs+1−1

@@ -26,7 +26,7 @@ import Distribution.Nixpkgs.Fetch

2626import Distribution.Nixpkgs.Haskell

2727import Distribution.Nixpkgs.Meta

2828import Distribution.Nixpkgs.PackageMap

29−import Distribution.Nixpkgs.Util.PrettyPrinting hiding ( attr, (<>) )

29+import Internal.PrettyPrinting hiding ( attr, (<>) )

3030import Distribution.Package

3131import Distribution.PackageDescription hiding ( options, buildDepends, extraLibs, buildTools )

3232import Distribution.PackageDescription.Configuration