git.iko.soy/typeable/cabal2nix
on master help sign in
Cabal2Nix.Package renamed to Cabal2NixGenerate, which feels more appropriate.
a3f42bdPeter Simons
cabal2nix.cabal+2−2
compare with master
unifiedsplit
@@ -50,11 +50,11 @@ Executable cabal2nix
50 Ghc-Options: -Wall
50 Ghc-Options: -Wall
51 other-modules: Cabal2Nix.CorePackages
51 other-modules: Cabal2Nix.CorePackages
52 Cabal2Nix.Flags
52 Cabal2Nix.Flags
53+ Cabal2Nix.Generate
53 Cabal2Nix.Hackage
54 Cabal2Nix.Hackage
54 Cabal2Nix.License
55 Cabal2Nix.License
55 Cabal2Nix.Name
56 Cabal2Nix.Name
56 Cabal2Nix.Normalize
57 Cabal2Nix.Normalize
57− Cabal2Nix.Package
58 Cabal2Nix.PostProcess
58 Cabal2Nix.PostProcess
59
59
60Executable hackage4nix
60Executable hackage4nix
@@ -67,8 +67,8 @@ Executable hackage4nix
67 Ghc-Options: -Wall
67 Ghc-Options: -Wall
68 other-modules: Cabal2Nix.CorePackages
68 other-modules: Cabal2Nix.CorePackages
69 Cabal2Nix.Flags
69 Cabal2Nix.Flags
70+ Cabal2Nix.Generate
70 Cabal2Nix.License
71 Cabal2Nix.License
71 Cabal2Nix.Name
72 Cabal2Nix.Name
72 Cabal2Nix.Normalize
73 Cabal2Nix.Normalize
73− Cabal2Nix.Package
74 Cabal2Nix.PostProcess
74 Cabal2Nix.PostProcess
src/Cabal2Nix.hs+1−1
@@ -1,7 +1,7 @@
1module Main ( main ) where
1module Main ( main ) where
2
2
3import Cabal2Nix.Hackage ( hashPackage, readCabalFile )
3import Cabal2Nix.Hackage ( hashPackage, readCabalFile )
4−import Cabal2Nix.Package ( cabal2nix )
4+import Cabal2Nix.Generate ( cabal2nix )
5import Cabal2Nix.Normalize ( normalize )
5import Cabal2Nix.Normalize ( normalize )
6import Distribution.NixOS.Derivation.Cabal
6import Distribution.NixOS.Derivation.Cabal
7import Distribution.NixOS.Derivation.Meta
7import Distribution.NixOS.Derivation.Meta
src/Cabal2Nix/Package.hs → src/Cabal2Nix/Generate.hsrenamed+1−1
@@ -1,4 +1,4 @@
1−module Cabal2Nix.Package ( cabal2nix ) where
1+module Cabal2Nix.Generate ( cabal2nix ) where
2
2
3import Cabal2Nix.License
3import Cabal2Nix.License
4import Cabal2Nix.PostProcess
4import Cabal2Nix.PostProcess
src/Hackage4Nix.hs+1−1
@@ -1,7 +1,7 @@
1module Main ( main ) where
1module Main ( main ) where
2
2
3import Cabal2Nix.Normalize
3import Cabal2Nix.Normalize
4−import Cabal2Nix.Package
4+import Cabal2Nix.Generate
5import Control.Exception ( bracket )
5import Control.Exception ( bracket )
6import Control.Monad.RWS
6import Control.Monad.RWS
7import Data.List
7import Data.List