git.iko.soy/typeable/cabal2nix
on master help sign in
More cosmetic re-factoring.
commitc45599a05665d8c8e995acfb42ee99b5b319f9e0 authorPeter Simons <simons@cryp.to> dateMon 26 Jan 2015, 17:42 (12 years ago) parent94896d0
11 files changed+30−35
compare with master
unifiedsplit
src/Cabal2Nix/Generate.hs+1−1 src/Cabal2Nix/License.hs+2−2 src/Cabal2Nix/Normalize.hs+1−1 src/Cabal2Nix/Package.hs+9−11 src/Cabal2Nix/PostProcess.hs+1−1 src/Distribution/Nixpkgs/Derivation/Cabal.hs → src/Distribution/Nixpkgs/Haskell.hs+3−3 src/Distribution/Nixpkgs/Derivation/License.hs → src/Distribution/Nixpkgs/License.hs+1−1 src/Distribution/Nixpkgs/Derivation/Meta.hs → src/Distribution/Nixpkgs/Meta.hs+3−3 src/cabal2nix.hs+6−6 src/hackage2nix.hs+1−1 test/spec.hs+2−5
src/Cabal2Nix/Generate.hs+1−1
@@ -6,7 +6,7 @@ import Cabal2Nix.Normalize
66import Cabal2Nix.PostProcess
77import Data.Maybe
88import Distribution.Compiler
9−import Distribution.Nixpkgs.Derivation.Cabal
9+import Distribution.Nixpkgs.Haskell
1010import qualified Distribution.Package as Cabal
1111import qualified Distribution.PackageDescription as Cabal
1212import Distribution.PackageDescription.Configuration
src/Cabal2Nix/License.hs+2−2
@@ -1,10 +1,10 @@
11module Cabal2Nix.License ( fromCabalLicense ) where
22
3−import Distribution.Nixpkgs.Derivation.License
3+import Distribution.Nixpkgs.License
44import Distribution.License ( License(..) )
55import Data.Version
66
7−fromCabalLicense :: Distribution.License.License -> Distribution.Nixpkgs.Derivation.License.License
7+fromCabalLicense :: Distribution.License.License -> Distribution.Nixpkgs.License.License
88fromCabalLicense (GPL Nothing) = Unknown (Just "GPL")
99fromCabalLicense (GPL (Just (Version [2] []))) = Known "stdenv.lib.licenses.gpl2"
1010fromCabalLicense (GPL (Just (Version [3] []))) = Known "stdenv.lib.licenses.gpl3"
src/Cabal2Nix/Normalize.hs+1−1
@@ -9,7 +9,7 @@ import Data.Set ( Set )
99import qualified Data.Set as Set
1010import Data.Function
1111import Data.List
12−import Distribution.Nixpkgs.Derivation.Cabal
12+import Distribution.Nixpkgs.Haskell
1313import Distribution.Nixpkgs.Util.Regex ( regsubmatch )
1414import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )
1515import Distribution.Simple.Utils ( lowercase )
src/Cabal2Nix/Package.hs+9−11
@@ -1,30 +1,28 @@
11module Cabal2Nix.Package where
22
3+import qualified Cabal2Nix.Hackage as DB
34import Control.Applicative
5+import qualified Control.Exception as Exception
46import Control.Monad
57import Control.Monad.IO.Class
68import Control.Monad.Trans.Maybe
79import Data.List ( isSuffixOf, isPrefixOf )
810import Data.Maybe ( listToMaybe )
9−import Distribution.Nixpkgs.Derivation.Cabal
11+import Data.Version
1012import Distribution.Nixpkgs.Fetch
13+import qualified Distribution.Package as Cabal
14+import qualified Distribution.PackageDescription as Cabal
15+import qualified Distribution.PackageDescription.Parse as Cabal
16+import qualified Distribution.ParseUtils as ParseUtils
1117import Distribution.Text ( simpleParse )
1218import System.Directory ( doesDirectoryExist, doesFileExist, createDirectoryIfMissing, getHomeDirectory, getDirectoryContents )
1319import System.Exit ( exitFailure )
1420import System.FilePath ( (</>), (<.>) )
1521import System.IO ( hPutStrLn, stderr, hPutStr )
1622
17−import qualified Cabal2Nix.Hackage as DB
18−import qualified Distribution.Package as Cabal
19−import qualified Distribution.PackageDescription as Cabal
20−import qualified Distribution.PackageDescription.Parse as Cabal
21−import qualified Distribution.ParseUtils as ParseUtils
22−
23−import qualified Control.Exception as Exception
24−
2523data Package = Package
26− { source :: DerivationSource
27− , cabal :: Cabal.GenericPackageDescription
24+ { pkgSource :: DerivationSource
25+ , pkgCabal :: Cabal.GenericPackageDescription
2826 }
2927 deriving (Show)
3028
src/Cabal2Nix/PostProcess.hs+1−1
@@ -3,7 +3,7 @@
33module Cabal2Nix.PostProcess ( postProcess ) where
44
55import qualified Data.Set as Set
6−import Distribution.Nixpkgs.Derivation.Cabal
6+import Distribution.Nixpkgs.Haskell
77import Distribution.Text ( display )
88
99postProcess :: Derivation -> Derivation
src/Distribution/Nixpkgs/Derivation/Cabal.hs → src/Distribution/Nixpkgs/Haskell.hsrenamed+3−3
@@ -1,11 +1,11 @@
11{-# LANGUAGE PatternGuards, RecordWildCards, DeriveGeneric, StandaloneDeriving #-}
22{-# OPTIONS_GHC -fno-warn-orphans #-} -- for FlagName below
33
4−module Distribution.Nixpkgs.Derivation.Cabal
4+module Distribution.Nixpkgs.Haskell
55 ( Derivation(..)
66 , renderDerivation
77 , DerivationSource(..)
8− , module Distribution.Nixpkgs.Derivation.Meta
8+ , module Distribution.Nixpkgs.Meta
99 , module Data.Version
1010 )
1111 where
@@ -17,7 +17,7 @@ import qualified Data.Set as Set
1717import Data.Function
1818import Data.List
1919import Data.Version
20−import Distribution.Nixpkgs.Derivation.Meta
20+import Distribution.Nixpkgs.Meta
2121import Distribution.Nixpkgs.Fetch
2222import Distribution.Nixpkgs.Util.PrettyPrinting
2323import Distribution.Package
src/Distribution/Nixpkgs/Derivation/License.hs → src/Distribution/Nixpkgs/License.hsrenamed+1−1
@@ -5,7 +5,7 @@
55 are represented as a literal string.
66 -}
77
8−module Distribution.Nixpkgs.Derivation.License ( License(..) ) where
8+module Distribution.Nixpkgs.License ( License(..) ) where
99
1010import Control.DeepSeq.Generics
1111import Data.Maybe
src/Distribution/Nixpkgs/Derivation/Meta.hs → src/Distribution/Nixpkgs/Meta.hsrenamed+3−3
@@ -5,14 +5,14 @@
55 of the Nixpkgs manual at <http://nixos.org/nixpkgs/docs.html>.
66 -}
77
8−module Distribution.Nixpkgs.Derivation.Meta
8+module Distribution.Nixpkgs.Meta
99 ( Meta(..)
10− , module Distribution.Nixpkgs.Derivation.License
10+ , module Distribution.Nixpkgs.License
1111 )
1212 where
1313
1414import Control.DeepSeq.Generics
15−import Distribution.Nixpkgs.Derivation.License
15+import Distribution.Nixpkgs.License
1616import Distribution.Nixpkgs.Util.PrettyPrinting
1717import GHC.Generics ( Generic )
1818import Data.Set ( Set )
src/cabal2nix.hs+6−6
@@ -6,7 +6,7 @@ import Cabal2Nix.Package
66import Cabal2Nix.Version
77import Control.Exception ( bracket )
88import Control.Monad ( when )
9−import Distribution.Nixpkgs.Derivation.Cabal hiding ( version )
9+import Distribution.Nixpkgs.Haskell hiding ( version )
1010import Distribution.Nixpkgs.Fetch
1111import Distribution.Nixpkgs.Util.PrettyPrinting
1212import Distribution.PackageDescription ( FlagName(..), FlagAssignment )
@@ -104,11 +104,11 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
104104
105105 let flags = readFlagList (optFlags cfg)
106106
107− deriv = (cabal2nix flags $ cabal pkg) { src = source pkg
108− , runHaddock = optHaddock cfg
109− , jailbreak = optJailbreak cfg
110− , hyperlinkSource = optHyperlinkSource cfg
111− }
107+ deriv = (cabal2nix flags $ pkgCabal pkg) { src = pkgSource pkg
108+ , runHaddock = optHaddock cfg
109+ , jailbreak = optJailbreak cfg
110+ , hyperlinkSource = optHyperlinkSource cfg
111+ }
112112 deriv' = deriv { metaSection = (metaSection deriv)
113113 { maintainers = Set.fromList (optMaintainer cfg)
114114 , platforms = Set.fromList (optPlatform cfg)
src/hackage2nix.hs+1−1
@@ -21,7 +21,7 @@ import Data.Monoid
2121import Data.Set ( Set )
2222import qualified Data.Set as Set
2323import Distribution.Compiler
24−import Distribution.Nixpkgs.Derivation.Cabal
24+import Distribution.Nixpkgs.Haskell
2525import Distribution.Nixpkgs.PackageMap
2626import Distribution.Nixpkgs.Util.PrettyPrinting hiding ( attr, (<>) )
2727import Distribution.Package
test/spec.hs+2−5
@@ -3,12 +3,9 @@ module Main ( main ) where
33import Control.DeepSeq
44import Control.Exception
55import Data.Set ( empty )
6−import Distribution.Nixpkgs.Derivation.License
7−import Distribution.Nixpkgs.Derivation.Meta
8−import System.Process
6+import Distribution.Nixpkgs.License
7+import Distribution.Nixpkgs.Meta
98import Test.Hspec
10−import Test.Hspec.QuickCheck
11−import Test.QuickCheck
129
1310main :: IO ()
1411main = do