cabal2nix 1.58 → 1.59
raw patch · 5 files changed
+12/−6 lines, 5 files
Files
- README.md +2/−2
- cabal2nix.cabal +3/−3
- src/Cabal2Nix/Flags.hs +3/−1
- src/Cabal2Nix/Name.hs +3/−0
- src/Cabal2Nix/PostProcess.hs +1/−0
README.md view
@@ -115,7 +115,7 @@ Cabal files. There are only a handful of exceptions, which we cannot generate because these packages aren't available on Hackage. The list of those packages is hard-coded into the-[`hackage4nix.hs`](http://github.com/NixOS/cabal2nix/blob/master/src/Hackage4Nix.hs)+[`hackage4nix.hs`](https://github.com/NixOS/cabal2nix/blob/master/src/hackage4nix.hs) binary in the function `badPackagePaths`. Furthermore, Hackage4Nix will not re-generate packages that have been@@ -133,5 +133,5 @@ and published at <http://cryp.to/haskell-in-nixpkgs.txt>. Hackage picks it up from there and generates links on each package's homepage to the corresponding page in Hydra automatically. See [ticket-875](http://hackage.haskell.org/trac/hackage/ticket/875) for further+875](http://www.haskell.org/pipermail/cabal-devel/2011-August/007714.html) for further details.
cabal2nix.cabal view
@@ -1,5 +1,5 @@ Name: cabal2nix-Version: 1.58+Version: 1.59 Copyright: Peter Simons, Andres Loeh License: BSD3 License-File: LICENSE@@ -34,8 +34,8 @@ . The only required argument is the path to the cabal file. For example: .- > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.58/cabal2nix.cabal- > cabal2nix cabal://cabal2nix-1.58+ > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.59/cabal2nix.cabal+ > cabal2nix cabal://cabal2nix-1.59 . If the @--sha256@ option has not been specified, cabal2nix calls @nix-prefetch-url@ to determine the hash automatically. This causes
src/Cabal2Nix/Flags.hs view
@@ -12,9 +12,11 @@ , enable "Production", enable "TDFA"] | name == "haskeline" = [enable "terminfo"] | name == "hslua" = [enable "system-lua"]+ | name == "io-streams" = [enable "NoInteractiveTests"] | name == "reactive-banana-wx" = [disable "buildExamples"]- | name == "xmobar" = [enable "with_xft", enable "with_iwlib"]+ | name == "xmobar" = [enable "with_xft", enable "with_iwlib", enable "with_alsa"] | name == "xmonad-extras" = [disable "with_hlist", enable "with_split", enable "with_parsec"]+ | name == "yi" = [enable "pango"] | otherwise = [] enable :: String -> (FlagName,Bool)
src/Cabal2Nix/Name.hs view
@@ -19,11 +19,13 @@ libNixName :: String -> [String] libNixName "adns" = return "adns" libNixName "alsa" = return "alsaLib"+libNixName "asound" = return "alsaLib" libNixName "cairo-pdf" = return "cairo" libNixName "cairo-ps" = return "cairo" libNixName "cairo" = return "cairo" libNixName "cairo-svg" = return "cairo" libNixName "crypto" = return "openssl"+libNixName "dl" = [] -- provided by glibc libNixName "gconf-2.0" = return "gconf" libNixName "gdk-2.0" = return "gtk" libNixName "gdk-pixbuf-2.0" = return "gdk_pixbuf"@@ -76,6 +78,7 @@ libNixName "X11" = return "libX11" libNixName "Xext" = return "libXext" libNixName "xft" = return "libXft"+libNixName "Xi" = return "libXi" libNixName "xml2" = return "libxml2" libNixName "Xrandr" = return "libXrandr" libNixName "Xss" = return "libXScrnSaver"
src/Cabal2Nix/PostProcess.hs view
@@ -29,6 +29,7 @@ | pname == "github-backup" = deriv { buildTools = "git":buildTools } | pname == "glade" = deriv { extraLibs = "pkgconfig":"libc":extraLibs, pkgConfDeps = "gtkC":delete "gtk" pkgConfDeps } | pname == "glib" = deriv { extraLibs = "pkgconfig":"libc":extraLibs }+ | pname == "gloss-raster" = deriv { extraLibs = "llvm":extraLibs } | pname == "GLUT" = deriv { extraLibs = "glut":"libSM":"libICE":"libXmu":"libXi":"mesa":extraLibs } | pname == "gtk" = deriv { extraLibs = "pkgconfig":"libc":extraLibs, buildDepends = delete "gio" buildDepends } | pname == "gtksourceview2" = deriv { extraLibs = "pkgconfig":"libc":extraLibs }