cabal2nix 1.30 → 1.31
raw patch · 3 files changed
+9/−5 lines, 3 files
Files
- cabal2nix.cabal +3/−3
- src/Cabal2Nix/Name.hs +1/−0
- src/Cabal2Nix/PostProcess.hs +5/−2
cabal2nix.cabal view
@@ -1,5 +1,5 @@ Name: cabal2nix-Version: 1.30+Version: 1.31 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.30/cabal2nix.cabal- > cabal2nix cabal://cabal2nix-1.30+ > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.31/cabal2nix.cabal+ > cabal2nix cabal://cabal2nix-1.31 . If the @--sha256@ option has not been specified, cabal2nix calls @nix-prefetch-url@ to determine the hash automatically. This causes
src/Cabal2Nix/Name.hs view
@@ -50,6 +50,7 @@ libNixName "ssl" = return "openssl" libNixName "stdc++" = [] -- in stdenv libNixName "X11" = return "libX11"+libNixName "Xext" = return "libXext" libNixName "xft" = return "libXft" libNixName "xml2" = return "libxml2" libNixName "Xrandr" = return "libXrandr"
src/Cabal2Nix/PostProcess.hs view
@@ -23,13 +23,14 @@ | pname == "haskell-src-meta" = deriv { buildDepends = "uniplate":buildDepends } | pname == "hmatrix" = deriv { extraLibs = "gsl":"liblapack":"blas":extraLibs } | pname == "idris" = deriv { buildTools = "happy":buildTools }+ | pname == "leksah-server" = deriv { buildDepends = "process-leksah":buildDepends }+ | pname == "multiarg" = deriv { buildDepends = "utf8String":buildDepends } | pname == "OpenAL" = deriv { extraLibs = "openal":extraLibs } | 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-algorithms" = deriv { extraLibs = "llvm":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 }@@ -38,6 +39,8 @@ | pname == "threadscope" = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags } | pname == "vacuum" = deriv { extraLibs = "ghcPaths":extraLibs } | pname == "wxcore" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs }+ | pname == "X11" && version >= (Version [1,6] [])+ = deriv { extraLibs = "libXinerama":"libXext":"libXrender":extraLibs } | pname == "X11" = deriv { extraLibs = "libXinerama":"libXext":extraLibs } | pname == "X11-xft" = deriv { extraLibs = "pkgconfig":"freetype":"fontconfig":extraLibs , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags