cabal2nix 1.41 → 1.42

raw patch · 2 files changed

+10/−3 lines, 2 files

Files

• cabal2nix.cabal +3/−3
• src/Cabal2Nix/PostProcess.hs +7/−0

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

@@ -25,6 +25,7 @@   | pname == "happy"            = deriv { buildTools = "perl":buildTools }   | pname == "haskell-src"      = deriv { buildTools = "happy":buildTools }   | pname == "haskell-src-meta" = deriv { buildDepends = "uniplate":buildDepends }+  | pname == "highlighting-kate"= highlightingKatePostProcessing deriv   | pname == "hmatrix"          = deriv { extraLibs = "gsl":"liblapack":"blas":extraLibs }   | pname == "idris"            = deriv { buildTools = "happy":buildTools }   | pname == "language-c-quote" = deriv { buildTools = "alex":"happy":buildTools }@@ -118,3 +119,9 @@   , "  mv contrib/darcs_completion $out/etc/bash_completion.d/darcs"   , "'';"   ]++highlightingKatePostProcessing :: Derivation -> Derivation+highlightingKatePostProcessing deriv@(MkDerivation {..}) = deriv+  { phaseOverrides = "prePatch = \"sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal\";"+  , buildDepends = "regex-pcre" : filter (/="regex-pcre-builtin") buildDepends+  }