summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/persistent/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-12-28 23:28:30 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-12-29 10:01:22 +0100
commite740b565cf01082be314dff8833c4a65a834bcff (patch)
tree59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/development/libraries/haskell/persistent/default.nix
parentcb639302df235bc1a9a3f1c14901c021813ee6b5 (diff)
parent9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff)
downloadnixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar
nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.gz
nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.bz2
nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.lz
nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.xz
nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.zst
nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.zip
Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/persistent/default.nix')
-rw-r--r--pkgs/development/libraries/haskell/persistent/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index a336ab4fb88..8ca5a919f5c 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.2.3.0";
-  sha256 = "0bil1932rnh3my9yjyc4sk24g0qwkkgv8b48nrn7fm007vyf173m";
+  version = "1.2.3.2";
+  sha256 = "18kail3v524k10gjx2j6yh462bvf89lq49gya0hiwxkmqsbx9fdn";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit