cabal2nix 1.27 → 1.28

raw patch · 5 files changed

+9/−6 lines, 5 files

Files

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

@@ -129,6 +129,7 @@         (pre|post)Configure         (pre|post)Install         patchPhase+        patches      are considered "patched". That list of attributes is hard-coded in     [`hackage4nix.hs`](http://github.com/NixOS/cabal2nix/blob/master/src/Hackage4Nix.hs)

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

@@ -23,6 +23,7 @@ libNixName "cairo"              = return "cairo" libNixName "cairo-svg"          = return "cairo" libNixName "crypto"             = return "openssl"+libNixName "gio-2.0"            = return "glib" libNixName "glib-2.0"           = return "glib" libNixName "GL"                 = return "mesa" libNixName "GLU"                = ["freeglut","mesa"]@@ -46,14 +47,14 @@ libNixName "pq"                 = return "postgresql" libNixName "sndfile"            = return "libsndfile" libNixName "sqlite3"            = return "sqlite"-libNixName "stdc++"             = []  -- in stdenv libNixName "ssl"                = return "openssl"+libNixName "stdc++"             = []  -- in stdenv libNixName "X11"                = return "libX11" libNixName "xft"                = return "libXft" libNixName "xml2"               = return "libxml2" libNixName "Xrandr"             = return "libXrandr"-libNixName "z"                  = return "zlib" libNixName "zmq"                = return "zeromq"+libNixName "z"                  = return "zlib" libNixName x                    = return x  -- | Map build tool names to Nix attribute names.

@@ -26,6 +26,7 @@   | pname == "OpenGL"           = deriv { extraLibs = "mesa":"libX11":extraLibs }   | pname == "pango"            = deriv { extraLibs = "pkgconfig":"libc":extraLibs }   | pname == "persistent"       = deriv { extraLibs = "sqlite3":extraLibs }+  | pname == "leksah-server"    = deriv { buildDepends = "process-leksah":buildDepends }   | pname == "repa-examples"    = deriv { extraLibs = "llvm":extraLibs }   | pname == "multiarg"         = deriv { buildDepends = "utf8String":buildDepends }   | pname == "SDL-image"        = deriv { extraLibs = "SDL_image":extraLibs }

@@ -73,7 +73,7 @@  regenerateDerivation :: Derivation -> String -> Bool regenerateDerivation deriv buf = not (pname deriv `elem` patchedPackages) &&-                                 not (buf =~ "(pre|post)Configure|(pre|post)Install|patchPhase")+                                 not (buf =~ "(pre|post)Configure|(pre|post)Install|patchPhase|patches")  parseNixFile :: FilePath -> String -> Hackage4Nix (Maybe Pkg) parseNixFile path buf