cabal2nix 1.23 → 1.24

raw patch · 3 files changed

+6/−3 lines, 3 files

Files

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

@@ -1,5 +1,5 @@ Name:                   cabal2nix-Version:                1.23+Version:                1.24 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.23/cabal2nix.cabal-  > cabal2nix cabal://cabal2nix-1.23+  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.24/cabal2nix.cabal+  > cabal2nix cabal://cabal2nix-1.24   .   If the @--sha256@ option has not been specified, cabal2nix calls   @nix-prefetch-url@ to determine the hash automatically. This causes

@@ -45,8 +45,10 @@ libNixName "sndfile"            = return "libsndfile" libNixName "sqlite3"            = return "sqlite" libNixName "stdc++"             = []  -- in stdenv+libNixName "ssl"                = return "openssl" libNixName "X11"                = return "libX11" libNixName "xft"                = return "libXft"+libNixName "xml2"               = return "libxml2" libNixName "Xrandr"             = return "libXrandr" libNixName "z"                  = return "zlib" libNixName "zmq"                = return "zeromq"

@@ -26,6 +26,7 @@   | pname == "pango"            = deriv { extraLibs = "pkgconfig":"libc":extraLibs }   | pname == "persistent"       = deriv { extraLibs = "sqlite3":extraLibs }   | pname == "repa-examples"    = deriv { extraLibs = "llvm":extraLibs }+  | pname == "multiarg"         = deriv { buildDepends = "utf8String":buildDepends }   | pname == "SDL-image"        = deriv { extraLibs = "SDL_image":extraLibs }   | pname == "SDL-mixer"        = deriv { extraLibs = "SDL_mixer":extraLibs }   | pname == "SDL-ttf"          = deriv { extraLibs = "SDL_ttf":extraLibs }