From 87154e257ad923850103733e3f137341cb87b405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Wed, 11 Jun 2014 15:55:19 +0800 Subject: [PATCH 1/3] haskell-spawn: new package, v0.3 --- pkgs/development/libraries/haskell/spawn/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/spawn/default.nix diff --git a/pkgs/development/libraries/haskell/spawn/default.nix b/pkgs/development/libraries/haskell/spawn/default.nix new file mode 100644 index 00000000000..a69b7fd2641 --- /dev/null +++ b/pkgs/development/libraries/haskell/spawn/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "spawn"; + version = "0.3"; + sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8"; + meta = { + description = "Tiny library for concurrent computations"; + 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 a928ab30fba..3676d46cff1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1982,6 +1982,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sparse = callPackage ../development/libraries/haskell/sparse {}; + spawn = callPackage ../development/libraries/haskell/spawn {}; + speculation = callPackage ../development/libraries/haskell/speculation {}; spoon = callPackage ../development/libraries/haskell/spoon {}; From 1d3477c422a1b756e46683f51a87ec8b58dc6c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Wed, 11 Jun 2014 15:56:41 +0800 Subject: [PATCH 2/3] haskell-io-memoize: new package, v1.0.0.0 --- .../libraries/haskell/io-memoize/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/io-memoize/default.nix diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix new file mode 100644 index 00000000000..bba2cd3b1e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/io-memoize/default.nix @@ -0,0 +1,13 @@ +{ cabal, spawn }: + +cabal.mkDerivation (self: { + pname = "io-memoize"; + version = "1.0.0.0"; + sha256 = "1z6aimyg7wasaqmacpch7skfm9iyl7khd54lfmb8iwghyfvah5d0"; + buildDepends = [ spawn ]; + meta = { + description = "Memoize IO actions"; + 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 3676d46cff1..c519eb14080 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1236,6 +1236,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ioChoice = callPackage ../development/libraries/haskell/io-choice {}; + ioMemoize = callPackage ../development/libraries/haskell/io-memoize {}; + IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {}; IOSpec = callPackage ../development/libraries/haskell/IOSpec {}; From de0520bb3a56b8bec127d13a050b8f48ef26f0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Wed, 11 Jun 2014 15:57:48 +0800 Subject: [PATCH 3/3] haskell-hspec2: new package, v0.3.0 --- .../libraries/haskell/hspec2/default.nix | 29 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec2/default.nix diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix new file mode 100644 index 00000000000..be49f612aaa --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -0,0 +1,29 @@ +{ cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths +, hspecExpectations, hspecMeta, HUnit, ioMemoize, QuickCheck +, quickcheckIo, random, setenv, silently, tfRandom, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec2"; + version = "0.3.0"; + sha256 = "0ia19jraz2di31c48lh0kswkb2573jxm7msf33i8d5a5yq8y9wwp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansiTerminal async deepseq filepath hspecExpectations HUnit + ioMemoize QuickCheck quickcheckIo random setenv tfRandom time + transformers + ]; + testDepends = [ + ansiTerminal async deepseq doctest filepath ghcPaths + hspecExpectations hspecMeta HUnit ioMemoize QuickCheck quickcheckIo + random setenv silently tfRandom time transformers + ]; + meta = { + homepage = "http://hspec.github.io/"; + description = "Alpha version of Hspec 2.0"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c519eb14080..ed1445e2e44 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1156,6 +1156,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspec = callPackage ../development/libraries/haskell/hspec {}; + hspec2 = callPackage ../development/libraries/haskell/hspec2 {}; + hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {};