summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/scotty/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-08-02 05:08:07 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-08-02 05:08:07 +0200
commit6295a3ca36cc746e11c7b01fd47562fde3a703ec (patch)
tree18d9289564e8893a9d7e4df671e5226bcd2b0f0c /pkgs/development/libraries/haskell/scotty/default.nix
parent91b53aaebc0ca2e80d073459324515879e300f34 (diff)
parentfb565f1a4ea2a71debe48e206ef6c2d032bba0a3 (diff)
downloadnixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar
nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.gz
nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.bz2
nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.lz
nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.xz
nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.zst
nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.zip
Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/scotty/default.nix')
-rw-r--r--pkgs/development/libraries/haskell/scotty/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 4555f5af9d5..91876f7e318 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.8.1";
-  sha256 = "182iwsz5h7p08sqwfzb332gwj1wjx7fhhazm6gfdc0incab769m0";
+  version = "0.8.2";
+  sha256 = "07vjdj26380inlyi350mdifm7v1dpbc56041vi2czf5zzhx97qb0";
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
     monadControl mtl regexCompat text transformers transformersBase wai