723f9af · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Distribution/NixOS/Derivation: configured export lists

commit723f9af3326968eed38375ff81eba69e27fee6a8 authorPeter Simons <simons@cryp.to> dateSun 14 Aug 2011, 23:25 (15 years ago) parent7363efe

4 files changed+28−14

compare with master

unifiedsplit

src/Distribution/NixOS/Derivation/Cabal.hs+7−2 src/Distribution/NixOS/Derivation/License.hs+7−9 src/Distribution/NixOS/Derivation/Meta.hs+5−2 src/Distribution/NixOS/Derivation/PrettyPrinting.hs+9−1

src/Distribution/NixOS/Derivation/Cabal.hs+7−2

@@ -1,8 +1,13 @@

1−module Distribution.NixOS.Derivation.Cabal where

1+module Distribution.NixOS.Derivation.Cabal

2+ ( Derivation(..)

3+ , parseDerivation

4+ , module Distribution.NixOS.Derivation.Meta

5+ , Version(..), PackageName(..)

6+ )

7+ where

39import Distribution.NixOS.Derivation.PrettyPrinting

410import Distribution.NixOS.Derivation.Meta

5−import Distribution.NixOS.Derivation.License

611import Distribution.Package

712import Distribution.Text

813import Data.Version

src/Distribution/NixOS/Derivation/License.hs+7−9

@@ -1,13 +1,11 @@

1−module Distribution.NixOS.Derivation.License where

2−

3−-- import qualified Distribution.Package as Cabal

4−-- import qualified Distribution.PackageDescription as Cabal

5−import qualified Distribution.License as Cabal

6−-- import Distribution.Package

7−import Data.Version

8−-- import Distribution.PackageDescription

9−-- import Distribution.PackageDescription.Configuration

1+module Distribution.NixOS.Derivation.License

2+ ( License(..)

3+ , fromCabalLicense

4+ )

5+ where

106

7+import qualified Distribution.License as Cabal ( License(..) )

8+import Data.Version ( Version(..) )

119import Distribution.Text

1210import Text.PrettyPrint

1311

src/Distribution/NixOS/Derivation/Meta.hs+5−2

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

1−module Distribution.NixOS.Derivation.Meta where

1+module Distribution.NixOS.Derivation.Meta

2+ ( Meta(..)

3+ , module Distribution.NixOS.Derivation.License

4+ )

5+ where

37import Distribution.NixOS.Derivation.PrettyPrinting

48import Distribution.NixOS.Derivation.License

59import Distribution.Text

6−-- import Data.Version

710import Text.PrettyPrint

811

912data Meta = Meta

src/Distribution/NixOS/Derivation/PrettyPrinting.hs+9−1

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

1−module Distribution.NixOS.Derivation.PrettyPrinting where

1+module Distribution.NixOS.Derivation.PrettyPrinting

2+ ( onlyIf

3+ , listattr

4+ , boolattr

5+ , attr

6+ , string

7+ , funargs

8+ )

9+ where

210

311import Text.PrettyPrint

412