From 29c8fdc94171848a500c7be3299398a7d6ca88bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jul 2014 12:54:59 +0200 Subject: [PATCH] Re-generate Haskell expressions with cabal2nix. --- pkgs/development/libraries/haskell/HFuse/default.nix | 5 ----- .../libraries/haskell/jmacro-rpc-happstack/default.nix | 2 ++ .../libraries/haskell/jmacro-rpc-snap/default.nix | 2 ++ pkgs/development/libraries/haskell/jmacro-rpc/default.nix | 2 ++ pkgs/development/libraries/haskell/jmacro/default.nix | 2 ++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 7ddacbc79ac..04ebefd37fa 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -9,11 +9,6 @@ cabal.mkDerivation (self: { extraLibraries = [ fuse ]; 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 ''; meta = { homepage = "https://github.com/m15k/hfuse"; diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix index 124032b9a0b..c8c7c503ea9 100644 --- a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix +++ b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeHtml, happstackServer, jmacro, jmacroRpc, mtl }: diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix index 356cb243595..9ff082e3239 100644 --- a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix +++ b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, jmacro, jmacroRpc, mtl, snapCore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix index 24044fdb1f3..d1e302b1bc9 100644 --- a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix +++ b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, blazeHtml, contravariant, jmacro, mtl , scientific, split, text, unorderedContainers, vector }: diff --git a/pkgs/development/libraries/haskell/jmacro/default.nix b/pkgs/development/libraries/haskell/jmacro/default.nix index 50932d1b517..32d4d3747ef 100644 --- a/pkgs/development/libraries/haskell/jmacro/default.nix +++ b/pkgs/development/libraries/haskell/jmacro/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, haskellSrcExts, haskellSrcMeta, mtl, parseargs , parsec, regexPosix, safe, syb, text, unorderedContainers, vector , wlPprintText