summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/lifted-base/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-04-18 11:00:58 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-04-18 11:22:20 +0200
commitbf414c9d4f892fd4e392a5f42016b57e84402a8b (patch)
tree08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/development/libraries/haskell/lifted-base/default.nix
parent29901451700a7382f3f9d5a0a23cd55b187e5585 (diff)
parent9de9669496a05f64ea436c01f9b66c057cd74f90 (diff)
downloadnixpkgs-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/lifted-base/default.nix')
-rw-r--r--pkgs/development/libraries/haskell/lifted-base/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 3e4f95521bb..2aa24f83325 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.3.0";
-  sha256 = "0wbh9l7hsbgvfplxyamvpb8nq6w147zsd2yskylfmpw7kyz6yp9n";
+  version = "0.2.3.3";
+  sha256 = "1n015i21pyh1ksrdiy105c9sw3gm3yvmlwv1sajy7nvpxb2xdjc3";
   buildDepends = [ monadControl transformersBase ];
   testDepends = [
     HUnit monadControl testFramework testFrameworkHunit transformers