cabal2nix 1.66 → 1.67

raw patch · 3 files changed

+8/−13 lines, 3 files

Files

• cabal2nix.cabal +3/−3
• src/Cabal2Nix/Name.hs +1/−1
• src/Cabal2Nix/PostProcess.hs +4/−9

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

@@ -56,7 +56,7 @@ libNixName "idn"                                = return "libidn" libNixName "IL"                                 = return "libdevil" libNixName "iw"                                 = return "wirelesstools"-libNixName "jack"                               = return "jackaudio"+libNixName "jack"                               = return "jack2" libNixName "jpeg"                               = return "libjpeg" libNixName "libglade-2.0"                       = return "libglade" libNixName "libgsasl"                           = return "gsasl"

@@ -2,8 +2,8 @@  module Cabal2Nix.PostProcess ( postProcess ) where -import Distribution.NixOS.Derivation.Cabal import Data.List+import Distribution.NixOS.Derivation.Cabal  postProcess :: Derivation -> Derivation postProcess deriv@(MkDerivation {..})@@ -36,7 +36,7 @@   | 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 == "gtk"              = deriv { extraLibs = "pkgconfig":"libc":extraLibs }   | pname == "gtkglext"         = deriv { pkgConfDeps = "pangox_compat":pkgConfDeps }   | pname == "gtk2hs-buildtools"= deriv { buildDepends = "hashtables":buildDepends }   | pname == "gtksourceview2"   = deriv { extraLibs = "pkgconfig":"libc":extraLibs }@@ -46,7 +46,6 @@   | pname == "haskeline"        = deriv { buildDepends = "utf8String":buildDepends }   | pname == "haskell-src"      = deriv { buildTools = "happy":buildTools }   | pname == "haskell-src-meta" = deriv { buildDepends = "uniplate":buildDepends }-  | pname == "hflags"           = deriv { metaSection = metaSection { license = Unknown (Just "Apache-2.0") } }   | pname == "hfsevents"        = deriv { buildTools = "gccApple":buildTools, phaseOverrides = "configureFlags = \"--ghc-option=-pgmc=${gccApple}/bin/gcc\";" }   | pname == "HFuse"            = deriv { phaseOverrides = hfusePreConfigure }   | pname == "highlighting-kate"= highlightingKatePostProcessing deriv@@ -98,6 +97,7 @@   | pname == "terminfo"         = deriv { extraLibs = "ncurses":extraLibs }   | pname == "text-icu"         = deriv { doCheck = True, phaseOverrides = textIcuDoCheckHook }   | pname == "threadscope"      = deriv { configureFlags = "--ghc-options=-rtsopts":configureFlags }+  | pname == "thyme"            = deriv { buildTools = "cpphs":buildTools }   | pname == "transformers" && version >= Version [0,4,1] []                                 = deriv { runHaddock = True, phaseOverrides = transformersNoHaddock }   | pname == "tz"               = deriv { extraFunctionArgs = ["pkgs_tzdata"], phaseOverrides = "preConfigure = \"export TZDIR=${pkgs_tzdata}/share/zoneinfo\";" }@@ -229,11 +229,6 @@ hfusePreConfigure = unlines   [ "preConfigure = ''"   , "  sed -i -e \"s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@\" HFuse.cabal"-  , "  sed -i -e \"s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/\" System/Fuse.hsc"-  , "  sed -i -e \"s/E(Exception/E(catch, Exception, IOException/\" System/Fuse.hsc"-  , "  sed -i -e \"s/IO(catch,/IO(/\" System/Fuse.hsc"-  , "  sed -i -e \"s/IO.catch/ E.catch/\" System/Fuse.hsc"-  , "  sed -i -e \"s/const exitFailure/\\\\\\\\(_ :: IOException) -> exitFailure/\" System/Fuse.hsc"   , "'';"   ] @@ -274,7 +269,7 @@ agdaPostInstall :: String agdaPostInstall = unlines   [ "postInstall = ''"-  , "  $out/bin/agda -c --no-main $out/share/Agda-*/lib/prim/Agda/Primitive.agda"+  , "  $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)"   , "  $out/bin/agda-mode compile"   , "'';"   ]