diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:00:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:22:20 +0200 |
| commit | bf414c9d4f892fd4e392a5f42016b57e84402a8b (patch) | |
| tree | 08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/development/libraries/haskell/clock/default.nix | |
| parent | 29901451700a7382f3f9d5a0a23cd55b187e5585 (diff) | |
| parent | 9de9669496a05f64ea436c01f9b66c057cd74f90 (diff) | |
| download | nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.gz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.bz2 nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.lz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.xz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.zst nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.zip | |
Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
Diffstat (limited to 'pkgs/development/libraries/haskell/clock/default.nix')
| -rw-r--r-- | pkgs/development/libraries/haskell/clock/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix index 3c064d1db2d..e97195cb5fc 100644 --- a/pkgs/development/libraries/haskell/clock/default.nix +++ b/pkgs/development/libraries/haskell/clock/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clock"; - version = "0.4.0.1"; - sha256 = "1bn6dalank30l680iifyam0mg9izxbyscgq0vmr1aw5brba5kv6j"; + version = "0.4.1.3"; + sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d"; meta = { homepage = "http://corsis.github.com/clock/"; description = "High-resolution clock functions: monotonic, realtime, cputime"; |