git.iko.soy/typeable/cabal2nix
on master help sign in
Move the generated Version.hs module into the Internal hierachy.
commit5deb08a908f3baa694235717283869e22a491a1c authorPeter Simons <simons@cryp.to> dateThu 20 Aug 2015, 23:46 (11 years ago) parent563f8db
5 files changed+9−9
compare with master
unifiedsplit
.gitignore+1−1 GNUmakefile+2−2 generate-cabal-file.hs+2−2 src/cabal2nix.hs+2−2 src/hackage2nix.hs+2−2
.gitignore+1−1
@@ -5,7 +5,7 @@
55/Setup.o
66/cabal2nix.cabal
77/dist/*
8−/src/Cabal2Nix/Version.hs
8+/src/Internal/Version.hs
99/TAGS
1010/test/doctest.hs
1111
GNUmakefile+2−2
@@ -24,8 +24,8 @@ hlint::
2424 hlint src
2525
2626clean::
27− @rm -rf cabal2nix.cabal dist src/Cabal2Nix/Version.hs test/doctest.hs
27+ @rm -rf cabal2nix.cabal dist src/Internal/Version.hs test/doctest.hs
2828
2929cabal2nix.cabal: generate-cabal-file.hs
3030 runhaskell "$<" >"$@"
31− cabal check
31+ @cabal check
generate-cabal-file.hs+2−2
@@ -104,8 +104,8 @@ main = do
104104 let releaseMode = "--release" `elem` args
105105 defaultMainWithHeader (const (return "")) $ do
106106 liftIO $ do ('v':gv) <- getGitVersion
107− writeFile "src/Cabal2Nix/Version.hs" $
108− "module Cabal2Nix.Version where\n\
107+ writeFile "src/Internal/Version.hs" $
108+ "module Internal.Version where\n\
109109 \version :: String\n\
110110 \version = " ++ show gv ++ "\n"
111111 libraryModules <- modules "src"
src/cabal2nix.hs+2−2
@@ -5,7 +5,6 @@ module Main ( main ) where
55import Cabal2Nix.Generate ( cabal2nix )
66import Cabal2Nix.Normalize ( normalize )
77import Cabal2Nix.Package
8−import Cabal2Nix.Version
98import Control.Exception ( bracket )
109import Control.Lens
1110import Data.Maybe ( fromMaybe )
@@ -13,9 +12,10 @@ import qualified Data.Set as Set
1312import Distribution.Nixpkgs.Fetch
1413import Distribution.Nixpkgs.Haskell
1514import Distribution.Nixpkgs.Meta
16−import Internal.PrettyPrinting hiding ( (<>) )
1715import Distribution.PackageDescription ( FlagName(..), FlagAssignment )
1816import Distribution.Simple.Utils ( lowercase )
17+import Internal.PrettyPrinting hiding ( (<>) )
18+import Internal.Version
1919import Options.Applicative
2020import System.IO ( hFlush, stdout, stderr )
2121import qualified Text.PrettyPrint.ANSI.Leijen as P2 hiding ( (<$>), (<>) )
src/hackage2nix.hs+2−2
@@ -7,7 +7,6 @@ import Cabal2Nix.Flags ( configureCabalFlags )
77import Cabal2Nix.Generate ( cabal2nix' )
88import Cabal2Nix.HackageGit ( readHackage, Hackage )
99import Cabal2Nix.Package
10−import Cabal2Nix.Version
1110import Control.Arrow ( second )
1211import Control.Monad
1312import Control.Monad.Par.Combinator
@@ -26,7 +25,6 @@ import Distribution.Nixpkgs.Fetch
2625import Distribution.Nixpkgs.Haskell
2726import Distribution.Nixpkgs.Meta
2827import Distribution.Nixpkgs.PackageMap
29−import Internal.PrettyPrinting hiding ( attr, (<>) )
3028import Distribution.Package
3129import Distribution.PackageDescription hiding ( options, buildDepends, extraLibs, buildTools )
3230import Distribution.PackageDescription.Configuration
@@ -34,6 +32,8 @@ import Distribution.System
3432import Distribution.Text
3533import Distribution.Version
3634import Internal.Lens
35+import Internal.PrettyPrinting hiding ( attr, (<>) )
36+import Internal.Version
3737import Language.Nix.Identifier
3838import Language.Nix.Path
3939import Options.Applicative