From 4bcdeb49a1d882c4ab2e4e0a099be812ba88fa91 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 5 Oct 2013 21:18:07 +0200
Subject: mesa: update 9.1.6 -> 9.2.1, enable R600 LLVM stuff

---
 pkgs/development/compilers/llvm/default.nix        |   3 +-
 pkgs/development/libraries/mesa/default.nix        |  36 ++-
 pkgs/development/libraries/mesa/fix-rounding.patch | 357 ---------------------
 3 files changed, 21 insertions(+), 375 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/fix-rounding.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index abd3277d919..bed6bf1fc13 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${binutils_gold}/include"
-  ] ++ lib.optional (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
+    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
+  ] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 4fa5ee9e74a..456c6e2857a 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -3,8 +3,8 @@
 , libdrm, xorg, wayland, udev, llvm, libffi
 , libvdpau
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
-, enableR600LlvmCompiler ? false # current llvm-3.3 + mesa-9.1.6 don't configure
-, enableExtraFeatures ? false # add ~15 MB to mesa_drivers
+, enableR600LlvmCompiler ? true, libelf
+, enableExtraFeatures ? false # add ~15 MB to mesa_drivers; some problems building currently
 }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
@@ -16,23 +16,25 @@ else
     This or the mesa attribute (which also contains GLU) are small (~ 2.2 MB, mostly headers)
     and are designed to be the buildInput of other packages.
   - DRI and EGL drivers are compiled into $drivers output,
-    which is bigger (~13 MB) and depends on LLVM (~40 MB).
-    These should be searched at runtime in /run/current-system/sw/lib/*
+    which is bigger (~13 MB) and depends on LLVM (~44 MB).
+    These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*"
     and so are kind-of impure (given by NixOS).
     (I suppose on non-NixOS one would create the appropriate symlinks from there.)
 */
 
 let
-  version = "9.1.6";
+  version = "9.2.1";
   # this is the default search path for DRI drivers (note: X server introduces an overriding env var)
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
+with { inherit (stdenv.lib) optional optionals optionalString; };
+
 stdenv.mkDerivation {
   name = "mesa-noglu-${version}";
 
-  src = fetchurl {
+  src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "0gay00fy84hrnp25hpacz5cbvxrpvgg1d390vichmbdgmkqdycp6";
+    sha256 = "1l56zlma7ijhczdqanwv3ssrd36j07pp2996bsq9z7kpnmm7xd78";
   };
 
   prePatch = "patchShebangs .";
@@ -40,7 +42,6 @@ stdenv.mkDerivation {
   patches = [
     ./static-gallium.patch
     ./dricore-gallium.patch
-    ./fix-rounding.patch
   ];
 
   # Change the search path for EGL drivers from $drivers/* to driverLink
@@ -53,7 +54,7 @@ stdenv.mkDerivation {
 
   preConfigure = "./autogen.sh";
 
-  configureFlags = with stdenv.lib; [
+  configureFlags = [
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-egl-driver-dir=$(drivers)/lib/egl"
     "--with-dri-searchpath=${driverLink}/lib/dri"
@@ -66,10 +67,11 @@ stdenv.mkDerivation {
     "--enable-xa" # used in vmware driver
 
     "--with-dri-drivers=i965,r200,radeon"
-    "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" # radeonsi complains about R600 missing in LLVM
+    ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
+      + optionalString enableR600LlvmCompiler ",radeonsi")
     "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi"
   ]
-    ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler" # complains about R600 missing in LLVM
+    ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler"
     ++ optional enableTextureFloats "--enable-texture-float"
     ++ optionals enableExtraFeatures [
       "--enable-gles1" "--enable-gles2"
@@ -83,16 +85,16 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig python makedepend file flex bison ];
 
   propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]
-  ++
-  stdenv.lib.optionals stdenv.isLinux [libdrm]
-  ;
+    ++ optionals stdenv.isLinux [libdrm]
+    ;
   buildInputs = with xorg; [
     autoconf automake libtool intltool expat libxml2Python llvm
     libXfixes glproto dri2proto libX11 libXext libxcb libXt
     libffi wayland
-  ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
-  ++ stdenv.lib.optional stdenv.isLinux [udev]
-  ;
+  ] ++ optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
+    ++ optional stdenv.isLinux udev
+    ++ optional enableR600LlvmCompiler libelf
+    ;
 
   enableParallelBuilding = true;
   doCheck = true;
diff --git a/pkgs/development/libraries/mesa/fix-rounding.patch b/pkgs/development/libraries/mesa/fix-rounding.patch
deleted file mode 100644
index f81760a6708..00000000000
--- a/pkgs/development/libraries/mesa/fix-rounding.patch
+++ /dev/null
@@ -1,357 +0,0 @@
-From c25ae5d27b114e23d5734f846002df1a05759658 Mon Sep 17 00:00:00 2001
-From: Roland Scheidegger <sroland@vmware.com>
-Date: Thu, 31 Jan 2013 19:27:49 +0000
-Subject: gallivm: fix issues with trunc/round/floor/ceil with no arch rounding
-
-The emulation of these if there's no rounding instruction available
-is a bit more complicated than what the code did.
-In particular, doing fp-to-int/int-to-fp will not work if the exponent
-is large enough (and with NaNs, Infs). Hence such values need to be filtered
-out and the original value returned in this case (which fortunately should
-always be exact). This comes at the expense of performance (if your cpu
-doesn't support rounding instructions).
-Furthermore, floor/ifloor/ceil/iceil were affected by precision issues for
-values near negative (for floor) or positive (for ceil) zero, fix that as well
-(fixing this issue might not actually be slower except for ceil/iceil if the
-type is not signed which is probably rare - note iceil has no callers left
-in any case).
-
-Also add some new rounding test values in lp_test_arit to actually test
-for that stuff (which previously would have failed without sse41).
-
-This fixes https://bugs.freedesktop.org/show_bug.cgi?id=59701.
----
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
-index b4e9f23..ec05026 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
-@@ -1590,12 +1590,37 @@ lp_build_trunc(struct lp_build_context *bld,
-       return lp_build_round_arch(bld, a, LP_BUILD_ROUND_TRUNCATE);
-    }
-    else {
--      LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type);
--      LLVMTypeRef int_vec_type = lp_build_int_vec_type(bld->gallivm, type);
--      LLVMValueRef res;
--      res = LLVMBuildFPToSI(builder, a, int_vec_type, "");
--      res = LLVMBuildSIToFP(builder, res, vec_type, "");
--      return res;
-+      const struct lp_type type = bld->type;
-+      struct lp_type inttype;
-+      struct lp_build_context intbld;
-+      LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24);
-+      LLVMValueRef trunc, res, anosign, mask;
-+      LLVMTypeRef int_vec_type = bld->int_vec_type;
-+      LLVMTypeRef vec_type = bld->vec_type;
-+
-+      assert(type.width == 32); /* might want to handle doubles at some point */
-+
-+      inttype = type;
-+      inttype.floating = 0;
-+      lp_build_context_init(&intbld, bld->gallivm, inttype);
-+
-+      /* round by truncation */
-+      trunc = LLVMBuildFPToSI(builder, a, int_vec_type, "");
-+      res = LLVMBuildSIToFP(builder, trunc, vec_type, "floor.trunc");
-+
-+      /* mask out sign bit */
-+      anosign = lp_build_abs(bld, a);
-+      /*
-+       * mask out all values if anosign > 2^24
-+       * This should work both for large ints (all rounding is no-op for them
-+       * because such floats are always exact) as well as special cases like
-+       * NaNs, Infs (taking advantage of the fact they use max exponent).
-+       * (2^24 is arbitrary anything between 2^24 and 2^31 should work.)
-+       */
-+      anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, "");
-+      cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, "");
-+      mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval);
-+      return lp_build_select(bld, mask, a, res);
-    }
- }
- 
-@@ -1620,11 +1645,36 @@ lp_build_round(struct lp_build_context *bld,
-       return lp_build_round_arch(bld, a, LP_BUILD_ROUND_NEAREST);
-    }
-    else {
--      LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type);
--      LLVMValueRef res;
-+      const struct lp_type type = bld->type;
-+      struct lp_type inttype;
-+      struct lp_build_context intbld;
-+      LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24);
-+      LLVMValueRef res, anosign, mask;
-+      LLVMTypeRef int_vec_type = bld->int_vec_type;
-+      LLVMTypeRef vec_type = bld->vec_type;
-+
-+      assert(type.width == 32); /* might want to handle doubles at some point */
-+
-+      inttype = type;
-+      inttype.floating = 0;
-+      lp_build_context_init(&intbld, bld->gallivm, inttype);
-+
-       res = lp_build_iround(bld, a);
-       res = LLVMBuildSIToFP(builder, res, vec_type, "");
--      return res;
-+
-+      /* mask out sign bit */
-+      anosign = lp_build_abs(bld, a);
-+      /*
-+       * mask out all values if anosign > 2^24
-+       * This should work both for large ints (all rounding is no-op for them
-+       * because such floats are always exact) as well as special cases like
-+       * NaNs, Infs (taking advantage of the fact they use max exponent).
-+       * (2^24 is arbitrary anything between 2^24 and 2^31 should work.)
-+       */
-+      anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, "");
-+      cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, "");
-+      mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval);
-+      return lp_build_select(bld, mask, a, res);
-    }
- }
- 
-@@ -1648,11 +1698,52 @@ lp_build_floor(struct lp_build_context *bld,
-       return lp_build_round_arch(bld, a, LP_BUILD_ROUND_FLOOR);
-    }
-    else {
--      LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type);
--      LLVMValueRef res;
--      res = lp_build_ifloor(bld, a);
--      res = LLVMBuildSIToFP(builder, res, vec_type, "");
--      return res;
-+      const struct lp_type type = bld->type;
-+      struct lp_type inttype;
-+      struct lp_build_context intbld;
-+      LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24);
-+      LLVMValueRef trunc, res, anosign, mask;
-+      LLVMTypeRef int_vec_type = bld->int_vec_type;
-+      LLVMTypeRef vec_type = bld->vec_type;
-+
-+      assert(type.width == 32); /* might want to handle doubles at some point */
-+
-+      inttype = type;
-+      inttype.floating = 0;
-+      lp_build_context_init(&intbld, bld->gallivm, inttype);
-+
-+      /* round by truncation */
-+      trunc = LLVMBuildFPToSI(builder, a, int_vec_type, "");
-+      res = LLVMBuildSIToFP(builder, trunc, vec_type, "floor.trunc");
-+
-+      if (type.sign) {
-+         LLVMValueRef tmp;
-+
-+         /*
-+          * fix values if rounding is wrong (for non-special cases)
-+          * - this is the case if trunc > a
-+          */
-+         mask = lp_build_cmp(bld, PIPE_FUNC_GREATER, res, a);
-+         /* tmp = trunc > a ? 1.0 : 0.0 */
-+         tmp = LLVMBuildBitCast(builder, bld->one, int_vec_type, "");
-+         tmp = lp_build_and(&intbld, mask, tmp);
-+         tmp = LLVMBuildBitCast(builder, tmp, vec_type, "");
-+         res = lp_build_sub(bld, res, tmp);
-+      }
-+
-+      /* mask out sign bit */
-+      anosign = lp_build_abs(bld, a);
-+      /*
-+       * mask out all values if anosign > 2^24
-+       * This should work both for large ints (all rounding is no-op for them
-+       * because such floats are always exact) as well as special cases like
-+       * NaNs, Infs (taking advantage of the fact they use max exponent).
-+       * (2^24 is arbitrary anything between 2^24 and 2^31 should work.)
-+       */
-+      anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, "");
-+      cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, "");
-+      mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval);
-+      return lp_build_select(bld, mask, a, res);
-    }
- }
- 
-@@ -1676,11 +1767,48 @@ lp_build_ceil(struct lp_build_context *bld,
-       return lp_build_round_arch(bld, a, LP_BUILD_ROUND_CEIL);
-    }
-    else {
--      LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type);
--      LLVMValueRef res;
--      res = lp_build_iceil(bld, a);
--      res = LLVMBuildSIToFP(builder, res, vec_type, "");
--      return res;
-+      const struct lp_type type = bld->type;
-+      struct lp_type inttype;
-+      struct lp_build_context intbld;
-+      LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24);
-+      LLVMValueRef trunc, res, anosign, mask, tmp;
-+      LLVMTypeRef int_vec_type = bld->int_vec_type;
-+      LLVMTypeRef vec_type = bld->vec_type;
-+
-+      assert(type.width == 32); /* might want to handle doubles at some point */
-+
-+      inttype = type;
-+      inttype.floating = 0;
-+      lp_build_context_init(&intbld, bld->gallivm, inttype);
-+
-+      /* round by truncation */
-+      trunc = LLVMBuildFPToSI(builder, a, int_vec_type, "");
-+      trunc = LLVMBuildSIToFP(builder, trunc, vec_type, "ceil.trunc");
-+
-+      /*
-+       * fix values if rounding is wrong (for non-special cases)
-+       * - this is the case if trunc < a
-+       */
-+      mask = lp_build_cmp(bld, PIPE_FUNC_LESS, trunc, a);
-+      /* tmp = trunc < a ? 1.0 : 0.0 */
-+      tmp = LLVMBuildBitCast(builder, bld->one, int_vec_type, "");
-+      tmp = lp_build_and(&intbld, mask, tmp);
-+      tmp = LLVMBuildBitCast(builder, tmp, vec_type, "");
-+      res = lp_build_add(bld, trunc, tmp);
-+
-+      /* mask out sign bit */
-+      anosign = lp_build_abs(bld, a);
-+      /*
-+       * mask out all values if anosign > 2^24
-+       * This should work both for large ints (all rounding is no-op for them
-+       * because such floats are always exact) as well as special cases like
-+       * NaNs, Infs (taking advantage of the fact they use max exponent).
-+       * (2^24 is arbitrary anything between 2^24 and 2^31 should work.)
-+       */
-+      anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, "");
-+      cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, "");
-+      mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval);
-+      return lp_build_select(bld, mask, a, res);
-    }
- }
- 
-@@ -1826,32 +1954,30 @@ lp_build_ifloor(struct lp_build_context *bld,
-          res = lp_build_round_arch(bld, a, LP_BUILD_ROUND_FLOOR);
-       }
-       else {
--         /* Take the sign bit and add it to 1 constant */
--         LLVMTypeRef vec_type = bld->vec_type;
--         unsigned mantissa = lp_mantissa(type);
--         LLVMValueRef mask = lp_build_const_int_vec(bld->gallivm, type,
--                                  (unsigned long long)1 << (type.width - 1));
--         LLVMValueRef sign;
--         LLVMValueRef offset;
-+         struct lp_type inttype;
-+         struct lp_build_context intbld;
-+         LLVMValueRef trunc, itrunc, mask;
- 
--         /* sign = a < 0 ? ~0 : 0 */
--         sign = LLVMBuildBitCast(builder, a, int_vec_type, "");
--         sign = LLVMBuildAnd(builder, sign, mask, "");
--         sign = LLVMBuildAShr(builder, sign,
--                              lp_build_const_int_vec(bld->gallivm, type,
--                                                     type.width - 1),
--                              "ifloor.sign");
-+         assert(type.floating);
-+         assert(lp_check_value(type, a));
- 
--         /* offset = -0.99999(9)f */
--         offset = lp_build_const_vec(bld->gallivm, type,
--                                     -(double)(((unsigned long long)1 << mantissa) - 10)/((unsigned long long)1 << mantissa));
--         offset = LLVMConstBitCast(offset, int_vec_type);
-+         inttype = type;
-+         inttype.floating = 0;
-+         lp_build_context_init(&intbld, bld->gallivm, inttype);
- 
--         /* offset = a < 0 ? offset : 0.0f */
--         offset = LLVMBuildAnd(builder, offset, sign, "");
--         offset = LLVMBuildBitCast(builder, offset, vec_type, "ifloor.offset");
-+         /* round by truncation */
-+         itrunc = LLVMBuildFPToSI(builder, a, int_vec_type, "");
-+         trunc = LLVMBuildSIToFP(builder, itrunc, bld->vec_type, "ifloor.trunc");
- 
--         res = LLVMBuildFAdd(builder, res, offset, "ifloor.res");
-+         /*
-+          * fix values if rounding is wrong (for non-special cases)
-+          * - this is the case if trunc > a
-+          * The results of doing this with NaNs, very large values etc.
-+          * are undefined but this seems to be the case anyway.
-+          */
-+         mask = lp_build_cmp(bld, PIPE_FUNC_GREATER, trunc, a);
-+         /* cheapie minus one with mask since the mask is minus one / zero */
-+         return lp_build_add(&intbld, itrunc, mask);
-       }
-    }
- 
-@@ -1883,35 +2009,30 @@ lp_build_iceil(struct lp_build_context *bld,
-       res = lp_build_round_arch(bld, a, LP_BUILD_ROUND_CEIL);
-    }
-    else {
--      LLVMTypeRef vec_type = bld->vec_type;
--      unsigned mantissa = lp_mantissa(type);
--      LLVMValueRef offset;
-+      struct lp_type inttype;
-+      struct lp_build_context intbld;
-+      LLVMValueRef trunc, itrunc, mask;
- 
--      /* offset = 0.99999(9)f */
--      offset = lp_build_const_vec(bld->gallivm, type,
--                                  (double)(((unsigned long long)1 << mantissa) - 10)/((unsigned long long)1 << mantissa));
-+      assert(type.floating);
-+      assert(lp_check_value(type, a));
- 
--      if (type.sign) {
--         LLVMValueRef mask = lp_build_const_int_vec(bld->gallivm, type,
--                                (unsigned long long)1 << (type.width - 1));
--         LLVMValueRef sign;
-+      inttype = type;
-+      inttype.floating = 0;
-+      lp_build_context_init(&intbld, bld->gallivm, inttype);
- 
--         /* sign = a < 0 ? 0 : ~0 */
--         sign = LLVMBuildBitCast(builder, a, int_vec_type, "");
--         sign = LLVMBuildAnd(builder, sign, mask, "");
--         sign = LLVMBuildAShr(builder, sign,
--                              lp_build_const_int_vec(bld->gallivm, type,
--                                                     type.width - 1),
--                              "iceil.sign");
--         sign = LLVMBuildNot(builder, sign, "iceil.not");
--
--         /* offset = a < 0 ? 0.0 : offset */
--         offset = LLVMConstBitCast(offset, int_vec_type);
--         offset = LLVMBuildAnd(builder, offset, sign, "");
--         offset = LLVMBuildBitCast(builder, offset, vec_type, "iceil.offset");
--      }
-+      /* round by truncation */
-+      itrunc = LLVMBuildFPToSI(builder, a, int_vec_type, "");
-+      trunc = LLVMBuildSIToFP(builder, itrunc, bld->vec_type, "iceil.trunc");
- 
--      res = LLVMBuildFAdd(builder, a, offset, "iceil.res");
-+      /*
-+       * fix values if rounding is wrong (for non-special cases)
-+       * - this is the case if trunc < a
-+       * The results of doing this with NaNs, very large values etc.
-+       * are undefined but this seems to be the case anyway.
-+       */
-+      mask = lp_build_cmp(bld, PIPE_FUNC_LESS, trunc, a);
-+      /* cheapie plus one with mask since the mask is minus one / zero */
-+      return lp_build_sub(&intbld, itrunc, mask);
-    }
- 
-    /* round to nearest (toward zero) */
-diff --git a/src/gallium/drivers/llvmpipe/lp_test_arit.c b/src/gallium/drivers/llvmpipe/lp_test_arit.c
-index 99928b8..f14e4b3 100644
---- a/src/gallium/drivers/llvmpipe/lp_test_arit.c
-+++ b/src/gallium/drivers/llvmpipe/lp_test_arit.c
-@@ -207,6 +207,18 @@ const float round_values[] = {
-       -10.0, -1, 0.0, 12.0,
-       -1.49, -0.25, 1.25, 2.51,
-       -0.99, -0.01, 0.01, 0.99,
-+      1.401298464324817e-45f, // smallest denormal
-+      -1.401298464324817e-45f,
-+      1.62981451e-08f,
-+      -1.62981451e-08f,
-+      1.62981451e15f, // large number not representable as 32bit int
-+      -1.62981451e15f,
-+      FLT_EPSILON,
-+      -FLT_EPSILON,
-+      1.0f - 0.5f*FLT_EPSILON,
-+      -1.0f + FLT_EPSILON,
-+      FLT_MAX,
-+      -FLT_MAX
- };
- 
- static float fractf(float x)
---
-cgit v0.9.0.2-2-gbebe
-- 
cgit 1.4.1


From cb8fff57c1fb5ebed77a575ff4b57b1ff4805605 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 5 Oct 2013 20:21:13 +0200
Subject: update gtk deps, on GNOME-3.10 branches now

---
 pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix       |  6 +++---
 pkgs/desktops/gnome-3/core/at-spi2-core/default.nix      |  5 ++---
 pkgs/development/libraries/atk/default.nix               | 12 +++++++++---
 pkgs/development/libraries/gdk-pixbuf/default.nix        | 14 ++++++++++----
 pkgs/development/libraries/glib/default.nix              | 16 +++++++++++++---
 .../libraries/gobject-introspection/default.nix          | 10 +++++++---
 6 files changed, 44 insertions(+), 19 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
index ab25845c413..daae670fd9b 100644
--- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
+++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
@@ -2,14 +2,14 @@
 , intltool, dbus_glib, at_spi2_core, libSM }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.8";
-  versionMinor = "1";
+  versionMajor = "2.10";
+  versionMinor = "0";
   moduleName   = "at-spi2-atk";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "01pxfnksixrjj27ivllpla54r6nkwsjj34acb0phmp76zna9nrgb";
+    sha256 = "150sqc21difazqd53llwfdaqnwfy73bic9hia41xpfy9kcpzz9yy";
   };
 
   buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
index 2d433486677..1a7ac31db80 100644
--- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
+++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
@@ -2,15 +2,14 @@
 , libX11, xextproto, libSM, libICE, libXtst, libXi }:
 
 stdenv.mkDerivation rec {
-
-  versionMajor = "2.8";
+  versionMajor = "2.10";
   versionMinor = "0";
   moduleName   = "at-spi2-core";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0n64h6j10sn90ds9y70d9wlvvsbwnrym9fm0cyjxb0zmqw7s6q8q";
+    sha256 = "1ns44yibdgcwzwri7sr075hfs5rh5lgxkh71247a0822az3mahcn";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index f4c33c86911..65956f66c8b 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,11 +1,15 @@
 { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
 
+let
+  ver_maj = "2.10";
+  ver_min = "0";
+in
 stdenv.mkDerivation rec {
-  name = "atk-2.8.0";
+  name = "atk-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/atk/2.8/${name}.tar.xz";
-    sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj";
+    url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
+    sha256 = "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3";
   };
 
   buildInputs = libintlOrEmpty;
@@ -14,6 +18,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ];
 
+  #doCheck = true; # no checks in there (2.10.0)
+
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 6ad30f66e03..f37195021fa 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11
 , jasper, libintlOrEmpty, gobjectIntrospection }:
 
+let
+  ver_maj = "2.30";
+  ver_min = "0";
+in
 stdenv.mkDerivation rec {
-  name = "gdk-pixbuf-2.28.2";
+  name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz";
-    sha256 = "05s6ksvy1yan6h6zny9n3bmvygcnzma6ljl6i0z9cci2xg116c8q";
+    url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
+    sha256 = "0n56rbi1acpi8skj8zdhzkm4yv0jq5rzii9n8jhq64k24l2n0wsa";
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
@@ -20,6 +24,8 @@ stdenv.mkDerivation rec {
     + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
     ;
 
+  doCheck = false; # broken animation tester
+
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 119584deb1e..03846993ea3 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -10,6 +10,13 @@
 #     Possible solution: disable compilation of this example somehow
 #     Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
 #       $out/bin/gtester-report' to postInstall if this is solved
+/*
+  * Use --enable-installed-tests for GNOME-related packages,
+      and use them as a separately installed tests runned by Hydra
+      (they should test an already installed package)
+      https://wiki.gnome.org/GnomeGoals/InstalledTests
+  * Support org.freedesktop.Application, including D-Bus activation from desktop files
+*/
 
 let
   # Some packages don't get "Cflags" from pkgconfig correctly
@@ -24,15 +31,18 @@ let
     done
     ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
   '';
+
+  ver_maj = "2.38";
+  ver_min = "0";
 in
 with { inherit (stdenv.lib) optionalString; };
 
 stdenv.mkDerivation rec {
-  name = "glib-2.36.4";
+  name = "glib-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz";
-    sha256 = "0zmdbkg2yjyxdl72w34lxvrssbzqzdficskkfn22s0994dad4m7n";
+    url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
+    sha256 = "0cpzqadqk6z6bmb79p04pykxc8x57rvshh33414cnk41bvgaf4vm";
   };
 
   # configure script looks for d-bus but it is (probably) only needed for tests
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 6a2caa28136..da746969ed7 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -4,12 +4,16 @@
 # it may be worth thinking about using multiple derivation outputs
 # In that case its about 6MB which could be separated
 
+let
+  ver_maj = "1.38";
+  ver_min = "0";
+in
 stdenv.mkDerivation rec {
-  name = "gobject-introspection-1.36.0";
+  name = "gobject-introspection-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gobject-introspection/1.36/${name}.tar.xz";
-    sha256 = "10v3idh489vra7pjn1g8f844nnl6719zgkgq3dv38xcf8afnvrz3";
+    url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
+    sha256 = "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m";
   };
 
   buildInputs = [ flex bison glib pkgconfig python ]
-- 
cgit 1.4.1


From 346ad742774668e43b242ee94efd1d6f43a45bf6 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 5 Oct 2013 20:41:40 +0200
Subject: gtk2: minor update .20 -> .21

---
 pkgs/development/libraries/gtk+/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 92463d80c2b..f4e4e607dc3 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.20";
+  name = "gtk+-2.24.21";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "18qdvb7nxi25hfnpmcy01p3majw9jnx83ikm263dk9rrjazvqrnc";
+    sha256 = "1qyw73pr9ryqhir2h1kbx3vm70km4dg2fxrgkrdlpv0rvlb94bih";
   };
 
   enableParallelBuilding = true;
-- 
cgit 1.4.1


From e902ca15ab1e24f4e64cb7dd2040311ba39558e7 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 5 Oct 2013 21:21:21 +0200
Subject: update wayland deps needed for gtk+ 3.10

---
 pkgs/development/libraries/libxkbcommon/default.nix | 10 +++++-----
 pkgs/development/libraries/wayland/default.nix      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 4a1327778d4..e7923f3df5b 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, yacc, flex, xkeyboard_config }:
+{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
-  name = "libxkbcommon-0.2.0";
+  name = "libxkbcommon-0.3.1";
 
   src = fetchurl {
-    url = "http://xkbcommon.org/download/${name}.tar.bz2";
-    sha256 = "0hpvfa8p4bhvhc1gcb578m354p5idd192xb8zlaq16d33h90msvl";
+    url = "http://xkbcommon.org/download/${name}.tar.xz";
+    sha256 = "13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww";
   };
 
-  buildInputs = [ yacc flex xkeyboard_config ];
+  buildInputs = [ pkgconfig yacc flex xkeyboard_config ];
 
   configureFlags = ''
     --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 8854a41210b..38174308360 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
 
-let version = "1.0.5"; in
+let version = "1.2.1"; in
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w";
+    sha256 = "0vqngxpavcxvjwlw7afgrbv7qvmd489sj555wrnxjc8p10mjw1kq";
   };
 
   buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];
-- 
cgit 1.4.1


From e1e0a11f8637d06a8aa28396a9d809b8e9bc3652 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 5 Oct 2013 21:24:40 +0200
Subject: gtk3: update 3.8.4 -> 3.10.0

---
 pkgs/development/libraries/gtk+/3.x.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 76424d79d7a..ed9d6a52d40 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, gettext
-, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs, x11, gobjectIntrospection
+{ stdenv, fetchurl, pkgconfig, gettext, perl
+, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
+, xlibs, x11, wayland, libxkbcommon
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? stdenv.isLinux, cups ? null
 }:
@@ -7,17 +8,23 @@
 assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
+let
+  ver_maj = "3.10";
+  ver_min = "0";
+in
 stdenv.mkDerivation rec {
-  name = "gtk+-3.8.4";
+  name = "gtk+-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/3.8/${name}.tar.xz";
-    sha256 = "1qlj0qdhkp8j5xiris4l4xnx47g4pbk4qnj3nf8rwa82fwb610xh";
+    url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
+    sha256 = "1zjkbjvp6ay08107r6zfsrp39x7qfadbd86p3hs5v4ydc2rzwnb5";
   };
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
+
+  buildInputs = [ wayland libxkbcommon ];
   propagatedBuildInputs = with xlibs; with stdenv.lib;
     [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
     ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ]
-- 
cgit 1.4.1


From a7d129b05e16964d655c30659bc4a857d800569c Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 30 Sep 2013 14:48:16 +0200
Subject: polkit: update, including non-critical CVE-2013-4288 fix

---
 pkgs/development/interpreters/spidermonkey/185-1.0.0.nix |  6 ++++--
 pkgs/development/libraries/polkit/default.nix            | 14 +++++++++-----
 pkgs/top-level/all-packages.nix                          |  4 +++-
 3 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
index 55e0dada71e..1c0d77345b7 100644
--- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf213, nspr, perl, python, readline, zip }:
+{ stdenv, fetchurl, pkgconfig, autoconf213, nspr, perl, python, readline, zip }:
 
 stdenv.mkDerivation rec {
   version = "185-1.0.0";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
   };
 
-  buildInputs = [ autoconf213 nspr perl python readline zip ];
+  propagatedBuildInputs = [ nspr ];
+
+  buildInputs = [ pkgconfig autoconf213 perl python readline zip ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 788b6d6d32b..00ebad9a931 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
+{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey
 , gobjectIntrospection
 , useSystemd ? true, systemd }:
 
@@ -16,18 +16,22 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.105";
+  name = "polkit-0.112";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
-    sha256 = "1pz1hn4z0f1wk4f7w8q1g6ygwan1b6kxmfad3b7gql27pb47rp4g";
+    sha256 = "1xkary7yirdcjdva950nqyhmsz48qhrdsr78zciahj27p8yg95fn";
   };
 
   buildInputs =
-    [ pkgconfig glib expat pam intltool gobjectIntrospection ]
+    [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ]
     ++ stdenv.lib.optional useSystemd systemd;
 
-  configureFlags = "--libexecdir=$(out)/libexec/polkit-1";
+  # TODO: Distro/OS detection is impure
+  configureFlags = [
+    "--libexecdir=$(out)/libexec/polkit-1"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+  ];
 
   # Ugly hack to overwrite hardcoded directories
   # TODO: investigate a proper patch which will be accepted upstream
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5af633722f..04f23f5f23b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5329,7 +5329,9 @@ let
 
   podofo = callPackage ../development/libraries/podofo { };
 
-  polkit = callPackage ../development/libraries/polkit { };
+  polkit = callPackage ../development/libraries/polkit {
+    spidermonkey = spidermonkey_185;
+  };
 
   polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { };
 
-- 
cgit 1.4.1


From f445474d33b2a4a958303c7c26fc36499e595cd2 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 6 Oct 2013 23:54:47 +0200
Subject: polkit: remove hacks, fix chroot builds

---
 pkgs/development/libraries/polkit/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 00ebad9a931..bbd37f0b8e5 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey
 , gobjectIntrospection
-, useSystemd ? true, systemd }:
+, useSystemd ? stdenv.isLinux, systemd }:
 
 let
 
@@ -27,18 +27,18 @@ stdenv.mkDerivation rec {
     [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ]
     ++ stdenv.lib.optional useSystemd systemd;
 
+  preConfigure = ''
+    patchShebangs .
+  '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ ''
+    sed '/libsystemd-login autoconfigured, but system does not appear to use systemd/s/.*/:/' -i configure
+  '';
+
   # TODO: Distro/OS detection is impure
   configureFlags = [
     "--libexecdir=$(out)/libexec/polkit-1"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
   ];
 
-  # Ugly hack to overwrite hardcoded directories
-  # TODO: investigate a proper patch which will be accepted upstream
-  CFLAGS = stdenv.lib.concatStringsSep " "
-    ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var foolVars}"\"'')
-        (builtins.attrNames foolVars) );
-
   preBuild =
     ''
       # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
-- 
cgit 1.4.1


From cf568b6883784b18d51de5d11fd43b2fa8142878 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 5 Oct 2013 20:41:40 +0200
Subject: gtk2: minor update .20 -> .22

---
 pkgs/development/libraries/gtk+/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 92463d80c2b..fdc2c675847 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.20";
+  name = "gtk+-2.24.22";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "18qdvb7nxi25hfnpmcy01p3majw9jnx83ikm263dk9rrjazvqrnc";
+    sha256 = "0zxf810znlk80j230rbr0xscx3gm71jmf2bdiamg76rqzglvc55i";
   };
 
   enableParallelBuilding = true;
-- 
cgit 1.4.1


From 23f495689e73308d1826ee49acfa65a089889703 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 26 Oct 2013 15:19:39 +0200
Subject: mesa: bugfix update 9.1.6 -> .7

Thist is just for master before the official release,
x-updates has 9.2.* already.
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 4fa5ee9e74a..6a0ae2cf61e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "9.1.6";
+  version = "9.1.7";
   # this is the default search path for DRI drivers (note: X server introduces an overriding env var)
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "0gay00fy84hrnp25hpacz5cbvxrpvgg1d390vichmbdgmkqdycp6";
+    sha256 = "1824p185ys7z9bah46xasp7khv44n9wv2c4p38i1dispniwbirih";
   };
 
   prePatch = "patchShebangs .";
-- 
cgit 1.4.1


From e790d27543ba9bd8fa89345b20094081451362e0 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Fri, 1 Nov 2013 10:54:29 +0100
Subject: polkit WIP: TESTED OK, only missing NM config testing/tweaking

History: 7a29bd02 7cd5ff085
---
 nixos/modules/security/polkit.nix                  | 79 ++++++++--------------
 .../modules/services/networking/networkmanager.nix | 15 +++-
 .../interpreters/spidermonkey/185-1.0.0.nix        |  6 +-
 pkgs/development/libraries/polkit/default.nix      | 54 ++++++++-------
 pkgs/top-level/all-packages.nix                    |  4 +-
 5 files changed, 78 insertions(+), 80 deletions(-)

(limited to 'pkgs/development')

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index cafa9f82d5e..e3cca533e54 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -18,35 +18,17 @@ in
       description = "Whether to enable PolKit.";
     };
 
-    security.polkit.permissions = mkOption {
+    security.polkit.extraConfig = mkOption {
       type = types.lines;
       default = "";
       example =
         ''
-          [Disallow Users To Suspend]
-          Identity=unix-group:users
-          Action=org.freedesktop.upower.*
-          ResultAny=no
-          ResultInactive=no
-          ResultActive=no
-
-          [Allow Anybody To Eject Disks]
-          Identity=unix-user:*
-          Action=org.freedesktop.udisks.drive-eject
-          ResultAny=yes
-          ResultInactive=yes
-          ResultActive=yes
-
-          [Allow Alice To Mount Filesystems After Admin Authentication]
-          Identity=unix-user:alice
-          Action=org.freedesktop.udisks.filesystem-mount
-          ResultAny=auth_admin
-          ResultInactive=auth_admin
-          ResultActive=auth_admin
+          TODO
         '';
       description =
         ''
-          Allows the default permissions of privileged actions to be overridden.
+          Any polkit rules to be added to config (in JavaScript ;-). See:
+          http://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html#polkit-rules
         '';
     };
 
@@ -71,29 +53,23 @@ in
 
     environment.systemPackages = [ pkgs.polkit ];
 
-    # The polkit daemon reads action files
-    environment.pathsToLink = [ "/share/polkit-1/actions" ];
-
-    environment.etc =
-      [ # No idea what the "null backend" is, but it seems to need this.
-        { source = "${pkgs.polkit}/etc/polkit-1/nullbackend.conf.d";
-          target = "polkit-1/nullbackend.conf.d";
-        }
-
-        # This file determines what users are considered
-        # "administrators".
-        { source = pkgs.writeText "10-nixos.conf"
-            ''
-              [Configuration]
-              AdminIdentities=${cfg.adminIdentities}
-            '';
-          target = "polkit-1/localauthority.conf.d/10-nixos.conf";
-        }
-
-        { source = pkgs.writeText "org.nixos.pkla" cfg.permissions;
-          target = "polkit-1/localauthority/10-vendor.d/org.nixos.pkla";
-        }
-      ];
+    systemd.packages = [ pkgs.polkit ];
+
+    # The polkit daemon reads action/rule files
+    environment.pathsToLink = [ "/share/polkit-1" ];
+
+    # PolKit rules for NixOS
+    environment.etc = [ {
+      source = pkgs.writeText "10-nixos.conf"
+        ''
+          polkit.addAdminRule(function(action, subject) {
+            return ["${cfg.adminIdentities}"];
+          });
+
+          ${cfg.extraConfig}
+        ''; #TODO: validation on compilation (at least against typos)
+      target = "polkit-1/rules.d/10-nixos.conf";
+    } ];
 
     services.dbus.packages = [ pkgs.polkit ];
 
@@ -101,24 +77,25 @@ in
 
     security.setuidPrograms = [ "pkexec" ];
 
-    security.setuidOwners = singleton
+    security.setuidOwners = [
       { program = "polkit-agent-helper-1";
         owner = "root";
         group = "root";
         setuid = true;
-        source = "${pkgs.polkit}/libexec/polkit-1/polkit-agent-helper-1";
-      };
+        source = "${pkgs.polkit}/lib/polkit-1/polkit-agent-helper-1";
+      }
+    ];
 
     system.activationScripts.polkit =
       ''
-        mkdir -p /var/lib/polkit-1/localauthority
-        chmod 700 /var/lib/polkit-1{/localauthority,}
+        # Probably no more needed, clean up
+        rm -rf /var/lib/{polkit-1,PolicyKit}
 
         # Force polkitd to be restarted so that it reloads its
         # configuration.
         ${pkgs.procps}/bin/pkill -INT -u root -x polkitd
       '';
-
   };
 
 }
+
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index ad6f9858aaf..1ed4e20b9a5 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -21,7 +21,7 @@ let
     level=WARN
   '';
 
-  polkitConf = ''
+  /*
     [network-manager]
     Identity=unix-group:networkmanager
     Action=org.freedesktop.NetworkManager.*
@@ -35,6 +35,16 @@ let
     ResultAny=yes
     ResultInactive=no
     ResultActive=yes
+  */
+  polkitConf = ''
+    polkit.addRule(function(action, subject) {
+      if (
+        subject.isInGroup("networkmanager")
+        && (action.id.indexOf("org.freedesktop.NetworkManager.") == 0
+            || action.id.indexOf("org.freedesktop.ModemManager.")  == 0
+        ))
+          { return polkit.Result.YES; } #TODO: active/inactive
+    });
   '';
 
   ipUpScript = writeScript "01nixos-ip-up" ''
@@ -179,7 +189,8 @@ in {
       systemctl restart NetworkManager
     '';
 
-    security.polkit.permissions = polkitConf;
+    #TODO
+    #security.polkit.permissions = polkitConf;
 
     # openvpn plugin has only dbus interface
     services.dbus.packages = cfg.packages ++ [
diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
index 55e0dada71e..1c0d77345b7 100644
--- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf213, nspr, perl, python, readline, zip }:
+{ stdenv, fetchurl, pkgconfig, autoconf213, nspr, perl, python, readline, zip }:
 
 stdenv.mkDerivation rec {
   version = "185-1.0.0";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
   };
 
-  buildInputs = [ autoconf213 nspr perl python readline zip ];
+  propagatedBuildInputs = [ nspr ];
+
+  buildInputs = [ pkgconfig autoconf213 perl python readline zip ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 9d1f0d18c1a..821e66ea0b3 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,48 +1,59 @@
-{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
-, gobjectIntrospection
+{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey
+, gobjectIntrospection, libxslt, docbook_xsl
 , useSystemd ? stdenv.isLinux, systemd }:
 
 let
 
   system = "/var/run/current-system/sw";
+  setuid = "/var/setuid-wrappers"; #TODO: from <nixos> config.security.wrapperDir;
 
   foolVars = {
-    LOCALSTATE = "/var";
     SYSCONF = "/etc";
-    LIB = "${system}/lib";
-    DATA = "${system}/share";
+    DATA = "${system}/share"; # to find share/polkit-1/actions of other apps at runtime
   };
 
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.105";
+  name = "polkit-0.112";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
-    sha256 = "1pz1hn4z0f1wk4f7w8q1g6ygwan1b6kxmfad3b7gql27pb47rp4g";
+    sha256 = "1xkary7yirdcjdva950nqyhmsz48qhrdsr78zciahj27p8yg95fn";
   };
 
   buildInputs =
-    [ pkgconfig glib expat pam intltool gobjectIntrospection ]
+    [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ]
+    ++ [ libxslt docbook_xsl ] # man pages
     ++ stdenv.lib.optional useSystemd systemd;
 
-  configureFlags = "--libexecdir=$(out)/libexec/polkit-1";
-
   # Ugly hack to overwrite hardcoded directories
   # TODO: investigate a proper patch which will be accepted upstream
+  # After update it's good to check the sources via:
+  #   grep '\<PACKAGE_' '--include=*.[ch]' -R
   CFLAGS = stdenv.lib.concatStringsSep " "
     ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var foolVars}"\"'')
         (builtins.attrNames foolVars) );
 
-  preBuild =
-    ''
-      # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
-      # NixOS.  Hard-coding the path is kinda ugly.  Maybe we can just
-      # call through $PATH, but that might have security implications.
-      substituteInPlace src/polkitagent/polkitagentsession.c \
-        --replace PACKAGE_LIBEXEC_DIR '"/var/setuid-wrappers"'
-    '';
+  preConfigure = ''
+    patchShebangs .
+  '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ ''
+    sed '/libsystemd-login autoconfigured, but system does not appear to use systemd/s/.*/:/' -i configure
+  ''
+    # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
+    # NixOS.  Hard-coding the path is kinda ugly.  Maybe we can just
+    # call through $PATH, but that might have security implications.
+  + ''
+    substituteInPlace src/polkitagent/polkitagentsession.c \
+      --replace   'PACKAGE_PREFIX "/lib/polkit-1/'   '"${setuid}/'
+  '';
+
+  configureFlags = [
+    #"--libexecdir=$(out)/libexec/polkit-1" # this and localstatedir are ignored by configure
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
+    "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
+  ];
 
   makeFlags =
     ''
@@ -50,12 +61,7 @@ stdenv.mkDerivation rec {
       INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0
     '';
 
-  postInstall =
-    ''
-      # Allow some files with paranoid permissions to be stripped in
-      # the fixup phase.
-      chmod a+rX -R $out
-    '';
+  #doCheck = true; # some /bin/bash problem that isn't auto-solved by patchShebangs
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/polkit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5737918cff..9a4118098a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5400,7 +5400,9 @@ let
 
   podofo = callPackage ../development/libraries/podofo { };
 
-  polkit = callPackage ../development/libraries/polkit { };
+  polkit = callPackage ../development/libraries/polkit {
+    spidermonkey = spidermonkey_185;
+  };
 
   polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { };
 
-- 
cgit 1.4.1


From 5ddbacecb5ed67ed00957590906d450eb8d55012 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 8 Oct 2013 19:50:07 +0200
Subject: dbus: minor update 1.6.14 -> .16 "fortify agility"

---
 pkgs/development/libraries/dbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 8ec47f86e34..794128d054a 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -3,8 +3,8 @@
 , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }:
 
 let
-  version = "1.6.14"; # 1.7.* isn't recommended, even for gnome 3.8
-  sha256 = "0v7mcxwfmpjf7vndnvf2kf02al61clrxs36bqii20s0lawfh2xjn";
+  version = "1.6.16"; # 1.7.* isn't recommended, even for gnome 3.8
+  sha256 = "0wrmh5azszb54zpy7d0zjsy456khcv8yc19ivqrygkdg7a3l4gs6";
 
   inherit (stdenv) lib;
 
-- 
cgit 1.4.1


From 9999ac6d89d86887a17560c0e1b6bd9b22d27fbb Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 8 Oct 2013 20:20:03 +0200
Subject: mesa: add GLES 1 and 2 support by default

The libs have just a few kilobytes and no additional deps.
---
 pkgs/development/libraries/mesa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 456c6e2857a..bfded9ab096 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation {
     "--enable-driglx-direct" # seems enabled anyway
     "--enable-gallium-llvm" "--with-llvm-shared-libs"
     "--enable-xa" # used in vmware driver
+    "--enable-gles1" "--enable-gles2"
 
     "--with-dri-drivers=i965,r200,radeon"
     ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
@@ -74,7 +75,6 @@ stdenv.mkDerivation {
     ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler"
     ++ optional enableTextureFloats "--enable-texture-float"
     ++ optionals enableExtraFeatures [
-      "--enable-gles1" "--enable-gles2"
       "--enable-osmesa"
       "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful
       #"--enable-xvmc" # tests segfault with 9.1.{1,2,3}
-- 
cgit 1.4.1


From 923bd1ebf57ff89d780882d3261c35a121a92260 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 5 Nov 2013 08:23:01 +0100
Subject: mesa: bugfix update 9.2.1 -> .2

On 9.2.* we seem to be hitting a [problem] on Hydra
(unlikely to be fixed by this update),
although the tests run fine on my machine.

[problem] https://bugs.freedesktop.org/show_bug.cgi?id=67672
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index bfded9ab096..10f86eb104b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "9.2.1";
+  version = "9.2.2";
   # this is the default search path for DRI drivers (note: X server introduces an overriding env var)
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1l56zlma7ijhczdqanwv3ssrd36j07pp2996bsq9z7kpnmm7xd78";
+    sha256 = "0gbacnnacv4x8q27s8my4qhf2xq8q4nyhbs9y9688win4csm12n7";
   };
 
   prePatch = "patchShebangs .";
-- 
cgit 1.4.1


From 0a2c5ad9291ff3806633419676814e63e6b75645 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 2 Nov 2013 11:53:04 +0100
Subject: perl: avoid --no-cpp-precomp on darwin, (close #1160)

Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch

Conflicts (trivial):
	pkgs/development/interpreters/perl/5.16/default.nix
---
 pkgs/development/interpreters/perl/5.16/cpp-precomp.patch | 11 +++++++++++
 pkgs/development/interpreters/perl/5.16/default.nix       |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/perl/5.16/cpp-precomp.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch
new file mode 100644
index 00000000000..231853fe51a
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch
@@ -0,0 +1,11 @@
+--- a/hints/darwin.sh	2013-05-08 11:13:45.000000000 -0600
++++ b/hints/darwin.sh	2013-05-08 11:15:04.000000000 -0600
+@@ -129,7 +129,7 @@
+ 
+ # Avoid Apple's cpp precompiler, better for extensions
+ if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then
+-    cppflags="${cppflags} -no-cpp-precomp"
++    #cppflags="${cppflags} -no-cpp-precomp"
+ 
+     # This is necessary because perl's build system doesn't
+     # apply cppflags to cc compile lines as it should.
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 2113faee164..a3ab0ef4b96 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     [ # Do not look in /usr etc. for dependencies.
       ./no-sys-dirs.patch
     ]
-    ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch;
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
-- 
cgit 1.4.1


From 0ed07fdeaa7a345609dc38b50a491acf45f533e3 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 5 Nov 2013 21:31:12 +0100
Subject: mesa: disable checkPhase for the time being

The problem doesn't seem serious and it only occurs on some HW.
However, it would be best to fix this before merging into master.
---
 pkgs/development/libraries/mesa/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index ae814652b3c..cb3a1345912 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -98,7 +98,8 @@ stdenv.mkDerivation {
     ;
 
   enableParallelBuilding = true;
-  doCheck = true;
+  #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672
+  # TODO: best fix this before merging >=9.2 to master
 
   # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
   # ToDo: probably not all .la files are completely fixed, but it shouldn't matter
-- 
cgit 1.4.1


From 9da8db195b92a3ecaf65615ef11060a38b3cbb6c Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 16 Nov 2013 21:23:10 +0100
Subject: mesa: minor update, enable vdpau drivers by default

It is in $drivers; it also depends on LLVM.
No testing done yet.
---
 pkgs/development/libraries/mesa/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index cb3a1345912..2b22d74756f 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "9.2.2";
+  version = "9.2.3";
   # this is the default search path for DRI drivers (note: X server introduces an overriding env var)
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "0gbacnnacv4x8q27s8my4qhf2xq8q4nyhbs9y9688win4csm12n7";
+    sha256 = "0p8p35bwvrifc3v4z4wplxrs49h2qwzhcpsfjkkinfckkw6lqvg0";
   };
 
   prePatch = "patchShebangs .";
@@ -67,6 +67,7 @@ stdenv.mkDerivation {
     "--enable-gallium-llvm" "--with-llvm-shared-libs"
     "--enable-xa" # used in vmware driver
     "--enable-gles1" "--enable-gles2"
+    "--enable-vdpau"
 
     "--with-dri-drivers=i965,r200,radeon"
     ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
@@ -79,7 +80,6 @@ stdenv.mkDerivation {
       "--enable-osmesa"
       "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful
       #"--enable-xvmc" # tests segfault with 9.1.{1,2,3}
-      "--enable-vdpau"
       #"--enable-opencl" # ToDo: opencl seems to need libclc for clover
     ];
 
@@ -91,8 +91,8 @@ stdenv.mkDerivation {
   buildInputs = with xorg; [
     autoconf automake libtool intltool expat libxml2Python llvm
     libXfixes glproto dri2proto libX11 libXext libxcb libXt
-    libffi wayland
-  ] ++ optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
+    libffi wayland libvdpau
+  ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
     ++ optional stdenv.isLinux udev
     ++ optional enableR600LlvmCompiler libelf
     ;
@@ -107,24 +107,24 @@ stdenv.mkDerivation {
     mv -t "$drivers/lib/" \
   '' + optionalString enableExtraFeatures ''
       `#$out/lib/libXvMC*` \
-      $out/lib/vdpau \
       $out/lib/libOSMesa* \
       $out/lib/gbm $out/lib/libgbm* \
       $out/lib/gallium-pipe \
   '' + ''
       $out/lib/libdricore* \
       $out/lib/libgallium* \
+      $out/lib/vdpau \
       $out/lib/libxatracker*
 
   '' + /* now fix references in .la files */ ''
     sed "/^libdir=/s,$out,$drivers," -i \
   '' + optionalString enableExtraFeatures ''
       `#$drivers/lib/libXvMC*.la` \
-      $drivers/lib/vdpau/*.la \
       $drivers/lib/libOSMesa*.la \
       $drivers/lib/gallium-pipe/*.la \
   '' + ''
       $drivers/lib/libgallium.la \
+      $drivers/lib/vdpau/*.la \
       $drivers/lib/libdricore*.la
 
     sed "s,$out\(/lib/\(libdricore[0-9\.]*\|libgallium\).la\),$drivers\1,g" \
-- 
cgit 1.4.1


From 9df6a053c3555d3a0e928ea0a1ef1c31f06d25da Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 16 Nov 2013 21:25:57 +0100
Subject: libvdpau: minor update 0.6 -> 0.7

---
 pkgs/development/libraries/libvdpau/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 835e2711a77..cc8b3f59529 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, xlibs }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-0.6";
+  name = "libvdpau-0.7";
 
   src = fetchurl {
     url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "0x9dwxzw0ilsy88kqlih3170z1zfrrsx1dr9jbwbn0cbkpnbwmcv";
+    sha256 = "1q5wx6fmqg2iiw57wxwh5vv4yszqs4nlvlzhzdn9vig8gi30ip14";
   };
 
   buildInputs = with xlibs; [ pkgconfig dri2proto libXext ];
 
   propagatedBuildInputs = [ xlibs.libX11 ];
-  
+
   configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ];
 
   meta = {
-- 
cgit 1.4.1


From b8aba318bda927b6b13f27cb88af1a91dde53131 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 10:53:41 +0100
Subject: mesa: build libOSMesa into $osmesa output

---
 pkgs/development/libraries/mesa/default.nix | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 2b22d74756f..3e026f01271 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -4,7 +4,7 @@
 , libvdpau
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableR600LlvmCompiler ? true, libelf
-, enableExtraFeatures ? false # add ~15 MB to mesa_drivers; some problems building currently
+, enableExtraFeatures ? false # not maintained
 }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
@@ -20,6 +20,7 @@ else
     These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*"
     and so are kind-of impure (given by NixOS).
     (I suppose on non-NixOS one would create the appropriate symlinks from there.)
+  - libOSMesa is in $osmesa (~4.2 MB)
 */
 
 let
@@ -51,7 +52,7 @@ stdenv.mkDerivation {
       -i src/egl/main/Makefile.am
   '';
 
-  outputs = ["out" "drivers"];
+  outputs = ["out" "drivers" "osmesa"];
 
   preConfigure = "./autogen.sh";
 
@@ -68,6 +69,7 @@ stdenv.mkDerivation {
     "--enable-xa" # used in vmware driver
     "--enable-gles1" "--enable-gles2"
     "--enable-vdpau"
+    "--enable-osmesa" # used by wine
 
     "--with-dri-drivers=i965,r200,radeon"
     ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
@@ -77,7 +79,6 @@ stdenv.mkDerivation {
     ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler"
     ++ optional enableTextureFloats "--enable-texture-float"
     ++ optionals enableExtraFeatures [
-      "--enable-osmesa"
       "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful
       #"--enable-xvmc" # tests segfault with 9.1.{1,2,3}
       #"--enable-opencl" # ToDo: opencl seems to need libclc for clover
@@ -101,13 +102,13 @@ stdenv.mkDerivation {
   #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672
   # TODO: best fix this before merging >=9.2 to master
 
-  # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
+  # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
+  #   also move libOSMesa to $osmesa, as it's relatively big
   # ToDo: probably not all .la files are completely fixed, but it shouldn't matter
   postInstall = with stdenv.lib; ''
     mv -t "$drivers/lib/" \
   '' + optionalString enableExtraFeatures ''
       `#$out/lib/libXvMC*` \
-      $out/lib/libOSMesa* \
       $out/lib/gbm $out/lib/libgbm* \
       $out/lib/gallium-pipe \
   '' + ''
@@ -116,11 +117,20 @@ stdenv.mkDerivation {
       $out/lib/vdpau \
       $out/lib/libxatracker*
 
+    mkdir -p {$osmesa,$drivers}/lib/pkgconfig
+    mv -t $osmesa/lib/ \
+      $out/lib/libOSMesa*
+
+    mv -t $drivers/lib/pkgconfig/ \
+      $out/lib/pkgconfig/xatracker.pc
+
+    mv -t $osmesa/lib/pkgconfig/ \
+      $out/lib/pkgconfig/osmesa.pc
+
   '' + /* now fix references in .la files */ ''
     sed "/^libdir=/s,$out,$drivers," -i \
   '' + optionalString enableExtraFeatures ''
       `#$drivers/lib/libXvMC*.la` \
-      $drivers/lib/libOSMesa*.la \
       $drivers/lib/gallium-pipe/*.la \
   '' + ''
       $drivers/lib/libgallium.la \
@@ -130,8 +140,11 @@ stdenv.mkDerivation {
     sed "s,$out\(/lib/\(libdricore[0-9\.]*\|libgallium\).la\),$drivers\1,g" \
       -i $drivers/lib/*.la $drivers/lib/*/*.la
 
+    sed "/^libdir=/s,$out,$osmesa," -i \
+      $osmesa/lib/libOSMesa*.la
+
   '' + /* work around bug #529, but maybe $drivers should also be patchelf-ed */ ''
-    find $drivers/ -type f -executable -print0 | xargs -0 strip -S || true
+    find $drivers/ $osmesa/ -type f -executable -print0 | xargs -0 strip -S || true
 
   '' + /* add RPATH so the drivers can find the moved libgallium and libdricore9 */ ''
     for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do
-- 
cgit 1.4.1


From 6dc30df086d55d9c66a9072ad1abe7d1e7508586 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 13:41:10 +0100
Subject: libdrm: minor update 2.4.46 -> .48

---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index cf3febfc455..6fababe8bf2 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.46";
+  name = "libdrm-2.4.48";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "1wah4qmrrcv0gnx65lhrlxb6gprxch92wy8lhxv6102fml6k5krk";
+    sha256 = "17jclibkw4jv90mi0h8kkyma4x12cgz5m4vw7vg6kb7hv2z0pfzr";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From 2a1cd6433bc864b3b7b0f1a8f0994bb0dad8cbb9 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 13:44:40 +0100
Subject: pixman: major update 0.30.2 -> 0.32.2

This is new major release with performance improvements for image scaling,
and a large number of bug fixes.
---
 pkgs/development/libraries/pixman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 23bfbeeb808..4ec2a69c64f 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-0.30.2";
+  name = "pixman-0.32.2";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "1sgnpx34pj3245a9v8056jddc4cg4xxkqdjvvw6k2hnprhh8k65x";
+    sha256 = "0kas43iw0wxw22z6gafsx15f8p73x991gw35asnah2myqw43x7pn";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];
-- 
cgit 1.4.1


From 1876b8e4b262a496a97383f170a7dd98e9e91dad Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 13:48:22 +0100
Subject: glib: bugfix update 2.38.0 -> .2

---
 pkgs/development/libraries/glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 03846993ea3..e7bae0100a4 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -33,7 +33,7 @@ let
   '';
 
   ver_maj = "2.38";
-  ver_min = "0";
+  ver_min = "2";
 in
 with { inherit (stdenv.lib) optionalString; };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "0cpzqadqk6z6bmb79p04pykxc8x57rvshh33414cnk41bvgaf4vm";
+    sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5";
   };
 
   # configure script looks for d-bus but it is (probably) only needed for tests
-- 
cgit 1.4.1


From 45859b5f344d70d333819cae4ee9b0df453b7f8e Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 14:08:21 +0100
Subject: icu: update 51.1 -> 52.1

---
 pkgs/development/libraries/icu/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index 838d6f7b75f..4437fc4bad2 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -3,15 +3,17 @@
 let
 
   pname = "icu4c";
-  version = "51.1";
+  ver_maj = "52";
+  ver_min = "1";
+  version = "${ver_maj}.${ver_min}";
 in
 
 stdenv.mkDerivation {
   name = pname + "-" + version;
 
   src = fetchurl {
-    url = http://download.icu-project.org/files/icu4c/51.1/icu4c-51_1-src.tgz;
-    sha256 = "0sv6hgkm92pm27zgjxgk284lcxxbsl0syi40ckw2b7yj7d8sxrc7";
+    url = "http://download.icu-project.org/files/icu4c/${version}/icu4c-${ver_maj}_${ver_min}-src.tgz";
+    sha256 = "14l0kl17nirc34frcybzg0snknaks23abhdxkmsqg3k9sil5wk9g";
   };
 
   postUnpack = ''
-- 
cgit 1.4.1


From 3bcc63913b4aa770037600489afaf7c504ebc5d7 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 14:16:28 +0100
Subject: harfbuzz: major update 0.9.12 -> .24

Also use deps recommended by upstream (by defaul).
---
 pkgs/development/libraries/harfbuzz/default.nix | 13 ++++++-------
 pkgs/top-level/all-packages.nix                 |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 78e016c1582..11cbd0dd1cd 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, glib, freetype,
-  icu ? null, graphite2 ? null, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, icu
+, graphite2 ? null, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.12";
+  name = "harfbuzz-0.9.24";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6";
+    sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd";
   };
 
-  buildInputs = [ pkgconfig glib freetype ]
+  buildInputs = [ pkgconfig glib freetype cairo icu ] # recommended by upstream
     ++ libintlOrEmpty;
   propagatedBuildInputs = []
-    ++ (stdenv.lib.optionals (icu != null) [icu])
-    ++ (stdenv.lib.optionals (graphite2 != null) [graphite2])
+    ++ stdenv.lib.optional (graphite2 != null) graphite2
     ;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a4a085ead3..9b24cb3c08e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4492,7 +4492,6 @@ let
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz {
-    icu = null;
     graphite2 = null;
   };
 
-- 
cgit 1.4.1


From 08085aaf0a685698ffd8b7cad2ca59d01aba0926 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 14:27:19 +0100
Subject: libusb1: update 1.0.16 -> .17

---
 pkgs/development/libraries/libusb1/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 9a6a303fe32..dfb8f1c54a1 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
+let
+  version = "1.0.17";
+in
 stdenv.mkDerivation rec {
-  name = "libusb-1.0.16";
+  name = "libusb-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libusbx/libusbx-1.0.16.tar.bz2";
-    sha256 = "105m9jvjr3vrriyg0mwmyf7qla4l71iwwnymrsk3sy9dazwmqcsv";
+    url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2";
+    sha256 = "1f25a773x9x5n48a0mcigyk77ay0hkiz6y6bi4588wzf7wn8svw7";
   };
 
   buildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From 5aaabde3b8fdb73afbdfe7701f0cc5351d1f4c8e Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 14:34:55 +0100
Subject: gdk_pixbuf: bugfix update 2.30.0 -> .1

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 91af939db43..0daae5fda2e 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.30";
-  ver_min = "0";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "0n56rbi1acpi8skj8zdhzkm4yv0jq5rzii9n8jhq64k24l2n0wsa";
+    sha256 = "0c4dxsnpqc46liqjlh3w2qmrzv0b89ksn15z2f9h13362lg3n9m3";
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-- 
cgit 1.4.1


From 6c193c70539f90642ebc7ca391a2b088eab13a8f Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 14:43:32 +0100
Subject: gtk3: bugfix updates 3.10.0 -> .4

---
 pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index ed9d6a52d40..cea98bbc4b0 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,14 +10,14 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.10";
-  ver_min = "0";
+  ver_min = "4";
 in
 stdenv.mkDerivation rec {
   name = "gtk+-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
-    sha256 = "1zjkbjvp6ay08107r6zfsrp39x7qfadbd86p3hs5v4ydc2rzwnb5";
+    sha256 = "0ax5qk9a6mp4k7i7nh8ajjz8sbl2g3819779z3bnknbpcgy13m2g";
   };
 
   enableParallelBuilding = true;
-- 
cgit 1.4.1


From 1812522f2a574bde1871e5691fcb645a02f9e7e6 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 14:48:42 +0100
Subject: libssh: bugfix update + CVE-2013-0176

It seems an old DoS-only problem.
---
 pkgs/development/libraries/libssh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index c2b812744c9..0a06452d5d8 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.5.3";
+  name = "libssh-0.5.5";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/38/${name}.tar.gz";
-    sha256 = "1w6s217vjq0w3v5i0c5ql6m0ki1yz05g9snah3azxfkl9k4schpd";
+    url = "https://red.libssh.org/attachments/download/51/${name}.tar.gz";
+    sha256 = "17cfdff4hc0ijzrr15biq29fiabafz0bw621zlkbwbc1zh2hzpy0";
   };
 
   buildInputs = [ zlib libgcrypt ];
-- 
cgit 1.4.1


From a44df6d289d2bc6da00deb036fe5ed85070d5ce5 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 15:10:24 +0100
Subject: libgsf: bugfix update 1.14.26 -> .28

---
 pkgs/development/libraries/libgsf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 9253468b8df..0c79b20b564 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -4,11 +4,11 @@
 with { inherit (stdenv.lib) optionals; };
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.26";
+  name = "libgsf-1.14.28";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "1md67l60li7rkma9m6mwchqz6b6q4xsfr38c6n056y6xm8jyf6c9";
+    sha256 = "1r6bkwramb6qglmgbjmqvr5sahbfmql057ql97mx99fs3x7r357a";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-- 
cgit 1.4.1


From 017b36a5dfff7d53521a7d13dbef13b733d45ff7 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 15:10:46 +0100
Subject: dbus_python: update 1.1.1 -> 1.2.0

---
 pkgs/development/python-modules/dbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index bfce358a2aa..32ef97bf29c 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-python-1.1.1";
+  name = "dbus-python-1.2.0";
 
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";
-    sha256 = "122yj5y0mndk9axh735qvwwckck6s6x0q84dw6p97mplp17wl5w9";
+    sha256 = "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71";
   };
 
   postPatch = "patchShebangs .";
-- 
cgit 1.4.1


From 4aa1dff1d6bba2d7c64503bbe142d819a289c5e3 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 20:20:13 +0100
Subject: gvfs: major update 1.14.2 -> 1.18.3, unify to one

There were several files defining gvfs, now use one common.
Also delete long-unused forgotten xfce file.
---
 pkgs/desktops/gnome-2/default.nix              |  4 +-
 pkgs/desktops/gnome-2/desktop/gvfs/default.nix | 21 --------
 pkgs/desktops/gnome-3/core/gvfs/default.nix    | 21 --------
 pkgs/desktops/gnome-3/default.nix              |  2 +-
 pkgs/desktops/xfce/common.nix                  | 74 --------------------------
 pkgs/development/libraries/gvfs/default.nix    | 10 ++--
 6 files changed, 10 insertions(+), 122 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/desktop/gvfs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/core/gvfs/default.nix
 delete mode 100644 pkgs/desktops/xfce/common.nix

(limited to 'pkgs/development')

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 3d76ba72dae..ce8d9e54c72 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, self, stdenv, gettext, overrides ? {} }:
+{ callPackage, self, stdenv, gettext, gvfs, overrides ? {} }:
 {
   __overrides = overrides;
 
@@ -79,7 +79,7 @@
 
   libgweather = callPackage ./desktop/libgweather { };
 
-  gvfs = callPackage ./desktop/gvfs { };
+  gvfs = gvfs.override { gnome = self; };
 
   libgnomekbd = callPackage ./desktop/libgnomekbd { };
 
diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
deleted file mode 100644
index 9e7949047c7..00000000000
--- a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2
-, libcdio, libxml2, libtool, glib, intltool, GConf, libgnome_keyring, libsoup
-, udev, avahi, libxslt, docbook_xsl }:
-
-stdenv.mkDerivation rec {
-  name = "gvfs-1.14.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
-    sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a";
-  };
-
-  buildInputs =
-    [ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 GConf
-      libgnome_keyring libsoup avahi libtool libxslt docbook_xsl
-    ];
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  enableParallelBuilding = true;
-}
diff --git a/pkgs/desktops/gnome-3/core/gvfs/default.nix b/pkgs/desktops/gnome-3/core/gvfs/default.nix
deleted file mode 100644
index 1eea518c4b7..00000000000
--- a/pkgs/desktops/gnome-3/core/gvfs/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2
-, libcdio, libxml2, libtool, glib, intltool, gconf, libgnome_keyring, libsoup
-, udev, avahi, libxslt, docbook_xsl }:
-
-stdenv.mkDerivation rec {
-  name = "gvfs-1.14.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
-    sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
-  };
-
-  buildInputs =
-    [ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 gconf
-      libgnome_keyring libsoup avahi libtool libxslt docbook_xsl
-    ];
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  enableParallelBuilding = true;
-}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 8af6d65420a..8a576c7ffcb 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -31,7 +31,7 @@ rec {
 
   gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { });
 
-  gvfs = callPackage ./core/gvfs { };
+  gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
 
   libcroco = callPackage ./core/libcroco {};
 
diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix
deleted file mode 100644
index a7e64707f91..00000000000
--- a/pkgs/desktops/xfce/common.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ pkgs, newScope, xfce_self }: rec {
-
-  callPackage = newScope (deps // xfce_self);
-
-  deps = rec { # xfce-global dependency overrides should be here
-    inherit (pkgs.gnome) libglade libwnck vte gtksourceview;
-    inherit (pkgs.perlPackages) URI;
-
-    # The useful bits from ‘gnome-disk-utility’.
-    libgdu = callPackage ./support/libgdu.nix { };
-
-    # Gvfs is required by Thunar for the trash feature and for volume
-    # mounting.  Should use the one from Gnome, but I don't want to mess
-    # with the Gnome packages (or pull in a zillion Gnome dependencies).
-    gvfs = callPackage ./support/gvfs.nix { };
-
-    # intelligent fetcher for Xfce
-    fetchXfce = rec {
-      generic = prepend : name : hash :
-        let lib = pkgs.lib;
-            p = builtins.parseDrvName name;
-            versions = lib.splitString "." p.version;
-            ver_maj = lib.concatStrings (lib.intersperse "." (lib.take 2 versions));
-            name_low = lib.toLower p.name;
-        in pkgs.fetchurl {
-          url = "mirror://xfce/src/${prepend}/${name_low}/${ver_maj}/${name}.tar.bz2";
-          sha256 = hash;
-        };
-      core = generic "xfce";
-      app = generic "apps";
-      art = generic "art";
-    };
-  };
-
-  xfce_common = rec {
-
-    inherit (deps) gvfs; # used by NixOS
-
-    #### CORE
-
-    garcon  = callPackage ./core/garcon.nix { v= "0.2.0";   h= "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2"; };
-
-    # not used anymore TODO: really? Update to 2.99.2?
-    gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
-
-    # ToDo: segfaults after some work
-    tumbler = callPackage ./core/tumbler.nix  { v= "0.1.27"; h= "0s9qj99b81asmlqa823nzykq8g6p9azcp2niak67y9bp52wv6q2c"; };
-
-    xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix  { v= "1.0.10"; h= "1w120k1sl4s459ijaxkqkba6g1p2sqrf9paljv05wj0wz12bpr40"; };
-
-
-    #### APPLICATIONS
-    #TODO: correct links; more stuff
-
-    xfce4notifyd           = callPackage ./applications/xfce4-notifyd.nix      { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; };
-    gigolo                 = callPackage ./applications/gigolo.nix             { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; };
-    xfce4taskmanager       = callPackage ./applications/xfce4-taskmanager.nix  { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; };
-    mousepad               = callPackage ./applications/mousepad.nix           { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; };
-    thunar_volman          = callPackage ./core/thunar-volman.nix              { };
-    thunar_archive_plugin  = callPackage ./core/thunar-archive-plugin.nix      { };
-
-
-    #### ART
-
-    xfce4icontheme  = callPackage ./art/xfce4-icon-theme.nix  { v= "4.4.3"; h= "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; };
-
-    #### PANEL PLUGINS
-
-    xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
-    xfce4_cpufreq_plugin    = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix    { };
-
-  };
-}
-
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 067d3dc9383..083d0a10cdf 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -4,12 +4,16 @@
 , libxml2, libxslt, docbook_xsl
 , lightWeight ? true, gnome, samba, makeWrapper }:
 
+let
+  ver_maj = "1.18";
+  version = "${ver_maj}.3";
+in
 stdenv.mkDerivation rec {
-  name = "gvfs-1.14.2";
+  name = "gvfs-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
-    sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
+    url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
+    sha256 = "0b27vidnrwh6yb2ga9a1k9qlrz6lrzsaz2hcxqbc1igivhb9g0hx";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libtool ];
-- 
cgit 1.4.1


From 747e75750077bb5b378140d43eac1c17547fa1fc Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 17 Nov 2013 22:21:56 +0100
Subject: libunique: fix build, make the package unique

The one in gnome2 was failing to build,
but all there is likely in a desolate state anyway.

In gmpc it also seemed without any reason to have a duplicate.
---
 pkgs/applications/audio/gmpc/default.nix             | 18 +-----------------
 pkgs/desktops/gnome-2/default.nix                    |  4 ++--
 pkgs/desktops/gnome-2/platform/libunique/default.nix | 14 --------------
 pkgs/development/libraries/libunique/default.nix     |  1 -
 4 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/libunique/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 10a2f0dcee9..728155c02bd 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
-, gtk, curl, mpd_clientlib, libsoup, gob2, vala
+, gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
 }:
 
 stdenv.mkDerivation rec {
@@ -15,22 +15,6 @@ stdenv.mkDerivation rec {
     buildInputs = [ pkgconfig glib ];
   };
 
-  libunique = stdenv.mkDerivation {
-    name = "libunique-1.1.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/sources/libunique/1.1/libunique-1.1.6.tar.gz;
-      sha256 = "2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea";
-    };
-    buildInputs = [ pkgconfig glib gtk ];
-
-    patches = [
-      (fetchurl {
-        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/remove_G_CONST_RETURN.patch?h=packages/libunique";
-        sha256 = "0da2qi7cyyax4rr1p25drlhk360h8d3lapgypi5w95wj9k6bykhr";
-      })
-    ];
-  };
-
   src = fetchurl {
     url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz";
     sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index ce8d9e54c72..cecd56ad4f2 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, self, stdenv, gettext, gvfs, overrides ? {} }:
+{ callPackage, self, stdenv, gettext, gvfs, libunique, overrides ? {} }:
 {
   __overrides = overrides;
 
@@ -67,7 +67,7 @@
   startup_notification = callPackage ./platform/startup-notification { };
 
   # Required for nautilus
-  libunique = callPackage ./platform/libunique { };
+  inherit (libunique);
 
   gtkglext = callPackage ./platform/gtkglext { };
 
diff --git a/pkgs/desktops/gnome-2/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix
deleted file mode 100644
index 6b9cee80042..00000000000
--- a/pkgs/desktops/gnome-2/platform/libunique/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl_gnome, pkgconfig, gtk}:
-
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "libunique";
-    major = "1"; minor = "1"; patchlevel = "6";
-    sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk ];
-}
diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix
index 603759d47c0..125cb890008 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/pkgs/development/libraries/libunique/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib gtk dbus_glib ];
 
   # don't make deprecated usages hard errors
-  preBuildPhases = "preBuild";
   preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""'';
 
   doCheck = true;
-- 
cgit 1.4.1


From dc3b8cc8015550f91e716e0d2c0a83dc536add5d Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 18 Nov 2013 20:06:30 +0100
Subject: libwnck3: fix build via disabling introspection

It isn't used anywhere, but fixing it won't hurt (I found by accident).
---
 pkgs/development/libraries/libwnck/3.x.nix | 2 ++
 pkgs/top-level/all-packages.nix            | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index 59355f3c37d..17393fab074 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -10,4 +10,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ pkgconfig intltool ];
   propagatedBuildInputs = [ libX11 gtk3 ];
+
+  configureFlags = [ "--disable-introspection" ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b24cb3c08e..6386d1044b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5104,7 +5104,8 @@ let
 
   libwmf = callPackage ../development/libraries/libwmf { };
 
-  libwnck = callPackage ../development/libraries/libwnck { };
+  libwnck = libwnck2;
+  libwnck2 = callPackage ../development/libraries/libwnck { };
   libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { };
 
   libwpd = callPackage ../development/libraries/libwpd { };
-- 
cgit 1.4.1


From 971c67a1baf211d6a3f786d31487b9b483dc0548 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 18 Nov 2013 20:15:42 +0100
Subject: libnotify: minor update 0.7.5 -> .6

---
 pkgs/development/libraries/libnotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index ab8034c781e..00308bf9471 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   ver_maj = "0.7";
-  ver_min = "5";
+  ver_min = "6";
   name = "libnotify-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz";
-    sha256 = "0lmnzy16vdjs9vlgdm0b7wfyi1nh526hv2dpb7vxb92bhx3wny23";
+    sha256 = "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf";
   };
   src_m4 = fetchurl {
     url = "mirror://gentoo/distfiles/introspection-20110205.m4.tar.bz2";
-- 
cgit 1.4.1


From 63481f1b4bdc5d715421df5238c8eed5f1740d87 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 18 Nov 2013 20:51:06 +0100
Subject: librsvg: comment on why the version isn't updated

---
 pkgs/development/libraries/librsvg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 15e07af9f1e..808407877e9 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -6,7 +6,7 @@
 # no introspection by default, it's too big
 
 stdenv.mkDerivation rec {
-  name = "librsvg-2.36.4";
+  name = "librsvg-2.36.4"; # 2.37 needs pango 1.32.6, 2.40 doesn't support gtk2
 
   src = fetchurl {
     url    = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz";
-- 
cgit 1.4.1


From f7b39cce8c27c021037042f7c5a9d8d92866bd7a Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 23 Nov 2013 10:17:52 +0100
Subject: pixman: minor update 0.32.2 -> .4

---
 pkgs/development/libraries/pixman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 4ec2a69c64f..cb76a1b615f 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-0.32.2";
+  name = "pixman-0.32.4";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "0kas43iw0wxw22z6gafsx15f8p73x991gw35asnah2myqw43x7pn";
+    sha256 = "113ycngcssbrps217dyajq96hm9xghsfch82h14yffla1r1fviw0";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];
-- 
cgit 1.4.1


From 0d4d1097cbf7f6d58c75c3a1cc6be00aa9de838b Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 23 Nov 2013 10:18:15 +0100
Subject: libdrm: minor update 2.4.48 -> .49

---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 6fababe8bf2..b8a76b42fd7 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.48";
+  name = "libdrm-2.4.49";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "17jclibkw4jv90mi0h8kkyma4x12cgz5m4vw7vg6kb7hv2z0pfzr";
+    sha256 = "0zbsx554yk9prjda95q1ljay42ygq3qlhc3vp39m1hyq63yx7mr5";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From 30666ed5ad0169611cb7a6ab80a9e941fe7dd9ca Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 23 Nov 2013 23:30:47 +0100
Subject: wayland, weston: update to 1.3.1, fix weston build

Also make Hydra build weston, so we can see the breakages in future.
---
 pkgs/applications/window-managers/weston/default.nix | 18 ++++++++++--------
 pkgs/development/libraries/wayland/default.nix       |  4 ++--
 pkgs/top-level/all-packages.nix                      |  6 +-----
 3 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 2c1044d6937..4162ba57dc1 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -2,30 +2,32 @@
 , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
 , libjpeg, pam, autoconf, automake, libtool }:
 
-let version = "1.0.5"; in
+let version = "1.3.1"; in
 
 stdenv.mkDerivation rec {
   name = "weston-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0";
+    sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p";
   };
 
   buildInputs = [ pkgconfig wayland mesa libxkbcommon
     cairo libxcb libXcursor x11 udev libdrm mtdev
-    libjpeg pam autoconf automake libtool ];
+    libjpeg pam /*autoconf automake libtool*/ ];
 
-  preConfigure = "autoreconf -vfi";
+  #preConfigure = "autoreconf -vfi";
 
-  # prevent install target to chown root weston-launch, which fails
-  configureFlags = ''
-    --disable-setuid-install
-  '';
+  NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm";
+
+  configureFlags = [
+    "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
+  ];
 
   meta = {
     description = "Reference implementation of a Wayland compositor";
     homepage = http://wayland.freedesktop.org/;
     license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 38174308360..e9ad56bdbf1 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
 
-let version = "1.2.1"; in
+let version = "1.3.0"; in
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0vqngxpavcxvjwlw7afgrbv7qvmd489sj555wrnxjc8p10mjw1kq";
+    sha256 = "0vhd8z74r4zmm7hrbb8l450sb6slqkdrvmk4k78sq9lays2pd09f";
   };
 
   buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 100536b635b..bcda69ca598 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9012,11 +9012,7 @@ let
     gnutls = gnutls32;
   };
 
-  weston = callPackage ../applications/window-managers/weston {
-    cairo = cairo.override {
-      glSupport = true;
-    };
-  };
+  weston = callPackage ../applications/window-managers/weston { };
 
   windowmaker = callPackage ../applications/window-managers/windowmaker { };
 
-- 
cgit 1.4.1


From 55f40dfbec7df7ac2cf0e8e9ecb4691165c08363 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 24 Nov 2013 12:43:22 +0100
Subject: graphite2: clean unneeded dependencies

We almost created cycles in harfbuzz.
---
 pkgs/development/libraries/silgraphite/graphite2.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index 0a36efbc982..070d65cb3a2 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig, cmake }:
+{ stdenv, fetchurl, pkgconfig, freetype, cmake }:
 
 stdenv.mkDerivation rec {
   version = "1.2.3";
   name = "graphite2-${version}";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz";
     sha256 = "1xgwnd81gm6p293x8paxb3yisnvpj5qnv1dzr7bjdi7b7h00ls7g";
   };
 
-  buildInputs = [pkgconfig freetype libXft pango fontconfig cmake];
-
-  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
+  buildInputs = [ pkgconfig freetype cmake ];
 
   meta = {
     description = "An advanced font engine";
-- 
cgit 1.4.1


From a829337ea662a8249ddbfd3ab35e4ddf6c7c02ec Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 24 Nov 2013 13:51:12 +0100
Subject: harfbuzz by default: don't use icu and do use graphite2

Also fix detection, so texLive builds now.
---
 pkgs/development/libraries/harfbuzz/default.nix | 20 ++++++++++++++++----
 pkgs/top-level/all-packages.nix                 |  6 ++----
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 11cbd0dd1cd..4cee49bea51 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, icu
-, graphite2 ? null, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
+, icu, graphite2
+, withIcu ? false # recommended by upstream as default, but most don't needed and it's big
+, withGraphite2 ? true # it is small and major distros do include it
+}:
+
+# TODO: split non-icu and icu lib into different outputs?
+# (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
   name = "harfbuzz-0.9.24";
@@ -9,10 +15,16 @@ stdenv.mkDerivation rec {
     sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd";
   };
 
-  buildInputs = [ pkgconfig glib freetype cairo icu ] # recommended by upstream
+  configureFlags = [
+    ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default
+    ( "--with-icu=" +       (if withIcu       then "yes" else "no") )
+  ];
+
+  buildInputs = [ pkgconfig glib freetype cairo ] # recommended by upstream
     ++ libintlOrEmpty;
   propagatedBuildInputs = []
-    ++ stdenv.lib.optional (graphite2 != null) graphite2
+    ++ stdenv.lib.optional withGraphite2 graphite2
+    ++ stdenv.lib.optional withIcu icu
     ;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bcda69ca598..52e9581a57a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4501,9 +4501,7 @@ let
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
 
-  harfbuzz = callPackage ../development/libraries/harfbuzz {
-    graphite2 = null;
-  };
+  harfbuzz = callPackage ../development/libraries/harfbuzz { };
 
   hawknl = callPackage ../development/libraries/hawknl { };
 
@@ -10196,7 +10194,7 @@ let
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
     harfbuzz = harfbuzz.override {
-      inherit icu graphite2;
+      withIcu = true; withGraphite2 = true;
     };
   };
 
-- 
cgit 1.4.1


From b98da7c2737706adcd804948e1fa42eaea1802e8 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 25 Nov 2013 22:24:13 +0100
Subject: libpng: several minor updates 1.6.4 -> 1.6.7

all seem unimportant
---
 pkgs/development/libraries/libpng/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 6702cdec9c1..adcc120bdfe 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 let
-  version = "1.6.4";
-  sha256 = "15pqany43q2hzaxqn84p9dba071xmvqi8h1bhnjxnxdf3g64zayg";
-  patch_src = fetchurl { # not released yet, hopefully OK
-    url = "mirror://sourceforge/libpng-apng/libpng-1.6.3-apng.patch.gz";
-    sha256 = "0fjnb6cgbj2c7ggl0qzcnliml2ylrjxzigp89vw0hxq221k5mlsx";
+  version = "1.6.7";
+  sha256 = "0igrw6xzvljd8ddk2qmqz4pav1glqj6naqcrzy7j2056m59wij8k";
+  patch_src = fetchurl {
+    url = "mirror://sourceforge/libpng-apng/libpng-1.6.7-apng.patch.gz";
+    sha256 = "1g5hmlb9smwl9qv6wb2d7795jqcfrx8g3dhrya5dshrj909jb95k";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 
-- 
cgit 1.4.1


From cb4639f2b9c39d55bf9372483b9a3598c00b9472 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 30 Nov 2013 09:24:35 +0100
Subject: spidermonkey_185: enable threads and tests by default

Also drop redundant autoconf.
---
 .../interpreters/spidermonkey/185-1.0.0.nix        | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
index 1c0d77345b7..30aec0c2790 100644
--- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoconf213, nspr, perl, python, readline, zip }:
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python, readline, zip }:
 
 stdenv.mkDerivation rec {
   version = "185-1.0.0";
@@ -11,21 +11,28 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  buildInputs = [ pkgconfig autoconf213 perl python readline zip ];
+  buildInputs = [ pkgconfig perl python readline zip ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
     export LIBXUL_DIST=$out
-    autoconf
   '';
 
+  configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ];
+
+  # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
+  preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
+
+  doCheck = true;
+  preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
+
   meta = with stdenv.lib; {
-      description = "Mozilla's JavaScript engine written in C/C++";
-      homepage = https://developer.mozilla.org/en/SpiderMonkey;
-      # TODO: MPL/GPL/LGPL tri-license.
-      maintainers = [ maintainers.goibhniu ];
+    description = "Mozilla's JavaScript engine written in C/C++";
+    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    # TODO: MPL/GPL/LGPL tri-license.
+    maintainers = [ maintainers.goibhniu ];
   };
-
 }
+
-- 
cgit 1.4.1


From d29ce615214cfbb7932bc0ce0b4739a9b3ef831d Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 30 Nov 2013 09:47:02 +0100
Subject: spidermonkey_185: drop unused readline, parallel build

---
 pkgs/development/interpreters/spidermonkey/185-1.0.0.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
index 30aec0c2790..d4af39ea16b 100644
--- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python, readline, zip }:
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }:
 
 stdenv.mkDerivation rec {
   version = "185-1.0.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  buildInputs = [ pkgconfig perl python readline zip ];
+  buildInputs = [ pkgconfig perl python zip ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
   # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
   preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
 
+  enableParallelBuilding = true;
+
   doCheck = true;
   preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
 
-- 
cgit 1.4.1


From 796a60613e511467620990cdc65c498edf791083 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 30 Nov 2013 21:56:53 +0100
Subject: mesa: bugfix update 9.2.3 -> .4

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 3e026f01271..5428c3b38dc 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
 */
 
 let
-  version = "9.2.3";
+  version = "9.2.4";
   # this is the default search path for DRI drivers (note: X server introduces an overriding env var)
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "0p8p35bwvrifc3v4z4wplxrs49h2qwzhcpsfjkkinfckkw6lqvg0";
+    sha256 = "0dxrawlpfhmlp0qxdrvpmp9q9vrfsx0drxgwkbxf27bss71i1ppx";
   };
 
   prePatch = "patchShebangs .";
-- 
cgit 1.4.1


From 7e9b24c8f1204b212a5c8b83f395e9be29ebe37e Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Thu, 5 Dec 2013 22:50:41 +0100
Subject: cogl, clutter: update to 1.16.{0,2}

---
 pkgs/development/libraries/clutter/default.nix | 14 ++++++++++----
 pkgs/development/libraries/cogl/default.nix    | 19 ++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 33bc196143b..fbfa6bc711b 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,12 +1,16 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
 
-stdenv.mkDerivation {
-  name = "clutter-1.8.2";
+let
+  ver_maj = "1.16";
+  ver_min = "2";
+in
+stdenv.mkDerivation rec {
+  name = "clutter-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/clutter/1.8/clutter-1.8.2.tar.xz;
-    sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw";
+    url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
+    sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -17,6 +21,8 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
 
+  #doCheck = true; # no tests possible without a display
+
   meta = {
     description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
 
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index abb92f7b08b..46a46773810 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite
-, libXdamage, libintlOrEmpty
+{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, xorg, libintlOrEmpty
 , pangoSupport ? true, pango, cairo }:
 
+let
+  ver_maj = "1.16";
+  ver_min = "0";
+in
 stdenv.mkDerivation rec {
-  name = "cogl-1.8.2";
+  name = "cogl-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/cogl/1.8/cogl-1.8.2.tar.xz;
-    sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc";
+    url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
+    sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs =
-    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]
+  propagatedBuildInputs = with xorg;
+    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage libXrandr ]
     ++ libintlOrEmpty;
 
   buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
@@ -24,6 +27,8 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
+  #doCheck = true; # all tests fail (no idea why)
+
   meta = with stdenv.lib; {
     description = "A small open source library for using 3D graphics hardware for rendering";
     maintainers = with maintainers; [ lovek323 ];
-- 
cgit 1.4.1


From 493eaf95dd18f62512fa3eeaef6b2820c922ba0c Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 9 Dec 2013 21:14:39 +0100
Subject: poppler: bugfix update 0.24.3 -> .4

---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index c438849e0cd..0db3722e6aa 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,8 +4,8 @@
 }:
 
 let
-  version = "0.24.3"; # even major numbers are stable
-  sha256 = "0kip6mxp4lscr3wvgfashqk7ymhx2w1hgdilfpgig0a5kr805kfj";
+  version = "0.24.4"; # even major numbers are stable
+  sha256 = "1qh1gk6hq5cfpkqyxxgkpyl78na8dckmh6zbgsqbpw762yd518y8";
 
   qtcairo_patches =
     let qtcairo = fetchgit { # the version for poppler-0.22
-- 
cgit 1.4.1


From 8dc05a8fc903fa1d8a9833196b2ad153a1d90aa8 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 10:41:35 +0100
Subject: libdrm: bump 2.4.49 -> .50

Mainly, it fixes a critical bug for Radeon Southern Islands GPUs.
---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index b8a76b42fd7..5aa54582fdc 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.49";
+  name = "libdrm-2.4.50";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "0zbsx554yk9prjda95q1ljay42ygq3qlhc3vp39m1hyq63yx7mr5";
+    sha256 = "0idh6cwqr2rilig7vygb3gxvivchp0q1iq4md79jq340v96d48rq";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From 7ae520404f715aa79aa42ecd3ceaf82e454e1292 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Thu, 5 Dec 2013 23:12:00 +0800
Subject: libsoup: update from 2.44.1 to 2.44.2

Enable introspection
Renamed from libsoup_2_40 to libsoup_2_44
---
 pkgs/development/libraries/libsoup/2.40.nix | 32 --------------------------
 pkgs/development/libraries/libsoup/2.44.nix | 35 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++--
 3 files changed, 37 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/libsoup/2.40.nix
 create mode 100644 pkgs/development/libraries/libsoup/2.44.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libsoup/2.40.nix b/pkgs/development/libraries/libsoup/2.40.nix
deleted file mode 100644
index ca37ceb941c..00000000000
--- a/pkgs/development/libraries/libsoup/2.40.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, sqlite, intltool, python
-, gnomeSupport ? true, libgnome_keyring, glib_networking
-}:
-
-stdenv.mkDerivation {
-  name = "libsoup-2.44.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.1.tar.xz;
-    sha256 = "07acjwvik3gagcsdjzi85g44ga4pd3nh4ww6722bfzjzvlqw6cn5";
-  };
-
-
-  preConfigure = ''
-    substituteInPlace libsoup/tld-parser.py \
-      --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
-  '';
-  buildInputs = [ pkgconfig intltool python ];
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libxml2 sqlite ]
-    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
-  passthru.propagatedUserEnvPackages = [ glib_networking ];
-
-  # glib_networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check";
-
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
-  meta = {
-#    inherit (glib.meta) maintainers platforms;
-  };
-}
diff --git a/pkgs/development/libraries/libsoup/2.44.nix b/pkgs/development/libraries/libsoup/2.44.nix
new file mode 100644
index 00000000000..4bef93ff8cd
--- /dev/null
+++ b/pkgs/development/libraries/libsoup/2.44.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection
+, glib, libxml2, sqlite, glib_networking
+, gnomeSupport ? true, libgnome_keyring
+}:
+
+stdenv.mkDerivation {
+  name = "libsoup-2.44.2";
+
+  meta = {
+    description = "HTTP client/server library";
+    license = stdenv.lib.licenses.lgpl2Plus;
+  };
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz;
+    sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77";
+  };
+
+  preConfigure = ''
+    substituteInPlace libsoup/tld-parser.py \
+      --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
+  '';
+
+  nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ];
+
+  propagatedBuildInputs = [ glib libxml2 sqlite ]
+    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
+
+  passthru.propagatedUserEnvPackages = [ glib_networking ];
+
+  # glib_networking is a runtime dependency, not a compile-time dependency
+  configureFlags = "--disable-tls-check";
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eccce1181de..5a5ca07ba18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4202,7 +4202,7 @@ let
   geoclue = callPackage ../development/libraries/geoclue {};
 
   geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {
-    libsoup = libsoup_2_40;
+    libsoup = libsoup_2_44;
   };
 
   geoip = builderDefsPackage ../development/libraries/geoip {
@@ -5050,7 +5050,7 @@ let
   libsodium = callPackage ../development/libraries/libsodium { };
 
   libsoup = callPackage ../development/libraries/libsoup { };
-  libsoup_2_40 = callPackage ../development/libraries/libsoup/2.40.nix { };
+  libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { };
 
   libssh = callPackage ../development/libraries/libssh { };
 
-- 
cgit 1.4.1


From 9c8789e8bc96f670bb11bbc01d21c2b485514ecb Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Thu, 5 Dec 2013 23:24:05 +0800
Subject: add webkitgtk 2.2.3

With minor changes from @vcunat, see #1197.
---
 pkgs/development/libraries/webkitgtk/default.nix   | 52 ++++++++++++++++++++++
 .../webkitgtk/webcore-svg-libxml-cflags.patch      |  8 ++++
 pkgs/top-level/all-packages.nix                    |  8 ++++
 3 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/libraries/webkitgtk/default.nix
 create mode 100644 pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
new file mode 100644
index 00000000000..ff3122a9316
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
+, pkgconfig, which, gettext, gobjectIntrospection
+, gtk2, gtk3, wayland, libwebp, enchant
+, libxml2, libsoup, libsecret, libxslt, harfbuzz
+}:
+
+stdenv.mkDerivation rec {
+  name = "webkitgtk-2.2.3";
+
+  meta = {
+    description = "Web content rendering engine, GTK+ port";
+    homepage = "http://webkitgtk.org/";
+    license = stdenv.lib.licenses.bsd2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "http://webkitgtk.org/releases/${name}.tar.xz";
+    sha256 = "01a69v0aw3bv2zkx6jzk71r3pjlf2xfhxavjnma89kmd78qb7g4l";
+  };
+
+  patches = [ ./webcore-svg-libxml-cflags.patch ];
+
+  prePatch = ''
+    for i in $(find . -name '*.p[l|m]'); do
+      sed -e 's@/usr/bin/gcc@gcc@' -i $i
+    done
+  '';
+
+  configureFlags = [
+    "--disable-geolocation"
+    "--disable-video"              # TODO: gsteramer-1.0
+    "--enable-introspection"
+  ];
+
+  dontAddDisableDepTrack = true;
+
+  nativeBuildInputs = [
+    perl python ruby bison gperf flex
+    pkgconfig which gettext gobjectIntrospection
+  ];
+
+  buildInputs = [
+    gtk2 wayland libwebp enchant
+    libxml2 libsecret libxslt harfbuzz
+  ];
+
+  propagatedBuildInputs = [ gtk3 libsoup ];
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch b/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch
new file mode 100644
index 00000000000..03fc3f3f97d
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch
@@ -0,0 +1,8 @@
+--- webkitgtk-2.2.3-orig/GNUmakefile.in	2013-12-04 17:56:28.000000000 +0800
++++ webkitgtk-2.2.3/GNUmakefile.in	2013-12-05 17:32:37.976689248 +0800
+@@ -21911,6 +21911,7 @@
+ @ENABLE_SVG_TRUE@	$(CAIRO_CFLAGS) \
+ @ENABLE_SVG_TRUE@	$(FREETYPE_CFLAGS) \
+ @ENABLE_SVG_TRUE@	$(LIBSOUP_CFLAGS) \
++@ENABLE_SVG_TRUE@	$(LIBXML_CFLAGS) \
+ @ENABLE_SVG_TRUE@	$(UNICODE_CFLAGS)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a5ca07ba18..507155fb497 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5845,6 +5845,14 @@ let
       inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
     };
 
+  webkitgtk = callPackage ../development/libraries/webkitgtk {
+    stdenv = overrideGCC stdenv gcc47;
+    libsoup = libsoup_2_44;
+    harfbuzz = harfbuzz.override {
+      withIcu = true;
+    };
+  };
+
   wildmidi = callPackage ../development/libraries/wildmidi { };
 
   wvstreams = callPackage ../development/libraries/wvstreams { };
-- 
cgit 1.4.1


From 7a3ae83a97554c51e1bddce028e51cf46201b2c5 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 12:46:11 +0100
Subject: gtk3: bugfix update 3.10.4 -> .5

---
 pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index cea98bbc4b0..e3237f83b74 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,14 +10,14 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.10";
-  ver_min = "4";
+  ver_min = "5"; # .6 needs currently unreleased wayland for introspection (wl_proxy_marshal_constructor)
 in
 stdenv.mkDerivation rec {
   name = "gtk+-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
-    sha256 = "0ax5qk9a6mp4k7i7nh8ajjz8sbl2g3819779z3bnknbpcgy13m2g";
+    sha256 = "1iyc566r61d3jfdiq5knwbssq5bsqsn8hqzdm30vmw6dx3cgd49i";
   };
 
   enableParallelBuilding = true;
-- 
cgit 1.4.1


From db32c7ca8bf7daad6792c3e9597c68768aafd271 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 12:52:24 +0100
Subject: mesa: add myself as a maintainer

When I authored much of the current expression,
I should better watch it, too.
---
 pkgs/development/libraries/mesa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5428c3b38dc..1bb57ca6e07 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -164,6 +164,6 @@ stdenv.mkDerivation {
     homepage = http://www.mesa3d.org/;
     license = "bsd";
     platforms = stdenv.lib.platforms.mesaPlatforms;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons vcunat ];
   };
 }
-- 
cgit 1.4.1


From f9f14be6323a2f8659f0f5d2299198e44a3faa48 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 16:53:45 +0100
Subject: libsigcxx: bugfix update 2.2.10 -> .11, enable tests

---
 pkgs/development/libraries/libsigcxx/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index b1e4f31c567..a127e7322eb 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, pkgconfig, gnum4 }:
 
 stdenv.mkDerivation rec {
-  name = "libsigc++-2.2.10";
+  name = "libsigc++-2.2.11";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libsigc++/2.2/${name}.tar.xz";
-    sha256 = "8ceb6f2732f5399ef50d5b70f433d49945a12e0900b8f9f43c135866a2e5bf47";
+    sha256 = "0ms93q7r8zznsqkfdj1ds9533f0aqfaw3kdkqv154rzmfigh8d4q";
   };
 
   buildInputs = [ pkgconfig gnum4 ];
 
+  doCheck = true;
+
   meta = {
     homepage = http://libsigc.sourceforge.net/;
     description = "A typesafe callback system for standard C++";
-- 
cgit 1.4.1


From cb1993116010de8d849fbeab9f2d15e13f7afe67 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 17:02:13 +0100
Subject: glibmm: update (after a long time), drop unneeded dep

---
 pkgs/development/libraries/glibmm/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 962b14bc788..6801012e855 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }:
+{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
 
+let
+  ver_maj = "2.38";
+  ver_min = "1";
+in
 stdenv.mkDerivation rec {
-  name = "glibmm-2.34.1";
+  name = "glibmm-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz";
-    sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl";
+    url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";
+    sha256 = "18n4czi6lh4ncj54apxms18xn9k8pmrp2ba9sxn0sk9w3pp2bja9";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ];
+  propagatedBuildInputs = [ glib libsigcxx ];
+
+  #doCheck = true; # some tests need network
 
   meta = {
     description = "C++ interface to the GLib library";
-- 
cgit 1.4.1


From 1e113b82840049362c0b6942074e6847ca01fd6b Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 17:12:32 +0100
Subject: pangomm: update, so we can drop older cairo

---
 pkgs/development/libraries/cairo/1.12.2.nix    | 86 --------------------------
 pkgs/development/libraries/pangomm/2.28.x.nix  | 29 ---------
 pkgs/development/libraries/pangomm/default.nix | 33 ++++++++++
 pkgs/top-level/all-packages.nix                |  5 +-
 4 files changed, 34 insertions(+), 119 deletions(-)
 delete mode 100644 pkgs/development/libraries/cairo/1.12.2.nix
 delete mode 100644 pkgs/development/libraries/pangomm/2.28.x.nix
 create mode 100644 pkgs/development/libraries/pangomm/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/cairo/1.12.2.nix b/pkgs/development/libraries/cairo/1.12.2.nix
deleted file mode 100644
index e60af3a23a8..00000000000
--- a/pkgs/development/libraries/cairo/1.12.2.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ postscriptSupport ? true
-, pdfSupport ? true
-, pngSupport ? true
-, xcbSupport ? false
-, gobjectSupport ? true, glib
-, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
-, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
-, libiconvOrEmpty, libintlOrEmpty
-}:
-
-assert postscriptSupport -> zlib != null;
-assert pngSupport -> libpng != null;
-assert xcbSupport -> libxcb != null && xcbutil != null;
-
-stdenv.mkDerivation rec {
-  name = "cairo-1.12.2";
-
-  src = fetchurl {
-    url = "http://cairographics.org/releases/${name}.tar.xz";
-    sha1 = "bc2ee50690575f16dab33af42a2e6cdc6451e3f9";
-  };
-
-  buildInputs =
-    [ pkgconfig x11 fontconfig xlibs.libXrender ]
-    ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
-    ++ libintlOrEmpty
-    ++ libiconvOrEmpty;
-
-  propagatedBuildInputs =
-    [ freetype pixman ] ++
-    stdenv.lib.optional gobjectSupport glib ++
-    stdenv.lib.optional postscriptSupport zlib ++
-    stdenv.lib.optional pngSupport libpng;
-
-  NIX_CFLAGS_COMPILE = ( if stdenv.isDarwin
-                         then "-I${pixman}/include/pixman-1"
-                         else "" );
-
-  configureFlags =
-    [ "--enable-tee" ]
-    ++ stdenv.lib.optional xcbSupport "--enable-xcb"
-    ++ stdenv.lib.optional pdfSupport "--enable-pdf";
-
-  preConfigure = ''
-    # Work around broken `Requires.private' that prevents Freetype
-    # `-I' flags to be propagated.
-    sed -i "src/cairo.pc.in" \
-        -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
-  ''
-
-  # On FreeBSD, `-ldl' doesn't exist.
-  + (stdenv.lib.optionalString stdenv.isFreeBSD
-       '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
-          do
-            cat "$i" | sed -es/-ldl//g > t
-            mv t "$i"
-          done
-       '');
-
-  enableParallelBuilding = true;
-
-  # The default `--disable-gtk-doc' is ignored.
-  postInstall = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "A 2D graphics library with support for multiple output devices";
-
-    longDescription = ''
-      Cairo is a 2D graphics library with support for multiple output
-      devices.  Currently supported output targets include the X
-      Window System, Quartz, Win32, image buffers, PostScript, PDF,
-      and SVG file output.  Experimental backends include OpenGL
-      (through glitz), XCB, BeOS, OS/2, and DirectFB.
-
-      Cairo is designed to produce consistent output on all output
-      media while taking advantage of display hardware acceleration
-      when available (e.g., through the X Render Extension).
-    '';
-
-    homepage = http://cairographics.org/;
-
-    licenses = [ "LGPLv2+" "MPLv1" ];
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
deleted file mode 100644
index 6843ff7a307..00000000000
--- a/pkgs/development/libraries/pangomm/2.28.x.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }:
-
-stdenv.mkDerivation rec {
-  name = "pangomm-2.28.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/pangomm/2.28/pangomm-2.28.4.tar.xz;
-    sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ];
-
-  meta = with stdenv.lib; {
-    description = "C++ interface to the Pango text rendering library";
-    homepage    = http://www.pango.org/;
-    license     = with licenses; [ lgpl2 lgpl21 ];
-    maintainers = with maintainers; [ lovek323 raskin ];
-    platforms   = platforms.unix;
-
-    longDescription = ''
-      Pango is a library for laying out and rendering of text, with an
-      emphasis on internationalization.  Pango can be used anywhere
-      that text layout is needed, though most of the work on Pango so
-      far has been done in the context of the GTK+ widget toolkit.
-      Pango forms the core of text and font handling for GTK+-2.x.
-    '';
-  };
-}
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
new file mode 100644
index 00000000000..f71c52e670b
--- /dev/null
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }:
+
+let
+  ver_maj = "2.34";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "pangomm-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz";
+    sha256 = "0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ];
+
+  meta = with stdenv.lib; {
+    description = "C++ interface to the Pango text rendering library";
+    homepage    = http://www.pango.org/;
+    license     = with licenses; [ lgpl2 lgpl21 ];
+    maintainers = with maintainers; [ lovek323 raskin ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      Pango is a library for laying out and rendering of text, with an
+      emphasis on internationalization.  Pango can be used anywhere
+      that text layout is needed, though most of the work on Pango so
+      far has been done in the context of the GTK+ widget toolkit.
+      Pango forms the core of text and font handling for GTK+-2.x.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31cfcc41b5d..48209825d56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4480,13 +4480,10 @@ let
     glSupport = config.cairo.gl or (stdenv.isLinux &&
       !stdenv.isArm && !stdenv.isMips);
   };
-  cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { };
   cairomm = callPackage ../development/libraries/cairomm { };
 
   pango = callPackage ../development/libraries/pango { };
-  pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix {
-    cairo = cairo_1_12_2;
-  };
+  pangomm = callPackage ../development/libraries/pangomm { };
 
   pangox_compat = callPackage ../development/libraries/pangox-compat { };
 
-- 
cgit 1.4.1


From a5110391ddf0cb739f69eb34c723433ce7bae1c6 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 17:20:28 +0100
Subject: atkmm: maintenance update

---
 pkgs/development/libraries/atkmm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix
index b25432491fb..03f08efca98 100644
--- a/pkgs/development/libraries/atkmm/default.nix
+++ b/pkgs/development/libraries/atkmm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, atk, glibmm, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "atkmm-2.22.6";
+  name = "atkmm-2.22.7";
 
   src = fetchurl {
-    url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz;
-    sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a";
+    url = "mirror://gnome/sources/atkmm/2.22/${name}.tar.xz";
+    sha256 = "06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz";
   };
 
   propagatedBuildInputs = [ atk glibmm ];
-- 
cgit 1.4.1


From 69a0de865e8c2171d484e0e8e1ccf8fb16485c49 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 17:37:59 +0100
Subject: gtkmm*: update, enable tests

Also add myself as a maintainer
to be able to monitor all gtk2/3 deps easily.
---
 pkgs/development/libraries/gtkmm/2.x.nix |  8 +++++---
 pkgs/development/libraries/gtkmm/3.x.nix | 14 ++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index ec7f01a8be5..c7ae2ee5312 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -5,14 +5,16 @@ stdenv.mkDerivation rec {
 
   src = fetchurl_gnome {
     project = "gtkmm";
-    major = "2"; minor = "24"; patchlevel = "2"; extension = "xz";
-    sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369";
+    major = "2"; minor = "24"; patchlevel = "4"; extension = "xz";
+    sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4";
   };
 
   nativeBuildInputs = [pkgconfig];
 
   propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ];
 
+  doCheck = true;
+
   meta = {
     description = "C++ interface to the GTK+ graphical user interface library";
 
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [stdenv.lib.maintainers.raskin];
+    maintainers = with stdenv.lib.maintainers; [ raskin vcunat ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 5c4a13fe507..8649abec637 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,17 +1,23 @@
 { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
 
+let
+  ver_maj = "3.10";
+  ver_min = "1";
+in
 stdenv.mkDerivation rec {
-  name = "gtkmm-3.7.12"; # gnome 3.8 release; stable 3.6 has problems with our new glibc
+  name = "gtkmm-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkmm/3.7/${name}.tar.xz";
-    sha256 = "05nrilm34gid7kqlq09hcdd7942prn2vbr1qgqvdhgy4x8pvz9p9";
+    url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
+    sha256 = "0f1587pc6x8hn268vqj5zr4dvyisj5zd9zpsfxyfm1pkbjmcv9bg";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
 
+  doCheck = true;
+
   meta = {
     description = "C++ interface to the GTK+ graphical user interface library";
 
@@ -29,7 +35,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
cgit 1.4.1


From 1d62c6445fbcdf4b8d020ff94d143e875dfa5fd8 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 10 Dec 2013 22:37:35 +0100
Subject: racket: fix build via forcing -lgcc_s

---
 pkgs/development/interpreters/racket/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index f45c96d2805..586c0a0acb9 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf
     echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf
     echo "</fontconfig>" >> chroot-fontconfig/fonts.conf
-   
+
     export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf
 
     cd src
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
 
+  NIX_LDFLAGS = "-lgcc_s";
+
   postInstall = ''
     for p in $(ls $out/bin/) ; do
       wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ;
-- 
cgit 1.4.1


From e0a959d05f88987411f5319462ed8db6c4dc788d Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Thu, 12 Dec 2013 21:59:45 +0100
Subject: webkitgtk: disable parallel building

It seems that is what causes build errors on Hydra.
---
 pkgs/development/libraries/webkitgtk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index ff3122a9316..7fab8b5fb91 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -48,5 +48,5 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gtk3 libsoup ];
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # build problems on Hydra
 }
-- 
cgit 1.4.1


From 7c2ba05e1321b7ac7ae041a06473c85c2d9ee0e5 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Fri, 13 Dec 2013 21:31:35 +0800
Subject: webkitgtk: fix build by patchShebangs
 /Tools/gtk/generate-feature-defines-files

---
 pkgs/development/libraries/webkitgtk/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 7fab8b5fb91..766bb715474 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
   patches = [ ./webcore-svg-libxml-cflags.patch ];
 
   prePatch = ''
+    patchShebangs Tools/gtk
+
     for i in $(find . -name '*.p[l|m]'); do
       sed -e 's@/usr/bin/gcc@gcc@' -i $i
     done
-- 
cgit 1.4.1


From 458f17ae260b9bcbb22baa4dba49a1e3d5f7b7ed Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 14 Dec 2013 23:51:48 +0100
Subject: mesa: move vdpau drivers so they are found

---
 pkgs/development/libraries/mesa/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1bb57ca6e07..565d5bf1e0b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -154,6 +154,8 @@ stdenv.mkDerivation {
     done
   '' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
     substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
+  '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
+    mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
   '';
   #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM
 
-- 
cgit 1.4.1


From e8394e3f8c7d464bc27a344a982648c20a08a6d7 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 15 Dec 2013 00:24:44 +0100
Subject: mesa: bugfix update 9.2.4 -> .5

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 565d5bf1e0b..f7ff87b34cc 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
 */
 
 let
-  version = "9.2.4";
+  version = "9.2.5";
   # this is the default search path for DRI drivers (note: X server introduces an overriding env var)
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "0dxrawlpfhmlp0qxdrvpmp9q9vrfsx0drxgwkbxf27bss71i1ppx";
+    sha256 = "1w3bxclgwl2hwyxk3za7dbdakb8jsya7afck35cz0v8pxppvjsml";
   };
 
   prePatch = "patchShebangs .";
-- 
cgit 1.4.1


From dd07654ca0588aad41ddc5e97052a58b8715d883 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 13:23:17 +0200
Subject: SDL_gfx: update from 2.0.22 to 2.0.25

---
 pkgs/development/libraries/SDL_gfx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 1090a99915f..49f5fec1da3 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, SDL} :
 
 stdenv.mkDerivation rec {
-  name = "SDL_gfx-2.0.22";
+  name = "SDL_gfx-2.0.25";
 
   src = fetchurl {
     url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
-    sha256 = "1w1bdpyypvqg1nmbjwkqnjhmngvpjmhc0zanwgq7z4pxffzffx8m";
+    sha256 = "1h2rj34dxi5xlwpvm293v2d91gsirhnpzlmnjns9xwkcdg0fsvjm";
   };
 
   buildInputs = [ SDL ] ;
-- 
cgit 1.4.1


From d4cf43d7073f7ee1dac026aedd2d2840f049c57c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 13:27:17 +0200
Subject: SDL_net: update from 1.2.7 to 1.2.8

---
 pkgs/development/libraries/SDL_net/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index 54b38110e00..6def7a92efc 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "SDL_net";
-  version = "1.2.7";
+  version = "1.2.8";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
-    sha256 = "2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53";
+    sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
   };
 
   propagatedBuildInputs = [SDL];
-- 
cgit 1.4.1


From 0102ffdf8de547899315b67590d2890e48779eb7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 13:30:58 +0200
Subject: aalib: update from 1.4rc4 to 1.4rc5

---
 pkgs/development/libraries/aalib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index 897fc9db8de..a2c968ceb02 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses, automake}:
 
 stdenv.mkDerivation {
-  name = "aalib-1.4rc4";
+  name = "aalib-1.4rc5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://sourceforge/aa-project/aalib-1.4rc4.tar.gz;
-    md5 = "d5aa8e9eae07b7441298b5c30490f6a6";
+    url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz;
+    sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv";
   };
 
   # The fuloong2f is not supported by aalib still
-- 
cgit 1.4.1


From 46f338d55deee4b20ecd4327847592a2c54ad7dc Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 18 Dec 2013 13:33:12 +0200
Subject: aalib: update builder

---
 pkgs/development/libraries/aalib/builder.sh  | 5 -----
 pkgs/development/libraries/aalib/default.nix | 7 ++++---
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 pkgs/development/libraries/aalib/builder.sh

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/aalib/builder.sh b/pkgs/development/libraries/aalib/builder.sh
deleted file mode 100644
index 5d4df565a6d..00000000000
--- a/pkgs/development/libraries/aalib/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--without-x --with-ncurses=$ncurses"
-
-genericBuild
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index a2c968ceb02..fa21a9570c7 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "aalib-1.4rc5";
-  builder = ./builder.sh;
+
   src = fetchurl {
     url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz;
     sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv";
@@ -13,8 +13,9 @@ stdenv.mkDerivation {
     cp ${automake}/share/automake*/config.{sub,guess} .
   '';
 
-  buildInputs = [ncurses];
-  inherit ncurses;
+  buildInputs = [ ncurses ];
+
+  configureFlags = "--without-x --with-ncurses=${ncurses}";
 
   meta = {
     description = "ASCII art graphics library";
-- 
cgit 1.4.1


From 55a8f167e268fbba9cf4df4d6dd5aaa9a3cc37ce Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 13:44:09 +0200
Subject: allegro5: update from 5.0.4 to 5.0.10

---
 pkgs/development/libraries/allegro/5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 2bfc57011fd..e2d78e4b57e 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -15,11 +15,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="allegro";
-    version="5.0.4";
+    version="5.0.10";
     name="${baseName}-${version}";
     project="alleg";
     url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="0vm93kqvvw4rw2zx4l64c2i86xl5giwbqbyki4b2b83z0acpmc1n";
+    hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
   };
 in
 rec {
-- 
cgit 1.4.1


From 4c2976230ace0c10f9c8f9ea5e1bd394a331fdb0 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 18 Dec 2013 13:46:33 +0200
Subject: allegro5: add missing dependencies

---
 pkgs/development/libraries/allegro/5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index e2d78e4b57e..60634dc7db8 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -3,7 +3,7 @@ x@{builderDefsPackage
   , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
   , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
   , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , kbproto
+  , kbproto, libjpeg, flac
   , ...}:
 builderDefsPackage
 (a :  
-- 
cgit 1.4.1


From aa44e4995a058fc0e17b1784eb4dd84a6fe35550 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 13:53:57 +0200
Subject: asio: update from 1.5.3 to 1.10.1

---
 pkgs/development/libraries/asio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix
index acf53c708e0..039c2e85d63 100644
--- a/pkgs/development/libraries/asio/default.nix
+++ b/pkgs/development/libraries/asio/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, boost, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "asio-1.5.3";
+  name = "asio-1.10.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/asio/${name}.tar.bz2";
-    sha256 = "08fdsv1zhwbfwlx3r3dzl1371lxy5gw92ms0kqcscxqn0ycf3rlj";
+    sha256 = "16dxzkra0wmhm2vp2p9lb1h6qsdjk82sxfgj6zlz792n7jnms2l2";
   };
 
   propagatedBuildInputs = [ boost ];
-- 
cgit 1.4.1


From e941f202f191740a4c3b3dd0081c998fca295bb7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:02:25 +0200
Subject: audiofile: update from 0.3.3 to 0.3.6

---
 pkgs/development/libraries/audiofile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 73f38f02814..497909cf25c 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "audiofile-0.3.3";
+  name = "audiofile-0.3.6";
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   src = fetchurl {
     url = "http://audiofile.68k.org/${name}.tar.gz";
-    sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq";
+    sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
   };
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1


From 8970fb09ab977f4519ac53e1e8b2bf3bd775054f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:05:00 +0200
Subject: autogen: update from 5.17 to 5.18

---
 pkgs/development/tools/misc/autogen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index cd4f19694b2..308183cb6fc 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, guile, which, libffi }:
 
-let version = "5.17"; in
+let version = "5.18"; in
 
   stdenv.mkDerivation {
     name = "autogen-${version}";
 
     src = fetchurl {
       url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
-      sha256 = "065mg9gfb605wxbsk3inf93528ygcjgg6j8ml51691f6ghj363ff";
+      sha256 = "1h2d3wpzkla42igxyisaqh2nwpq01vwad1wp9671xmm5ahvkw5f7";
     };
 
     buildInputs = [ guile which libffi ];
-- 
cgit 1.4.1


From 37d39237ab52c87cb0ee30795c71599edc239462 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:15:28 +0200
Subject: avrdude: update from 5.11 to 6.0.1

---
 pkgs/development/tools/misc/avrdude/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 133e1c38194..89e848df03b 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -3,11 +3,11 @@
 let edf = composableDerivation.edf; in
 
 composableDerivation.composableDerivation {} rec {
-  name="avrdude-5.11";
+  name="avrdude-6.0.1";
 
   src = fetchurl {
     url = "mirror://savannah/avrdude/${name}.tar.gz";
-    sha256 = "1mwmslqysak25a3x61pj97wygqgk79s5qpp50xzay6yb1zrz85v3";
+    sha256 = "0hfy1qkc6a5vpqsp9ahi1fpf9x4s10wq4bpyblc26sx9vxl4d066";
   };
 
   configureFlags = [ "--disable-dependency-tracking" ];
-- 
cgit 1.4.1


From fe6522309e570811d6fe12cc2ab257e9ffa547c9 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:27:19 +0200
Subject: bison3: update from 3.0 to 3.0.2

---
 pkgs/development/tools/parsing/bison/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 9b1499c1537..b35ad14b32c 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, perl, flex }:
 
 stdenv.mkDerivation rec {
-  name = "bison-3.0";
+  name = "bison-3.0.2";
 
   src = fetchurl {
     url = "mirror://gnu/bison/${name}.tar.xz";
-    sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79";
+    sha256 = "0g4gjan477lac18m51kv4xzcsp6wjfsfwvd2dxymcl6vid9fihx2";
   };
 
   nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex];
-- 
cgit 1.4.1


From 146bcfe7b196a7ac4e680865c12cf4ff59b8e396 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:30:59 +0200
Subject: boolstuff: update from 0.1.13 to 0.1.14

---
 pkgs/development/libraries/boolstuff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index 9b5c25d4ca4..c1bd8a4b3a2 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -3,11 +3,11 @@
 let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in
 
 stdenv.mkDerivation rec {
-  name = "boolstuff-0.1.13";
+  name = "boolstuff-0.1.14";
 
   src = fetchurl {
     url = "${baseurl}/${name}.tar.gz";
-    sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn";
+    sha256 = "1ccn9v3kxz44pv3mr8q0l2i9769jiigw1gfv47ia50mbspwb87r6";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From c677e9df98feb3dfe5c500eaa469dd9a58ae9a75 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:36:53 +0200
Subject: bwidget: update from 1.9.5 to 1.9.7

---
 pkgs/development/libraries/bwidget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index 17f2b545168..81f4f9a287e 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bwidget-${version}";
-  version = "1.9.5";
+  version = "1.9.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz";
-    sha256 = "1njssjjvfalsfh37prkxwqi4hf0zj1d54qzggvjwpzkm424jjcii";
+    sha256 = "1z2z77l41g01ra7v716c0q3x8s2kx30l4p1kf21ma8bdqa98arp6";
   };
 
   dontBuild = true;
-- 
cgit 1.4.1


From 32b2973807c6e84576175963b7a78cc814e82175 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:42:28 +0200
Subject: ccache: update from 3.1.7 to 3.1.9

---
 pkgs/development/tools/misc/ccache/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 05a0d9bbeb5..3dd634274f3 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -3,10 +3,10 @@
 let
   ccache =
 stdenv.mkDerivation {
-  name = "ccache-3.1.7";
+  name = "ccache-3.1.9";
   src = fetchurl {
-    url = http://samba.org/ftp/ccache/ccache-3.1.7.tar.gz;
-    sha256 = "04ax6ks49b6rn57hx4v9wbvmsfmw6ipn0wyfqwhh4lzw70flv3r7";
+    url = http://samba.org/ftp/ccache/ccache-3.1.9.tar.gz;
+    sha256 = "0ixlxqv1xyacwgg0k9b4a6by07c7k75y0xbr8dp76jvyada0c9x2";
   };
 
   buildInputs = [ zlib ];
-- 
cgit 1.4.1


From f4172038331ea3d61cfcfe3f5fbdb5f393bdbeef Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:46:14 +0200
Subject: ccrtp: update from 2.0.3 to 2.0.6

---
 pkgs/development/libraries/ccrtp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 73ea5254182..daf36e28919 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }:
 
 stdenv.mkDerivation {
-  name = "ccrtp-2.0.3";
+  name = "ccrtp-2.0.6";
 
   src = fetchurl {
-    url = mirror://gnu/ccrtp/ccrtp-2.0.3.tar.gz;
-    sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01";
+    url = mirror://gnu/ccrtp/ccrtp-2.0.6.tar.gz;
+    sha256 = "06rqwk2w5sikfb3l5bcpxszhq4g7ra840gqx1f011xrmhvclrzir";
   };
 
   buildInputs = [ openssl pkgconfig libgcrypt ];
-- 
cgit 1.4.1


From 6584533c89babce1285856a714f7eb4c51ad39ad Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:49:18 +0200
Subject: celt: update from 0.11.1 to 0.11.3

---
 pkgs/development/libraries/celt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix
index 471a47de404..28e51efbc4b 100644
--- a/pkgs/development/libraries/celt/default.nix
+++ b/pkgs/development/libraries/celt/default.nix
@@ -10,10 +10,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="celt";
-    version="0.11.1";
+    version="0.11.3";
     name="${baseName}-${version}";
     url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz";
-    hash="1gsc3pxydyzzra8w0r6hrrsalm76lrq4lw6bd283qa4bpagmghh1";
+    hash="0dh893wqbh0q4a0x1xyqryykmnhpv7mkblpch019s04a99fq2r3y";
   };
 in
 rec {
-- 
cgit 1.4.1


From 339a738e72c6344ad06cf433d76274f5de2c3855 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:51:01 +0200
Subject: cgal: update from 3.9 to 4.3

---
 pkgs/development/libraries/CGAL/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 49cf0a6b94b..0b65fcba0cb 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -2,7 +2,7 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "3.9";
+  version = "4.3";
   name = "cgal-${version}";
   src = fetchurl {
     url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz";
-- 
cgit 1.4.1


From be5572e2dc97c0a07e4dc6fa3298a4a6ecd366a5 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:52:14 +0200
Subject: chipmunk: update from 6.0.3 to 6.1.5

---
 pkgs/development/libraries/chipmunk/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index d5471b9be75..d148c4d829a 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -4,17 +4,17 @@ let
   fetchurl = args.fetchurl;
   fullDepEntry = args.fullDepEntry;
 
-  version = lib.attrByPath ["version"] "6.0.3" args; 
-  majorVersion = lib.attrByPath ["majorVersion"] "6" args; 
+  version = lib.attrByPath ["version"] "6.1.5" args;
+  majorVersion = lib.attrByPath ["majorVersion"] "6" args;
   buildInputs = with args; [
-    cmake freeglut mesa 
+    cmake freeglut mesa
     libX11 xproto inputproto libXi libXmu
   ];
 in
 rec {
   src = fetchurl {
     url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
-    sha256 = "c6f550454bc1c63a2a63e0ff8febecb4781a528ab6d6b657a17933a6f567541a";
+    sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7";
   };
 
   inherit buildInputs;
-- 
cgit 1.4.1


From f52514956d72cf8988a470bd15530c470e54d57c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 14:59:51 +0200
Subject: clojure_binary: update from 1.4.0 to 1.5.1

---
 pkgs/development/interpreters/clojure/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix
index 3902d7f335c..1678a932379 100644
--- a/pkgs/development/interpreters/clojure/binary.nix
+++ b/pkgs/development/interpreters/clojure/binary.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
+  version = "1.5.1";
   name = "clojure-binary-${version}";
 
   src = fetchurl {
     url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
-    sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
+    sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy";
   };
 
 
-- 
cgit 1.4.1


From 7f6851883fb70ee1fa23ab661fefe357b9393df9 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:00:59 +0200
Subject: cminpack: update from 1.1.2 to 1.3.2

---
 pkgs/development/libraries/cminpack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix
index 121f41a0f3c..c73e9594857 100644
--- a/pkgs/development/libraries/cminpack/default.nix
+++ b/pkgs/development/libraries/cminpack/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "cminpack-1.1.2";
+  name = "cminpack-1.3.2";
   
   src = fetchurl {
-    url = http://devernay.free.fr/hacks/cminpack/cminpack-1.1.2.tar.gz;
-    sha256 = "0sd8gqk7npyiiiz2jym8q89d9gqx8fig0mnx63swkwmp4lqmmxww";
+    url = http://devernay.free.fr/hacks/cminpack/cminpack-1.3.2.tar.gz;
+    sha256 = "09bqr44wqancbdsc39lvhdz7rci3hknmlrrrzv46skvwx6rgk9x0";
   };
 
   patchPhase = ''
-- 
cgit 1.4.1


From 2d22254e874d39877bcbacd8e2f17329bbcb03b1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:03:11 +0200
Subject: cracklib: update from 2.8.16 to 2.9.1

---
 pkgs/development/libraries/cracklib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 7fb9089420d..e0c8d443ec8 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "cracklib-2.8.16";
+  name = "cracklib-2.9.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/cracklib/${name}.tar.gz";
-    sha256 = "1g3mchdvra9nihxlkl3rdz96as3xnfw5m59hmr5k17l7qa9a8fpw";
+    sha256 = "0mni2sz7350d4acs7gdl8nilfmnb8qhcvmxnpf6dr5wsag10b2a0";
   };
 
   buildInputs = libintlOrEmpty;
-- 
cgit 1.4.1


From 0b276be28baeadc8d338e643d879423c7111266f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:07:04 +0200
Subject: csslint: update from 0.5.0 to 0.10.0

---
 pkgs/development/web/csslint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix
index 668ff6a7f4a..4a6cdc3aa34 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/pkgs/development/web/csslint/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, nodejs }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.10.0";
   name = "csslint-${version}";
 
   src = fetchurl {
     url = "http://registry.npmjs.org/csslint/-/${name}.tgz";
-    sha256 = "ee7a79c8f2af1c228d4b7869b6681d0d02a93568774dbf51c7a45aa1ffa1da14";
+    sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid";
   };
 
   # node is the interpreter used to run this script
-- 
cgit 1.4.1


From 99c9ff6442221d3bad66ddfda7e60454ffeb6dc7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:18:19 +0200
Subject: db48: update from 4.8.26 to 4.8.30

---
 pkgs/development/libraries/db4/db4-4.8.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix
index 86424fac567..a56a42f22ae 100644
--- a/pkgs/development/libraries/db4/db4-4.8.nix
+++ b/pkgs/development/libraries/db4/db4-4.8.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
 
 stdenv.mkDerivation {
-  name = "db4-4.8.26";
+  name = "db4-4.8.30";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://download.oracle.com/berkeley-db/db-4.8.26.tar.gz;
-    sha256 = "0hcxh0kb6m0wk3apjhs57p7b171zzn63rg4l3nkcavygg5gx2mgp";
+    url = http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz;
+    sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
   };
   
   configureFlags = [
-- 
cgit 1.4.1


From 8d2d9f6d217bbe343f0130d0b732b8ad3bef8bf2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:26:13 +0200
Subject: docutils: update from 0.10 to 0.11

---
 pkgs/development/tools/documentation/docutils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix
index f6edcf54463..cd01cf059d6 100644
--- a/pkgs/development/tools/documentation/docutils/default.nix
+++ b/pkgs/development/tools/documentation/docutils/default.nix
@@ -2,15 +2,15 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.10" a; 
+  version = a.lib.attrByPath ["version"] "0.11" a;
   buildInputs = with a; [
-    python pil makeWrapper 
+    python pil makeWrapper
   ];
 in
 rec {
   src = fetchurl {
     url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz";
-    sha256 = "0gk0733w34zibzvi6paqqfbbajzaxajc4z5i5wpxlwv73gk281ip";
+    sha256 = "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s";
   };
 
   inherit buildInputs;
-- 
cgit 1.4.1


From 490dfa536371c7424c1b6fa82da0dd3751061e57 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:43:35 +0200
Subject: enet: update from 1.3.1 to 1.3.9

---
 pkgs/development/libraries/enet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 6df90622383..39a332223ea 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "enet-1.3.1";
+  name = "enet-1.3.9";
   
   src = fetchurl {
     url = "http://enet.bespin.org/download/${name}.tar.gz";
-    sha256 = "1faszy5jvxcbjvnqzxaxpcm0rh8xib52pgn2zm1vyc9gg957hw99";
+    sha256 = "0z4blmkyfjrkvgr12adjx7nnjrx4mvcm4zj8jp581m6rral7nf9y";
   };
 
   meta = {
-- 
cgit 1.4.1


From d3b47ef72575ccf2f1c885d325f2e3427e7abe2b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:44:39 +0200
Subject: esdl: update from 1.0.1 to 1.2

---
 pkgs/development/libraries/esdl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix
index ccc3318ff6b..49b72008698 100644
--- a/pkgs/development/libraries/esdl/default.nix
+++ b/pkgs/development/libraries/esdl/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, SDL, mesa, erlang}:
 
 stdenv.mkDerivation rec {
-  name = "esdl-1.0.1";
+  name = "esdl-1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/esdl/${name}.src.tar.gz";
-    sha256 = "0zc7cmr44v10sb593dismdm5qc2v7sm3z9yh22g4r9g6asbg5z0n";
+    sha256 = "0zbnwhy2diivrrs55n96y3sfnbs6lsgz91xjaq15sfi858k9ha29";
   };
 
   buildInputs = [ erlang ];
-- 
cgit 1.4.1


From 0a6ec77d3a3687045b86f959dce2875903016a25 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:47:10 +0200
Subject: exiv2: update from 0.22 to 0.23

---
 pkgs/development/libraries/exiv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index fec9600b010..a7deb9f4c27 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, expat}:
 
 stdenv.mkDerivation rec {
-  name = "exiv2-0.22";
+  name = "exiv2-0.23";
   
   src = fetchurl {
     url = "http://www.exiv2.org/${name}.tar.gz";
-    sha256 = "0ynf4r4fqijaa9yb0wfddk0a151p8cbcqxab54dyhc1xk83saf6k";
+    sha256 = "04bbg2cg6mgcyz435zamx37sp5zw44n2alb59ki1daz71f851yl1";
   };
   
   propagatedBuildInputs = [zlib expat];
-- 
cgit 1.4.1


From 05288d3ad5f0c939d91c0daf30e978927d4d2e45 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:55:49 +0200
Subject: findbugs: update from 1.3.2 to 2.0.3

---
 pkgs/development/tools/analysis/findbugs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index 0623632936d..2adaaf3c031 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "findbugs-1.3.2";
+  name = "findbugs-2.0.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/findbugs/findbugs-1.3.2.tar.gz;
-    sha256 = "0mbwxzz5m9vizxlbg0i6rh5ywywiiw9zpabq5li7map43768apvr";
+    url = mirror://sourceforge/findbugs/findbugs-2.0.3.tar.gz;
+    sha256 = "17s93vszc5s2b7pwi0yk8d6w54gandxrr7vflhzmpbl6sxj2mfjr";
   };
 
   buildPhase = ''
-- 
cgit 1.4.1


From f3bbb6ff5d2fb596a48b7c79a2430f45771ff750 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 15:59:31 +0200
Subject: fox_1_6: update from 1.6.48 to 1.6.49

---
 pkgs/development/libraries/fox/fox-1.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 2a7bb1dc31a..1d986275563 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -2,7 +2,7 @@
 , libXrandr, mesa, libXft, libXfixes, xinput }:
 
 let
-  version = "1.6.48";
+  version = "1.6.49";
 in
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
-    sha256 = "1i0q0357lrd41jjr2nkf2a7ls5ls2nwrkxbfc7202vy22942lb9k";
+    sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n";
   };
 
   buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
-- 
cgit 1.4.1


From efa05777b0a815d8fa497ee7365f3914ba1be8b7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 16:31:59 +0200
Subject: glew: update from 1.9.0 to 1.10.0

---
 pkgs/development/libraries/glew/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 313eec0bc7d..ef81f210d39 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }:
 
 stdenv.mkDerivation rec {
-  name = "glew-1.9.0";
+  name = "glew-1.10.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/glew/${name}.tgz";
-    sha256 = "11xpmsw7m5qn7y8fa2ihhqcislz1bdd83mp99didd5ac84756dlv";
+    sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
   };
 
 
-- 
cgit 1.4.1


From ec635085e906a691d364004ace6a9dd459d110e0 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 16:35:19 +0200
Subject: glfw: update from 2.6 to 2.7.9

---
 pkgs/development/libraries/glfw/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/glfw/default.nix b/pkgs/development/libraries/glfw/default.nix
index 1f4df39408e..292c15361b6 100644
--- a/pkgs/development/libraries/glfw/default.nix
+++ b/pkgs/development/libraries/glfw/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, mesa, libX11, libXext }:
 
 stdenv.mkDerivation {
-  name = "glfw-2.6";
+  name = "glfw-2.7.9";
 
   src = fetchurl {
-    url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2;
-    sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv";
+    url = mirror://sourceforge/glfw/glfw-2.7.9.tar.bz2;
+    sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i";
   };
 
   buildInputs = [ mesa libX11 libXext ];
-- 
cgit 1.4.1


From f40d79adf6de1c3b20f7d09a84e3227eed0f360d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 16:46:49 +0200
Subject: graphite2: update from 1.2.3 to 1.2.4

---
 pkgs/development/libraries/silgraphite/graphite2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index 0a36efbc982..1ceb7a05000 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.3";
+  version = "1.2.4";
   name = "graphite2-${version}";
   
   src = fetchurl {
     url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz";
-    sha256 = "1xgwnd81gm6p293x8paxb3yisnvpj5qnv1dzr7bjdi7b7h00ls7g";
+    sha256 = "00xhv1mp640fr3wmdzwn4yz0g56jd4r9fb7b02mc1g19h0bdbhsb";
   };
 
   buildInputs = [pkgconfig freetype libXft pango fontconfig cmake];
-- 
cgit 1.4.1


From 965c3464e181008e2e3ff9f745f7cb224ae64c25 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 16:51:16 +0200
Subject: gssdp: update from 0.12.1 to 0.12.2.1

---
 pkgs/development/libraries/gssdp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index c33457544f5..2c14451ba78 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libsoup, glib, libxml2}:
 
 stdenv.mkDerivation {
-  name = "gssdp-0.12.1";
+  name = "gssdp-0.12.2.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.1.tar.xz;
-    sha256 = "0irkbzaj9raais6zdnbj3ysjkmdqhmdvfn0p1sz6x0s9ab6b9b0n";
+    url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz;
+    sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj";
   };
 
   buildInputs = [pkgconfig libsoup glib libxml2];
-- 
cgit 1.4.1


From 7e348c17dad8a7621bcee70096a6455f53ad2e1f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 16:54:12 +0200
Subject: gst_plugins_bad: update from 0.10.22 to 0.10.23

---
 pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
index 2d1309f3a3c..470cc29eb8e 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
@@ -2,14 +2,14 @@
 , libdvdnav, libdvdread }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-0.10.22";
+  name = "gst-plugins-bad-0.10.23";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "030728gf0zjg62yng4qy9yapaffbvkziawa28rk0gspz8cpi1xyq";
+    sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf";
   };
 
   buildInputs =
-- 
cgit 1.4.1


From 0d453d90e3a9244b2504d6903f2e44e579a14d6e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 16:55:18 +0200
Subject: gst_plugins_ugly: update from 0.10.18 to 0.10.19

---
 pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
index b85fb983880..3a59ef16529 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
@@ -2,14 +2,14 @@
 , libmad, libdvdread, libmpeg2, libcdio, a52dec }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-0.10.18";
+  name = "gst-plugins-ugly-0.10.19";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "054fdkb2riy5knda39cp6w3xp9lzax52bn12cklglscjrm46ghgr";
+    sha256 = "1w4d5iz9ffvh43l261zdp997i6s2iwd61lflf755s3sw4xch1a8w";
   };
 
   buildInputs =
-- 
cgit 1.4.1


From 399c0474a84e52a32b0d99f9045ba0dc67786a03 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 16:56:04 +0200
Subject: gst_python: update from 0.10.19 to 0.10.22

---
 pkgs/development/libraries/gstreamer/gst-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/gst-python/default.nix
index fedb44068eb..e960aa90421 100644
--- a/pkgs/development/libraries/gstreamer/gst-python/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-python/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-python-0.10.19";
+  name = "gst-python-0.10.22";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-python/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "956f81a8c15daa3f17e688a0dc5a5d18a3118141066952d3b201a6ac0c52b415";
+    sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg";
   };
 
   buildInputs =
-- 
cgit 1.4.1


From 0b3d2c0cacfe8d69f3106466ca8378548be444bf Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:00:56 +0200
Subject: gupnp: update from 0.18.1 to 0.18.4

---
 pkgs/development/libraries/gupnp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index c70d8fcb0c2..ca92bb82a73 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
 stdenv.mkDerivation {
-  name = "gupnp-0.18.1";
+  name = "gupnp-0.18.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.1.tar.xz;
-    sha256 = "1bn98mw4zicg0a7a2xjr4j93ksnpwkhccii8y8zy08g7x2jg3dhk";
+    url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz;
+    sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb";
   };
 
   propagatedBuildInputs = [ libxml2 libsoup gssdp ];
-- 
cgit 1.4.1


From 14e0d3d693743ee111dab95d2aacde87f8ab8ea2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:08:54 +0200
Subject: isocodes: update from 3.40 to 3.49

---
 pkgs/development/libraries/iso-codes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 4e6614345c1..3c408e6bc78 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gettext, python, xz}:
 
 stdenv.mkDerivation rec {
-  name = "iso-codes-3.40";
+  name = "iso-codes-3.49";
   src = fetchurl {
     url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz";
-    sha256 = "0iph96n8vh4khidxg2zzhmcqnphfzg50agn0lv9cjhmnx0i712pr";
+    sha256 = "1ryk5i467p7xxrbrqynb35ci046yj9k9b4d3hfxzass962lz9q04";
   };
   patchPhase = ''
     for i in `find . -name \*.py`
-- 
cgit 1.4.1


From 4ed5c4df73a4774806e4026e3125470915a93f8f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:19:08 +0200
Subject: leptonica: update from 1.68 to 1.69

---
 pkgs/development/libraries/leptonica/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index e84bd0656c4..ecd63e98f19 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}:
 
 stdenv.mkDerivation {
-  name = "leptonica-1.68";
+  name = "leptonica-1.69";
 
   src = fetchurl {
-    url = http://www.leptonica.org/source/leptonica-1.68.tar.gz;
-    sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc";
+    url = http://www.leptonica.org/source/leptonica-1.69.tar.gz;
+    sha256 = "0bd7w0zpmwwfn1cnrlyzjw3jf8x59r0rhdmvk7rigr57rnfnddry";
   };
 
   buildInputs = [ libpng libtiff libjpeg zlib ];
-- 
cgit 1.4.1


From c0536e306c46a45313353242e8a2a66f00baeb06 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:20:50 +0200
Subject: libav_0_8: update from 0.8.8 to 0.8.9

---
 pkgs/development/libraries/libav/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 287ac32fff5..6678984ebbe 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -27,7 +27,7 @@ with { inherit (stdenv.lib) optional optionals; };
 let
   result = {
     libav_9   = libavFun  "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3";
-    libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79";
+    libav_0_8 = libavFun "0.8.9" "0zzphhkpwsdp2k3ijqr8miqsp4vk7dgcrcrv06qda1s09qb82lag";
   };
 
   libavFun = version : sha256 : stdenv.mkDerivation rec {
-- 
cgit 1.4.1


From 63df9742ba5aed987fb0f0dbecd702cb7cd216da Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:21:57 +0200
Subject: libcaca: update from 0.99.beta17 to 0.99.beta18

---
 pkgs/development/libraries/libcaca/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index b8410380aba..f183d9c3cd0 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "libcaca-0.99.beta17";
+  name = "libcaca-0.99.beta18";
   
   src = fetchurl {
     url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz";
-    sha256 = "1mpicj3xf4d0mf8papb1zbks5yzi4lnj6yh5cvpq7sb176gawmb3";
+    sha256 = "189kdh7zi88gxb3w33rh0p5l0yhn7s1c2xjgrpf24q2a7xihdskp";
   };
   
   configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
-- 
cgit 1.4.1


From e6ef5bd6e26e8b865aab932fffb9045b5b6dc5b4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:23:03 +0200
Subject: libcdio: update from 0.90 to 0.92

---
 pkgs/development/libraries/libcdio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index 00159e1de46..856d5124a3f 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "libcdio-0.90";
+  name = "libcdio-0.92";
   
   src = fetchurl {
     url = "mirror://gnu/libcdio/${name}.tar.gz";
-    sha256 = "0kpp6gr5sjr30pb9klncc37fhkw0wi6r41d2fmvmw17cbj176zmg";
+    sha256 = "1b9zngn8nnxb1yyngi1kwi73nahp4lsx59j17q1bahzz58svydik";
   };
 
   buildInputs = [ libcddb pkgconfig ncurses help2man ];
-- 
cgit 1.4.1


From cd698b44ec241dd915d3ae062d2d1bb6a9908848 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:28:49 +0200
Subject: libdc1394: update from 2.2.0 to 2.2.1

---
 pkgs/development/libraries/libdc1394/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index cd784a4de6a..f92bc585524 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libraw1394, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "libdc1394-2.2.0";
+  name = "libdc1394-2.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/libdc1394/${name}.tar.gz";
-    sha256 = "0v7y8r8zxpkcw8fhwr6x08wkbpfzs5snw5s589fpqmn569f1grn6";
+    sha256 = "1wkcx4ff094qba1fwllmlr81i7xg7l8dzq7y7pvy3wlbpwd3634j";
   };
 
   buildInputs = [ libraw1394 libusb1 ];
-- 
cgit 1.4.1


From b54df4fe1b91c95b5581fa671bf8565c8610ed6f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:30:37 +0200
Subject: libdmtx: update from 0.7.2 to 0.7.4

---
 pkgs/development/libraries/libdmtx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix
index 970a1cf05e9..8d7049dc29a 100644
--- a/pkgs/development/libraries/libdmtx/default.nix
+++ b/pkgs/development/libraries/libdmtx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, imagemagick }:
 
 stdenv.mkDerivation rec {
-  name = "libdmtx-0.7.2";
+  name = "libdmtx-0.7.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/libdmtx/${name}.tar.bz2";
-    sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk";
+    sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From 6b5525f471761c44ddee3f9bdfe176751beec070 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:32:03 +0200
Subject: libdvdcss: update from 1.2.10 to 1.2.13

---
 pkgs/development/libraries/libdvdcss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index 73755ab3386..40fa337bd66 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libdvdcss-1.2.10";
+  name = "libdvdcss-1.2.13";
   
   src = fetchurl {
-    url = http://download.videolan.org/pub/libdvdcss/1.2.10/libdvdcss-1.2.10.tar.bz2;
-    sha256 = "0812zxg4b6yjkckzwdzfzb4jnffykr9567f9v29barmb2d8ag513";
+    url = http://download.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2;
+    sha256 = "0b5s25awn2md4jr00rwg5siwvi3kivyaxkjgfxzzh7ggrykbpwc4";
   };
 
   meta = {
-- 
cgit 1.4.1


From 787977493002669fe23e3084dd522bf06a2e6d33 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:34:34 +0200
Subject: libgcrypt: update from 1.5.3 to 1.6.0

---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 997e9cfc5b8..f12e0dfa61c 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgpgerror }:
 
 stdenv.mkDerivation (rec {
-  name = "libgcrypt-1.5.3";
+  name = "libgcrypt-1.6.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw";
+    sha256 = "024plbybsmnxbp39hs92lp6dzvkz2cb70nv69qrwr55d02350bb6";
   };
 
   propagatedBuildInputs = [ libgpgerror ];
-- 
cgit 1.4.1


From 01fb1ca1b89c6e1f1089258bc6a0969007ed67f3 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:42:29 +0200
Subject: libgpgerror: update from 1.11 to 1.12

---
 pkgs/development/libraries/libgpg-error/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index eb0de7aa2be..da142a957ad 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash }:
 
 stdenv.mkDerivation (rec {
-  name = "libgpg-error-1.11";
+  name = "libgpg-error-1.12";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "1h0ql8j65ns2rmhj9wnc9035026crzkg226xg8614fq71947ccxf";
+    sha256 = "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a";
   };
 
   doCheck = true;
-- 
cgit 1.4.1


From d81a5a46dec001f822787a2e26871378718cb706 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:44:06 +0200
Subject: libmemcached: update from 1.0.7 to 1.0.8

---
 pkgs/development/libraries/libmemcached/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index b724f915150..9ab1962806a 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cyrus_sasl, libevent }:
 
 stdenv.mkDerivation rec {
-  name = "libmemcached-1.0.7";
+  name = "libmemcached-1.0.8";
   
   src = fetchurl {
-    url = https://launchpad.net/libmemcached/1.0/1.0.7/+download/libmemcached-1.0.7.tar.gz;
-    sha256 = "10cdczkgqiirjy7jwfdk49namqi4jiv1djqrf5fxbaiyfg4qdyiy";
+    url = https://launchpad.net/libmemcached/1.0/1.0.8/+download/libmemcached-1.0.8.tar.gz;
+    sha256 = "198wcvhrqjnak0cjnkxmjsr3xkjc1k6yq2a77nlk852gcf8ypx03";
   };
   
   buildInputs = [ cyrus_sasl libevent ];
-- 
cgit 1.4.1


From 5ca15d27aa59707674c7c05b087f9e003fea561f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:45:32 +0200
Subject: libmtp: update from 1.1.5 to 1.1.6

---
 pkgs/development/libraries/libmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 95d060df7f7..10bc9e5eebf 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.5";
+  name = "libmtp-1.1.6";
 
   propagatedBuildInputs = [ libusb1 ];
   buildInputs = [ pkgconfig ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "0fn6y7kirgln6sfizmwvjsy7qkdb0p3rccf0zkr3r2xg3cbpjxkq";
+    sha256 = "02nbf1cigxmv9sak201f4m5c1d21q6avgzjlxd941plimy1iq71s";
   };
 
   meta = {
-- 
cgit 1.4.1


From 7a2584fb8790c7de1de87cf02c355c285fef8c92 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:46:19 +0200
Subject: libmspack: update from 0.3alpha to 0.4alpha

---
 pkgs/development/libraries/libmspack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index 7a8b2d36143..d02217afd3e 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libmspack-0.3alpha";
+  name = "libmspack-0.4alpha";
   src = fetchurl {
-    url = http://www.cabextract.org.uk/libmspack/libmspack-0.3alpha.tar.gz;
-    sha256 = "03rlzhvzd3qm7sb029gs14syq1z6xjmczvwb9kbz5sl20sjngidh";
+    url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz;
+    sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp";
   };
 
   meta = {
-- 
cgit 1.4.1


From 2d2e6199eef0f47f93987de83c8f4e1b53b20446 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:47:22 +0200
Subject: libogg: update from 1.3.0 to 1.3.1

---
 pkgs/development/libraries/libogg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index f3c2d3b766d..b11b1202080 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
-  name = "libogg-1.3.0";
+  name = "libogg-1.3.1";
   
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz";
-    sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3";
+    sha256 = "1ynwij1qdibwb2nvcl3ixri0c6pvq1higl96hf87iyqsv1wasnrs";
   };
 
   nativeBuildInputs = [ xz ];
-- 
cgit 1.4.1


From fbc0c4ffccfea431c1c9826d027230ca8726ddfe Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:49:36 +0200
Subject: librdf_raptor2: update from 2.0.8 to 2.0.12

---
 pkgs/development/libraries/librdf/raptor2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index 4658cf28335..500acdfb2ec 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, libxslt, curl }:
 
 stdenv.mkDerivation rec {
-  name = "raptor2-2.0.8"; # 2.0.9 misses a header and so fails liblrdf
+  name = "raptor2-2.0.12"; # 2.0.9 misses a header and so fails liblrdf
 
   src = fetchurl {
     url = "http://download.librdf.org/source/${name}.tar.gz";
-    sha256 = "1mz7cxnfw73saf74c9if06n2mlsvn2rnn67vy7j2mq3wkhy0hcb0";
+    sha256 = "1644a1nnw5k6168v9gjfx1rcbij6ybjximd35a3zhcvyyijmb5di";
   };
 
   buildInputs = [ libxml2 libxslt ];
-- 
cgit 1.4.1


From f0500be89a68f335654d27ee00e30adbee4a2165 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:50:41 +0200
Subject: librdf_rasqal: update from 0.9.30 to 0.9.31

---
 pkgs/development/libraries/librdf/rasqal.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 6d6f9d05808..1acc7c1d73c 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "rasqal-0.9.30";
+  name = "rasqal-0.9.31";
 
   src = fetchurl {
     url = "http://download.librdf.org/source/${name}.tar.gz";
-    sha256 = "1z8wifq79kivcwpwzmjnjdrbr65zam190gpxhgrvsyfch0yykw5b";
+    sha256 = "1vkzifr488i31vxdnykyf2aq87023vx4bag4d94b1rdhy74l7mr8";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From b9964865fec5a1f84ff3977c1e576be01cc332da Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:51:57 +0200
Subject: libsamplerate: update from 0.1.7 to 0.1.8

---
 pkgs/development/libraries/libsamplerate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 57eaf529a63..708d8989304 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, fftw, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "libsamplerate-0.1.7";
+  name = "libsamplerate-0.1.8";
 
   src = fetchurl {
     url = "http://www.mega-nerd.com/SRC/${name}.tar.gz";
-    sha256 = "1k3z09b13c0z10mqfn6w48pxsdx569s3wslg0x52q5mzy6gmvvbq";
+    sha256 = "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck";
   };
 
   buildInputs = [ pkgconfig ];
-- 
cgit 1.4.1


From 67ca29d457a566f639ea361410753b5f2da381d8 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:54:46 +0200
Subject: libsndfile: update from 1.0.23 to 1.0.25

---
 pkgs/development/libraries/libsndfile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 8164b79e61b..8b0eeeb8e57 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libsndfile-1.0.23";
+  name = "libsndfile-1.0.25";
 
   src = fetchurl {
     url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz";
-    sha256 = "0k9x4804gfh9d9zd4rm1v2izm8l716rzk4d6jlrjcf45b5sw7jal";
+    sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar";
   };
 
   buildInputs = [ pkgconfig flac libogg libvorbis ];
-- 
cgit 1.4.1


From ee2575f16febe84c0361af08afc897e3198dc797 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:55:54 +0200
Subject: libsoup_2_40: update from 2.44.1 to 2.44.2

---
 pkgs/development/libraries/libsoup/2.40.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libsoup/2.40.nix b/pkgs/development/libraries/libsoup/2.40.nix
index ca37ceb941c..c82bb399e5e 100644
--- a/pkgs/development/libraries/libsoup/2.40.nix
+++ b/pkgs/development/libraries/libsoup/2.40.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "libsoup-2.44.1";
+  name = "libsoup-2.44.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.1.tar.xz;
-    sha256 = "07acjwvik3gagcsdjzi85g44ga4pd3nh4ww6722bfzjzvlqw6cn5";
+    url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz;
+    sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77";
   };
 
 
-- 
cgit 1.4.1


From d4f8c6874eb8d5dad952fb1b4f828fbdb82e2422 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:57:22 +0200
Subject: liburcu: update from 0.7.7 to 0.8.1

---
 pkgs/development/libraries/liburcu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index 74c6b8fa615..44daabe6a73 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.7";
+  version = "0.8.1";
   name = "liburcu-${version}";
 
   src = fetchurl {
     url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
-    sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a";
+    sha256 = "07p0lh43j7i1606m4l1dxm195z6fcfz74fmx7q2d7mrhn2bzc240";
   };
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1


From b2fc677345e0d350d2532355ef988832cb6c695f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 17:59:04 +0200
Subject: log4cplus: update from 1.0.4 to 1.1.2

---
 pkgs/development/libraries/log4cplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
index 0856832c188..9d07f033eda 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 let
-  name = "log4cplus-1.0.4";
+  name = "log4cplus-1.1.2";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
-    sha256 = "c2bb01b5f4bff5fa768700e98ead4a79dfd556096c9f3f0401849da7ab80fbef";
+    sha256 = "14zdfaxnxjrnfdjipmcrvsqp8pj1s4wscphvg4jvbp3kd34mcvf4";
   };
 
   meta = {
-- 
cgit 1.4.1


From 22b9ebd4f05888ad7b5e5119a4112e4bf9129ba4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 18:05:39 +0200
Subject: opencv: update from 2.4.5 to 2.4.7

---
 pkgs/development/libraries/opencv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index a7e514a5780..ea858417b2f 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
 , pkgconfig, gstreamer, xineLib, glib, python27, python27Packages }:
 
-let v = "2.4.5"; in
+let v = "2.4.7"; in
 
 stdenv.mkDerivation rec {
   name = "opencv-${v}";
 
   src = fetchurl {
     url = "mirror://sourceforge/opencvlibrary/opencv-${v}.tar.gz";
-    sha256 = "14k2w07jcchp11c9v6p5x49h3h1zmg2m9brm2sypz5sp9g7yw2yk";
+    sha256 = "0hravl3yhyv4r4n7vb055d4qnp893q2hc0fcmmncfh7sbdrnr3f4";
   };
 
   buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer
-- 
cgit 1.4.1


From d9bd3c6d2f6c5d3e29e5e9df1a48f6eaac75001f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 18:08:32 +0200
Subject: phonon: update from 4.7.0 to 4.7.1

---
 pkgs/development/libraries/phonon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index ce5adc4b0a5..5948fd0ef2b 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }:
 
 let
-  v = "4.7.0";
+  v = "4.7.1";
 in
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz";
-    sha256 = "1sxrnwm16dxy32xmrqf26762wmbqing1zx8i4vlvzgzvd9xy39ac";
+    sha256 = "0pdpj7xnalr511zx12akxg6smz7x5gybkpliclb5f5dcxqnq1xsg";
   };
 
   buildInputs = [ qt4 pulseaudio ];
-- 
cgit 1.4.1


From 5725ac31e1eed41db1411bb0e644aabefd8a9782 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 18:13:49 +0200
Subject: ucommon: update from 6.0.5 to 6.0.7

---
 pkgs/development/libraries/ucommon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 699da60768f..2ec478d7a76 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "ucommon-6.0.5";
+  name = "ucommon-6.0.7";
 
   src = fetchurl {
-    url = mirror://gnu/commoncpp/ucommon-6.0.5.tar.gz;
-    sha256 = "0w5nl2a2l630n4kvfaz22by1s92ybd87g0q1zpcmsl8i5d00789l";
+    url = mirror://gnu/commoncpp/ucommon-6.0.7.tar.gz;
+    sha256 = "1rlvchmg6qq8jq79qjgv0l0wqi1dqhmm4ng1qj9f012dbhwcap3x";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];
-- 
cgit 1.4.1


From 8e97719684e8db13881751006beef66b632d81e0 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 18 Dec 2013 18:17:23 +0200
Subject: xineLib: update from 1.2.2 to 1.2.4

---
 pkgs/development/libraries/xine-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 45c60acfa89..11ba5df80ca 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xine-lib-1.2.2";
+  name = "xine-lib-1.2.4";
   
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.xz";
-    sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1";
+    sha256 = "1pdv7bs683ily548arv4wsxabslyf3x3laij5jb921dxyx71nnww";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];
-- 
cgit 1.4.1


From 0c246250c0192fe4798ffe597f3c310c0d1b845f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 18 Dec 2013 21:31:49 +0200
Subject: Revert "libgcrypt: update from 1.5.3 to 1.6.0"

Too much breakage.

This reverts commit 787977493002669fe23e3084dd522bf06a2e6d33.
---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index f12e0dfa61c..997e9cfc5b8 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgpgerror }:
 
 stdenv.mkDerivation (rec {
-  name = "libgcrypt-1.6.0";
+  name = "libgcrypt-1.5.3";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "024plbybsmnxbp39hs92lp6dzvkz2cb70nv69qrwr55d02350bb6";
+    sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw";
   };
 
   propagatedBuildInputs = [ libgpgerror ];
-- 
cgit 1.4.1


From 743159515920e01a5d4377053d15dc5874ba698f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:13 +0100
Subject: haskell-OpenAL: update to version 1.6.0.0

---
 pkgs/development/libraries/haskell/OpenAL/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
index a04aea993fa..36d3b41583f 100644
--- a/pkgs/development/libraries/haskell/OpenAL/default.nix
+++ b/pkgs/development/libraries/haskell/OpenAL/default.nix
@@ -1,13 +1,13 @@
-{ cabal, ObjectName, openal, StateVar, Tensor }:
+{ cabal, openal, OpenGL }:
 
 cabal.mkDerivation (self: {
   pname = "OpenAL";
-  version = "1.4.0.2";
-  sha256 = "19q4pd5i2w330qh895z0cgim4m4f4gxqf4ya1192fchqmgcz1svz";
-  buildDepends = [ ObjectName StateVar Tensor ];
+  version = "1.6.0.0";
+  sha256 = "0bw20ykn8vi3g4im4nsrfz7p1qq9qwnx8da83zwdbr3wjm9934gd";
+  buildDepends = [ OpenGL ];
   extraLibraries = [ openal ];
   meta = {
-    homepage = "http://connect.creativelabs.com/openal/";
+    homepage = "https://github.com/haskell-openal/ALUT";
     description = "A binding to the OpenAL cross-platform 3D audio API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
cgit 1.4.1


From 481678ed08af96484d8ad7182797adf88b95e565 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:13 +0100
Subject: haskell-doctest: update to version 0.9.10

---
 pkgs/development/libraries/haskell/doctest/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 46e69c95f94..68731426683 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -14,7 +14,6 @@ cabal.mkDerivation (self: {
     stringbuilder syb transformers
   ];
   doCheck = false;
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
   meta = {
     homepage = "https://github.com/sol/doctest-haskell#readme";
     description = "Test interactive Haskell examples";
-- 
cgit 1.4.1


From 200305d3e390924dd02f6912edce62ab5e4a6f40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:13 +0100
Subject: haskell-haskell-names: update to version 0.3.2.3

---
 pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index b77cd134dc8..bac417b618b 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-names";
-  version = "0.3.2.2";
-  sha256 = "0imr0kgxkm2j2xx9ryll5s1b5bn8s4bkwpqdvvb4z44jhrgcgz7b";
+  version = "0.3.2.3";
+  sha256 = "0vh88qkvlljqviy5mqjz8gbpwnl2wq65c2rm9kyjnc2cpyp4i8zx";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
-- 
cgit 1.4.1


From a415fcc5c58a649449f426ccaf102732f07b28c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:14 +0100
Subject: haskell-http-client-conduit: update to version 0.2.0.1

---
 pkgs/development/libraries/haskell/http-client-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
index df4b49b47f3..1c47b68f06c 100644
--- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client-conduit";
-  version = "0.2.0.0";
-  sha256 = "1pb47mms5qfi185nrz675if4pb7xji97xdqpmyrplqaxqygwih1y";
+  version = "0.2.0.1";
+  sha256 = "0fy9vkxh7hvmp9ijifq8nx6y5y92n6d3s1vdyg53ln65pclc6jn5";
   buildDepends = [ conduit httpClient resourcet transformers ];
   meta = {
     homepage = "https://github.com/snoyberg/http-client";
-- 
cgit 1.4.1


From 6066969c92e53f6bac5a2b30b59eaa174e40544e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:14 +0100
Subject: haskell-http-client-tls: update to version 0.2.0.1

---
 pkgs/development/libraries/haskell/http-client-tls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
index f92ddcd7d55..f0b28ab1612 100644
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client-tls";
-  version = "0.2.0.0";
-  sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0";
+  version = "0.2.0.1";
+  sha256 = "0wzbxah6pkglpgl4ax12crw3cl8w48b8pbasb3xkbqcxpaakvbkx";
   buildDepends = [ connection dataDefault httpClient network tls ];
   testDepends = [ hspec httpClient httpTypes ];
   doCheck = false;
-- 
cgit 1.4.1


From 0939566a80dadfbf9c22257fa603c5a76a48e3f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:14 +0100
Subject: haskell-http-conduit: update to version 2.0.0.3

---
 pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index b041957e555..bb237f16d58 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.2";
-  sha256 = "0ypwn63brdjxyh70x10wb26xbsymj5x9v664nzc3nwvlh22ldhyw";
+  version = "2.0.0.3";
+  sha256 = "1s3nyc3wwpqildhmkv5fps2a0552yrnwcqjv4bxcvg581k5sj42i";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers
-- 
cgit 1.4.1


From 178c4ed9d03d15e630e82905b8bc8fe01659d6b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:14 +0100
Subject: haskell-monad-logger: update to version 0.3.3.2

---
 pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index 83cd57ce39b..afd96822710 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.3.1";
-  sha256 = "1amihx9jl42w7sm01ihnldvgv9cilg89im7gr9l0x2f6q4nbhbl2";
+  version = "0.3.3.2";
+  sha256 = "0s75q974q6jwp89xj5kkqziy4crm9484dqvrpgd8ms7rw613jjz6";
   buildDepends = [
     conduit fastLogger liftedBase monadControl monadLoops mtl resourcet
     stm stmChans text transformers transformersBase
-- 
cgit 1.4.1


From 1d96322785168dfc06b8c8c6486beb22f9b744fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:14 +0100
Subject: haskell-resourcet: update to version 0.4.10

---
 pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index b4d0fccd8a0..913e77483e4 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.9";
-  sha256 = "1jpaphmwvykjshjqwmmyfx64w1j99f6dphy9ygrzc32fjffk5laz";
+  version = "0.4.10";
+  sha256 = "0mgwcgacf4ilyh54s862p8jqv1f42dkp287sdkpswyai1pxlvipz";
   buildDepends = [
     liftedBase mmorph monadControl mtl transformers transformersBase
   ];
-- 
cgit 1.4.1


From 63a33906837e82674bee9a9baf5a98f89606ad4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:14 +0100
Subject: haskell-stylish-haskell: update to version 0.5.9.0

---
 pkgs/development/libraries/haskell/stylish-haskell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 74646c9acca..c430dfc36a6 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.8.0";
-  sha256 = "1wjrn4cq47jjmqkb2zv02x90l2mv6n7zh4mvcav25s9bwvvca10r";
+  version = "0.5.9.0";
+  sha256 = "1iy0d437yd6hgmxmiqa0b6lvg4gw838jxqwn83kdpy1mlykqwmgq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
cgit 1.4.1


From cedf33fafc8e15912df8be82630f05abea73098d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:14 +0100
Subject: haskell-yesod-auth: update to version 1.2.4.1

---
 pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 87cbe9f3d43..d6bab2c5da5 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.4";
-  sha256 = "1bpcz8ihjqdhyxxm4ib4yhgj5h491lxv34mpc3x55wl2daq731qi";
+  version = "1.2.4.1";
+  sha256 = "05csxa0mgqnam375fq38r0rl51zdjq0bki2dzrr99469mg33fzh4";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
-- 
cgit 1.4.1


From 640547334370ee4fd3c29cda3b838ef56c7eebeb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Dec 2013 17:42:14 +0100
Subject: haskell-yesod-routes: update to version 1.2.0.4

---
 pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index 87b4d059dc5..1c2922fe069 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-routes";
-  version = "1.2.0.3";
-  sha256 = "0p2640bbsx1lmxd0wq6qwicp6rbh1c54hjb6kiaczj63yahn04y3";
+  version = "1.2.0.4";
+  sha256 = "1c3fpfvcdx8ijvjxxfjwld5zl6x4xl2587a8gdj2qmsr94f8lgb9";
   buildDepends = [ pathPieces text vector ];
   testDepends = [ hspec HUnit pathPieces text ];
   meta = {
-- 
cgit 1.4.1


From 57713cd258a8f636ae892df8868ac18250f86a4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 11:34:40 +0100
Subject: haskell-pretty-show: update to version 1.6.3

---
 .../libraries/haskell/pretty-show/1.6.2.nix            | 18 ------------------
 .../libraries/haskell/pretty-show/1.6.3.nix            | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix                    |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
 create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.6.3.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
deleted file mode 100644
index ea3b7ed27cb..00000000000
--- a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, filepath, happy, haskellLexer }:
-
-cabal.mkDerivation (self: {
-  pname = "pretty-show";
-  version = "1.6.2";
-  sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath haskellLexer ];
-  buildTools = [ happy ];
-  meta = {
-    homepage = "http://wiki.github.com/yav/pretty-show";
-    description = "Tools for working with derived `Show` instances and generic inspection of values";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.3.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.3.nix
new file mode 100644
index 00000000000..6979213cc29
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pretty-show/1.6.3.nix
@@ -0,0 +1,18 @@
+{ cabal, filepath, happy, haskellLexer }:
+
+cabal.mkDerivation (self: {
+  pname = "pretty-show";
+  version = "1.6.3";
+  sha256 = "161zhbsqa86s1gqa7ss8pimw2msdlvgjlldh6ryizc17579dfcfw";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ filepath haskellLexer ];
+  buildTools = [ happy ];
+  meta = {
+    homepage = "http://wiki.github.com/yav/pretty-show";
+    description = "Tools for working with derived `Show` instances and generic inspection of values";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5078076350d..a837314cee1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1782,10 +1782,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-  prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {
+  prettyShow_1_6_3 = callPackage ../development/libraries/haskell/pretty-show/1.6.3.nix {
     happy = self.happy_1_19_2;
   };
-  prettyShow = self.prettyShow_1_6_2;
+  prettyShow = self.prettyShow_1_6_3;
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 
-- 
cgit 1.4.1


From fa0f1c849d291043bf2807e91079cb66240209a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 11:35:14 +0100
Subject: haskell-doctest: configure noHaddock hook

---
 pkgs/development/libraries/haskell/doctest/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 68731426683..46e69c95f94 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     stringbuilder syb transformers
   ];
   doCheck = false;
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
   meta = {
     homepage = "https://github.com/sol/doctest-haskell#readme";
     description = "Test interactive Haskell examples";
-- 
cgit 1.4.1


From ede8d010a54270ea5fd3eff55348709fee52186c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 11:35:26 +0100
Subject: haskell-haskell-names: update to version 0.3.2.4

---
 pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index bac417b618b..ac1cf83ac5e 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-names";
-  version = "0.3.2.3";
-  sha256 = "0vh88qkvlljqviy5mqjz8gbpwnl2wq65c2rm9kyjnc2cpyp4i8zx";
+  version = "0.3.2.4";
+  sha256 = "1m3p64kkm8zv2diwila0zdincykavf2fvxpqzpsmfndwb24f5b3p";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
-- 
cgit 1.4.1


From ce3c422fc54c139200739a2feca3bd1ece0cb35a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 11:35:26 +0100
Subject: haskell-postgresql-simple: update to version 0.3.10.0

---
 pkgs/development/libraries/haskell/postgresql-simple/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 4203c0cd84c..f4b6bbb6f68 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,14 +5,14 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.9.1";
-  sha256 = "0byzlmcbwlycvlk35w0gdp5x7860jcc589ypbdx0vm08aq5vz87v";
+  version = "0.3.10.0";
+  sha256 = "1nfp05vxs3frp6yygf68ardz6s3pllccwl6myaa18kf42654lgyx";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text
     time transformers uuid vector
   ];
   testDepends = [
-    base16Bytestring cryptohash HUnit text time vector
+    aeson base16Bytestring cryptohash HUnit text time vector
   ];
   doCheck = false;
   meta = {
-- 
cgit 1.4.1


From 52fbea98739d610b61b4e2b51c5a86ebe849afb7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 11:35:26 +0100
Subject: haskell-quickcheck-instances: update to version 0.3.5

---
 pkgs/development/libraries/haskell/quickcheck-instances/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
index 0b29a55ce5f..9d76f7aef7b 100644
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "quickcheck-instances";
-  version = "0.3.4";
-  sha256 = "10kkjqn530cd4bz5jfnvfvpswk25glyjnmy21qj253db6ja8xns1";
+  version = "0.3.5";
+  sha256 = "1ak55d3yi6ii01921zihn8mk12mws78w05gmhk766kpylhhgni5f";
   buildDepends = [ QuickCheck text time ];
   meta = {
     homepage = "https://github.com/aslatter/qc-instances";
-- 
cgit 1.4.1


From e6fb232723c08a98105234f3043231d42fd4d368 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 11:35:26 +0100
Subject: haskell-type-eq: update to version 0.4

---
 pkgs/development/libraries/haskell/type-eq/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix
index 4a730891998..e88433a79c0 100644
--- a/pkgs/development/libraries/haskell/type-eq/default.nix
+++ b/pkgs/development/libraries/haskell/type-eq/default.nix
@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "type-eq";
-  version = "0.3";
-  sha256 = "094m8mk4a1iiqgrnqw0yk89rimp5ffj7i4n61nx3lzxqs5mw0kws";
+  version = "0.4";
+  sha256 = "1cvbqxwkiybxbpzr98yl2pnx5w4zrr340z86q40zirgr1f0ch674";
   meta = {
-    homepage = "http://github.com/glehel/type-eq";
+    homepage = "http://github.com/glaebhoerl/type-eq";
     description = "Type equality evidence you can carry around";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
cgit 1.4.1


From 95d31aa3063f257c410e0e107b01664461652ad2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 11:35:26 +0100
Subject: haskell-HaRe: update to version 0.7.0.9

---
 pkgs/development/tools/haskell/HaRe/default.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index f7d67f4be66..6c24b509db5 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -1,23 +1,26 @@
-{ cabal, cmdtheline, deepseq, Diff, filepath, ghcMod, ghcPaths
-, ghcSybUtils, hslogger, hspec, HUnit, mtl, parsec, QuickCheck
-, rosezipper, silently, StrafunskiStrategyLib, stringbuilder, syb
-, syz, time, transformers
+{ cabal, deepseq, Diff, dualTree, filepath, ghcMod, ghcPaths
+, ghcSybUtils, hslogger, hspec, HUnit, monoidExtras, mtl, parsec
+, QuickCheck, rosezipper, semigroups, silently
+, StrafunskiStrategyLib, stringbuilder, syb, syz, time
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.7.0.7";
-  sha256 = "0pgl5mav4sqc453by7nddf5fz7nj231072bklzj6crcph7qw4zy4";
+  version = "0.7.0.9";
+  sha256 = "1a3kf6hdzchcyb743l6ikyw3nclcy8g7a5kaj4jgxqvmss9z73f1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cmdtheline filepath ghcMod ghcPaths ghcSybUtils hslogger mtl parsec
-    rosezipper StrafunskiStrategyLib syb syz time transformers
+    dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger monoidExtras
+    mtl parsec rosezipper semigroups StrafunskiStrategyLib syb syz time
+    transformers
   ];
   testDepends = [
-    deepseq Diff filepath ghcMod ghcPaths ghcSybUtils hslogger hspec
-    HUnit mtl QuickCheck rosezipper silently StrafunskiStrategyLib
-    stringbuilder syb syz time transformers
+    deepseq Diff dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger
+    hspec HUnit monoidExtras mtl QuickCheck rosezipper semigroups
+    silently StrafunskiStrategyLib stringbuilder syb syz time
+    transformers
   ];
   jailbreak = true;
   meta = {
-- 
cgit 1.4.1


From 62b87f14f3c4b4782e5b41418c09efc147419f78 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 12:33:04 +0100
Subject: haskell-http-client-tls: update to version 0.2.0.2

---
 pkgs/development/libraries/haskell/http-client-tls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
index f0b28ab1612..82866abe9c3 100644
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client-tls";
-  version = "0.2.0.1";
-  sha256 = "0wzbxah6pkglpgl4ax12crw3cl8w48b8pbasb3xkbqcxpaakvbkx";
+  version = "0.2.0.2";
+  sha256 = "0v5730rssddc28f1q6ndkcjrfz8r5a1wmxk1azpmdxlq6nh4i9q9";
   buildDepends = [ connection dataDefault httpClient network tls ];
   testDepends = [ hspec httpClient httpTypes ];
   doCheck = false;
-- 
cgit 1.4.1


From bd005d8774293ecfc287a94e0a2a90c3fa8ce20b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 12:49:09 +0100
Subject: haskell-regex-tdfa: fix build with array 0.5.0.0 and later

---
 .../libraries/haskell/regex-tdfa/default.nix       |   1 +
 .../haskell/regex-tdfa/fix-build-with-array5.patch | 120 +++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
index 67073790d25..004bd9d7052 100644
--- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix
+++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.8";
   sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x";
   buildDepends = [ mtl parsec regexBase ];
+  patches = [ ./fix-build-with-array5.patch ];
   meta = {
     homepage = "http://hackage.haskell.org/package/regex-tdfa";
     description = "Replaces/Enhances Text.Regex";
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch b/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch
new file mode 100644
index 00000000000..2460e6bfc7a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-tdfa/fix-build-with-array5.patch
@@ -0,0 +1,120 @@
+diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs
+--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs	2011-03-12 00:46:39.000000000 +0100
++++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs	2013-12-19 12:42:27.048813869 +0100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -- | This is the code for the main engine.  This captures the posix
+ -- subexpressions.  There is also a non-capturing engine, and a
+ -- testing engine.
+@@ -20,7 +21,12 @@
+ 
+ import Prelude hiding ((!!))
+ import Control.Monad(when,unless,forM,forM_,liftM2,foldM)
++#if MIN_VERSION_array(0,4,0)
++import Data.Array.MArray(MArray(..))
++import Data.Array.Unsafe(unsafeFreeze)
++#else
+ import Data.Array.MArray(MArray(..),unsafeFreeze)
++#endif
+ import Data.Array.IArray(Array,bounds,assocs,Ix(range))
+ import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
+ import Data.IntMap(IntMap)
+@@ -574,7 +580,7 @@
+     case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) ->
+     (# s2#, () #) }}
+ {-
+-#else /* !__GLASGOW_HASKELL__ */
++-- #else /* !__GLASGOW_HASKELL__ */
+ 
+ copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e)
+ copySTU source destination = do
+@@ -585,5 +591,5 @@
+   forM_ (range b) $ \index ->
+     set destination index =<< source !! index
+   return destination
+-#endif /* !__GLASGOW_HASKELL__ */
++-- #endif /* !__GLASGOW_HASKELL__ */
+ -}
+diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs
+--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs	2011-03-12 00:46:39.000000000 +0100
++++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs	2013-12-19 12:42:27.049813918 +0100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -- | This is the code for the main engine.  This captures the posix subexpressions. This 'execMatch'
+ -- also dispatches to "Engine_NC", "Engine_FA", and "Engine_FC_NA"
+ -- 
+@@ -19,7 +20,12 @@
+ -}
+ import Prelude hiding ((!!))
+ 
++#if MIN_VERSION_array(0,4,0)
++import Data.Array.MArray(MArray(..))
++import Data.Array.Unsafe(unsafeFreeze)
++#else
+ import Data.Array.MArray(MArray(..),unsafeFreeze)
++#endif
+ import Data.Array.IArray(Array,bounds,assocs,Ix(rangeSize,range))
+ import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
+ import Data.IntMap(IntMap)
+@@ -716,7 +722,7 @@
+     case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) ->
+     (# s2#, () #) }}
+ {-
+-#else /* !__GLASGOW_HASKELL__ */
++-- #else /* !__GLASGOW_HASKELL__ */
+ 
+ copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e)
+ copySTU source destination = do
+@@ -727,5 +733,5 @@
+   forM_ (range b) $ \index ->
+     set destination index =<< source !! index
+   return destination
+-#endif /* !__GLASGOW_HASKELL__ */
++-- #endif /* !__GLASGOW_HASKELL__ */
+ -}
+diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs
+--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs	2011-03-12 00:46:39.000000000 +0100
++++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs	2013-12-19 12:42:27.048813869 +0100
+@@ -1,10 +1,16 @@
++{-# LANGUAGE CPP #-}
+ -- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String
+ module Text.Regex.TDFA.NewDFA.Engine_NC_FA(execMatch) where
+ 
+ import Control.Monad(unless)
+ import Prelude hiding ((!!))
+ 
++#if MIN_VERSION_array(0,4,0)
++import Data.Array.MArray(MArray(newArray))
++import Data.Array.Unsafe(unsafeFreeze)
++#else
+ import Data.Array.MArray(MArray(newArray),unsafeFreeze)
++#endif
+ import Data.Array.ST(STArray)
+ import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
+ import qualified Data.IntMap as IMap(null)
+diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs
+--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs	2011-03-12 00:46:39.000000000 +0100
++++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs	2013-12-19 12:42:27.048813869 +0100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String
+ module Text.Regex.TDFA.NewDFA.Engine_NC(execMatch) where
+ 
+@@ -5,7 +6,12 @@
+ import Data.Array.Base(unsafeRead,unsafeWrite)
+ import Prelude hiding ((!!))
+ 
++#if MIN_VERSION_array(0,4,0)
++import Data.Array.MArray(MArray(..))
++import Data.Array.Unsafe(unsafeFreeze)
++#else
+ import Data.Array.MArray(MArray(..),unsafeFreeze)
++#endif
+ import Data.Array.IArray(Ix)
+ import Data.Array.ST(STArray,STUArray)
+ import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
+@@ -248,4 +254,3 @@
+ wsToGroup (WScratch start stop) = do
+   ma <- newArray (0,0) (start,stop-start)  :: S.ST s (STArray s Int (MatchOffset,MatchLength))
+   unsafeFreeze ma
+-
-- 
cgit 1.4.1


From 2504dedaf68e2a2a4c88dbfc0353375b845c1003 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 18:00:46 +0100
Subject: haskell-assert-failure: jailbreak to fix build with recent versions
 of pretty-show

---
 pkgs/development/libraries/haskell/assert-failure/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix
index abc520e7b4b..bfb340147a8 100644
--- a/pkgs/development/libraries/haskell/assert-failure/default.nix
+++ b/pkgs/development/libraries/haskell/assert-failure/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.1";
   sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr";
   buildDepends = [ prettyShow text ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/Mikolaj/assert-failure";
     description = "Syntactic sugar improving 'assert' and 'error'";
-- 
cgit 1.4.1


From d54d87821283ff01ff40d4c03be65ba86261d2da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Dec 2013 18:10:56 +0100
Subject: haskell-minimorph: update to version 0.1.5.0

---
 pkgs/development/libraries/haskell/minimorph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix
index 06dcfaa1139..08865132701 100644
--- a/pkgs/development/libraries/haskell/minimorph/default.nix
+++ b/pkgs/development/libraries/haskell/minimorph/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "minimorph";
-  version = "0.1.4.0";
-  sha256 = "16ri9hfriszrgqcm111b1pp5x65s034hrc35kjz5qax32mnc9rn6";
+  version = "0.1.5.0";
+  sha256 = "00dnvv0pap2xr74xwzldz89783iw320z7p1rdw0lwjjpbqa3v00g";
   buildDepends = [ text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
-- 
cgit 1.4.1


From b18a2b580eb980756761a211a19bf9139e3fa9bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Dec 2013 10:45:55 +0100
Subject: haskell-mongoDB: update to version 1.4.2

---
 pkgs/development/libraries/haskell/mongoDB/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
index 2d269fc7a92..281fbb41359 100644
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -1,14 +1,15 @@
-{ cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl
-, network, parsec, random, randomShuffle, text, transformersBase
+{ cabal, binary, bson, cryptohash, hashtables, liftedBase
+, monadControl, mtl, network, parsec, random, randomShuffle, text
+, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "mongoDB";
-  version = "1.4.1.1";
-  sha256 = "1c9980x3i0jgacgz7mx65l5nyp3h83mqp9b52pzxq90lix6xnwhi";
+  version = "1.4.2";
+  sha256 = "15m23q17q8asrsa27mb73ydim1yjrxl06lgf7z8w4r6jy6lk34hf";
   buildDepends = [
-    binary bson cryptohash liftedBase monadControl mtl network parsec
-    random randomShuffle text transformersBase
+    binary bson cryptohash hashtables liftedBase monadControl mtl
+    network parsec random randomShuffle text transformersBase
   ];
   meta = {
     homepage = "http://github.com/selectel/mongodb-haskell";
-- 
cgit 1.4.1


From eb8244fe3ec54f81b51e51401b8010533f441937 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Dec 2013 10:45:55 +0100
Subject: haskell-tasty: update to version 0.6

---
 pkgs/development/libraries/haskell/tasty/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 6ba25cdc99b..c88e3c268d2 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -1,13 +1,14 @@
-{ cabal, ansiTerminal, deepseq, mtl, optparseApplicative
+{ cabal, ansiTerminal, deepseq, either, mtl, optparseApplicative
 , regexPosix, stm, tagged
 }:
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.5.2.1";
-  sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym";
+  version = "0.6";
+  sha256 = "00mf8pxwingzywnzgh7dypask1spp18kpiwqjbf1y11dqbs6ib6w";
   buildDepends = [
-    ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
+    ansiTerminal deepseq either mtl optparseApplicative regexPosix stm
+    tagged
   ];
   meta = {
     description = "Modern and extensible testing framework";
-- 
cgit 1.4.1


From cd73e1cefae4bc81869161c8ca9f829e95d8e452 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Dec 2013 10:45:56 +0100
Subject: haskell-uuagc: update to version 0.9.50.1

---
 pkgs/development/tools/haskell/uuagc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 165ea131dd9..d94765abdd5 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc";
-  version = "0.9.50";
-  sha256 = "0vyydqgmyl590ry63ibwshfpj2w9dd2v0nmr4jqlfw0m0d9ff50j";
+  version = "0.9.50.1";
+  sha256 = "0fpksqny1f083bzpr7pvx5ny53yds3mqss73fx4li8cwb2bs4azw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];
-- 
cgit 1.4.1


From 778539e871cee3df1a5e9da8125c191e27597778 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Dec 2013 16:00:03 +0100
Subject: openjdk: Update to 7u40b43

---
 pkgs/development/compilers/openjdk/default.nix             | 14 ++++++--------
 .../compilers/openjdk/no-crypto-restrictions.patch         | 12 ------------
 2 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/compilers/openjdk/no-crypto-restrictions.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 0be36379f33..b927a38abd9 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -39,9 +39,9 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "6";
+  update = "40";
 
-  build = "24";
+  build = "43";
 
 in
 
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
   name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}";
 
   src = fetchurl {
-    url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip";
-    sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9";
+    url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip;
+    sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00";
   };
 
 #  outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
@@ -90,10 +90,7 @@ stdenv.mkDerivation rec {
       openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
   '';
 
-  patches = [
-    ./cppflags-include-fix.patch
-    ./no-crypto-restrictions.patch
-  ];
+  patches = [ ./cppflags-include-fix.patch ];
 
   makeFlags = [
     "SORT=${coreutils}/bin/sort"
@@ -108,6 +105,7 @@ stdenv.mkDerivation rec {
     "DEVTOOLS_PATH="
     "UNIXCOMMAND_PATH="
     "BOOTDIR=${jdk}"
+    "UNLIMITED_CRYPTO=1"
   ];
 
   configurePhase = ''
diff --git a/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch b/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch
deleted file mode 100644
index 427ef353466..00000000000
--- a/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur openjdk-orig/jdk/make/javax/crypto/Makefile openjdk/jdk/make/javax/crypto/Makefile
---- openjdk-orig/jdk/make/javax/crypto/Makefile	2011-06-27 13:18:45.000000000 -0400
-+++ openjdk/jdk/make/javax/crypto/Makefile	2012-11-08 14:12:01.360718616 -0500
-@@ -156,7 +156,7 @@
- #
- 
- ifdef OPENJDK
--all: build-jar install-jar build-policy install-limited
-+all: build-jar install-jar build-policy install-unlimited
- else  # OPENJDK
- ifeq ($(strip $(FILES_java)),)
- all:
-- 
cgit 1.4.1


From e76c33475676d4959a9b93a911aef9637abb39e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Dec 2013 18:28:09 +0100
Subject: openjdk: Remove some unnecessary stuff from the installation

---
 pkgs/development/compilers/openjdk/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index b927a38abd9..fd229cf5b13 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00";
   };
 
-#  outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
+  #  outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
 
   buildInputs = [
     unzip
@@ -115,6 +115,14 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
+
+    # Remove some broken manpages.
+    rm -rf $out/share/man/ja*
+
+    # Remove crap from the installation.
+    rm -rf $out/demo $out/sample
+
+    # Generate certificates.
     pushd $out/${if ! jreOnly then "jre/" else ""}lib/security
     rm cacerts
     perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt
-- 
cgit 1.4.1


From b17324265ae5e96a8fb4668d046fd11dd4dbf483 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Dec 2013 00:11:38 +0100
Subject: haskell-cufft: the license doesn't allow this package to be built on
 Hydra

---
 pkgs/development/libraries/haskell/cufft/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix
index df9f686383e..ec23761003c 100644
--- a/pkgs/development/libraries/haskell/cufft/default.nix
+++ b/pkgs/development/libraries/haskell/cufft/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Haskell bindings for the CUFFT library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
-- 
cgit 1.4.1


From fe6862f8ab65e34b6b746fa950d0e92edd1c2f3e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 20 Dec 2013 16:35:45 +0200
Subject: Revert "esdl: update from 1.0.1 to 1.2"

Api change breaks dependencies.

This reverts commit d3b47ef72575ccf2f1c885d325f2e3427e7abe2b.
---
 pkgs/development/libraries/esdl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix
index 49b72008698..ccc3318ff6b 100644
--- a/pkgs/development/libraries/esdl/default.nix
+++ b/pkgs/development/libraries/esdl/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, SDL, mesa, erlang}:
 
 stdenv.mkDerivation rec {
-  name = "esdl-1.2";
+  name = "esdl-1.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/esdl/${name}.src.tar.gz";
-    sha256 = "0zbnwhy2diivrrs55n96y3sfnbs6lsgz91xjaq15sfi858k9ha29";
+    sha256 = "0zc7cmr44v10sb593dismdm5qc2v7sm3z9yh22g4r9g6asbg5z0n";
   };
 
   buildInputs = [ erlang ];
-- 
cgit 1.4.1


From d9885f2887214c1bbfcbb16ac160147e1c57469b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 20 Dec 2013 17:37:37 +0200
Subject: libgit2: update from 0.18.0 to 0.20.0

---
 pkgs/development/libraries/git2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 2e7a8d33cb0..3c4c2703d6f 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, cmake, zlib, python}:
 
 stdenv.mkDerivation rec {
-  version = "0.18.0";
+  version = "0.20.0";
   name = "libgit2-${version}";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    md5 = "50409ddb0c34713677b33ef617e92c94";
+    sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj";
   };
 
   nativeBuildInputs = [ cmake python ];
-- 
cgit 1.4.1


From 0b195054cb9db89f84c9c687ee452292a5fd1d76 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 20 Dec 2013 17:45:27 +0200
Subject: ode: update from 0.11.1 to 0.12

---
 pkgs/development/libraries/ode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index e7368e4f60b..7c9c9304f77 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -3,7 +3,7 @@ let
   lib = args.lib;
   fetchurl = args.fetchurl;
 
-  version = lib.attrByPath ["version"] "0.11.1" args; 
+  version = lib.attrByPath ["version"] "0.12" args;
   buildInputs = with args; [
     
   ];
@@ -11,7 +11,7 @@ in
 rec {
   src = fetchurl {
     url = "mirror://sourceforge/opende/ode-${version}.tar.bz2";
-    sha256 = "1883gbsnn7zldrpwfdh6kwj20g627n5bspz3yb2z6lrxdal88y47";
+    sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
   };
 
   inherit buildInputs;
-- 
cgit 1.4.1


From 60a2447e88f878122c05ebec99d1b346b4a0f7a9 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 20 Dec 2013 17:47:03 +0200
Subject: oniguruma: update from 5.9.3 to 5.9.4

---
 pkgs/development/libraries/oniguruma/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 684d6475c63..47a51b68d03 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "onig-5.9.3";
+  name = "onig-5.9.4";
   
   src = fetchurl {
-    url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.3.tar.gz;
-    sha256 = "0ahz0l64v2xv4jbh0w3q697xjff8jzdq2264h9jhwxl459msdfy3";
+    url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.4.tar.gz;
+    sha256 = "15q62c2id918fj2i7xbdrcc79xrdafdc75lhhld98rgq3y8j30lq";
   };
   
   meta = {
-- 
cgit 1.4.1


From 9587ab3ff6e039c03f53997a77bf62309e6c97bd Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 20 Dec 2013 17:48:36 +0200
Subject: openmpi: update from 1.6.4 to 1.6.5

---
 pkgs/development/libraries/openmpi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index d32cbd51606..6e61b743a56 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gfortran}:
 
 stdenv.mkDerivation {
-  name = "openmpi-1.6.4";
+  name = "openmpi-1.6.5";
   src = fetchurl {
-    url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.4.tar.bz2 ;
-    sha1 = "38095d3453519177272f488d5058a98f7ebdbf10";
+    url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2 ;
+    sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy";
   };
   buildInputs = [ gfortran ];
   meta = {
-- 
cgit 1.4.1


From 1b28fd4866ab514fd185548111c25ee5de664e19 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 20 Dec 2013 17:50:19 +0200
Subject: orc: update from 0.4.17 to 0.4.18

---
 pkgs/development/compilers/orc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 10945934d00..fd5a85967ed 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "orc-0.4.17";
+  name = "orc-0.4.18";
 
   src = fetchurl {
     url = "http://code.entropywave.com/download/orc/${name}.tar.gz";
-    sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg";
+    sha256 = "093a7a495bsy3j6i4wxaxqbqxk6hwg2hdhgvvkabwhlz4nkwilrl";
   };
 
   meta = {
-- 
cgit 1.4.1


From bfa9f1a9f961c06b096f902d4c852519b40054d4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 20 Dec 2013 17:57:24 +0200
Subject: perlPackages.DBFile: update from 1.826 to 1.831

---
 pkgs/development/perl-modules/DB_File/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index f6396af8b65..4017d8f5ca5 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, buildPerlPackage, db4}:
 
 buildPerlPackage rec {
-  name = "DB_File-1.826";
+  name = "DB_File-1.831";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "c39828ef3cfecff8197ff057cb1c6127b87107c051d182b87c6b9ac79d23f09c";
+    sha256 = "0hq2vvcsa3nkb5bpcl0nkfsxhk8wyrsp3p3ara18rscrfd783hjs";
   };
 
   preConfigure = ''
-- 
cgit 1.4.1


From b8eb00bcde7a1d3b62bf943ffc8e8199971e8e8c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 20 Dec 2013 20:26:09 +0200
Subject: pypy: update from 2.2 to 2.2.1

---
 pkgs/development/interpreters/pypy/2.2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix
index b418b50c089..8701f752c54 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null;
 
 let
 
-  majorVersion = "2.2";
+  majorVersion = "2.2.1";
   version = "${majorVersion}";
   pythonVersion = "2.7";
   libPrefix = "pypy${majorVersion}";
@@ -17,7 +17,7 @@ let
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
-      sha256 = "0kp0922d1739v3fqnxhrbwz1fg651dc5dmk3199ikq1rc2wgrzsh";
+      sha256 = "0pq36n6bap96smpacx8gvgl8yvi9r7ddl4mlpsi5cdj4gqc4a815";
     };
 
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
-- 
cgit 1.4.1


From f3b1680fcc567d4349b6d52747b354f8156aff65 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 21 Dec 2013 00:50:43 +0200
Subject: libextractor: update from 1.0.1 to 1.2

---
 pkgs/development/libraries/libextractor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index a3122dcf9a9..309816b65e5 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
 assert videoSupport -> ffmpeg != null && libmpeg2 != null;
 
 stdenv.mkDerivation rec {
-  name = "libextractor-1.0.1";
+  name = "libextractor-1.2";
 
   src = fetchurl {
     url = "mirror://gnu/libextractor/${name}.tar.gz";
-    sha256 = "1khy9s86vq6667h02zp2fvb16sqm27xlmr0xchgfxvsd6ascnl9j";
+    sha256 = "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96";
   };
 
   preConfigure =
-- 
cgit 1.4.1


From 8eef07e6b0bc8fe7b1861b9028c5369282181b53 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 21 Dec 2013 00:52:47 +0200
Subject: libunwind: update from 1.0.1 to 1.1

---
 pkgs/development/libraries/libunwind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 5c3670e2365..aeed6975bda 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libunwind-1.0.1";
+  name = "libunwind-1.1";
   
   src = fetchurl {
     url = "mirror://savannah/libunwind/${name}.tar.gz";
-    sha256 = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f";
+    sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
   };
   
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
-- 
cgit 1.4.1


From 9725eb13ef8aa921a7a75963fee451a62ea8a200 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 21 Dec 2013 00:55:49 +0200
Subject: libunwind: add missing xz dependency

---
 pkgs/development/libraries/libunwind/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index aeed6975bda..e28038c15da 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, xz}:
 
 stdenv.mkDerivation rec {
   name = "libunwind-1.1";
@@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
     url = "mirror://savannah/libunwind/${name}.tar.gz";
     sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
   };
-  
+
+  buildInputs = [ xz ];
+
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
   preInstall = ''
     mkdir -p "$out/lib"
-- 
cgit 1.4.1


From 9fa0c714016165a9bd9d5aeb1fcb65d1d0715708 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 21 Dec 2013 00:56:26 +0200
Subject: add libgcrypt-1.6

---
 pkgs/development/libraries/libgcrypt/1.6.nix | 44 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libgcrypt/1.6.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix
new file mode 100644
index 00000000000..f5f8297bc6c
--- /dev/null
+++ b/pkgs/development/libraries/libgcrypt/1.6.nix
@@ -0,0 +1,44 @@
+{ fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "libgcrypt-1.6.0";
+
+  src = fetchurl {
+    url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
+    sha256 = "024plbybsmnxbp39hs92lp6dzvkz2cb70nv69qrwr55d02350bb6";
+  };
+
+  nativeBuildInputs = [ transfig ghostscript texinfo ];
+
+  propagatedBuildInputs = [ libgpgerror ];
+
+  preBuild = ''
+    (cd doc; make stamp-vti)
+  '';
+
+  doCheck = true;
+
+  # For some reason the tests don't find `libgpg-error.so'.
+  checkPhase = ''
+    LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \
+    make check
+  '';
+
+  meta = {
+    description = "GNU Libgcrypt, a general-pupose cryptographic library";
+
+    longDescription = ''
+      GNU Libgcrypt is a general purpose cryptographic library based on
+      the code from GnuPG.  It provides functions for all
+      cryptographic building blocks: symmetric ciphers, hash
+      algorithms, MACs, public key algorithms, large integer
+      functions, random numbers and a lot of supporting functions.
+    '';
+
+    license = "LGPLv2+";
+
+    homepage = https://www.gnu.org/software/libgcrypt/;
+    repositories.git = git://git.gnupg.org/libgcrypt.git;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17446d568c0..e2d9b9e9ce1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4847,6 +4847,8 @@ let
 
   libgcrypt = callPackage ../development/libraries/libgcrypt { };
 
+  libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { });
+
   libgcrypt_git = lowPrio (callPackage ../development/libraries/libgcrypt/git.nix { });
 
   libgdiplus = callPackage ../development/libraries/libgdiplus { };
@@ -8099,7 +8101,7 @@ let
   gnunet = callPackage ../applications/networking/p2p/gnunet { };
 
   gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix {
-    libgcrypt = libgcrypt_git;
+    libgcrypt = libgcrypt_1_6;
   });
 
   gocr = callPackage ../applications/graphics/gocr { };
-- 
cgit 1.4.1


From 0ebf8e4e9ba04de2ba13a2b7a07d91d80bc6f76d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 21 Dec 2013 01:15:44 +0200
Subject: suil: update from 0.6.10 to 0.6.16

---
 pkgs/development/libraries/audio/suil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 45253b65edb..f5b68b7a843 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "suil-${version}";
-  version = "0.6.10";
+  version = "0.6.16";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1y7zgfciphr3icamikdfv2gh8xwix5blpq4npl426399i8f4ya5y";
+    sha256 = "101xq7pd8kvnqwm4viaj4ikhn65jxrlrkg79ca954yqrdb9p9w8v";
   };
 
   buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];
-- 
cgit 1.4.1


From b9fb4db2173b54a6ef415c62c2b63777053242d9 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 21 Dec 2013 01:16:56 +0200
Subject: snappy: update from 1.1.0 to 1.1.1

---
 pkgs/development/libraries/snappy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index ff1bfa7d4eb..acba85ec43b 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "snappy-1.1.0";
+  name = "snappy-1.1.1";
   
   src = fetchurl {
     url = "http://snappy.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0q31cx3zkw0apx1fy8z3xlh2lvivssvykqn0vxsgm4xvi32jpa0z";
+    sha256 = "1czscb5i003jg1amw3g1fmasv8crr5g3d922800kll8b3fj097yp";
   };
 
   # -DNDEBUG for speed
-- 
cgit 1.4.1


From cb6235c58e42538d0710b14a3ceb6be337bdb7b5 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 21 Dec 2013 02:09:07 +0200
Subject: goffice_0_10: update from 0.10.0 to 0.10.9

---
 pkgs/development/libraries/goffice/0.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/goffice/0.10.nix b/pkgs/development/libraries/goffice/0.10.nix
index 793704be255..20414952834 100644
--- a/pkgs/development/libraries/goffice/0.10.nix
+++ b/pkgs/development/libraries/goffice/0.10.nix
@@ -3,11 +3,11 @@
 , cairo, gconf, libgnomeui }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.0";
+  name = "goffice-0.10.9";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439";
+    sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg";
   };
 
   buildInputs = [
-- 
cgit 1.4.1


From f760304aaa4987a9cf1c513d17417fcc8f33ab0b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 21 Dec 2013 04:05:57 +0200
Subject: mdds: update from 0.7.1 to 0.8.1

---
 pkgs/development/libraries/mdds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 9c6c8e5e334..8ff2cac539c 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.1";
+  version = "0.8.1";
   name = "mdds-${version}";
 
   src = fetchurl {
     url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";
-    sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
+    sha256 = "12w8rs8kb8yffndsw0g7qfjvy4gpnppkdzc7r7vvc9n800ixl1gn";
   };
 
   meta = {
-- 
cgit 1.4.1


From ba9e03472cf9ed7bc75e7d14d84e5c8f591f0796 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 21 Dec 2013 07:09:16 +0200
Subject: pypy: disable failing test

---
 pkgs/development/interpreters/pypy/2.2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix
index 8701f752c54..80ad4c70a10 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -56,7 +56,8 @@ let
        export HOME="$TMPDIR";
        # disable shutils because it assumes gid 0 exists
        # disable socket because it has two actual network tests that fail
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil' lib-python
+       # disable test_mhlib because it fails for unknown reason
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil -test_mhlib' lib-python
     '';
 
     installPhase = ''
-- 
cgit 1.4.1


From e16d2b7e03c1e8a12a98bc896377ba47b260b9b8 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 21 Dec 2013 10:48:53 +0200
Subject: libunwind: propagate xz

---
 pkgs/development/libraries/libunwind/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index e28038c15da..75139ea988b 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
   };
 
-  buildInputs = [ xz ];
+  propagatedBuildInputs = [ xz ];
 
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
   preInstall = ''
-- 
cgit 1.4.1


From f6b3e2ca547639bd7bcacfe88022c123185cdd13 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Thu, 19 Dec 2013 20:44:52 -0800
Subject: libjpeg-turbo: Patch to fix CVE-2013-6629 and CVE-2013-6630.

Merge #1399.
---
 .../libraries/libjpeg-turbo/default.nix            |  2 ++
 ...ibjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch | 40 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index a4aa1cf44b4..8976e743192 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0d0jwdmj3h89bxdxlwrys2mw18mqcj4rzgb5l2ndpah8zj600mr6";
   };
 
+  patches = [ ./libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch ];
+
   buildInputs = [ nasm ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch b/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch
new file mode 100644
index 00000000000..8c0f9c75054
--- /dev/null
+++ b/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch
@@ -0,0 +1,40 @@
+Thanks to the sources below; this patch discovered via Gentoo.
+
+http://bugzilla.redhat.com/show_bug.cgi?id=1031734
+http://bugzilla.redhat.com/show_bug.cgi?id=1031749
+http://sourceforge.net/p/libjpeg-turbo/code/1090/
+
+--- libjpeg-turbo-1.3.0/jdmarker.c
++++ libjpeg-turbo-1.3.0/jdmarker.c
+@@ -304,7 +304,7 @@
+ /* Process a SOS marker */
+ {
+   INT32 length;
+-  int i, ci, n, c, cc;
++  int i, ci, n, c, cc, pi;
+   jpeg_component_info * compptr;
+   INPUT_VARS(cinfo);
+ 
+@@ -348,6 +348,13 @@
+     
+     TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
+ 	     compptr->dc_tbl_no, compptr->ac_tbl_no);
++
++    /* This CSi (cc) should differ from the previous CSi */
++    for (pi = 0; pi < i; pi++) {
++      if (cinfo->cur_comp_info[pi] == compptr) {
++        ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
++      }
++    }
+   }
+ 
+   /* Collect the additional scan parameters Ss, Se, Ah/Al. */
+@@ -465,6 +472,8 @@
+     for (i = 0; i < count; i++)
+       INPUT_BYTE(cinfo, huffval[i], return FALSE);
+ 
++    MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8));
++
+     length -= count;
+ 
+     if (index & 0x10) {		/* AC table definition */
-- 
cgit 1.4.1


From f4782016edddf0e643f4699c86d6bbc2e54c82e1 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 21 Dec 2013 15:14:05 +0100
Subject: libpng: minor update 1.6.7 -> .8

Fixes a potential segfault.
---
 pkgs/development/libraries/libpng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index adcc120bdfe..2eb30473c92 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,8 +3,8 @@
 assert zlib != null;
 
 let
-  version = "1.6.7";
-  sha256 = "0igrw6xzvljd8ddk2qmqz4pav1glqj6naqcrzy7j2056m59wij8k";
+  version = "1.6.8";
+  sha256 = "109h2fcjspd792lvh5q4xnkpsv7rjczmrdl15i4ajx0xbs5kvxr4";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-1.6.7-apng.patch.gz";
     sha256 = "1g5hmlb9smwl9qv6wb2d7795jqcfrx8g3dhrya5dshrj909jb95k";
-- 
cgit 1.4.1


From 51c83e927d52f0e72dc2d22cc7a2919e193af41f Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 21 Dec 2013 15:14:55 +0100
Subject: gdk_pixbuf: minor update (mainly JPEG fixes)

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 0daae5fda2e..4b92c6470eb 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.30";
-  ver_min = "1";
+  ver_min = "2";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "0c4dxsnpqc46liqjlh3w2qmrzv0b89ksn15z2f9h13362lg3n9m3";
+    sha256 = "1gzczsv41h28is4rrxjfyj1qx8ifp23fq2ckh0k099m9fnhbzfna";
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-- 
cgit 1.4.1


From f7fafb6931e25cab937ffeedf697dcbf786ff62a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 22 Dec 2013 01:25:30 +0200
Subject: telepathy_glib: update from 0.20.4 to 0.22.0

---
 pkgs/development/libraries/telepathy/glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 8c08a342a90..f44e4cbcd8b 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-glib-0.20.4";
+  name = "telepathy-glib-0.22.0";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
-    sha256 = "0v5izjmgm1phy51l2y5whfrgzqx8510lqp16d2y5hb21bp40g8y9";
+    sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232";
   };
 
   propagatedBuildInputs = [dbus_glib glib python];
-- 
cgit 1.4.1


From a0297b7be4acae29c78f5a6d12afcb69d7493217 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sat, 21 Dec 2013 16:54:07 -0430
Subject: Add older mdds as libreoffice does not build with current version.

---
 pkgs/development/libraries/mdds/0.7.1.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/mdds/0.7.1.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix
new file mode 100644
index 00000000000..9c6c8e5e334
--- /dev/null
+++ b/pkgs/development/libraries/mdds/0.7.1.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.1";
+  name = "mdds-${version}";
+
+  src = fetchurl {
+    url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";
+    sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
+  };
+
+  meta = {
+    homepage = https://code.google.com/p/multidimalgorithm/;
+    description = "A collection of multi-dimensional data structure and indexing algorithm";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1e9bf72ce9..900d4f40797 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5247,6 +5247,7 @@ let
 
   lzo = callPackage ../development/libraries/lzo { };
 
+  mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { };
   mdds = callPackage ../development/libraries/mdds { };
 
   # failed to build
@@ -8362,6 +8363,7 @@ let
     poppler = poppler_0_18;
     clucene_core = clucene_core_2;
     lcms = lcms2;
+    mdds = mdds_0_7_1;
   };
 
   liferea = callPackage ../applications/networking/newsreaders/liferea { };
-- 
cgit 1.4.1


From 7b5c0b39d206f6ed7bc41c956947f4307bf7c15d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 23 Dec 2013 05:15:00 +0200
Subject: tcllib: update from 1.14 to 1.15

---
 pkgs/development/libraries/tcllib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 12bbe0914e0..b2c2f0d0851 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tcllib-${version}";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchurl {
     url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz";
-    sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x";
+    sha256 = "1zdzaqdpxljsaabgknq3paakgs262qy255ib4p329knsv608jc3d";
   };
 
   passthru = {
-- 
cgit 1.4.1


From 424c47be8832ed172f90db231e41ba910ca30e51 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 23 Dec 2013 05:20:28 +0200
Subject: simgear: update from 2.12.0 to 2.12.1

---
 pkgs/development/libraries/simgear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index cb534cfbf31..0525043b6cf 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -13,11 +13,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="simgear";
-    version="2.12.0";
+    version="2.12.1";
     name="${baseName}-${version}";
     extension="tar.bz2";
     url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
-    hash="0spl6afk8rm96ss4lh7zy5561m5m2qgwsnqjyp35jr1gyyrc944f";
+    hash="0w8drzglgp01019frx96062qcigzfflsyq59f8shpwmzjb2hzli4";
   };
 in
 rec {
-- 
cgit 1.4.1


From 10f250f65c3a47c63d3f34eb8a4494362d28bbf8 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Mon, 23 Dec 2013 09:43:19 +0100
Subject: Adding go 1.2.

It doesn't include godoc anymore.

I could reproduce this, building this package:
http://code.google.com/p/go/issues/detail?id=6999
---
 pkgs/development/compilers/go/1.2.nix          | 88 ++++++++++++++++++++++++++
 pkgs/development/compilers/go/cacert-1.2.patch | 15 +++++
 pkgs/top-level/all-packages.nix                |  2 +
 3 files changed, 105 insertions(+)
 create mode 100644 pkgs/development/compilers/go/1.2.nix
 create mode 100644 pkgs/development/compilers/go/cacert-1.2.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
new file mode 100644
index 00000000000..f420ceff853
--- /dev/null
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -0,0 +1,88 @@
+{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc
+, removeGodocExternals ? false }:
+
+let
+  loader386 = "${glibc}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc}/lib/ld-linux.so.3";
+in
+
+stdenv.mkDerivation {
+  name = "go-1.2";
+
+  src = fetchurl {
+    url = http://go.googlecode.com/files/go1.2.src.tar.gz;
+    sha1 = "7dd2408d40471aeb30a9e0b502c6717b5bf383a5";
+  };
+
+  buildInputs = [ bison glibc bash makeWrapper ];
+
+  # I'm not sure what go wants from its 'src', but the go installation manual
+  # describes an installation keeping the src.
+  preUnpack = ''
+    mkdir -p $out/share
+    cd $out/share
+  '';
+
+  prePatch = ''
+    cd ..
+    if [ ! -d go ]; then
+      mv * go
+    fi
+    cd go
+
+    patchShebangs ./ # replace /bin/bash
+    # !!! substituteInPlace does not seems to be effective.
+    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
+    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
+    sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
+
+    #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
+    #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
+    #  src/pkg/exec/exec_test.go
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
+    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
+  '' + stdenv.lib.optionalString removeGodocExternals ''
+    sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html 
+  '';
+
+  patches = [ ./cacert-1.2.patch ];
+
+  GOOS = "linux";
+  GOARCH = if stdenv.system == "i686-linux" then "386"
+          else if stdenv.system == "x86_64-linux" then "amd64"
+          else if stdenv.system == "armv5tel-linux" then "arm"
+          else throw "Unsupported system";
+  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    export GOROOT="$(pwd)/"
+    export GOBIN="$out/bin"
+    export PATH="$GOBIN:$PATH"
+    cd ./src
+    ./all.bash
+    cd -
+
+    # Copy the emacs configuration for Go files.
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp ./misc/emacs/* $out/share/emacs/site-lisp/
+  '';
+
+  meta = {
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/compilers/go/cacert-1.2.patch b/pkgs/development/compilers/go/cacert-1.2.patch
new file mode 100644
index 00000000000..1ad6910915f
--- /dev/null
+++ b/pkgs/development/compilers/go/cacert-1.2.patch
@@ -0,0 +1,15 @@
+Go comes with hardcoded cacert. We add the usual in NixOS,
+for easier NixOS life.
+
+diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
+index 76e79f4..6ef1dd3 100644
+--- a/src/pkg/crypto/x509/root_unix.go
++++ b/src/pkg/crypto/x509/root_unix.go
+@@ -15,6 +15,7 @@ var certFiles = []string{
+	"/etc/ssl/ca-bundle.pem",                 // OpenSUSE
+	"/etc/ssl/cert.pem",                      // OpenBSD
+	"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
++	"/etc/ssl/certs/ca-bundle.crt",           // NixOS
+ }
+ 
+ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 900d4f40797..3b6d7411a76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2789,6 +2789,8 @@ let
     else
       callPackage ../development/compilers/go/1.1.nix { };
 
+  go_1_2 = callPackage ../development/compilers/go/1.2.nix { };
+
   go = go_1_1;
 
   gprolog = callPackage ../development/compilers/gprolog { };
-- 
cgit 1.4.1


From 1b88488988611376bd44dcd8e5431705d2309276 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 8 Nov 2013 23:45:47 +0100
Subject: gperftools: upgrade to 2.1

---
 pkgs/development/libraries/gperftools/default.nix      | 10 ++++++----
 pkgs/development/libraries/gperftools/glibc-2.16.patch | 13 -------------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/gperftools/glibc-2.16.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 76d1d8c41f7..c7c639f2adb 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchurl, libunwind }:
 
 stdenv.mkDerivation rec {
-  name = "gperftools-2.0";
+  name = "gperftools-2.1";
 
   src = fetchurl {
     url = "https://gperftools.googlecode.com/files/${name}.tar.gz";
-    sha1 = "da7181a7ba9b5ee7302daf6c16e886c179fe8d1b";
+    sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk";
   };
 
-  patches = [ ./glibc-2.16.patch ];
-
   buildInputs = [ libunwind ];
 
+  # some packages want to link to the static tcmalloc_minimal
+  # to drop the runtime dependency on gperftools
+  dontDisableStatic = true;
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/gperftools/glibc-2.16.patch b/pkgs/development/libraries/gperftools/glibc-2.16.patch
deleted file mode 100644
index b17e0d57f5f..00000000000
--- a/pkgs/development/libraries/gperftools/glibc-2.16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gperftools-2.0/src/base/linuxthreads.cc
-===================================================================
---- gperftools-2.0.orig/src/base/linuxthreads.cc
-+++ gperftools-2.0/src/base/linuxthreads.cc
-@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
- /* Signal handler to help us recover from dying while we are attached to
-  * other threads.
-  */
--static void SignalHandler(int signum, siginfo_t *si, void *data) {
-+static void SignalHandler(int signum, struct siginfo *si, void *data) {
-   if (sig_pids != NULL) {
-     if (signum == SIGABRT) {
-       while (sig_num_threads-- > 0) {
-- 
cgit 1.4.1


From 1f42e5c565a9d0f62929f0ffb9eb90f23dfb7dd3 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 3 Dec 2013 13:28:23 +0100
Subject: haskell-trifecta 1.1: relax comonad dependency

---
 pkgs/development/libraries/haskell/trifecta/1.1.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix
index bf5f2f0d0a7..ac6cfdd43ae 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.1.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix
@@ -18,7 +18,8 @@ cabal.mkDerivation (self: {
     substituteInPlace trifecta.cabal \
       --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.7," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2,"
+      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
+      --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5,"
   '';
   meta = {
     homepage = "http://github.com/ekmett/trifecta/";
-- 
cgit 1.4.1


From c693d2e7fa05889bb3d0954e5ae3fc8be41fcd10 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 3 Dec 2013 14:00:33 +0100
Subject: haskell-trifecta 1.2: relax comonad dependency

---
 pkgs/development/libraries/haskell/trifecta/1.2.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix
index f7b9a7aea81..de876fa7f67 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.2.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix
@@ -18,7 +18,8 @@ cabal.mkDerivation (self: {
     substituteInPlace trifecta.cabal \
       --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.7," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
-      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2,"
+      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
+      --replace "comonad              >= 3       && < 4,"   "comonad              >= 3       && < 5,"
   '';
   meta = {
     homepage = "http://github.com/ekmett/trifecta/";
-- 
cgit 1.4.1


From 98334e1d0abf8b20c8f3622b48c8b29a1539dfc5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 9 Nov 2013 01:09:06 +0100
Subject: add haskell-protocol-buffers

---
 .../libraries/haskell/protocol-buffers/default.nix         | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                        |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/protocol-buffers/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
new file mode 100644
index 00000000000..bf74e4fc4d6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
@@ -0,0 +1,14 @@
+{ cabal, binary, filepath, mtl, syb, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "protocol-buffers";
+  version = "2.0.14";
+  sha256 = "1wihnpvc7kjq345a6v702s42gmrqd9cjm50safc7kigyvhr5vm1i";
+  buildDepends = [ binary filepath mtl syb utf8String ];
+  meta = {
+    homepage = "http://code.haskell.org/protocol-buffers/";
+    description = "Parse Google Protocol Buffer specifications";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a837314cee1..8cddf060f17 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1813,6 +1813,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     fgl = self.fgl_5_4_2_4;
   };
 
+  protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {};
+
   PSQueue = callPackage ../development/libraries/haskell/PSQueue {};
 
   publicsuffixlist = callPackage ../development/libraries/haskell/publicsuffixlist {};
-- 
cgit 1.4.1


From 5188f7f939f8715f7278e645a013007162843442 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 9 Nov 2013 01:11:01 +0100
Subject: add haskell-protocol-buffers-descriptor

---
 .../haskell/protocol-buffers-descriptor/default.nix        | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                        |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
new file mode 100644
index 00000000000..7b14fabd8b1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
@@ -0,0 +1,14 @@
+{ cabal, protocolBuffers }:
+
+cabal.mkDerivation (self: {
+  pname = "protocol-buffers-descriptor";
+  version = "2.0.14";
+  sha256 = "0xbpmm9a4fg42c9zbarawqdl4klfjjc233ilbsibb7asa3v7zmj3";
+  buildDepends = [ protocolBuffers ];
+  meta = {
+    homepage = "http://code.haskell.org/protocol-buffers/";
+    description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8cddf060f17..3660a55074c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1815,6 +1815,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {};
 
+  protocolBuffersDescriptor = callPackage ../development/libraries/haskell/protocol-buffers-descriptor {};
+
   PSQueue = callPackage ../development/libraries/haskell/PSQueue {};
 
   publicsuffixlist = callPackage ../development/libraries/haskell/publicsuffixlist {};
-- 
cgit 1.4.1


From 86c298b51087b22ac6ee0aef15a182ba70c12dc5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 9 Nov 2013 01:04:42 +0100
Subject: add rethinkdb haskell driver

---
 .../libraries/haskell/rethinkdb/default.nix         | 21 +++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/rethinkdb/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix
new file mode 100644
index 00000000000..4a299e9f556
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix
@@ -0,0 +1,21 @@
+{ cabal, aeson, attoparsec, dataDefault, mtl, network
+, protocolBuffers, protocolBuffersDescriptor, text, time
+, unorderedContainers, utf8String, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "rethinkdb";
+  version = "1.8.0.5";
+  sha256 = "1s3mzbs0b2jdvs1gfdxb2fp2lw7978ja63411iz43yjd29d3pwzq";
+  buildDepends = [
+    aeson attoparsec dataDefault mtl network protocolBuffers
+    protocolBuffersDescriptor text time unorderedContainers utf8String
+    vector
+  ];
+  meta = {
+    homepage = "http://github.com/atnnn/haskell-rethinkdb";
+    description = "RethinkDB is a distributed document store with a powerful query language";
+    license = self.stdenv.lib.licenses.asl20;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3660a55074c..0c54836ab6e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1929,6 +1929,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   resourcet = callPackage ../development/libraries/haskell/resourcet {};
 
+  rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {};
+
   rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {};
 
   rosezipper = callPackage ../development/libraries/haskell/rosezipper {};
-- 
cgit 1.4.1


From 84538c25da4ef5e756e3bc2271fcf410ea65e67c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 12 Dec 2013 15:45:10 +0100
Subject: go: removeGodocExternals no longer needed

---
 pkgs/development/compilers/go/1.2.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index f420ceff853..2abdc51e4c6 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc
-, removeGodocExternals ? false }:
+{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
 
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";
@@ -51,8 +50,6 @@ stdenv.mkDerivation {
     sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-  '' + stdenv.lib.optionalString removeGodocExternals ''
-    sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html 
   '';
 
   patches = [ ./cacert-1.2.patch ];
-- 
cgit 1.4.1


From bdae7f99eaef3a92ab0fff833f99c3b31f434ed6 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 23 Dec 2013 09:42:41 +0100
Subject: add haskellPackages.eventList

---
 .../development/libraries/haskell/event-list/default.nix | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix                      |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/event-list/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix
new file mode 100644
index 00000000000..16b73d9bfb3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/event-list/default.nix
@@ -0,0 +1,16 @@
+{ cabal, nonNegative, QuickCheck, transformers, utilityHt }:
+
+cabal.mkDerivation (self: {
+  pname = "event-list";
+  version = "0.1.0.2";
+  sha256 = "01j48871nijhkbqdsfvbvq01yr9b5a056fn03ccgazikfsd368ri";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ nonNegative QuickCheck transformers utilityHt ];
+  meta = {
+    homepage = "http://code.haskell.org/~thielema/event-list/";
+    description = "Event lists with relative or absolute time stamps";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a837314cee1..a5fdaa16002 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -981,6 +981,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   esqueleto = callPackage ../development/libraries/haskell/esqueleto {};
 
+  eventList = callPackage ../development/libraries/haskell/event-list {};
+
   exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; };
 
   exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
-- 
cgit 1.4.1


From d62b286c7f311788bac431c1f8eb86251bb63c46 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 23 Dec 2013 09:53:48 +0100
Subject: add haskellPackages.monoidTransformer

---
 .../libraries/haskell/monoid-transformer/default.nix         | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                          |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/monoid-transformer/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix
new file mode 100644
index 00000000000..d4e5962ec85
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monoid-transformer/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "monoid-transformer";
+  version = "0.0.2";
+  sha256 = "0hd8jb1iw6lbgml3f08n680bdij56cjanpkr4fc1jr7qn6yzzb2j";
+  meta = {
+    description = "Monoid counterparts to some ubiquitous monad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a5fdaa16002..01c663c6708 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1554,6 +1554,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {};
 
+  monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {};
+
   mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
 
   monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {};
-- 
cgit 1.4.1


From f4204813c698d62508418ac8f9d36c0bad3a1d94 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 23 Dec 2013 10:13:34 +0100
Subject: add haskellPackages.markovChain

---
 .../development/libraries/haskell/markov-chain/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                        |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/markov-chain/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix
new file mode 100644
index 00000000000..5907fce4f17
--- /dev/null
+++ b/pkgs/development/libraries/haskell/markov-chain/default.nix
@@ -0,0 +1,14 @@
+{ cabal, random, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "markov-chain";
+  version = "0.0.3.2";
+  sha256 = "0shld9b6vdi5274wyhwpw5ggfm6xi5j7m3ag989bxarhrfzjxgdk";
+  buildDepends = [ random transformers ];
+  meta = {
+    homepage = "http://code.haskell.org/~thielema/markov-chain/";
+    description = "Markov Chains for generating random sequences with a user definable behaviour";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 01c663c6708..bfd4ed7fd09 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1500,6 +1500,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {};
 
+  markovChain = callPackage ../development/libraries/haskell/markov-chain {};
+
   maude = callPackage ../development/libraries/haskell/maude {};
 
   MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
-- 
cgit 1.4.1


From 1e8dcf3921143c2697b1ec560126fe71ac158132 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 23 Dec 2013 10:21:27 +0100
Subject: add haskellPackages.midi

---
 pkgs/development/libraries/haskell/midi/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/midi/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix
new file mode 100644
index 00000000000..e50843c6ff2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/midi/default.nix
@@ -0,0 +1,21 @@
+{ cabal, binary, eventList, explicitException, monoidTransformer
+, nonNegative, QuickCheck, random, transformers, utilityHt
+}:
+
+cabal.mkDerivation (self: {
+  pname = "midi";
+  version = "0.2.1";
+  sha256 = "0i767y0835979s9i3wm8qwzh2awhhmfvhc5zvq2lkn8xlsp3wa6y";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary eventList explicitException monoidTransformer nonNegative
+    QuickCheck random transformers utilityHt
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/MIDI";
+    description = "Handling of MIDI messages and files";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bfd4ed7fd09..cf73f683313 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1510,6 +1510,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};
 
+  midi = callPackage ../development/libraries/haskell/midi {};
+
   minimorph = callPackage ../development/libraries/haskell/minimorph {};
 
   miniutter = callPackage ../development/libraries/haskell/miniutter {};
-- 
cgit 1.4.1


From 5a90dd86da8045d0fdbc6107cf1303129d504888 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 23 Dec 2013 10:22:37 +0100
Subject: add haskellPackages.haskore

---
 .../libraries/haskell/haskore/default.nix           | 21 +++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/haskore/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix
new file mode 100644
index 00000000000..7e3ebb6476b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskore/default.nix
@@ -0,0 +1,21 @@
+{ cabal, dataAccessor, eventList, haskellSrc, markovChain, midi
+, nonNegative, parsec, random, transformers, utilityHt
+}:
+
+cabal.mkDerivation (self: {
+  pname = "haskore";
+  version = "0.2.0.3";
+  sha256 = "0vg4m2cmy1fabfnck9v22jicflb0if64h0wjvyrgpn2ykb9wwbpa";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    dataAccessor eventList haskellSrc markovChain midi nonNegative
+    parsec random transformers utilityHt
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Haskore";
+    description = "The Haskore Computer Music System";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cf73f683313..f8411263135 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1207,6 +1207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
 
+  haskore = callPackage ../development/libraries/haskell/haskore {};
+
   hastache = callPackage ../development/libraries/haskell/hastache {};
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};
-- 
cgit 1.4.1


From 2de160c5943b76494572c385e919d20026dc22b8 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 11 Dec 2013 01:00:55 +0100
Subject: ffmpeg-0.10: upgrade to 0.10.10

---
 pkgs/development/libraries/ffmpeg/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 98a6c35c8b8..f51e3ccd3c0 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -21,13 +21,13 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10";
-  
+  name = "ffmpeg-0.10.10";
+
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3";
+    sha256 = "14fbjhiwv5zg9yh0zk3k9h6id815xrikyz6l2cdl7z4vazbmhq4k";
   };
-  
+
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
   # the resulting library is GPL'ed, so it can only be used in GPL'ed
   # applications.
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional dc1394Support libdc1394;
 
   enableParallelBuilding = true;
-    
+
   crossAttrs = {
     dontSetConfigureCross = true;
     configureFlags = configureFlags ++ [
-- 
cgit 1.4.1


From 8e85e17a992cda90c6820f6efbcb1278e64c69f4 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 11 Dec 2013 01:01:15 +0100
Subject: ffmpeg-1: upgrade to 1.2.4

---
 pkgs/development/libraries/ffmpeg/1.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index a2e01fdd41f..34d0a4e49fe 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
 assert freetypeSupport -> freetype != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-1.2.3";
+  name = "ffmpeg-1.2.4";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "0nvilgwaivzvikgp9lpvrwi4p1clxl4w8j961599bg0r2v7n4x6r";
+    sha256 = "1pqd544jmbggwisbkm0pj0l585b8a9x5n3jl9zbmqmw63g7ci5iv";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
-- 
cgit 1.4.1


From f1be397249353cef394e766e6e0fd9deaf34dfb1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 14 Dec 2013 09:14:50 +0100
Subject: gst-ffmpeg: upgrade to 0.10.13

- enabled orc support
---
 pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
index e7aaaa46a96..49c612f59e7 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm
+{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc
 , useInternalFfmpeg ? false, ffmpeg ? null }:
 
 stdenv.mkDerivation rec {
-  name = "gst-ffmpeg-0.10.12";
+  name = "gst-ffmpeg-0.10.13";
 
   src = fetchurl {
     urls = [
       "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi";
+    sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";
   };
 
   # Upstream strongly recommends against using --with-system-ffmpeg,
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
 
   buildInputs =
-    [ pkgconfig bzip2 gst_plugins_base ]
+    [ pkgconfig bzip2 gst_plugins_base orc ]
     ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
 
   meta = {
-- 
cgit 1.4.1


From eb51293c30d532e6b29e38c7927791fb8f8e9814 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 14 Dec 2013 09:15:15 +0100
Subject: gst-plugins-base: enable orc support

---
 .../libraries/gstreamer/gst-plugins-base/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index d6717d799f1..59ee86da86d 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia
-, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo
+, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
 , libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the ALSA plugin).
@@ -18,13 +18,14 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
+
     sed -i 's@/bin/echo@echo@g' configure
     sed -i -e 's/^   /\t/' docs/{libs,plugins}/Makefile.in
   '';
 
   # TODO : v4l, libvisual
   buildInputs =
-    [ pkgconfig glib cairo ]
+    [ pkgconfig glib cairo orc ]
     # can't build alsaLib on darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
     ++ stdenv.lib.optionals (!minimalDeps)
@@ -37,9 +38,9 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   propagatedBuildInputs = [ gstreamer ];
- 
+
   postInstall = "rm -rf $out/share/gtk-doc";
-  
+
   meta = with stdenv.lib; {
     homepage    = http://gstreamer.freedesktop.org;
     description = "Base plug-ins for GStreamer";
@@ -48,4 +49,3 @@ stdenv.mkDerivation rec {
     platforms   = platforms.unix;
   };
 }
-
-- 
cgit 1.4.1


From d81200da885919c20a1db12134e4c14d74f4c4e8 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 14 Dec 2013 09:15:54 +0100
Subject: gst-plugins-good: enable vpx, gdkpixbuf and orc support

---
 pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index 85468b309c5..a09f8279760 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
-, flac, libjpeg, zlib, speex, libpng, libdv, libcaca
-, libiec61883, libavc1394, taglib, pulseaudio
+, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
+, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
 , glib, gstreamer, bzip2
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
       aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
-      taglib bzip2
+      taglib bzip2 libvpx gdk_pixbuf orc
     ];
 
   enableParallelBuilding = true;
-- 
cgit 1.4.1


From 1e695ec40bef37a45e86dfce94421ed55016c8c0 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 14 Dec 2013 09:16:17 +0100
Subject: gst-plugins-bad: upgrade to 0.10.23

- enable orc support
---
 pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
index 470cc29eb8e..a433d717039 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
-, libdvdnav, libdvdread }:
+, libdvdnav, libdvdread, orc }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-0.10.23";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ];
+    [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread orc ];
 
   enableParallelBuilding = true;
 
-- 
cgit 1.4.1


From 2dd32f1e3da883199c1feea18bba4a1a463a3889 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 14 Dec 2013 09:17:15 +0100
Subject: gst-plugins-ugly: upgrade to 0.10.19

- enable x264 support
- enable orc support
---
 pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
index 3a59ef16529..769de911fd6 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
-, libmad, libdvdread, libmpeg2, libcdio, a52dec }:
+, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-0.10.19";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ];
+    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ];
 
   enableParallelBuilding = true;
 
-- 
cgit 1.4.1


From 4a909c7be369bc3c384c54a151f97e350e641a76 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 16 Dec 2013 14:28:44 +0100
Subject: log4cxx: depend on db4 instead of db45

---
 pkgs/development/libraries/log4cxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index 983fabc041e..e62fa2fa1c5 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost
-, apr, aprutil, db45, expat
+, apr, aprutil, db4, expat
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
        src/main/cpp/socketoutputstream.cpp
   '';
 
-  buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat];
+  buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat];
 
   meta = {
     homepage = http://logging.apache.org/log4cxx/index.html;
-- 
cgit 1.4.1


From 5e2921df64e3646e60a667d0ed5bf6f958f5e8f9 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 16 Dec 2013 14:29:42 +0100
Subject: bsddb3: upgrade to 6.0.1

should be backward compatible with all bdb 3 and 4 versions
---
 pkgs/development/python-modules/bsddb3/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
index 6ba7f9f8d02..c26347c5243 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, python, db4}:
 
-stdenv.mkDerivation {
-  name = "bsddb3-4.5.0";
+stdenv.mkDerivation rec {
+  name = "bsddb3-6.0.1";
   src = fetchurl {
-    url = mirror://sourceforge/pybsddb/bsddb3-4.5.0.tar.gz;
-    sha256 = "1h09kij32iikr9racp5p7qrb4li2gf2hs0lyq6d312qarja4d45v";
+    url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz";
+    md5 = "2b22ab1b4d896961c30e4106660e9139";
   };
   buildInputs = [python];
   buildPhase = "true";
-- 
cgit 1.4.1


From e9a9fcc8d1c72c538a544a163bcff2943596b298 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 16 Dec 2013 14:32:50 +0100
Subject: ffms: upgrade to 2.19

---
 pkgs/development/libraries/ffms/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 38371ec276d..92146c12e30 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "ffms-2.17";
-  
+stdenv.mkDerivation rec {
+  name = "ffms-2.19";
+
   src = fetchurl {
-    url = http://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2;
-    sha256 = "0gb42hrwnldz3zjlk4llx85dvxysxlfrdf5yy3fay8r8k1vpl7wr";
+    url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.19;
+    name = "${name}.tar.gz";
+    sha256 = "0498si8bzwyxxq0f1yc6invzb1lv1ab436gwzn9418839x8pj4vg";
   };
 
   NIX_CFLAGS_COMPILE = "-fPIC";
-- 
cgit 1.4.1


From cf9cc60a8db221f2ad1314cf6de2bc026b156e40 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 20 Dec 2013 10:05:22 +0100
Subject: bison: use gz tarball, early stdenv does not have xz

---
 pkgs/development/tools/parsing/bison/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index b35ad14b32c..e3bd4ac7a5a 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "bison-3.0.2";
 
   src = fetchurl {
-    url = "mirror://gnu/bison/${name}.tar.xz";
-    sha256 = "0g4gjan477lac18m51kv4xzcsp6wjfsfwvd2dxymcl6vid9fihx2";
+    url = "mirror://gnu/bison/${name}.tar.gz";
+    sha256 = "1vc17y6242jlwp0gdj7wsim3nvc1ws7q3j0v3065nz8g9hd9vwnd";
   };
 
   nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex];
-- 
cgit 1.4.1


From e3acde0b4471d1594c9175a4ed76a8796382913c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 11 Dec 2013 00:58:53 +0100
Subject: ffmpeg: switch to default versioning-scheme

---
 pkgs/development/libraries/ffmpeg/0.10.nix    | 87 +++++++++++++++++++++++++++
 pkgs/development/libraries/ffmpeg/default.nix | 87 ---------------------------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 90 insertions(+), 88 deletions(-)
 create mode 100644 pkgs/development/libraries/ffmpeg/0.10.nix
 delete mode 100644 pkgs/development/libraries/ffmpeg/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
new file mode 100644
index 00000000000..f51e3ccd3c0
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
+, mp3Support ? true, lame ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, vorbisSupport ? true, libvorbis ? null
+, vpxSupport ? false, libvpx ? null
+, x264Support ? true, x264 ? null
+, xvidSupport ? true, xvidcore ? null
+, vdpauSupport ? true, libvdpau ? null
+, faacSupport ? false, faac ? null
+, dc1394Support ? false, libdc1394 ? null
+}:
+
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert vorbisSupport -> libvorbis != null;
+assert vpxSupport -> libvpx != null;
+assert x264Support -> x264 != null;
+assert xvidSupport -> xvidcore != null;
+assert vdpauSupport -> libvdpau != null;
+assert faacSupport -> faac != null;
+
+stdenv.mkDerivation rec {
+  name = "ffmpeg-0.10.10";
+
+  src = fetchurl {
+    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+    sha256 = "14fbjhiwv5zg9yh0zk3k9h6id815xrikyz6l2cdl7z4vazbmhq4k";
+  };
+
+  # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
+  # the resulting library is GPL'ed, so it can only be used in GPL'ed
+  # applications.
+  configureFlags = [
+    "--enable-gpl"
+    "--enable-postproc"
+    "--enable-swscale"
+    "--disable-ffplay"
+    "--enable-shared"
+    "--enable-runtime-cpudetect"
+  ]
+    ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
+    ++ stdenv.lib.optional speexSupport "--enable-libspeex"
+    ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
+    ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
+    ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
+    ++ stdenv.lib.optional x264Support "--enable-libx264"
+    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
+    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
+    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394";
+
+  buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
+    ++ stdenv.lib.optional mp3Support lame
+    ++ stdenv.lib.optional speexSupport speex
+    ++ stdenv.lib.optional theoraSupport libtheora
+    ++ stdenv.lib.optional vorbisSupport libvorbis
+    ++ stdenv.lib.optional vpxSupport libvpx
+    ++ stdenv.lib.optional x264Support x264
+    ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional vdpauSupport libvdpau
+    ++ stdenv.lib.optional faacSupport faac
+    ++ stdenv.lib.optional dc1394Support libdc1394;
+
+  enableParallelBuilding = true;
+
+  crossAttrs = {
+    dontSetConfigureCross = true;
+    configureFlags = configureFlags ++ [
+      "--cross-prefix=${stdenv.cross.config}-"
+      "--enable-cross-compile"
+      "--target_os=linux"
+      "--arch=${stdenv.cross.arch}"
+      ];
+  };
+
+  passthru = {
+    inherit vdpauSupport;
+  };
+
+  meta = with stdenv.lib; {
+    homepage    = http://www.ffmpeg.org/;
+    description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
deleted file mode 100644
index f51e3ccd3c0..00000000000
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
-, mp3Support ? true, lame ? null
-, speexSupport ? true, speex ? null
-, theoraSupport ? true, libtheora ? null
-, vorbisSupport ? true, libvorbis ? null
-, vpxSupport ? false, libvpx ? null
-, x264Support ? true, x264 ? null
-, xvidSupport ? true, xvidcore ? null
-, vdpauSupport ? true, libvdpau ? null
-, faacSupport ? false, faac ? null
-, dc1394Support ? false, libdc1394 ? null
-}:
-
-assert speexSupport -> speex != null;
-assert theoraSupport -> libtheora != null;
-assert vorbisSupport -> libvorbis != null;
-assert vpxSupport -> libvpx != null;
-assert x264Support -> x264 != null;
-assert xvidSupport -> xvidcore != null;
-assert vdpauSupport -> libvdpau != null;
-assert faacSupport -> faac != null;
-
-stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10.10";
-
-  src = fetchurl {
-    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "14fbjhiwv5zg9yh0zk3k9h6id815xrikyz6l2cdl7z4vazbmhq4k";
-  };
-
-  # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
-  # the resulting library is GPL'ed, so it can only be used in GPL'ed
-  # applications.
-  configureFlags = [
-    "--enable-gpl"
-    "--enable-postproc"
-    "--enable-swscale"
-    "--disable-ffplay"
-    "--enable-shared"
-    "--enable-runtime-cpudetect"
-  ]
-    ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
-    ++ stdenv.lib.optional speexSupport "--enable-libspeex"
-    ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
-    ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
-    ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
-    ++ stdenv.lib.optional x264Support "--enable-libx264"
-    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
-    ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
-    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
-    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394";
-
-  buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
-    ++ stdenv.lib.optional mp3Support lame
-    ++ stdenv.lib.optional speexSupport speex
-    ++ stdenv.lib.optional theoraSupport libtheora
-    ++ stdenv.lib.optional vorbisSupport libvorbis
-    ++ stdenv.lib.optional vpxSupport libvpx
-    ++ stdenv.lib.optional x264Support x264
-    ++ stdenv.lib.optional xvidSupport xvidcore
-    ++ stdenv.lib.optional vdpauSupport libvdpau
-    ++ stdenv.lib.optional faacSupport faac
-    ++ stdenv.lib.optional dc1394Support libdc1394;
-
-  enableParallelBuilding = true;
-
-  crossAttrs = {
-    dontSetConfigureCross = true;
-    configureFlags = configureFlags ++ [
-      "--cross-prefix=${stdenv.cross.config}-"
-      "--enable-cross-compile"
-      "--target_os=linux"
-      "--arch=${stdenv.cross.arch}"
-      ];
-  };
-
-  passthru = {
-    inherit vdpauSupport;
-  };
-
-  meta = with stdenv.lib; {
-    homepage    = http://www.ffmpeg.org/;
-    description = "A complete, cross-platform solution to record, convert and stream audio and video";
-    maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72c9c41dcfd..38d5f25fa1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4126,7 +4126,7 @@ let
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
-  ffmpeg = callPackage ../development/libraries/ffmpeg {
+  ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
     vpxSupport = !stdenv.isMips;
 
     stdenv = if stdenv.isDarwin
@@ -4152,6 +4152,8 @@ let
     texinfo = texinfo5;
   };
 
+  ffmpeg = ffmpeg_0_10;
+
   ffms = callPackage ../development/libraries/ffms { };
 
   fftw = callPackage ../development/libraries/fftw {
-- 
cgit 1.4.1


From 82131d50138c9ee00e67c066dab7313aaa51ec6d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 23 Dec 2013 11:35:35 +0100
Subject: clucene_core: switch to versioning scheme to make overriding easier

---
 pkgs/applications/misc/bibletime/default.nix | 6 +++---
 pkgs/development/libraries/sword/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix              | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 689bcf89ef9..cdaeb49f14c 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}:
+{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}:
 
 stdenv.mkDerivation rec {
 
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure =  ''
-    export CLUCENE_HOME=${cluceneCore};
+    export CLUCENE_HOME=${clucene_core};
     export SWORD_HOME=${sword};
   '';
 
-  buildInputs = [ cmake sword qt4 boost cluceneCore ];
+  buildInputs = [ cmake sword qt4 boost clucene_core ];
 
   cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";
 
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 3486981463f..bd177ffc660 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, icu, cluceneCore, curl}:
+{stdenv, fetchurl, pkgconfig, icu, clucene_core, curl}:
 
 stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fc71avaxkhx6kckjiflw6j02lpg569b9bzaksq49i1m87awfxmg";
   };
 
-  buildInputs = [ pkgconfig icu cluceneCore curl ];
+  buildInputs = [ pkgconfig icu clucene_core curl ];
 
   # because curl/types.h disappeared since at least curl 7.21.7
   patches = [ ./dont_include_curl_types_h.patch ];
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
   };
 
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58ca8c62d96..a9609334820 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4020,9 +4020,9 @@ let
 
   clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
 
-  clucene_core = callPackage ../development/libraries/clucene-core { };
+  clucene_core_1 = callPackage ../development/libraries/clucene-core { };
 
-  cluceneCore = clucene_core; # !!! remove this
+  clucene_core = clucene_core_1;
 
   clutter = callPackage ../development/libraries/clutter { };
 
-- 
cgit 1.4.1


From a1cfb23d7300e76a602772ec159067213213c18b Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 23 Dec 2013 18:06:09 +0100
Subject: libtiff: pull (mostly) security patches from Arch

Also enable lzma support and check phase.
---
 pkgs/development/libraries/libtiff/default.nix | 31 ++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index e073717de56..d4e35a115e8 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,7 +1,13 @@
-{ stdenv, fetchurl, zlib, libjpeg }:
-
-let version = "4.0.3"; in
+{ stdenv, fetchurl, fetchsvn, pkgconfig, zlib, libjpeg, xz }:
 
+let
+  version = "4.0.3";
+  patchDir = fetchsvn {
+    url = svn://svn.archlinux.org/packages/libtiff/trunk;
+    rev = "198247";
+    sha256 = "0a47l0zkc1zz7wxg64cyjv9z1djdvfyxgmwd03znlsac4zijkcy4";
+  };
+in
 stdenv.mkDerivation rec {
   name = "libtiff-${version}";
 
@@ -13,10 +19,27 @@ stdenv.mkDerivation rec {
     sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa";
   };
 
-  propagatedBuildInputs = [ zlib libjpeg ];
+  patchPhase = ''
+    for p in ${patchDir}/*-{2013-4244,2012-4447,2012-4564,2013-1960,2013-1961,libjpeg-turbo}.patch; do
+      patch -p1 < "$p"
+    done
+    (
+    cd tools
+    for p in ${patchDir}/*-CVE-{2013-4231,2013-4232}.patch; do
+      patch -p0 < "$p"
+    done
+    )
+    patch -p0 < ${patchDir}/*-tiff2pdf-colors.patch
+  '';
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
 
   enableParallelBuilding = true;
 
+  doCheck = true;
+
   meta = {
     description = "Library and utilities for working with the TIFF image file format";
     homepage = http://www.remotesensing.org/libtiff/;
-- 
cgit 1.4.1


From 7a93e63ae95964fd9579bc4ed1b605628022451b Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 23 Dec 2013 18:08:09 +0100
Subject: libmng: update 1.0.10 -> 2.0.2, drop autotools phase

---
 pkgs/development/libraries/libmng/default.nix | 14 +++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index 81878917384..b58e2dd257d 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -1,18 +1,14 @@
-{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake110x, autoconf, libtool }:
+{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }:
 
 stdenv.mkDerivation rec {
-  name = "libmng-1.0.10";
+  name = "libmng-2.0.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libmng/${name}.tar.bz2";
-    sha256 = "06415s40gz833s1v1q7c04c0m49p4sc87ich0vpdid2ldj0pf53v";
+    url = "mirror://sourceforge/libmng/${name}.tar.xz";
+    sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317";
   };
 
-  preConfigure = "unmaintained/autogen.sh";
-
-  nativeBuildInputs = [ automake110x autoconf libtool ];
-
-  propagatedBuildInputs = [ zlib libpng libjpeg lcms ];
+  propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ];
 
   meta = {
     description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e4e7a04b5b..45b22f287b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4976,7 +4976,7 @@ let
 
   libmowgli = callPackage ../development/libraries/libmowgli { };
 
-  libmng = callPackage ../development/libraries/libmng { lcms = lcms2; };
+  libmng = callPackage ../development/libraries/libmng { };
 
   libmnl = callPackage ../development/libraries/libmnl { };
 
-- 
cgit 1.4.1


From a84d2267d1940c83c15ed1b7f78579111212ba08 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 23 Dec 2013 18:11:15 +0100
Subject: qt4: fix CVE-2013-4549.patch

---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 79209017188..16bd1ee65d2 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -49,6 +49,16 @@ stdenv.mkDerivation rec {
 
   patches =
     [ ./glib-2.32.patch
+      (fetchurl {
+        name = "CVE-2013-4549.patch";
+        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/CVE-2013-4549.patch?h=packages/qt4";
+        sha256 = "0xz60fmspzvsyhd0f013pvh2bbm87976128fphbckfcwiqr1hanw";
+      })
+      (fetchurl {
+        name = "libmng2.patch";
+        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/libmng2.patch?h=packages/qt4";
+        sha256 = "1sgnrl3qzr370ad5bqc66f7sp0gk046jnsy1811x24f16cs04xzh";
+      })
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
         inherit cups icu libXfixes;
-- 
cgit 1.4.1


From b89ab32c60373ae4c8ca7b6604ea3445afabca85 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 23 Dec 2013 19:25:29 +0100
Subject: cogl: fix build, enable some features

---
 pkgs/development/libraries/cogl/default.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 9a151e88778..1fc1021156d 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, xorg, libintlOrEmpty
-, pangoSupport ? true, pango, cairo, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
+, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland }:
 
 let
   ver_maj = "1.16";
@@ -15,10 +15,19 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  configureFlags = " --enable-introspection " ;
-
-  propagatedBuildInputs = with xorg;
-    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage gobjectIntrospection ]
+  configureFlags = [
+    "--enable-introspection"
+    "--enable-gles1"
+    "--enable-gles2"
+    "--enable-kms-egl-platform"
+    "--enable-wayland-egl-platform"
+    "--enable-wayland-egl-server"
+  ];
+
+  propagatedBuildInputs = with xorg; [
+      glib gdk_pixbuf gobjectIntrospection
+      mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland
+    ]
     ++ libintlOrEmpty;
 
   buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
-- 
cgit 1.4.1


From 91ead938116beb93d05a78ff297f47acd6c00ecb Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 23 Dec 2013 19:42:19 +0100
Subject: libxslt: minor update to fix DOS security problem

---
 pkgs/development/libraries/libxslt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index e2568af6c9b..d8794142b7d 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2 }:
 
 stdenv.mkDerivation (rec {
-  name = "libxslt-1.1.27";
+  name = "libxslt-1.1.28";
 
   src = fetchurl {
     url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
-    sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n";
+    sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz";
   };
 
   buildInputs = [ libxml2 ];
-- 
cgit 1.4.1


From 4e917cdc356af05ba9cd2d479b560d3d1dd02d25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 21:45:46 +0100
Subject: python-2.6-bsddb: build this module with Berkeley DB 4.5

The current 'db' attribute refers to DB 4.8, which Python 2.6 does
recognize: <http://hydra.nixos.org/build/7320517/nixlog/1/raw>.
---
 pkgs/development/interpreters/python/2.6/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 6192c9e11e7..7fba70377d7 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
-, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
+, sqlite, tcl, tk, x11, openssl, readline, db45, ncurses, gdbm
 }:
 
 assert zlibSupport -> zlib != null;
@@ -17,7 +17,7 @@ let
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
     md5 = "c6e0420a21d8b23dee8b0195c9b9a125";
   };
-  
+
   patches =
     [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
       ./search-path.patch
@@ -34,12 +34,12 @@ let
     [ bzip2 ]
     ++ optional zlibSupport zlib;
 
-    
+
   # Build the basic Python interpreter without modules that have
   # external dependencies.
   python = stdenv.mkDerivation {
     name = "python-${version}";
-    
+
     inherit majorVersion version src patches buildInputs;
 
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
@@ -146,7 +146,7 @@ let
 
     bsddb = buildInternalPythonModule {
       moduleName = "bsddb";
-      deps = [ db4 ];
+      deps = [ db45 ];
     };
 
     crypt = buildInternalPythonModule {
@@ -193,5 +193,5 @@ let
     };
 
   };
-  
+
 in python // { inherit modules; }
-- 
cgit 1.4.1


From d57b9b0b8ba6d928436acab42cca98ccfa73433a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:35:58 +0100
Subject: haskell-github: update to version 0.7.3

---
 pkgs/development/libraries/haskell/github/default.nix     |  5 ++---
 pkgs/development/libraries/haskell/github/fix-build.patch | 13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/github/fix-build.patch

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 74368defc9c..9db0055922d 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -5,14 +5,13 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.7.2";
-  sha256 = "0w8m8ybzb63j1631v2a6xpm727zbj19dv98cml9fyzlxzlvlg5fs";
+  version = "0.7.3";
+  sha256 = "0cb7smydndigkcib4y8pbsycsqyzg45g5vrglyq1h245rd4j6s37";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure
     hashable HTTP httpConduit httpTypes network text time
     unorderedContainers vector
   ];
-  patches = [ ./fix-build.patch ];
   jailbreak = true;
   meta = {
     homepage = "https://github.com/fpco/github";
diff --git a/pkgs/development/libraries/haskell/github/fix-build.patch b/pkgs/development/libraries/haskell/github/fix-build.patch
deleted file mode 100644
index 2d3483b38ec..00000000000
--- a/pkgs/development/libraries/haskell/github/fix-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ubr github-0.7.2-orig/Github/Private.hs github-0.7.2/Github/Private.hs
---- github-0.7.2-orig/Github/Private.hs	2013-12-15 19:45:00.611789227 +0100
-+++ github-0.7.2/Github/Private.hs	2013-12-15 19:45:46.359954006 +0100
-@@ -104,9 +104,6 @@
-              in Just (Data.List.takeWhile (/= '>') s')
-         else Nothing
- 
--doHttps :: Method -> String -> Maybe GithubAuth
--        -> Maybe (RequestBody (ResourceT IO))
--        -> IO (Either E.SomeException (Response LBS.ByteString))
- doHttps reqMethod url auth body = do
-   let reqBody = fromMaybe (RequestBodyBS $ BS.pack "") body
-       reqHeaders = maybe [] getOAuth auth
-- 
cgit 1.4.1


From faedadea2823e8674cf70ccfe751b94b384f3580 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:40 +0100
Subject: haskell-digestive-functors-heist: update to version 0.8.3.1

---
 .../libraries/haskell/digestive-functors-heist/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index f83488b850d..c107c4c3c3c 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.8.3.0";
-  sha256 = "1im9247mvqngknvkjncjrjj3wydz2k9wlsin53vyddjcqbqxa54g";
+  version = "0.8.3.1";
+  sha256 = "11hrp3j3pz1ljp4mh5770fn70bga90kxgwqrm1fl6ki10q2q6z2h";
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];
-- 
cgit 1.4.1


From c460ce36508da5886a9177aa42046371eb6899ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:40 +0100
Subject: haskell-mongoDB: update to version 1.4.4

---
 pkgs/development/libraries/haskell/mongoDB/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
index 281fbb41359..448fd3b2f5f 100644
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mongoDB";
-  version = "1.4.2";
-  sha256 = "15m23q17q8asrsa27mb73ydim1yjrxl06lgf7z8w4r6jy6lk34hf";
+  version = "1.4.4";
+  sha256 = "11v0k2i0ix67zwm19w1215dslnnqllkc4jlhbs5yva2ix4z7d4gh";
   buildDepends = [
     binary bson cryptohash hashtables liftedBase monadControl mtl
     network parsec random randomShuffle text transformersBase
-- 
cgit 1.4.1


From dae18b0d6c75e94921c7e41675625c54e13e3d2f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:41 +0100
Subject: haskell-persistent-postgresql: update to version 1.2.1.3

---
 pkgs/development/libraries/haskell/persistent-postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 4195a048458..0db0a816eea 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.2.1";
-  sha256 = "04gl1qdhag60q4j2r61qr1skim1wcyx2vq34j51qk1a62wyqsdrl";
+  version = "1.2.1.3";
+  sha256 = "0chr8bs0823rkpf9cfx56ghjf29s9xaw23qx5a8g27x7dw5xvc12";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
-- 
cgit 1.4.1


From 0317d6fd3504cffebe00b05116b4aec844c962c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:41 +0100
Subject: haskell-persistent: update to version 1.2.3.2

---
 pkgs/development/libraries/haskell/persistent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

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
-- 
cgit 1.4.1


From 9a3b54a556300b5f8b3835cf50ceb496424410d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:41 +0100
Subject: haskell-postgresql-libpq: update to version 0.8.2.6

---
 pkgs/development/libraries/haskell/postgresql-libpq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index 720f8e67629..2208955a9d8 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-libpq";
-  version = "0.8.2.5";
-  sha256 = "102sakvff53dald2s7pbf22m2rgv9761251hj7bwy125jssxcd15";
+  version = "0.8.2.6";
+  sha256 = "0n3lqffscwc6pq0rfy4yjild9hcgnkpq9a8icbvgxv4si13ipsgh";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";
-- 
cgit 1.4.1


From 069166a4545f4e5b4a8dfd8f30cc398aa0be3cb4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:41 +0100
Subject: haskell-postgresql-simple: update to version 0.4.0.1

---
 pkgs/development/libraries/haskell/postgresql-simple/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index f4b6bbb6f68..ac34064972c 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.10.0";
-  sha256 = "1nfp05vxs3frp6yygf68ardz6s3pllccwl6myaa18kf42654lgyx";
+  version = "0.4.0.1";
+  sha256 = "03lj7z0n6yx55xap9606slcp0yiignwild7sibkrmg05jkb193nn";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text
     time transformers uuid vector
-- 
cgit 1.4.1


From d192c499d050c6eaa2a4c2847426eea52df7f4e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:41 +0100
Subject: haskell-unix-process-conduit: update to version 0.2.2.2

---
 pkgs/development/libraries/haskell/unix-process-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
index 8470a2d3f82..a52f9fe04fb 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-process-conduit";
-  version = "0.2.2.1";
-  sha256 = "0zix8m38dza95g6ijip4r5nxz6y9vkh5jy8ksg4qpx1v2ib1m2cc";
+  version = "0.2.2.2";
+  sha256 = "0an4lwwkzr902r0rxa35i9kdm5cpgdfmg5m06zsxzbck3mry7871";
   buildDepends = [ conduit filepath stm time transformers ];
   testDepends = [ conduit hspec transformers ];
   meta = {
-- 
cgit 1.4.1


From 4ca7f09ce501aa589159c22106ff16eeec399e66 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:42 +0100
Subject: haskell-yesod-auth: update to version 1.2.5.0

---
 pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index d6bab2c5da5..ab41a42164c 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.4.1";
-  sha256 = "05csxa0mgqnam375fq38r0rl51zdjq0bki2dzrr99469mg33fzh4";
+  version = "1.2.5.0";
+  sha256 = "1xb5dqk2cwxydvvw62h1j8rma46lm13wphsk44n0ndsdzq4pw413";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
-- 
cgit 1.4.1


From 44a9fc6fcb4a202cd20f49704508dc923f0b721d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:42 +0100
Subject: haskell-timeplot: update to version 1.0.23

---
 pkgs/development/tools/haskell/timeplot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index 71a0835713c..fc8c0e3f052 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "timeplot";
-  version = "1.0.22";
-  sha256 = "1dp1prcx3d6a0fr3xrdj6flp27sy7qbng5bbdjgjbb7rq8497if9";
+  version = "1.0.23";
+  sha256 = "0z87yzqv1bjclvyslzpclhrbfm4vcyz0q32jr4kbnfwjk3s8zyi2";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
cgit 1.4.1


From 47816b4bd471b8dd8a6550f58f051cf9305dc73c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Dec 2013 17:36:42 +0100
Subject: haskell-uuagc: update to version 0.9.50.2

---
 pkgs/development/tools/haskell/uuagc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index d94765abdd5..d61746ddbe1 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc";
-  version = "0.9.50.1";
-  sha256 = "0fpksqny1f083bzpr7pvx5ny53yds3mqss73fx4li8cwb2bs4azw";
+  version = "0.9.50.2";
+  sha256 = "1f587g4lf1gc5j9wd2fzxhjrny0a9axkpj6znxwsiylcpqw39dqs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];
-- 
cgit 1.4.1


From 682dac229ce2e7ef63fdb2658abff95fd4ade028 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 18:32:38 +0100
Subject: haskell-circle-packing: update to version 0.1.0.3

---
 pkgs/development/libraries/haskell/circle-packing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix
index bffc72cf73e..8fa1eb5ca42 100644
--- a/pkgs/development/libraries/haskell/circle-packing/default.nix
+++ b/pkgs/development/libraries/haskell/circle-packing/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "circle-packing";
-  version = "0.1.0.2";
-  sha256 = "182fadwlf6j3jhlfjskaddaickgcb07wlb7fh42yip2680gh9k1j";
+  version = "0.1.0.3";
+  sha256 = "1df284n181ny3i7ajx0j6x5grxw404zzz6y8iybmh5qgba1537g2";
   meta = {
     description = "Simple heuristic for packing discs of varying radii in a circle";
     license = self.stdenv.lib.licenses.bsd3;
-- 
cgit 1.4.1


From 969e23d5d1f9ecf16a69566f6987f886d599a363 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 18:32:38 +0100
Subject: haskell-direct-sqlite: update to version 2.3.9

---
 pkgs/development/libraries/haskell/direct-sqlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
index 7dc259cef93..9ffd3ca728d 100644
--- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "direct-sqlite";
-  version = "2.3.8";
-  sha256 = "0qvqacjymrm6yy093p8biq3swdinh3lx75m27iz1p3ckdkw10lva";
+  version = "2.3.9";
+  sha256 = "0haq14acdijd41jvah6f6l6qlqc4wjp3mwkx57pz4q5m6qvxrz44";
   buildDepends = [ text ];
   testDepends = [ base16Bytestring HUnit text ];
   meta = {
-- 
cgit 1.4.1


From 047988fe49a903dd8cf0962bc61dd163f5d30171 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 18:32:38 +0100
Subject: haskell-force-layout: update to version 0.2.0.1

---
 pkgs/development/libraries/haskell/force-layout/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 025ed14869f..a0816b5e7aa 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.2";
-  sha256 = "0aif7a28qs8ya7q9sklp02gb5228jyj8k4jabbp2sia7j4khrkpv";
+  version = "0.2.0.1";
+  sha256 = "1fvkfgjwsh0cr6ay4djxc8wg0vqfw2vcq3clqjz0zi8zyyjpv8rx";
   buildDepends = [ lens newtype vectorSpace vectorSpacePoints ];
   meta = {
     description = "Simple force-directed layout";
-- 
cgit 1.4.1


From beb05c164055b6f89c850b82d6774f9bdd232f51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 18:32:38 +0100
Subject: haskell-ghc-vis: update to version 0.7.2.1

---
 pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index bfedbdb776d..a768a101145 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-vis";
-  version = "0.7.2";
-  sha256 = "1mb33fafi212a6wawnd8601r80qjb1bja6nbj6jqrd91y96dxdll";
+  version = "0.7.2.1";
+  sha256 = "160b45bgiz2ckva70dnmkf6i9bvffaavm5wzia2lk8c65pnvc9ih";
   buildDepends = [
     cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
     transformers xdot
-- 
cgit 1.4.1


From a7c748f43ea382ae569f2de5a34c55d4b9bd5f3d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 18:32:39 +0100
Subject: haskell-scotty: update to version 0.6.2

---
 pkgs/development/libraries/haskell/scotty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index d72aed42852..b3ca635ac21 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.6.1";
-  sha256 = "1fcrd1fxlmgkm9d6xfyb76pmn68pgk0a367lpmyh77kp0zr3f7ib";
+  version = "0.6.2";
+  sha256 = "0szki6wcmhj20kxhmgidgf930xwhiq03qrk8m0x8aklcjzkhvy69";
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
     mtl regexCompat text transformers wai waiExtra warp
-- 
cgit 1.4.1


From 70ccb085dfaf02885f937914a2de3e9ff6c943b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 18:32:39 +0100
Subject: haskell-wl-pprint-text: update to version 1.1.0.1

---
 pkgs/development/libraries/haskell/wl-pprint-text/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
index 083f269255a..e800b3cee47 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wl-pprint-text";
-  version = "1.1.0.0";
-  sha256 = "18xgsrxg20sk18m9dwds6161vl4hgdp052qbb0cg9jqy50vhddis";
+  version = "1.1.0.1";
+  sha256 = "1rb5jmryxzcn6j8xalvsgwr61d1qzmsjyfp3iiq10n565bja70za";
   buildDepends = [ text ];
   meta = {
     description = "A Wadler/Leijen Pretty Printer for Text values";
-- 
cgit 1.4.1


From b0b46acdf05df149259085d06869866d08d32246 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 18:32:39 +0100
Subject: haskell-xdot: update to version 0.2.4.2

---
 pkgs/development/libraries/haskell/xdot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
index 7119705b357..700a838f894 100644
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ b/pkgs/development/libraries/haskell/xdot/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xdot";
-  version = "0.2.4.1";
-  sha256 = "1k1ci9lq8l9bx8ks7rdng9jjj6d7hcwgmfbz757al85m1q17xa64";
+  version = "0.2.4.2";
+  sha256 = "0a5wmwcl3akw1n9xgdhvlrbvphvy9s528daax28137ixaphvrl0f";
   buildDepends = [ cairo graphviz gtk mtl polyparse text ];
   meta = {
     description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
-- 
cgit 1.4.1


From c38099568697cb7c5c2ebc758098930645833840 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Dec 2013 18:32:39 +0100
Subject: haskell-yesod-auth: update to version 1.2.5.1

---
 pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index ab41a42164c..9de464d8ae3 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.5.0";
-  sha256 = "1xb5dqk2cwxydvvw62h1j8rma46lm13wphsk44n0ndsdzq4pw413";
+  version = "1.2.5.1";
+  sha256 = "163snl6165zkndcmr3iy48yl04rs7cp67kq77yxglxm420y8391h";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
-- 
cgit 1.4.1


From 0bf0610d1419fa8692dae90e1674ad638df4390b Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 24 Dec 2013 10:49:56 +0100
Subject: libpng: upgrade apng patch .7 -> .8

---
 pkgs/development/libraries/libpng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 2eb30473c92..f120bca50c6 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -6,8 +6,8 @@ let
   version = "1.6.8";
   sha256 = "109h2fcjspd792lvh5q4xnkpsv7rjczmrdl15i4ajx0xbs5kvxr4";
   patch_src = fetchurl {
-    url = "mirror://sourceforge/libpng-apng/libpng-1.6.7-apng.patch.gz";
-    sha256 = "1g5hmlb9smwl9qv6wb2d7795jqcfrx8g3dhrya5dshrj909jb95k";
+    url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
+    sha256 = "0wysnv0d8h7pyz7gfagnkwra2k7malqga1cn6wbk2l7a8k2r53qi";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 
-- 
cgit 1.4.1


From 94536ea09fbec5415bdd31cff6b271d8d764eae5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 18 Dec 2013 23:54:55 +0100
Subject: nss: Fix patch download URL

---
 pkgs/development/libraries/nss/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index bc361b39dd6..66e98a9d961 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,7 +11,7 @@ let
 
   secLoadPatch = fetchurl {
     name = "security_load.patch";
-    urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.3-1/85_security_load.patch;
+    urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.3.1-1/85_security_load.patch;
     sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds";
   };
 
-- 
cgit 1.4.1


From 2f624cd1fad832cdf852edeeb4033bb24b97807b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 24 Dec 2013 14:34:56 +0100
Subject: Make xcode detection a bit more robust and configurable

---
 pkgs/development/mobile/xcodeenv/default.nix      | 4 ++--
 pkgs/development/mobile/xcodeenv/xcodewrapper.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index 7f834688e63..ad6569d9478 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,8 +1,8 @@
-{stdenv}:
+{stdenv, version ? "5.0"}:
 
 rec {
   xcodewrapper = import ./xcodewrapper.nix {
-    inherit stdenv;
+    inherit stdenv version;
   };
 
   buildApp = import ./build-app.nix {
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
index 7515fcdd121..71e34ee5127 100644
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -1,4 +1,4 @@
-{stdenv, version ? "5.0"}:
+{stdenv, version}:
 
 stdenv.mkDerivation {
   name = "xcode-wrapper-"+version;
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
 
     # Check if we have the xcodebuild version that we want
-    if [ -z "$($out/bin/xcodebuild -version | grep ${version})" ]
+    if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ]
     then
         echo "We require xcodebuild version: ${version}"
         exit 1
-- 
cgit 1.4.1


From dad3202472574e9fcf846d0c46434e288ab9fc70 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 24 Dec 2013 22:20:50 +0200
Subject: libtorrentRasterbar: update from 0.16.12 to 0.16.13

---
 pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 7c3e7ed69a9..b4380c71986 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
-  version = "0.16.12";
+  version = "0.16.13";
   
   src = fetchurl {
     url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0s2nxhz4d93xcl6hchmfgi8hq7aw8mrkgixh5an7fbk4shswpcg8";
+    sha256 = "1sr788hhip6pgfb842110nl36hqdc1vz2s9n5vzypm0jy7qklmvm";
   };
 
   buildInputs = [ boost pkgconfig openssl zlib python ];
-- 
cgit 1.4.1


From 91decd3a354e56e4f413a3b8139a6022fae1ba43 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 24 Dec 2013 23:19:55 +0200
Subject: libtorrentRasterbar: add missing dependencies

---
 pkgs/development/libraries/libtorrent-rasterbar/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index b4380c71986..035077e12a6 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python }:
+{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconvOrNull, geoip }:
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
@@ -9,12 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "1sr788hhip6pgfb842110nl36hqdc1vz2s9n5vzypm0jy7qklmvm";
   };
 
-  buildInputs = [ boost pkgconfig openssl zlib python ];
+  buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ];
 
   configureFlags = [ 
     "--with-boost=${boost}/include/boost" 
     "--with-boost-libdir=${boost}/lib" 
     "--enable-python-binding"
+    "--with-libgeoip=system"
+    "--with-libiconv=yes"
  ];
   
   meta = with stdenv.lib; {
-- 
cgit 1.4.1


From 2abbce201a0187fda2997337d690bda0d49d118c Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Wed, 25 Dec 2013 10:28:35 +0100
Subject: gdal: add libtiff to buildInputs as well (fix build)

so that its private deps propagate.
---
 pkgs/development/libraries/gdal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index dde95364337..a641040187a 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -9,7 +9,7 @@ composableDerivation.composableDerivation {} (fixed: {
     md5 = "f5592cff69b239166c9b64ff81943b1a";
   };
 
-  buildInputs = [ unzip libjpeg ];
+  buildInputs = [ unzip libjpeg libtiff ];
 
   # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults
   preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0";
-- 
cgit 1.4.1


From 545216ee02d888b8d696dbb6a678a5d068d72eb0 Mon Sep 17 00:00:00 2001
From: Malcolm Matalka <mmatalka@gmail.com>
Date: Tue, 17 Dec 2013 23:16:38 +0100
Subject: Opam: Update to 1.1.0

Also keeps 1.0 for backwards compatibility.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/development/tools/ocaml/opam/1.0.0.nix   | 60 ++++++++++++++++++++++++++
 pkgs/development/tools/ocaml/opam/1.1.nix     | 61 +++++++++++++++++++++++++++
 pkgs/development/tools/ocaml/opam/default.nix | 60 --------------------------
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 124 insertions(+), 61 deletions(-)
 create mode 100644 pkgs/development/tools/ocaml/opam/1.0.0.nix
 create mode 100644 pkgs/development/tools/ocaml/opam/1.1.nix
 delete mode 100644 pkgs/development/tools/ocaml/opam/default.nix

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/ocaml/opam/1.0.0.nix b/pkgs/development/tools/ocaml/opam/1.0.0.nix
new file mode 100644
index 00000000000..f8f680ef4a5
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/1.0.0.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
+
+let
+  srcs = {
+    cudf = fetchurl {
+      url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz";
+      sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665";
+    };
+    extlib = fetchurl {
+      url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz";
+      sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
+    };
+    ocaml_re = fetchurl {
+      url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz";
+      sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f";
+    };
+    ocamlgraph = fetchurl {
+      url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz";
+      sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43";
+    };
+    dose3 = fetchurl {
+      url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz";
+      sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3";
+    };
+    cmdliner = fetchurl {
+      url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz";
+      sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81";
+    };
+    opam = fetchurl {
+      url = "https://github.com/OCamlPro/opam/archive/1.0.0.zip";
+      sha256 = "f8d94a91c2b8d110fa5e3b0a87c512a860acbae110654498a164c5c888c40bda";
+    };
+  };
+in
+stdenv.mkDerivation rec {
+  name = "opam-1.0.0";
+
+  buildInputs = [unzip curl ncurses ocaml];
+
+  src = srcs.opam;
+
+  postUnpack = ''
+    ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name}
+    ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name}
+    ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name}
+    ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name}
+    ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name}
+    ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name}
+  '';
+
+  makeFlags = ["HOME=$(TMPDIR)"];
+
+  doCheck = false;
+
+  meta = {
+    maintainers = stdenv.lib.maintainers.orbitz;
+    description = "A package manager for OCaml";
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix
new file mode 100644
index 00000000000..9d16c6f1e81
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/1.1.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
+
+let
+  srcs = {
+    cudf = fetchurl {
+      url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz";
+      sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665";
+    };
+    extlib = fetchurl {
+      url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz";
+      sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
+    };
+    ocaml_re = fetchurl {
+      url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz";
+      sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f";
+    };
+    ocamlgraph = fetchurl {
+      url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz";
+      sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43";
+    };
+    dose3 = fetchurl {
+      url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz";
+      sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3";
+    };
+    cmdliner = fetchurl {
+      url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz";
+      sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81";
+    };
+    opam = fetchurl {
+      url = "https://github.com/ocaml/opam/archive/1.1.0.zip";
+      sha256 = "38a5edc1428f9e8e0d13e7017c97e1614dd651b75b4c234c80ff22f103d38bf7";
+    };
+  };
+in
+stdenv.mkDerivation rec {
+  name = "opam-1.1.0";
+
+  buildInputs = [unzip curl ncurses ocaml];
+
+  src = srcs.opam;
+
+  postUnpack = ''
+    ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name}
+    ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name}
+    ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name}
+    ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name}
+    ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name}
+    ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name}
+  '';
+
+  # Dirty, but apparently ocp-build requires a TERM
+  makeFlags = ["TERM=screen"];
+
+  doCheck = false;
+
+  meta = {
+    maintainers = [stdenv.lib.maintainers.orbitz];
+    description = "A package manager for OCaml";
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
deleted file mode 100644
index c36d0004992..00000000000
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
-
-let
-  srcs = {
-    cudf = fetchurl {
-      url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz";
-      sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665";
-    };
-    extlib = fetchurl {
-      url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz";
-      sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
-    };
-    ocaml_re = fetchurl {
-      url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz";
-      sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f";
-    };
-    ocamlgraph = fetchurl {
-      url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz";
-      sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43";
-    };
-    dose3 = fetchurl {
-      url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz";
-      sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3";
-    };
-    cmdliner = fetchurl {
-      url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz";
-      sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81";
-    };
-    opam = fetchurl {
-      url = "https://github.com/OCamlPro/opam/archive/1.0.0.zip";
-      sha256 = "f8d94a91c2b8d110fa5e3b0a87c512a860acbae110654498a164c5c888c40bda";
-    };
-  };
-in
-stdenv.mkDerivation rec {
-  name = "opam-1.0.0";
-
-  buildInputs = [unzip curl ncurses ocaml];
-
-  src = srcs.opam;
-
-  postUnpack = ''
-    ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name}
-    ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name}
-    ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name}
-    ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name}
-    ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name}
-    ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name}
-  '';
-
-  makeFlags = ["HOME=$(TMPDIR)"];
-
-  doCheck = false;
-
-  meta = {
-    maintainers = stdenv.lib.maintainers.orbitz;
-    description = "A package manager for ocaml";
-    platforms   = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a71e712b557..ce38f2c4880 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3023,7 +3023,9 @@ let
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };
 
-    opam = callPackage ../development/tools/ocaml/opam { };
+    opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
+    opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { ocaml = ocaml_4_01_0; };
+    opam = opam_1_1;
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1;
-- 
cgit 1.4.1


From e87515e5198a9b225778caea4c7b88fe27c8fabb Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 25 Dec 2013 14:43:23 +0100
Subject: Opam 1.1: Constrain supported ocaml versions.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/development/tools/ocaml/opam/1.1.nix | 3 +++
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix
index 9d16c6f1e81..c5093db107d 100644
--- a/pkgs/development/tools/ocaml/opam/1.1.nix
+++ b/pkgs/development/tools/ocaml/opam/1.1.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
 
+# Opam 1.1 only works with ocaml >= 3.12.1 according to ./configure
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
+
 let
   srcs = {
     cudf = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce38f2c4880..6a75135604d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3024,7 +3024,7 @@ let
     pycaml = callPackage ../development/ocaml-modules/pycaml { };
 
     opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
-    opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { ocaml = ocaml_4_01_0; };
+    opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
     opam = opam_1_1;
   };
 
-- 
cgit 1.4.1


From 28cb01ee89247796dae018090dbb29f7c90f8ded Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Wed, 25 Dec 2013 18:51:35 +0100
Subject: libtiff on darwin: attempt to fix build

---
 pkgs/development/libraries/libtiff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index d4e35a115e8..2c99199664d 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
       patch -p0 < "$p"
     done
     )
-    patch -p0 < ${patchDir}/*-tiff2pdf-colors.patch
-  '';
+    patch -p0 < ${patchDir}/${if stdenv.isDarwin then "tiff-4.0.3" else "*"}-tiff2pdf-colors.patch
+  ''; # ^ sh on darwin seems not to expand globs in redirects, and I don't want to rebuild all again elsewhere
 
   nativeBuildInputs = [ pkgconfig ];
 
-- 
cgit 1.4.1


From 44c97e02f69add2691ce06424bd62c90b595297d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 26 Dec 2013 18:38:10 -0500
Subject: Move GEM_PATH part of rubygems' setup hook to ruby

Fixes #1413

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/interpreters/ruby/ruby-18.nix  | 15 +++++++++++++--
 pkgs/development/interpreters/ruby/ruby-19.nix  | 15 +++++++++++++--
 pkgs/development/interpreters/ruby/ruby-2.0.nix | 13 ++++++++++++-
 pkgs/development/interpreters/ruby/rubygems.nix |  6 ------
 4 files changed, 38 insertions(+), 11 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/ruby/ruby-18.nix b/pkgs/development/interpreters/ruby/ruby-18.nix
index f37e8baa68d..356fce4913c 100644
--- a/pkgs/development/interpreters/ruby/ruby-18.nix
+++ b/pkgs/development/interpreters/ruby/ruby-18.nix
@@ -33,8 +33,19 @@ stdenv.mkDerivation rec {
   configureFlags = ["--enable-shared" "--enable-pthread"];
 
   installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = "mkdir -pv $out/${passthru.gemPath}";
+
+  postInstall = ''
+    # Bundler tries to create this directory
+    mkdir -pv $out/${passthru.gemPath}
+    mkdir -p $out/nix-support
+    cat > $out/nix-support/setup-hook <<EOF
+    addGemPath() {
+      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
+    }
+
+    envHooks+=(addGemPath)
+    EOF
+  '';
 
   meta = {
     license = "Ruby";
diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix
index 345439b593e..d18718184ba 100644
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-19.nix
@@ -48,8 +48,19 @@ stdenv.mkDerivation rec {
     ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
 
   installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = "mkdir -pv $out/${passthru.gemPath}";
+
+  postInstall = ''
+    # Bundler tries to create this directory
+    mkdir -pv $out/${passthru.gemPath}
+    mkdir -p $out/nix-support
+    cat > $out/nix-support/setup-hook <<EOF
+    addGemPath() {
+      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
+    }
+
+    envHooks+=(addGemPath)
+    EOF
+  '';
 
   meta = {
     license     = "Ruby";
diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.nix
index 4ad2f8c515e..ae242107b96 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.0.nix
@@ -46,7 +46,18 @@ stdenv.mkDerivation rec {
 
   installFlags = stdenv.lib.optionalString docSupport "install-doc";
   # Bundler tries to create this directory
-  postInstall = "mkdir -pv $out/${passthru.gemPath}";
+  postInstall = ''
+    # Bundler tries to create this directory
+    mkdir -pv $out/${passthru.gemPath}
+    mkdir -p $out/nix-support
+    cat > $out/nix-support/setup-hook <<EOF
+    addGemPath() {
+      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
+    }
+
+    envHooks+=(addGemPath)
+    EOF
+  '';
 
   meta = {
     license = "Ruby";
diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index 22076d5ed9e..13829c3f9f6 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -18,12 +18,6 @@ rec {
     cat > $out/nix-support/setup-hook <<EOF
     export RUBYOPT=rubygems
     addToSearchPath RUBYLIB $out/lib
-
-    addGemPath() {
-      addToSearchPath GEM_PATH \$1/${ruby.gemPath}
-    }
-
-    envHooks+=(addGemPath)
     EOF'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
   /* doConfigure should be specified separately */
-- 
cgit 1.4.1


From 8cb70b0b931fbe3c544ee4ce6a557a5aee88d086 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 27 Dec 2013 08:25:39 +0100
Subject: Upgrade cppunit to 1.13.2

---
 pkgs/development/libraries/cppunit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 596720c542c..fd36a91e32a 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "cppunit-1.12.1";
+  name = "cppunit-1.13.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz;
-    sha256 = "0jm49v5rmc5qw34vqs56gy8xja1dhci73bmh23cig4kcir6a0a5c";
+    url = http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz;
+    sha256 = "17s2kzmkw3kfjhpp72rfppyd7syr7bdq5s69syj2nvrlwd3d4irz";
   };
 
   meta = {
-- 
cgit 1.4.1


From a126ce011af5292f44c60f0a55423cec3917570c Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 28 Dec 2013 15:34:08 +0100
Subject: gnumeric: add schemas and icons, refactor

Also move goffice under gnome3,
as it's released in the same way.
---
 pkgs/applications/office/gnumeric/default.nix      | 17 +++++---
 pkgs/desktops/gnome-3/default.nix                  | 21 +++++++---
 pkgs/desktops/gnome-3/misc/goffice/0.8.nix         | 37 +++++++++++++++++
 pkgs/desktops/gnome-3/misc/goffice/default.nix     | 33 +++++++++++++++
 pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch | 13 ++++++
 pkgs/development/libraries/goffice/0.10.nix        | 37 -----------------
 pkgs/development/libraries/goffice/default.nix     | 48 ----------------------
 pkgs/development/libraries/goffice/pcre_info.patch | 13 ------
 pkgs/top-level/all-packages.nix                    | 23 ++++-------
 9 files changed, 117 insertions(+), 125 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/misc/goffice/0.8.nix
 create mode 100644 pkgs/desktops/gnome-3/misc/goffice/default.nix
 create mode 100644 pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch
 delete mode 100644 pkgs/development/libraries/goffice/0.10.nix
 delete mode 100644 pkgs/development/libraries/goffice/default.nix
 delete mode 100644 pkgs/development/libraries/goffice/pcre_info.patch

(limited to 'pkgs/development')

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index f4389716b76..10b486a438f 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl
-, bzip2, glib, goffice, gtk3, intltool, libglade, libgsf, libxml2
-, pango, pkgconfig, scrollkeeper, zlib
+{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
+, goffice, makeWrapper, gtk3, gnome_icon_theme
 }:
 
 stdenv.mkDerivation rec {
@@ -11,13 +10,21 @@ stdenv.mkDerivation rec {
     sha256 = "1rv2ifw6rp0iza4fkf3bffvdkyi77dwvzdnvcbpqcyn2kxfsvlsc";
   };
 
+  preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs
+
   configureFlags = "--disable-component";
 
+  # ToDo: optional libgda, python, introspection?
   buildInputs = [
-    bzip2 glib goffice gtk3 intltool libglade libgsf libxml2
-    pango pkgconfig scrollkeeper zlib
+    pkgconfig intltool perl perlXMLParser
+    goffice gtk3 makeWrapper
   ];
 
+  postInstall = ''
+    wrapProgram "$out"/bin/gnumeric-* \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome_icon_theme}/share"
+  '';
+
   meta = {
     description = "The GNOME Office Spreadsheet";
     license = "GPLv2+";
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d3e575a7d27..d214a44aa0a 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -1,14 +1,16 @@
-{ callPackage, lib, self, stdenv, gettext, overrides ? {}, pkgs }:
+{ callPackage, self, pkgs }:
 
 rec {
-  inherit (pkgs) fetchurl_gnome glib gtk3 atk pango;
-  gtk = gtk3;
+  inherit (pkgs) glib gtk2 gtk3 gnome2;
+  gtk = gtk3; # just to be sure
   inherit (pkgs.gnome2) gnome_common ORBit2;
   orbit = ORBit2;
 
-  inherit (lib) lowPrio hiPrio appendToName makeOverridable;
 
-  __overrides = overrides;
+#### Overrides of libraries
+
+  librsvg = pkgs.librsvg.override { inherit gtk2; }; # gtk2 mysteriously needed in librsvg for goffice (commented in Gentoo)
+
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
@@ -31,7 +33,7 @@ rec {
 
   gnome_terminal = callPackage ./core/gnome-terminal { };
 
-  gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { });
+  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
 
   gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
 
@@ -43,16 +45,23 @@ rec {
 
   zenity = callPackage ./core/zenity { };
 
+
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
 
   gnome_dictionary = callPackage ./desktop/gnome-dictionary { };
 
   gnome_desktop = callPackage ./desktop/gnome-desktop { };
 
+
   # Removed from recent GNOME releases, but still required
   scrollkeeper = callPackage ./desktop/scrollkeeper { };
 
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 
+
+#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
+
+  goffice = callPackage ./misc/goffice { };
+
 }
diff --git a/pkgs/desktops/gnome-3/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/misc/goffice/0.8.nix
new file mode 100644
index 00000000000..02520a9f121
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/goffice/0.8.nix
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
+, pango, libgsf, libxml2, libart, intltool, gettext
+, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.8.17";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
+    sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
+  };
+
+  # fix linking error: undefined reference to pcre_info
+  patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
+
+  buildInputs = [
+    pkgconfig libglade bzip2 libart intltool gettext
+    gconf libgnomeui pcre
+  ];
+
+  propagatedBuildInputs = [
+    # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
+    glib libgsf libxml2 gtk libglade libart cairo pango
+  ];
+
+  postInstall =
+    ''
+      # Get GnuCash to build.  Might be unnecessary if we upgrade pkgconfig.
+      substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
+    '';
+
+  doCheck = true;
+
+  meta = gnome3.goffice.meta // {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/misc/goffice/default.nix b/pkgs/desktops/gnome-3/misc/goffice/default.nix
new file mode 100644
index 00000000000..d708ab92113
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/goffice/default.nix
@@ -0,0 +1,33 @@
+{ fetchurl, stdenv, pkgconfig, intltool, bzip2, glib, gdk_pixbuf, gtk3
+, libgsf, libxml2, cairo, pango, librsvg, libspectre }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.10.9";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
+    sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg";
+  };
+
+  propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
+    pkgconfig intltool bzip2 glib gdk_pixbuf gtk3
+    libgsf libxml2 cairo pango librsvg libspectre
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "A Glib/GTK+ set of document centric objects and utilities";
+
+    longDescription = ''
+      There are common operations for document centric applications that are
+      conceptually simple, but complex to implement fully: plugins, load/save
+      documents, undo/redo.
+    '';
+
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.gnu;
+  };
+  passthru = { inherit meta; };
+}
diff --git a/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch
new file mode 100644
index 00000000000..cd4ef3c9fed
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch
@@ -0,0 +1,13 @@
+diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
+index bc4aae4..3adb696 100644
+--- a/goffice/utils/regutf8.c
++++ b/goffice/utils/regutf8.c
+@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ 		default: return GO_REG_BADPAT;
+ 		}
+ 	} else {
+-		gor->re_nsub = pcre_info (r, NULL, NULL);
++		gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
+ 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ 		return 0;
+ 	}
diff --git a/pkgs/development/libraries/goffice/0.10.nix b/pkgs/development/libraries/goffice/0.10.nix
deleted file mode 100644
index 20414952834..00000000000
--- a/pkgs/development/libraries/goffice/0.10.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
-, pango, libgsf, libxml2, libart, librsvg, intltool, gettext
-, cairo, gconf, libgnomeui }:
-
-stdenv.mkDerivation rec {
-  name = "goffice-0.10.9";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg";
-  };
-
-  buildInputs = [
-    pkgconfig libglade bzip2 libart intltool gettext
-    gconf libgnomeui
-  ];
-
-  propagatedBuildInputs = [
-    glib libgsf libxml2 gtk libglade libart librsvg cairo pango
-  ];
-
-  doCheck = true;
-
-  meta = {
-    description = "GOffice, a Glib/GTK+ set of document centric objects and utilities";
-
-    longDescription = ''
-      There are common operations for document centric applications that are
-      conceptually simple, but complex to implement fully: plugins, load/save
-      documents, undo/redo.
-    '';
-
-    license = "GPLv2+";
-
-    platforms = stdenv.lib.platforms.gnu;
-  };
-}
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
deleted file mode 100644
index 016b340c51f..00000000000
--- a/pkgs/development/libraries/goffice/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
-, pango, libgsf, libxml2, libart, intltool, gettext
-, cairo, gconf, libgnomeui, pcre }:
-
-stdenv.mkDerivation rec {
-  name = "goffice-0.8.17";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
-    sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
-  };
-
-  # fix linking error: undefined reference to pcre_info
-  patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
-
-  buildInputs = [
-    pkgconfig libglade bzip2 libart intltool gettext
-    gconf libgnomeui pcre
-  ];
-
-  propagatedBuildInputs = [
-    # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
-    glib libgsf libxml2 gtk libglade libart cairo pango
-  ];
-
-  postInstall =
-    ''
-      # Get GnuCash to build.  Might be unnecessary if we upgrade pkgconfig.
-      substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
-    '';
-
-  doCheck = true;
-
-  meta = {
-    description = "GOffice, a Glib/GTK+ set of document centric objects and utilities";
-
-    longDescription = ''
-      There are common operations for document centric applications that are
-      conceptually simple, but complex to implement fully: plugins, load/save
-      documents, undo/redo.
-    '';
-
-    license = "GPLv2";
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;
-  };
-}
diff --git a/pkgs/development/libraries/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch
deleted file mode 100644
index cd4ef3c9fed..00000000000
--- a/pkgs/development/libraries/goffice/pcre_info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
-index bc4aae4..3adb696 100644
---- a/goffice/utils/regutf8.c
-+++ b/goffice/utils/regutf8.c
-@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
- 		default: return GO_REG_BADPAT;
- 		}
- 	} else {
--		gor->re_nsub = pcre_info (r, NULL, NULL);
-+		gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
- 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
- 		return 0;
- 	}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39eb66d5435..cf9d64a1f0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4361,19 +4361,6 @@ let
 
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
 
-  goffice = callPackage ../development/libraries/goffice {
-    inherit (gnome) libglade libgnomeui;
-    gconf = gnome.GConf;
-    libart = gnome.libart_lgpl;
-  };
-
-  goffice_0_10 = callPackage ../development/libraries/goffice/0.10.nix {
-    inherit (gnome) libglade libgnomeui;
-    gconf = gnome.GConf;
-    libart = gnome.libart_lgpl;
-    gtk = gtk3;
-  };
-
   goocanvas = callPackage ../development/libraries/goocanvas { };
 
   gperftools = callPackage ../development/libraries/gperftools { };
@@ -7877,7 +7864,6 @@ let
 
   inherit (gnome3) evince;
   keepass = callPackage ../applications/misc/keepass { };
-
   evolution_data_server = newScope (gnome) ../servers/evolution-data-server { };
 
   exrdisplay = callPackage ../applications/graphics/exrdisplay {
@@ -8056,7 +8042,13 @@ let
     gconf = gnome2.GConf;
     guile = guile_1_8;
     slibGuile = slibGuile.override { scheme = guile_1_8; };
+    goffice = goffice_0_8;
   };
+  goffice_0_8 = callPackage ../desktops/gnome-3/misc/goffice/0.8.nix {
+    inherit (gnome2) libglade libgnomeui;
+    gconf = gnome2.GConf;
+    libart = gnome2.libart_lgpl;
+  }; # latest version: gnome3.goffice
 
   ideas = recurseIntoAttrs (callPackage ../applications/editors/idea { });
 
@@ -8086,8 +8078,7 @@ let
   };
 
   gnumeric = callPackage ../applications/office/gnumeric {
-    goffice = goffice_0_10;
-    inherit (gnome) libglade scrollkeeper;
+    inherit (gnome3) goffice gnome_icon_theme;
   };
 
   gnunet = callPackage ../applications/networking/p2p/gnunet { };
-- 
cgit 1.4.1