git.iko.soy/typeable/cabal2nix
on master help sign in
cabal2nix: drop obsolete lens-construction-helper
commit909a4c4eb7cf7789734200d4ad003101b4fa99a4 authorPeter Simons <simons@cryp.to> dateThu 3 Sep 2015, 17:31 (11 years ago) parent6eebcd6
3 files changed+7−10
compare with master
unifiedsplit
cabal2nix/cabal2nix.cabal+1−2 cabal2nix/package.yaml+1−2 cabal2nix/src/Main.hs+5−6
cabal2nix/cabal2nix.cabal+1−2
@@ -1,4 +1,4 @@
1−-- This file has been generated from package.yaml by hpack version 0.5.4.
1+-- This file has been generated from package.yaml by hpack version 0.7.0.
22--
33-- see: https://github.com/sol/hpack
44
@@ -32,7 +32,6 @@ executable cabal2nix
3232 , distribution-nixpkgs
3333 , language-nix
3434 , lens
35− , lens-construction-helper
3635 , optparse-applicative
3736 , pretty >= 1.1.2
3837 , pretty-show
cabal2nix/package.yaml+1−2
@@ -10,14 +10,13 @@ category: Distribution
1010ghc-options: -Wall
1111
1212dependencies:
13+ - Cabal >= 1.22.2
1314 - ansi-wl-pprint
1415 - base < 5
15− - Cabal >= 1.22.2
1616 - containers
1717 - distribution-nixpkgs
1818 - language-nix
1919 - lens
20− - lens-construction-helper
2120 - optparse-applicative
2221 - pretty >= 1.1.2
2322 - pretty-show
cabal2nix/src/Main.hs+5−6
@@ -4,6 +4,7 @@
44module Main ( main ) where
55
66import Control.Exception ( bracket )
7+import Control.Lens
78import Data.Maybe ( fromMaybe )
89import qualified Data.Set as Set
910import Distribution.Nixpkgs.Fetch
@@ -14,14 +15,12 @@ import Distribution.Nixpkgs.Meta
1415import Distribution.PackageDescription ( FlagName(..), FlagAssignment )
1516import Distribution.Simple.Utils ( lowercase )
1617import Distribution.Text ( display )
17−import Paths_cabal2nix
18−import Text.PrettyPrint.HughesPJClass ( Doc, Pretty(..), text, vcat, hcat, semi )
19−import Control.Lens
20−import Control.Lens.Create
2118import Language.Nix
2219import Options.Applicative
20+import Paths_cabal2nix
2321import System.IO ( hFlush, stdout, stderr )
2422import qualified Text.PrettyPrint.ANSI.Leijen as P2 hiding ( (<$>), (<>) )
23+import Text.PrettyPrint.HughesPJClass ( Doc, Pretty(..), text, vcat, hcat, semi )
2524-- import Text.Show.Pretty
2625import Distribution.Nixpkgs.Haskell.PackageSourceSpec
2726
@@ -97,7 +96,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
9796
9897 let deriv :: Derivation
9998 deriv = fromGenericPackageDescription (const True)
100− (\i -> Just (create binding (i, create path [i])))
99+ (\i -> Just (binding # (i, path # [i])))
101100 (platform ghc7102)
102101 (compilerInfo ghc7102)
103102 (readFlagList optFlags)
@@ -109,7 +108,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
109108 & hyperlinkSource .~ optHyperlinkSource
110109 & enableLibraryProfiling .~ (fromMaybe False optEnableProfiling || optEnableLibraryProfiling)
111110 & enableExecutableProfiling .~ (fromMaybe False optEnableProfiling || optEnableExecutableProfiling)
112− & metaSection.maintainers .~ Set.fromList (map (create ident) optMaintainer)
111+ & metaSection.maintainers .~ Set.fromList (map (review ident) optMaintainer)
113112-- & metaSection.platforms .~ Set.fromList optPlatform
114113 & doCheck &&~ optDoCheck
115114 & extraFunctionArgs . contains "stdenv" .~ True