diff options
| author | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
| commit | 1c0d15b90ef67363f798d67d12dd31ed5fccb411 (patch) | |
| tree | 3693dd49b591dbbba261e95fc4b78650f1675578 /pkgs/development/libraries/haskell/hspec2 | |
| parent | bb61b45d92bad2435e80dcac855a78bda57ec7e8 (diff) | |
| parent | 2fc76ea05417671306d27f9ba83ef1b8d4049f3d (diff) | |
| download | nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.gz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.bz2 nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.lz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.xz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.zst nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.zip | |
Merge branch 'origin/master' into staging.
Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/hspec2')
| -rw-r--r-- | pkgs/development/libraries/haskell/hspec2/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index 295b01b4e32..e459e99e2fe 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.4.1"; - sha256 = "131w90yy7scxdpz7qa37n1wmyr8gvc5jqdsqkpg8s9pqham96w5v"; + version = "0.4.2"; + sha256 = "1wk1lvy3lngfa60n0dyllfqbj4gd4v0qxjw7gpvzknfk2y10536x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,7 +25,5 @@ cabal.mkDerivation (self: { description = "Alpha version of Hspec 2.0"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) |