summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/ghc-mtl/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-08-23 16:04:53 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-08-23 16:04:53 +0200
commit96cec2a7bdf2482ae58fe04cce5e87a1eec644f9 (patch)
treeea48b901c9ba0ac2b4a249ae94bd966c4a025001 /pkgs/development/libraries/haskell/ghc-mtl/default.nix
parentdb83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (diff)
parent084626deecaffcaa017af07eaab00682eff5d6f3 (diff)
downloadnixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.gz
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.bz2
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.lz
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.xz
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.zst
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.zip
Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/ghc-mtl/default.nix')
-rw-r--r--pkgs/development/libraries/haskell/ghc-mtl/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index ea2495f6586a..9ba3362000ad 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -1,15 +1,16 @@
-{ cabal, MonadCatchIOMtl, mtl }:
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, exceptions, extensibleExceptions, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mtl";
-  version = "1.0.1.2";
-  sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva";
-  buildDepends = [ MonadCatchIOMtl mtl ];
+  version = "1.2.1.0";
+  sha256 = "0h6r6gip9nsjlsq88wj105hhqliy7ac2dmmndsfzbjz07b03cklk";
+  buildDepends = [ exceptions extensibleExceptions mtl ];
   meta = {
-    homepage = "http://darcsden.com/jcpetruzza/ghc-mtl";
+    homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
     description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })