From 9134fc29b7d2ac9b16eb57a5118831fc4dedf25b Mon Sep 17 00:00:00 2001 From: "Julian K. Arni" Date: Wed, 12 Nov 2014 13:04:43 +0100 Subject: [PATCH] Matching hspec-hspec2 Upgraded hspec2 to 0.6. Upgraded hspec to 2.0.1. This allows (recursively) depending on hspec2 and hspec to work nicely, since now hspec2 is just a re-export of hspec. --- .../libraries/haskell/hspec-core/default.nix | 27 +++++++++++++++++++ .../haskell/hspec-discover/default.nix | 20 ++++++++++++++ .../libraries/haskell/hspec/default.nix | 21 +++++---------- .../libraries/haskell/hspec2/default.nix | 23 +++------------- pkgs/top-level/haskell-packages.nix | 4 +++ 5 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/libraries/haskell/hspec-core/default.nix create mode 100644 pkgs/development/libraries/haskell/hspec-discover/default.nix diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix new file mode 100644 index 00000000000..454f7c55bc7 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-core/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ansiTerminal, async, deepseq, ghcPaths, hspecExpectations +, hspecMeta, HUnit, QuickCheck, quickcheckIo, random, setenv +, silently, tfRandom, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec-core"; + version = "2.0.1"; + sha256 = "1yr2hkr1p95bpj5n6hqw20g8imqal6pva4nrvy0hmxdg53jyxcf7"; + buildDepends = [ + ansiTerminal async deepseq hspecExpectations HUnit QuickCheck + quickcheckIo random setenv tfRandom time transformers + ]; + testDepends = [ + ansiTerminal async deepseq ghcPaths hspecExpectations hspecMeta + HUnit QuickCheck quickcheckIo random setenv silently tfRandom time + transformers + ]; + meta = { + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix new file mode 100644 index 00000000000..b8af52ee87d --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-discover/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, hspecMeta }: + +cabal.mkDerivation (self: { + pname = "hspec-discover"; + version = "2.0.1"; + sha256 = "0k54j1id5yj60kjxs16w4hr52wanc55l131arypcjgf9w4yx3x3w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ filepath ]; + testDepends = [ filepath hspecMeta ]; + noHaddock = true; + meta = { + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 0848aabb515..58b0022d3b3 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,26 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths -, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, stringbuilder, tfRandom, time -, transformers +{ cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta +, QuickCheck, stringbuilder, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "1.12.3"; - sha256 = "0lqihgsk46lwm4k2nc81pbi1gdfk7qnmjli90bvf4pbbhg5igjkn"; - isLibrary = true; - isExecutable = true; + version = "2.0.1"; + sha256 = "05kwxn5sws8gc1v8im2pyirrj5bzc6lnj22q2klgj4mg3apjd0jb"; buildDepends = [ - ansiTerminal async deepseq filepath hspecExpectations HUnit - QuickCheck quickcheckIo random setenv tfRandom time transformers - ]; - testDepends = [ - ansiTerminal async deepseq filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - stringbuilder tfRandom time transformers + hspecCore hspecDiscover hspecExpectations QuickCheck transformers ]; + testDepends = [ hspecCore hspecMeta QuickCheck stringbuilder ]; doCheck = false; meta = { homepage = "http://hspec.github.io/"; diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index 8411bdff144..abf120023ec 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -1,31 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths -, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, stringbuilder, tfRandom, time -, transformers -}: +{ cabal, hspec, hspecDiscover }: cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.5.1"; - sha256 = "1ax507vb0zm5jalp6pvlk1fjfil766pf7w61d1igpxr0s00lnvlq"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - ansiTerminal async deepseq filepath hspecExpectations HUnit - QuickCheck quickcheckIo random setenv tfRandom time transformers - ]; - testDepends = [ - ansiTerminal async deepseq filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - stringbuilder tfRandom time transformers - ]; + version = "0.6.0"; + sha256 = "13gh7gf2kdawyssrsd8ln55i776v51r8fwih25160860n1p5dcz5"; + buildDepends = [ hspec hspecDiscover ]; meta = { homepage = "http://hspec.github.io/"; description = "Alpha version of Hspec 2.0"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8dd2aafbbac..31532dbb232 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1313,6 +1313,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspecCheckers = callPackage ../development/libraries/haskell/hspec-checkers {}; + hspecCore = callPackage ../development/libraries/haskell/hspec-core {}; + + hspecDiscover = callPackage ../development/libraries/haskell/hspec-discover {}; + hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; hsyslog = callPackage ../development/libraries/haskell/hsyslog {};