diff options
| author | Thomas Strobel <ts468@cam.ac.uk> | 2014-09-15 12:15:11 +0200 |
|---|---|---|
| committer | Thomas Strobel <ts468@cam.ac.uk> | 2014-09-15 12:15:11 +0200 |
| commit | 6366509e5456cf1d5960d3f0b93a8eb0624f5133 (patch) | |
| tree | 91c3090c7137f057e81f7931eb6c875b5bf1f8c3 /pkgs/development/libraries/haskell/tasty/default.nix | |
| parent | 66dbde4002b8ee64dd060ab06f9ecfbff9f2dd13 (diff) | |
| parent | 5c80997ebdea1572234925fb609cd89f7e0f9c6a (diff) | |
| download | nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.gz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.bz2 nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.lz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.xz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.zst nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.zip | |
Merge branch 'upstream' into pam_mount
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/tasty/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/tasty/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 6303320460f..b0623377114 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative -, regexTdfaRc, stm, tagged, unboundedDelays +, regexTdfaRc, stm, tagged, time, unboundedDelays }: cabal.mkDerivation (self: { pname = "tasty"; - version = "0.8.1.3"; - sha256 = "0hc030ms89w3cl1k3r8nrym3g7sg2n66ch2ljg6d7fwhrsgxnagf"; + version = "0.10"; + sha256 = "1va9rj6k0v8mdkqbgjvn5rcaf2zp785ihfr4b5j87xzaiw32m1l6"; buildDepends = [ ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm - tagged unboundedDelays + tagged time unboundedDelays ]; meta = { homepage = "http://documentup.com/feuerbach/tasty"; |