cabal2nix 1.32 → 1.33

raw patch · 3 files changed

+7/−5 lines, 3 files

Files

• cabal2nix.cabal +3/−3
• src/Cabal2Nix/Flags.hs +3/−2
• src/Cabal2Nix/Name.hs +1/−0

@@ -1,5 +1,5 @@ Name:                   cabal2nix-Version:                1.32+Version:                1.33 Copyright:              Peter Simons, Andres Loeh License:                BSD3 License-File:           LICENSE@@ -31,8 +31,8 @@   .   The only required argument is the path to the cabal file. For example:   .-  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.32/cabal2nix.cabal-  > cabal2nix cabal://cabal2nix-1.32+  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.33/cabal2nix.cabal+  > cabal2nix cabal://cabal2nix-1.33   .   If the @--sha256@ option has not been specified, cabal2nix calls   @nix-prefetch-url@ to determine the hash automatically. This causes

@@ -5,9 +5,10 @@  configureCabalFlags :: PackageIdentifier -> FlagAssignment configureCabalFlags (PackageIdentifier (PackageName name) _)- | name == "haskeline"          = [enable "terminfo"]- | name == "xmobar"             = [enable "with_xft"]  | name == "accelerate-examples"= [disable "opencl"]+ | name == "haskeline"          = [enable "terminfo"]+ | name == "reactive-banana-wx" = [disable "buildExamples"]+ | name == "xmobar"             = [enable "with_xft", enable "with_iwlib"]  | otherwise                    = []  enable :: String -> (FlagName,Bool)

@@ -35,6 +35,7 @@ libNixName "gtk+-2.0"           = return "gtk" libNixName "gtksourceview-2.0"  = return "gtksourceview" libNixName "idn"                = return "idn"+libNixName "iw"                 = return "wirelesstools" libNixName "jpeg"               = return "libjpeg" libNixName "libglade-2.0"       = return "libglade" libNixName "libidn"             = return "idn"