summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorOliver Charles <ollie@ocharles.org.uk>2014-04-13 12:11:27 +0100
committerOliver Charles <ollie@ocharles.org.uk>2014-04-13 12:11:27 +0100
commit7f4afcda7e15e938a5f63a790295dd2b0eb9fc40 (patch)
tree9a8e401601a655ab247d25fe3e3e272323df0908 /pkgs
parent6fa1ad04da125d14e78634b01295dfd482f1f4c4 (diff)
parent7fed418b249a33d96cd4d657099e7438515408ce (diff)
downloadnixpkgs-7f4afcda7e15e938a5f63a790295dd2b0eb9fc40.tar
nixpkgs-7f4afcda7e15e938a5f63a790295dd2b0eb9fc40.tar.gz
nixpkgs-7f4afcda7e15e938a5f63a790295dd2b0eb9fc40.tar.bz2
nixpkgs-7f4afcda7e15e938a5f63a790295dd2b0eb9fc40.tar.lz
nixpkgs-7f4afcda7e15e938a5f63a790295dd2b0eb9fc40.tar.xz
nixpkgs-7f4afcda7e15e938a5f63a790295dd2b0eb9fc40.tar.zst
nixpkgs-7f4afcda7e15e938a5f63a790295dd2b0eb9fc40.zip
Merge pull request #2235 from bennofs/haskell-monad-extras
haskell: add monad-extras
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/haskell/monad-extras/default.nix17
-rw-r--r--pkgs/top-level/haskell-packages.nix2
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix
new file mode 100644
index 00000000000..9a66c5ab983
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-extras/default.nix
@@ -0,0 +1,17 @@
+{ cabal, mmorph, monadControl, stm, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "monad-extras";
+  version = "0.5.7";
+  sha256 = "0dqj3n3ki679b6z5y7qw084chbahlqmj2vgj7yx0v552bl0ylzyj";
+  buildDepends = [
+    mmorph monadControl stm transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://github.com/jwiegley/monad-extras";
+    description = "Extra utility functions for working with monads";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fcf14325a82..91aa2aac5aa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1751,6 +1751,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {};
 
+  monadExtras = callPackage ../development/libraries/haskell/monad-extras {};
+
   monadloc = callPackage ../development/libraries/haskell/monadloc {};
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};