From 4bcdeb49a1d882c4ab2e4e0a099be812ba88fa91 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 -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 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') 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 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') 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 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') 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 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') 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 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') 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 5bcdc3efd2f92a2d611f5f0e76a765b7ffc27511 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 5 Oct 2013 22:17:01 +0200 Subject: xorg server: major update 1.13.4 -> 1.14.3 - The 1.13 branch gets no updates since April, so I thought it's a good time to switch. - Some xorg modules needed to be updated to build, but some don't have the update (probably all very obscure). - Maybe it would be good to update the intel driver (or some others), I don't know. --- pkgs/servers/x11/xorg/default.nix | 52 ++++++++++++++++----------------- pkgs/servers/x11/xorg/tarballs-7.7.list | 16 +++++----- 2 files changed, 34 insertions(+), 34 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 852d7ab9841..d4401177db9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1370,11 +1370,11 @@ let })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.6.2"; + name = "xf86-input-synaptics-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2; - sha256 = "082rlbyw63sashjbwd7dd0a0smp5n8yv9bihy19c706lhnhddxy3"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2; + sha256 = "13mmpcwp1d69w6c458a4fdqgwl24bpvrnq3zd6833chz1rk2an6v"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1420,11 +1420,11 @@ let })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) { - name = "xf86-video-ast-0.97.0"; + name = "xf86-video-ast-0.98.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2; - sha256 = "0xlfk64pa0vbg74m261fw8cn4vw6jw3nxm6wys9m4j3n2rwd9z18"; + url = mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2; + sha256 = "188nv73w0p5xhfxz2dffli44yzyn1qhhq3qkwc8wva9dhg25n8lh"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1440,31 +1440,31 @@ let })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) { - name = "xf86-video-cirrus-1.5.1"; + name = "xf86-video-cirrus-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2; - sha256 = "0my54x52fsa82bsh196hz79750xjlv8ddbvin7230ck7pnf44md9"; + url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2; + sha256 = "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) { - name = "xf86-video-dummy-0.3.6"; + name = "xf86-video-dummy-0.3.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2; - sha256 = "16773lxa74d9v2x758bx0byrmxssplqygnjn09q3klr605j5ncs4"; + url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2; + sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) { - name = "xf86-video-fbdev-0.4.3"; + name = "xf86-video-fbdev-0.4.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2; - sha256 = "0ca8khgy3wv0fys7s4087apvnp8j86blxj5m5m70l10hs5x06yzz"; + url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; + sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; @@ -1540,14 +1540,14 @@ let })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) { - name = "xf86-video-neomagic-1.2.7"; + name = "xf86-video-neomagic-1.2.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2; - sha256 = "0xnbk2y5pzs1g3w2rmjc4k3nyq6kazf67bv4q3dnbywalsgfh1lz"; + url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2; + sha256 = "0x48sxs1p3kmwk3pq1j7vl93y59gdmgkq1x5xbnh0yal0angdash"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ]; + })) // {inherit fontsproto libpciaccess xorgserver xproto ;}; xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) { name = "xf86-video-newport-0.2.4"; @@ -1680,11 +1680,11 @@ let })) // {inherit randrproto videoproto xorgserver xproto ;}; xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) { - name = "xf86-video-vesa-2.3.2"; + name = "xf86-video-vesa-2.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2; - sha256 = "1qqf97baii1dcsm3y8gqw674j4r8llhkbqsavhyn11iwmvzifjhl"; + url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2; + sha256 = "1y5fsg0c4bgmh1cfsbnaaf388fppyy02i7mcy9vax78flkjpb2yf"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -1900,11 +1900,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.13.4"; + name = "xorg-server-1.14.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2; - sha256 = "1kwq5hqgl3qmm4nxh5iwpa0wwwzsj67fxqiiglzhyyrwgy46kjd2"; + url = mirror://xorg/individual/xserver/xorg-server-1.14.3.tar.bz2; + sha256 = "0pjgp30j7v3v0db26462ajnmhbysy4vmqkcnbyswnga47bhml4h2"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4464aeea9b8..419be226363 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -116,15 +116,15 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.1.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 @@ -132,7 +132,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 @@ -146,7 +146,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 @@ -164,7 +164,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.14.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 -- cgit 1.4.1 From f445474d33b2a4a958303c7c26fc36499e595cd2 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 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') 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 4a96c8cf6aae464c5ec4a92cb8113c24060f8fed Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 20 Sep 2013 21:36:17 +0200 Subject: gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH --- pkgs/desktops/gnome-2/platform/gnome-common/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index 548783abf79..929ed44b752 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome }: +{ stdenv, fetchurl, fetchurl_gnome, which }: stdenv.mkDerivation rec { name = src.pkgname; @@ -8,4 +8,11 @@ stdenv.mkDerivation rec { major = "2"; minor = "34"; patchlevel = "0"; sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; + + propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which + + patches = [(fetchurl { + url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; + sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; + })]; } -- cgit 1.4.1 From e790d27543ba9bd8fa89345b20094081451362e0 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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 '\ 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 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') 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 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') 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 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') 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 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') 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 f9094a77b59983915549653fb4e19aa752237ab6 Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sun, 3 Nov 2013 16:35:56 +0000 Subject: darwin x11/opengl: only copy subset of files (close #1165) Copy only the pc files related to X11 and OpenGL. This should allow us to build our own version of libraries like cairo without having the native ones be accidentally dynamically linked in to things that depend on them. Before this patch if we `dyldinfo -dylibs libpangocairo` we can see that it was dynamically linked against the OS X (but seemingly built against include files from the nix one, as we would get a runtime complaint about missing symbols) --- pkgs/os-specific/darwin/native-x11-and-opengl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix index cee03741dce..3844912f6ba 100644 --- a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix +++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { builder = writeScript "${name}-builder.sh" '' /bin/mkdir -p $out - /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/ + /bin/mkdir $out/lib + /bin/ln -sv /usr/X11/lib/{*.dylib,X11,xorg} $out/lib + /bin/mkdir $out/lib/pkgconfig + /bin/ln -sv /usr/X11/lib/pkgconfig/{x*.pc,gl*.pc} $out/lib/pkgconfig + /bin/ln -sv /usr/X11/{bin,include,share} $out/ ''; } -- cgit 1.4.1 From 0ed07fdeaa7a345609dc38b50a491acf45f533e3 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 834af9c90508f8bec6e43b8b2d38aae9e1070cdc Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 5 Nov 2013 23:13:31 +0100 Subject: xorg-server: bugfix update 1.14.3 -> .4, including CVE CVE-2013-4396, otherwise a few fixes, see http://lists.x.org/archives/xorg-announce/2013-November/002352.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d4401177db9..3b347504a72 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1900,11 +1900,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.14.3"; + name = "xorg-server-1.14.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.14.3.tar.bz2; - sha256 = "0pjgp30j7v3v0db26462ajnmhbysy4vmqkcnbyswnga47bhml4h2"; + url = mirror://xorg/individual/xserver/xorg-server-1.14.4.tar.bz2; + sha256 = "1hsxyqgrw3hrgdl0sw8n4hbhjlindna0z8w4k1anwpw4zfmcz330"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 419be226363..d76afd9fbe2 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -164,7 +164,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.14.3.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.14.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 -- cgit 1.4.1 From feb778507fe715c6537322c28c2ed1769a794d23 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 6 Nov 2013 20:07:35 +0100 Subject: xorg-server: remove now-upstreamed patch I'm sorry I completely forgot to test the previous commit. Also remove some long unused patch. --- pkgs/servers/x11/xorg/overrides.nix | 1 - .../x11/xorg/xorgserver-cve-2013-4396.patch | 75 ---------------------- pkgs/servers/x11/xorg/xorgserver12-CVE-1940.patch | 34 ---------- 3 files changed, 110 deletions(-) delete mode 100644 pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch delete mode 100644 pkgs/servers/x11/xorg/xorgserver12-CVE-1940.patch (limited to 'pkgs') diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fb8b5856ecb..8c073c29c12 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -188,7 +188,6 @@ in patches = [ ./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch - ./xorgserver-cve-2013-4396.patch ]; buildInputs = attrs.buildInputs ++ [ xtrans ]; propagatedBuildInputs = diff --git a/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch b/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch deleted file mode 100644 index 4b6727e61c0..00000000000 --- a/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Mon, 16 Sep 2013 21:47:16 -0700 -Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText() - [CVE-2013-4396] - -Save a pointer to the passed in closure structure before copying it -and overwriting the *c pointer to point to our copy instead of the -original. If we hit an error, once we free(c), reset c to point to -the original structure before jumping to the cleanup code that -references *c. - -Since one of the errors being checked for is whether the server was -able to malloc(c->nChars * itemSize), the client can potentially pass -a number of characters chosen to cause the malloc to fail and the -error path to be taken, resulting in the read from freed memory. - -Since the memory is accessed almost immediately afterwards, and the -X server is mostly single threaded, the odds of the free memory having -invalid contents are low with most malloc implementations when not using -memory debugging features, but some allocators will definitely overwrite -the memory there, leading to a likely crash. - -Reported-by: Pedro Ribeiro -Signed-off-by: Alan Coopersmith -Reviewed-by: Julien Cristau ---- - dix/dixfonts.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/dix/dixfonts.c b/dix/dixfonts.c -index feb765d..2e34d37 100644 ---- a/dix/dixfonts.c -+++ b/dix/dixfonts.c -@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - GC *pGC; - unsigned char *data; - ITclosurePtr new_closure; -+ ITclosurePtr old_closure; - - /* We're putting the client to sleep. We need to - save some state. Similar problem to that handled -@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c) - err = BadAlloc; - goto bail; - } -+ old_closure = c; - *new_closure = *c; - c = new_closure; - - data = malloc(c->nChars * itemSize); - if (!data) { - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } -@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - if (!pGC) { - free(c->data); - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } -@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c) - FreeScratchGC(pGC); - free(c->data); - free(c); -+ c = old_closure; - err = BadAlloc; - goto bail; - } --- -1.7.9.2 diff --git a/pkgs/servers/x11/xorg/xorgserver12-CVE-1940.patch b/pkgs/servers/x11/xorg/xorgserver12-CVE-1940.patch deleted file mode 100644 index d85494f9029..00000000000 --- a/pkgs/servers/x11/xorg/xorgserver12-CVE-1940.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 10 Apr 2013 06:09:01 +0000 -Subject: xf86: fix flush input to work with Linux evdev devices. - -So when we VT switch back and attempt to flush the input devices, -we don't succeed because evdev won't return part of an event, -since we were only asking for 4 bytes, we'd only get -EINVAL back. - -This could later cause events to be flushed that we shouldn't have -gotten. - -This is a fix for CVE-2013-1940. - -Signed-off-by: Dave Airlie -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer ---- -diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c -index ab3757a..4d08c1e 100644 ---- a/hw/xfree86/os-support/shared/posix_tty.c -+++ b/hw/xfree86/os-support/shared/posix_tty.c -@@ -421,7 +421,8 @@ xf86FlushInput(int fd) - { - fd_set fds; - struct timeval timeout; -- char c[4]; -+ /* this needs to be big enough to flush an evdev event. */ -+ char c[256]; - - DebugF("FlushingSerial\n"); - if (tcflush(fd, TCIFLUSH) == 0) --- -cgit v0.9.0.2-2-gbebe -- cgit 1.4.1 From 9a97b842c5962907def8a3ed086ba6bb29d5bd98 Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sun, 10 Nov 2013 13:41:10 +0000 Subject: Emacs darwin: avoid X unless explictly requested This keeps the dependencies lighter. Perhaps future work on this derivation could enable the Cocoa interface by default on Mac. --- pkgs/applications/editors/emacs-24/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 18e263dae67..c558b483e97 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo -, withX ? true +, withX ? !stdenv.isDarwin }: assert (libXft != null) -> libpng != null; # probably a bug -- cgit 1.4.1 From 9f7510113e7ad92128c1a7464f092787a08c1c82 Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sun, 10 Nov 2013 13:43:43 +0000 Subject: gnuplot darwin: optional gnuplot_aquaterm variant This variant uses the more Mac-friendly aqua driver, but it requires that you separately install the AquaTerm package. Note that AquaTerm is open source and could perhaps be later included as a nix derivation. If that happens, it would be nice to remove the gnuplot_aquaterm top-level attribute and just make it the default. --- pkgs/tools/graphics/gnuplot/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 23d57f5b652..beb32ed9bea 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -6,6 +6,7 @@ , libXt ? null , libXpm ? null , libXaw ? null +, aquaterm ? false , wxGTK ? null , pango ? null , cairo ? null @@ -24,15 +25,18 @@ stdenv.mkDerivation rec { sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz"; }; + withX = libX11 != null && !aquaterm; + buildInputs = - [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw + [ zlib gd texinfo readline emacs lua texLive pango cairo pkgconfig makeWrapper ] + ++ stdenv.lib.optionals withX [ libX11 libXpm libXt libXaw ] # compiling with wxGTK causes a malloc (double free) error on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK; - configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; + configureFlags = if withX then ["--with-x"] else ["--without-x"]; - postInstall = stdenv.lib.optionalString (libX11 != null) '' + postInstall = stdenv.lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f462c62b4f2..0a0ab8c3a93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1003,6 +1003,9 @@ let else stdenv; }; + # must have AquaTerm installed separately + gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; + gnused = callPackage ../tools/text/gnused { }; gnutar = callPackage ../tools/archivers/gnutar { }; -- cgit 1.4.1 From 9da8db195b92a3ecaf65615ef11060a38b3cbb6c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 90e63ea5dd22c4ba6fd54bd690ec336d2d2d5b38 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 17 Nov 2013 14:31:03 +0100 Subject: gnome3.at_spi2_*: bugfix update 2.10.0 -> .2 --- pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/at-spi2-core/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') 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 daae670fd9b..aaea1b2e966 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { versionMajor = "2.10"; - versionMinor = "0"; + versionMinor = "2"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "150sqc21difazqd53llwfdaqnwfy73bic9hia41xpfy9kcpzz9yy"; + sha256 = "1xfh89lydl8d18dhnzwvzcsyyybr5q3ik001qgq520l3qh8shj73"; }; 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 1a7ac31db80..e3aee3f9b32 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { versionMajor = "2.10"; - versionMinor = "0"; + versionMinor = "2"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1ns44yibdgcwzwri7sr075hfs5rh5lgxkh71247a0822az3mahcn"; + sha256 = "1qfxlbmbaihgmqgkxnywnji9wkbvn8pvbv20x5glv3jc9zw5innk"; }; buildInputs = [ -- cgit 1.4.1 From 5aaabde3b8fdb73afbdfe7701f0cc5351d1f4c8e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 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') 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 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') 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 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') 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 04921cbae6a776a2f7153440470c423a9bb6a3e7 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 17 Nov 2013 15:14:20 +0100 Subject: desktop_file_utils: update --- pkgs/tools/misc/desktop-file-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 285160e50d6..7c84d913157 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "desktop-file-utils-0.16"; + name = "desktop-file-utils-0.22"; src = fetchurl { - url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.bz2"; - sha256 = "18y9am8n43rrnnldd1cy09ls39xz1gx3qczax2c4cjxayx5vwq3r"; + url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; + sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"; }; buildInputs = [ pkgconfig glib ]; -- cgit 1.4.1 From 85b6d2886263c7fc2afc918a69d137c25535c990 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 17 Nov 2013 15:41:10 +0100 Subject: imagemagick: minor update 6.8.7-5 -> .7-6 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index aa0bdbfe56c..a5d37c89c95 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,14 +18,14 @@ }: let - version = "6.8.7-5"; + version = "6.8.7-6"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "1cn1kg7scs6r7r00qlqirhnmqjnmyczbidab3vgqarw9qszh2ri6"; + sha256 = "0cbfhk184kxdxz5czyyqxac29mbfiahygjji6k97z6hp8ngnqlvh"; }; enableParallelBuilding = true; -- cgit 1.4.1 From 4aa1dff1d6bba2d7c64503bbe142d819a289c5e3 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 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') 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 aa3e96c3e09220b6b67c0516d3d5daa6c33576c5 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 18 Nov 2013 20:13:18 +0100 Subject: shared_mime_info: update 1.1 -> 1.2 --- pkgs/data/misc/shared-mime-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 1e424aca46b..134a6f5307e 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -2,11 +2,11 @@ , libxml2, glib}: stdenv.mkDerivation rec { - name = "shared-mime-info-1.1"; + name = "shared-mime-info-1.2"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "0v70z5b6340jsjvdhf7brczpzq766wc1lsnjg9hc57ks2m5hjk8q"; + sha256 = "0y5vi0vr6rbhvfzcfg57cfskn362bpvcpca9cy598nmr87i6lld5"; }; buildInputs = [ -- cgit 1.4.1 From 971c67a1baf211d6a3f786d31487b9b483dc0548 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 071a2c4b8114b342f1c9ee612ea1b4ffbcfe5f0e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 18 Nov 2013 20:23:45 +0100 Subject: libatasmart: update 0.17 -> 0.19 Alas, no NEWS anywhere. From skimming git shortlog I see nothing special -- hopefully OK. --- pkgs/os-specific/linux/libatasmart/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 86dffde4b55..7fe0a2be10f 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "libatasmart-0.17"; + name = "libatasmart-0.19"; src = fetchurl { - url = "http://0pointer.de/public/${name}.tar.gz"; - sha256 = "1zazxnqsirlv9gkzij6z31b21gv2nv7gkpja0wpxwb7kfh9a2qid"; + url = "http://0pointer.de/public/${name}.tar.xz"; + sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; buildInputs = [ pkgconfig udev ]; -- cgit 1.4.1 From 0bec9c1e4fce7641b006ce8bf95a9ef27a52b1e6 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 18 Nov 2013 20:30:21 +0100 Subject: libcroco: minor update 0.6.6 -> .8 --- pkgs/desktops/gnome-3/core/libcroco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 079a6f169b2..2cf785b8cca 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libxml2, glib }: stdenv.mkDerivation rec { - name = "libcroco-0.6.6"; # 3.6.2 release + name = "libcroco-0.6.8"; src = fetchurl { url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j"; + sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; }; configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; -- cgit 1.4.1 From 63481f1b4bdc5d715421df5238c8eed5f1740d87 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 c33c2e68e461a7c244aaf3d50f579a069e4b3f12 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 18 Nov 2013 21:08:25 +0100 Subject: xfce4notifyd: minor update, add to the default installation --- nixos/modules/services/x11/desktop-managers/xfce.nix | 3 ++- pkgs/desktops/xfce/applications/xfce4-notifyd.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index d20010c70a6..f06544fecc7 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -72,7 +72,8 @@ in pkgs.xfce.thunar_volman pkgs.xfce.gvfs pkgs.xfce.xfce4_appfinder - pkgs.xfce.tumbler + pkgs.xfce.tumbler # found via dbus + pkgs.xfce.xfce4notifyd # found via dbus ] ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index 5873ef9cd68..ace7aa7a2c7 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-notifyd"; ver_maj = "0.2"; - ver_min = "3"; + ver_min = "4"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0fx6z89rxs6ypb8bb6l1pg8fdbxn995fgs413sbhnaxjkm6gch6x"; + sha256 = "1l6fpfk0fkizdx7vwbyjdyzzj5i2ng8pf7r8j49nv0cnjhpxczlc"; }; name = "${p_name}-${ver_maj}.${ver_min}"; -- cgit 1.4.1 From 43d1707eec36e0e3ed865310203bb507ab76bb0f Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 19 Nov 2013 10:12:45 +0100 Subject: vdpauinfo: minor update 0.0.6 -> 0.1 --- pkgs/tools/X11/vdpauinfo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 23233861a06..0b1d889d700 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xlibs, libvdpau }: stdenv.mkDerivation rec { - name = "vdpauinfo-0.0.6"; - + name = "vdpauinfo-0.1"; + src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "0m2llqjnwh3x6y56hik3znym2mfk1haq81a15p54m60ngf0mvfsj"; + sha256 = "17q1spsrd5i4jzhpacbs0bb4blf74j8s45rpg0znyc1yjfk5dj5h"; }; buildInputs = [ pkgconfig xlibs.libX11 libvdpau ]; -- cgit 1.4.1 From f7b39cce8c27c021037042f7c5a9d8d92866bd7a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 6e5c003f42b957d50523f58b5a80e20a2c764765 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Nov 2013 12:31:23 +0100 Subject: xorg xf86-video-nv: fix build via an upstream patch --- pkgs/servers/x11/xorg/overrides.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs') diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8c073c29c12..d70bb54c704 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -159,6 +159,13 @@ in ]; }; + xf86videonv = attrs: attrs // { + patches = [( args.fetchurl { + url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da; + sha256 = "0ikbnz6048ygs1qahb6ylnxkyjhfjcqr2gm9bk95ca90v57j7i0f"; + })]; + }; + xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker }; -- cgit 1.4.1 From 21f36d73162652ce26c118582e162a2207b0b2f9 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Nov 2013 13:07:18 +0100 Subject: tigervnc: fix build via not applying a patch It's in our standard xorg-server now. --- pkgs/tools/admin/tigervnc/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index be42fb4d2a5..596c950b1f3 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { do patch -p1 < $a done - patch -p1 < ../xserver113.patch autoreconf -vfi ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" make TIGERVNC_SRCDIR=`pwd`/../.. -- cgit 1.4.1 From 30666ed5ad0169611cb7a6ab80a9e941fe7dd9ca Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 5c1e8fc56dc5984ed29c1fa6ab2d3debab4007a9 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Nov 2013 23:56:38 +0100 Subject: weston: clean the expression (no semantic change) --- pkgs/applications/window-managers/weston/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 4162ba57dc1..913235287ac 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -12,11 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p"; }; - buildInputs = [ pkgconfig wayland mesa libxkbcommon - cairo libxcb libXcursor x11 udev libdrm mtdev - libjpeg pam /*autoconf automake libtool*/ ]; - - #preConfigure = "autoreconf -vfi"; + buildInputs = [ + pkgconfig wayland mesa libxkbcommon + cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam + ]; NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm"; -- cgit 1.4.1 From 55f40dfbec7df7ac2cf0e8e9ecb4691165c08363 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 34df0b45ba0b4b27bdb3daa2f41faf1a3ad647d7 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sat, 30 Nov 2013 09:57:30 +0100 Subject: GJS error --- pkgs/desktops/cinnamon/cjs/default.nix | 39 +++++ .../cinnamon/cjs/fix_configure_ac_gobject.patch | 186 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 227 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cjs/default.nix create mode 100644 pkgs/desktops/cinnamon/cjs/fix_configure_ac_gobject.patch (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix new file mode 100644 index 00000000000..3b55ae80bb7 --- /dev/null +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -0,0 +1,39 @@ +{ stdenv, autoreconfHook, fetchurl }: + +stdenv.mkDerivation rec { + name = "cjs"; + version="2.0.0"; + + src = fetchurl { + url = "http://github.com/linuxmint/cjs/archive/${version}.tar.gz"; + sha256 = "16iazd5h2z27v9jxs4a8imwls5c1c690wk7i05r5ds3c3r4nrsig"; + }; + + buildInputs = [ autoreconfHook ]; + + patches = [./fix_configure_ac_gobject.patch]; + + configureFlags = [ + "--disable-static" + ]; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = " This module contains JavaScript bindings based on gobject-introspection." ; + + longDescription = '' + This module contains JavaScript bindings based on gobject-introspection. + + Because JavaScript is pretty free-form, consistent coding style and unit tests + are critical to give it some structure and keep it readable. + We propose that all GNOME usage of JavaScript conform to the style guide + in doc/Style_Guide.txt to help keep things sane. + + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} + + diff --git a/pkgs/desktops/cinnamon/cjs/fix_configure_ac_gobject.patch b/pkgs/desktops/cinnamon/cjs/fix_configure_ac_gobject.patch new file mode 100644 index 00000000000..a72c74d651d --- /dev/null +++ b/pkgs/desktops/cinnamon/cjs/fix_configure_ac_gobject.patch @@ -0,0 +1,186 @@ +From 88fcac23027d35b2dc4b7dd337d1028c55f68ecc Mon Sep 17 00:00:00 2001 +From: Roelof Wobben +Date: Fri, 29 Nov 2013 19:01:24 +0100 +Subject: [PATCH 1/3] fix + +--- + Makefile.am | 2 +- + configure.ac | 1 + + m4/introspection.m4 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 91 insertions(+), 1 deletion(-) + create mode 100644 m4/introspection.m4 + +diff --git a/Makefile.am b/Makefile.am +index 8957ede..0d82657 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -16,7 +16,7 @@ cjstest_files_with_tests = + TEST_PROGS = + check_PROGRAMS = $(TEST_PROGS) + INTROSPECTION_GIRS = +-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} ++ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -Im4 + + gjsjsdir = @gjsjsdir@ + gjsoverridedir = $(gjsjsdir)/overrides +diff --git a/configure.ac b/configure.ac +index a1433c8..fa208c1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,6 +11,7 @@ AC_INIT([cjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=cjs + AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) + AC_CONFIG_SRCDIR([cjs/console.c]) + AC_CONFIG_HEADER([config.h]) ++AC_CONFIG_MACRO_DIR([m4]) + + GETTEXT_PACKAGE=cjs + AC_SUBST([GETTEXT_PACKAGE]) +diff --git a/m4/introspection.m4 b/m4/introspection.m4 +new file mode 100644 +index 0000000..35ab79e +--- /dev/null ++++ b/m4/introspection.m4 +@@ -0,0 +1,89 @@ ++dnl -*- mode: autoconf -*- ++dnl Copyright 2009 Johan Dahlin ++dnl ++dnl This file is free software; the author(s) gives unlimited ++dnl permission to copy and/or distribute it, with or without ++dnl modifications, as long as this notice is preserved. ++dnl ++ ++# serial 1 ++ ++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first ++ ++ dnl enable/disable introspection ++ m4_if([$2], [require], ++ [dnl ++ enable_introspection=yes ++ ],[dnl ++ AC_ARG_ENABLE(introspection, ++ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], ++ [Enable introspection for this build]),, ++ [enable_introspection=auto]) ++ ])dnl ++ ++ AC_MSG_CHECKING([for gobject-introspection]) ++ ++ dnl presence/version checking ++ AS_CASE([$enable_introspection], ++ [no], [dnl ++ found_introspection="no (disabled, use --enable-introspection to enable)" ++ ],dnl ++ [yes],[dnl ++ PKG_CHECK_EXISTS([gobject-introspection-1.0],, ++ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) ++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], ++ found_introspection=yes, ++ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) ++ ],dnl ++ [auto],[dnl ++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) ++ ],dnl ++ [dnl ++ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) ++ ])dnl ++ ++ AC_MSG_RESULT([$found_introspection]) ++ ++ INTROSPECTION_SCANNER= ++ INTROSPECTION_COMPILER= ++ INTROSPECTION_GENERATE= ++ INTROSPECTION_GIRDIR= ++ INTROSPECTION_TYPELIBDIR= ++ if test "x$found_introspection" = "xyes"; then ++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` ++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` ++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ fi ++ AC_SUBST(INTROSPECTION_SCANNER) ++ AC_SUBST(INTROSPECTION_COMPILER) ++ AC_SUBST(INTROSPECTION_GENERATE) ++ AC_SUBST(INTROSPECTION_GIRDIR) ++ AC_SUBST(INTROSPECTION_TYPELIBDIR) ++ ++ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") ++]) ++ ++ ++dnl Usage: ++dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) ++ ++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], ++[ ++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) ++]) ++ ++dnl Usage: ++dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) ++ ++ ++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], ++[ ++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ++]) ++ +-- +1.8.4.3 + + +From e6bbed9baa1eb95abe8fd2655a266295cdf70914 Mon Sep 17 00:00:00 2001 +From: Roelof Wobben +Date: Fri, 29 Nov 2013 19:06:21 +0100 +Subject: [PATCH 2/3] test2 + +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fa208c1..efd6a29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,8 +119,6 @@ else + fi + CFLAGS="$save_CFLAGS" + +-GOBJECT_INTROSPECTION_REQUIRE([1.32.0]) +- + common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs185" + gjs_packages="gobject-introspection-1.0 libffi $common_packages" + gjs_cairo_gobject_packages="cairo-gobject $common_packages" +-- +1.8.4.3 + + +From 4286d5d73b5c66af48de062c637e37d5580d2be4 Mon Sep 17 00:00:00 2001 +From: Roelof Wobben +Date: Fri, 29 Nov 2013 19:31:55 +0100 +Subject: [PATCH 3/3] test3 + +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index efd6a29..4f415ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -128,7 +128,6 @@ gjs_gdbus_packages="gobject-2.0 >= glib_required_version gio-2.0" + # gjs-tests links against everything + gjstests_packages="$gjstests_packages $gjs_packages" + +-PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= glib_required_version]) + PKG_CHECK_MODULES([GJS], [$gjs_packages]) + # Prefer cairo-gobject if we have it + PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_gobject_packages], have_cairo_gobject=yes, have_cairo_gobject=no) +-- +1.8.4.3 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e9581a57a..33981913d5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9523,6 +9523,8 @@ let ### DESKTOP ENVIRONMENTS + + cjs = callPackage ../desktops/cinnamon/cjs { } ; enlightenment = callPackage ../desktops/enlightenment { }; -- cgit 1.4.1 From 43b894a5b30f4170433dffc8187ef54011bddf2b Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sat, 30 Nov 2013 10:50:40 +0100 Subject: solved the gobject error message --- pkgs/desktops/cinnamon/cjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 3b55ae80bb7..381fd26b036 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchurl }: +{ stdenv, autoreconfHook, fetchurl, pkgconfig, gobjectIntrospection, glib }: stdenv.mkDerivation rec { name = "cjs"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16iazd5h2z27v9jxs4a8imwls5c1c690wk7i05r5ds3c3r4nrsig"; }; - buildInputs = [ autoreconfHook ]; + buildInputs = [ autoreconfHook pkgconfig gobjectIntrospection glib]; patches = [./fix_configure_ac_gobject.patch]; -- cgit 1.4.1 From f668fd37dff914fdfd310002ac59fbaed9faefa8 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sat, 30 Nov 2013 17:16:55 +0100 Subject: broken patch --- pkgs/desktops/cinnamon/cjs.nix | 38 +++++ pkgs/desktops/cinnamon/cjs/default.nix | 39 ----- .../cinnamon/cjs/fix_configure_ac_gobject.patch | 186 --------------------- .../cinnamon/fix_configure_ac_gobject.patch | 24 +++ pkgs/top-level/all-packages.nix | 5 +- 5 files changed, 66 insertions(+), 226 deletions(-) create mode 100644 pkgs/desktops/cinnamon/cjs.nix delete mode 100644 pkgs/desktops/cinnamon/cjs/default.nix delete mode 100644 pkgs/desktops/cinnamon/cjs/fix_configure_ac_gobject.patch create mode 100644 pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cjs.nix b/pkgs/desktops/cinnamon/cjs.nix new file mode 100644 index 00000000000..2e5f261b286 --- /dev/null +++ b/pkgs/desktops/cinnamon/cjs.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, python +, dbus_glib, cairo, spidermonkey_185 }: + +stdenv.mkDerivation rec { + name = "cjs"; + version="2.0.0"; + + src = fetchurl { + url = "http://github.com/linuxmint/cjs/archive/${version}.tar.gz"; + sha256 = "16iazd5h2z27v9jxs4a8imwls5c1c690wk7i05r5ds3c3r4nrsig"; + }; + + buildInputs = [ + pkgconfig autoreconfHook python + dbus_glib cairo spidermonkey_185 + ]; + + patches = [ ./fix_configure_ac_gobject.patch]; + + preBuild = "patchShebangs ./scripts"; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "JavaScript bindings for Cinnamon" ; + + longDescription = '' + This module contains JavaScript bindings based on gobject-introspection. + + Because JavaScript is pretty free-form, consistent coding style and unit tests + are critical to give it some structure and keep it readable. + We propose that all GNOME usage of JavaScript conform to the style guide + in doc/Style_Guide.txt to help keep things sane. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} \ No newline at end of file diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix deleted file mode 100644 index 381fd26b036..00000000000 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, autoreconfHook, fetchurl, pkgconfig, gobjectIntrospection, glib }: - -stdenv.mkDerivation rec { - name = "cjs"; - version="2.0.0"; - - src = fetchurl { - url = "http://github.com/linuxmint/cjs/archive/${version}.tar.gz"; - sha256 = "16iazd5h2z27v9jxs4a8imwls5c1c690wk7i05r5ds3c3r4nrsig"; - }; - - buildInputs = [ autoreconfHook pkgconfig gobjectIntrospection glib]; - - patches = [./fix_configure_ac_gobject.patch]; - - configureFlags = [ - "--disable-static" - ]; - - meta = { - homepage = "http://cinnamon.linuxmint.com"; - description = " This module contains JavaScript bindings based on gobject-introspection." ; - - longDescription = '' - This module contains JavaScript bindings based on gobject-introspection. - - Because JavaScript is pretty free-form, consistent coding style and unit tests - are critical to give it some structure and keep it readable. - We propose that all GNOME usage of JavaScript conform to the style guide - in doc/Style_Guide.txt to help keep things sane. - - ''; - - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.roelof ]; - }; -} - - diff --git a/pkgs/desktops/cinnamon/cjs/fix_configure_ac_gobject.patch b/pkgs/desktops/cinnamon/cjs/fix_configure_ac_gobject.patch deleted file mode 100644 index a72c74d651d..00000000000 --- a/pkgs/desktops/cinnamon/cjs/fix_configure_ac_gobject.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 88fcac23027d35b2dc4b7dd337d1028c55f68ecc Mon Sep 17 00:00:00 2001 -From: Roelof Wobben -Date: Fri, 29 Nov 2013 19:01:24 +0100 -Subject: [PATCH 1/3] fix - ---- - Makefile.am | 2 +- - configure.ac | 1 + - m4/introspection.m4 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 91 insertions(+), 1 deletion(-) - create mode 100644 m4/introspection.m4 - -diff --git a/Makefile.am b/Makefile.am -index 8957ede..0d82657 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -16,7 +16,7 @@ cjstest_files_with_tests = - TEST_PROGS = - check_PROGRAMS = $(TEST_PROGS) - INTROSPECTION_GIRS = --ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -Im4 - - gjsjsdir = @gjsjsdir@ - gjsoverridedir = $(gjsjsdir)/overrides -diff --git a/configure.ac b/configure.ac -index a1433c8..fa208c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,6 +11,7 @@ AC_INIT([cjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=cjs - AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) - AC_CONFIG_SRCDIR([cjs/console.c]) - AC_CONFIG_HEADER([config.h]) -+AC_CONFIG_MACRO_DIR([m4]) - - GETTEXT_PACKAGE=cjs - AC_SUBST([GETTEXT_PACKAGE]) -diff --git a/m4/introspection.m4 b/m4/introspection.m4 -new file mode 100644 -index 0000000..35ab79e ---- /dev/null -+++ b/m4/introspection.m4 -@@ -0,0 +1,89 @@ -+dnl -*- mode: autoconf -*- -+dnl Copyright 2009 Johan Dahlin -+dnl -+dnl This file is free software; the author(s) gives unlimited -+dnl permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+ -+# serial 1 -+ -+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -+ -+ dnl enable/disable introspection -+ m4_if([$2], [require], -+ [dnl -+ enable_introspection=yes -+ ],[dnl -+ AC_ARG_ENABLE(introspection, -+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -+ [Enable introspection for this build]),, -+ [enable_introspection=auto]) -+ ])dnl -+ -+ AC_MSG_CHECKING([for gobject-introspection]) -+ -+ dnl presence/version checking -+ AS_CASE([$enable_introspection], -+ [no], [dnl -+ found_introspection="no (disabled, use --enable-introspection to enable)" -+ ],dnl -+ [yes],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0],, -+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -+ found_introspection=yes, -+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -+ ],dnl -+ [auto],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -+ ],dnl -+ [dnl -+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -+ ])dnl -+ -+ AC_MSG_RESULT([$found_introspection]) -+ -+ INTROSPECTION_SCANNER= -+ INTROSPECTION_COMPILER= -+ INTROSPECTION_GENERATE= -+ INTROSPECTION_GIRDIR= -+ INTROSPECTION_TYPELIBDIR= -+ if test "x$found_introspection" = "xyes"; then -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ fi -+ AC_SUBST(INTROSPECTION_SCANNER) -+ AC_SUBST(INTROSPECTION_COMPILER) -+ AC_SUBST(INTROSPECTION_GENERATE) -+ AC_SUBST(INTROSPECTION_GIRDIR) -+ AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ -+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -+]) -+ -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -+]) -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -+ -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -+]) -+ --- -1.8.4.3 - - -From e6bbed9baa1eb95abe8fd2655a266295cdf70914 Mon Sep 17 00:00:00 2001 -From: Roelof Wobben -Date: Fri, 29 Nov 2013 19:06:21 +0100 -Subject: [PATCH 2/3] test2 - ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fa208c1..efd6a29 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,8 +119,6 @@ else - fi - CFLAGS="$save_CFLAGS" - --GOBJECT_INTROSPECTION_REQUIRE([1.32.0]) -- - common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs185" - gjs_packages="gobject-introspection-1.0 libffi $common_packages" - gjs_cairo_gobject_packages="cairo-gobject $common_packages" --- -1.8.4.3 - - -From 4286d5d73b5c66af48de062c637e37d5580d2be4 Mon Sep 17 00:00:00 2001 -From: Roelof Wobben -Date: Fri, 29 Nov 2013 19:31:55 +0100 -Subject: [PATCH 3/3] test3 - ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index efd6a29..4f415ae 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -128,7 +128,6 @@ gjs_gdbus_packages="gobject-2.0 >= glib_required_version gio-2.0" - # gjs-tests links against everything - gjstests_packages="$gjstests_packages $gjs_packages" - --PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= glib_required_version]) - PKG_CHECK_MODULES([GJS], [$gjs_packages]) - # Prefer cairo-gobject if we have it - PKG_CHECK_MODULES([GJS_CAIRO], [$gjs_cairo_gobject_packages], have_cairo_gobject=yes, have_cairo_gobject=no) --- -1.8.4.3 - diff --git a/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch b/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch new file mode 100644 index 00000000000..454dde18797 --- /dev/null +++ b/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch @@ -0,0 +1,24 @@ +From cf9d3296fa1077474415e248c43e3acdebef46af Mon Sep 17 00:00:00 2001 +From: Roelof Wobben +Date: Sat, 30 Nov 2013 17:02:27 +0100 +Subject: [PATCH] fix + +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 4b34c01..34ab7f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,6 +11,7 @@ AC_INIT([cjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=cjs + AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) + AC_CONFIG_SRCDIR([cjs/console.c]) + AC_CONFIG_HEADER([config.h]) ++AC_CONFIG_MACRO_DIR([m4]) + + GETTEXT_PACKAGE=cjs + AC_SUBST([GETTEXT_PACKAGE]) +-- +1.8.4.3 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33981913d5b..5f9cda54ade 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9524,7 +9524,10 @@ let ### DESKTOP ENVIRONMENTS - cjs = callPackage ../desktops/cinnamon/cjs { } ; +cinnamon = recurseIntoAttrs { + cjs = callPackage ../desktops/cinnamon/cjs.nix { }; + }; + enlightenment = callPackage ../desktops/enlightenment { }; -- cgit 1.4.1 From 808603852a24e82a6cfc1e8c15d0b1469a30a7b5 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sat, 30 Nov 2013 20:33:46 +0100 Subject: cjs is working with the new mozjs185 --- pkgs/desktops/cinnamon/cjs.nix | 5 ++--- .../cinnamon/fix_configure_ac_gobject.patch | 24 ---------------------- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cjs.nix b/pkgs/desktops/cinnamon/cjs.nix index 2e5f261b286..63edc07a7a6 100644 --- a/pkgs/desktops/cinnamon/cjs.nix +++ b/pkgs/desktops/cinnamon/cjs.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, python -, dbus_glib, cairo, spidermonkey_185 }: +, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection}: stdenv.mkDerivation rec { name = "cjs"; @@ -13,10 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoreconfHook python dbus_glib cairo spidermonkey_185 + gobjectIntrospection ]; - patches = [ ./fix_configure_ac_gobject.patch]; - preBuild = "patchShebangs ./scripts"; meta = { diff --git a/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch b/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch deleted file mode 100644 index 454dde18797..00000000000 --- a/pkgs/desktops/cinnamon/fix_configure_ac_gobject.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cf9d3296fa1077474415e248c43e3acdebef46af Mon Sep 17 00:00:00 2001 -From: Roelof Wobben -Date: Sat, 30 Nov 2013 17:02:27 +0100 -Subject: [PATCH] fix - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 4b34c01..34ab7f5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,6 +11,7 @@ AC_INIT([cjs], pkg_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=cjs - AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) - AC_CONFIG_SRCDIR([cjs/console.c]) - AC_CONFIG_HEADER([config.h]) -+AC_CONFIG_MACRO_DIR([m4]) - - GETTEXT_PACKAGE=cjs - AC_SUBST([GETTEXT_PACKAGE]) --- -1.8.4.3 - -- cgit 1.4.1 From 81460560c3114fd36e7e0249ce033c55003ca1a5 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 2 Dec 2013 08:58:56 +0100 Subject: add cinnamon-desktop (close #1314) Reviewed and refactored by @vcunat. --- lib/maintainers.nix | 1 + pkgs/desktops/cinnamon/cinnamon-desktop.nix | 41 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cinnamon-desktop.nix (limited to 'pkgs') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ad110389f7a..4a1a3aa4106 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -49,6 +49,7 @@ rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; roconnor = "Russell O'Connor "; + roelof = "Roelof Wobben "; sander = "Sander van der Burg "; shlevy = "Shea Levy "; simons = "Peter Simons "; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix new file mode 100644 index 00000000000..d3cf04e835d --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, intltool +, glib, gobjectIntrospection, gdk_pixbuf, gtk3, gnome_common +, xorg, xkeyboard_config +}: + +let + version = "2.0.4"; +in +stdenv.mkDerivation { + name = "cinnamon-desktop-${version}"; + + src = fetchurl { + url = "http://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz"; + sha256 = "1cywin712558pv58c0cr73m25hfcv5x8pv5frvqjr9gwr2gpi6h3"; + }; + + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + buildInputs = with xorg; [ + pkgconfig autoreconfHook intltool + glib gobjectIntrospection gdk_pixbuf gtk3 gnome_common + xkeyboard_config libxkbfile libX11 libXrandr libXext + ]; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "Library and data for various Cinnamon modules"; + + longDescription = '' + The libcinnamon-desktop library provides API shared by several applications + on the desktop, but that cannot live in the platform for various + reasons. There is no API or ABI guarantee, although we are doing our + best to provide stability. Documentation for the API is available with + gtk-doc. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59594cf2789..966d6c69f47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9526,6 +9526,10 @@ let cinnamon = recurseIntoAttrs { cjs = callPackage ../desktops/cinnamon/cjs.nix { }; + + cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { + inherit (gnome3) gnome_common; + }; }; enlightenment = callPackage ../desktops/enlightenment { }; -- cgit 1.4.1 From 3a5f9ecd70d59ac7c4ebe6c375ae1a960462ccd3 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 2 Dec 2013 22:01:24 +0100 Subject: cinnamon.cjs refactor: include version in name --- pkgs/desktops/cinnamon/cjs.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cjs.nix b/pkgs/desktops/cinnamon/cjs.nix index 63edc07a7a6..3747262cdf4 100644 --- a/pkgs/desktops/cinnamon/cjs.nix +++ b/pkgs/desktops/cinnamon/cjs.nix @@ -1,9 +1,12 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, python -, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection}: +, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection +}: -stdenv.mkDerivation rec { - name = "cjs"; +let version="2.0.0"; +in +stdenv.mkDerivation rec { + name = "cjs-${version}"; src = fetchurl { url = "http://github.com/linuxmint/cjs/archive/${version}.tar.gz"; @@ -34,4 +37,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.roelof ]; }; -} \ No newline at end of file +} -- cgit 1.4.1 From 7e9b24c8f1204b212a5c8b83f395e9be29ebe37e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 b36ed39f2ea78227719505189bd90ebf11a63165 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 7 Dec 2013 14:27:21 +0100 Subject: cinnamon: various fixes cinnamon-translations: use $out/share instead of $out/usr/share, add version into name all-packages.nix: refactor --- pkgs/desktops/cinnamon/cinnamon-translations.nix | 18 ++++++++---------- pkgs/top-level/all-packages.nix | 17 ++++++++--------- 2 files changed, 16 insertions(+), 19 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix index 2d396947b89..a68a905f92e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "cinnamon-translations"; - version="2.0.3"; +{ stdenv, fetchurl }: +let + version = "2.0.3"; +in +stdenv.mkDerivation { + name = "cinnamon-translations-${version}"; src = fetchurl { url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"; sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc"; }; - installPhase = '' - mkdir -pv $out/usr/share/cinnamon/locale - cp -av mo-export/* $out/usr/share/cinnamon/locale/ + mkdir -pv $out/share/cinnamon/locale + cp -av mo-export/* $out/share/cinnamon/locale/ ''; meta = { @@ -25,5 +25,3 @@ stdenv.mkDerivation rec { }; } - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c101ed918a..eccce1181de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9586,17 +9586,16 @@ let ### DESKTOP ENVIRONMENTS - - cinnamon = recurseIntoAttrs { - cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; - }; - cinnamon = recurseIntoAttrs { - cjs = callPackage ../desktops/cinnamon/cjs.nix { }; + cinnamon = recurseIntoAttrs rec { + callPackage = newScope pkgs.cinnamon; + inherit (gnome3) gnome_common; - cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { - inherit (gnome3) gnome_common; - }; + cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { }; + + cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; + + cjs = callPackage ../desktops/cinnamon/cjs.nix { }; }; enlightenment = callPackage ../desktops/enlightenment { }; -- cgit 1.4.1 From 11b337fc7638081776f23a77c2639c61b7d07a73 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sat, 7 Dec 2013 20:00:54 +0100 Subject: added cinnamon-session --- pkgs/desktops/cinnamon/cinnamon-session.nix | 46 ++++++++++++++++++++++ .../cinnamon/remove-sessionmigration.patch | 19 +++++++++ pkgs/desktops/cinnamon/timeout.patch | 26 ++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 93 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cinnamon-session.nix create mode 100644 pkgs/desktops/cinnamon/remove-sessionmigration.patch create mode 100644 pkgs/desktops/cinnamon/timeout.patch (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix new file mode 100644 index 00000000000..3411633a289 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-session.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib, +upower, json_glib,intltool, systemd, hicolor_icon_theme, makeWrapper}: + +let + version = "2.0.6"; +in +stdenv.mkDerivation { + name = "cinnamon-session-${version}"; + + src = fetchurl { + url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz"; + sha256 = "0rs5w7npj3wf3gkk3sfb83awks2h7vjd6cz8mvfgbh6m3grn66l3"; + }; + + + configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ; + + patches = [ ./remove-sessionmigration.patch ./timeout.patch]; + + buildInputs = [ + pkgconfig autoreconfHook + glib gettext gnome_common + gtk3 dbus_glib upower json_glib + intltool systemd makeWrapper + ]; + + preBuild = "patchShebangs ./scripts"; + + installPhase = '' + wrapProgram $out/bin/cinnamon-session \ + --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" + ''; + + postInstall = '' + rm $out/share/icons/hicolor/icon-theme.cache + ''; + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "the cinnamon session files " ; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} + + diff --git a/pkgs/desktops/cinnamon/remove-sessionmigration.patch b/pkgs/desktops/cinnamon/remove-sessionmigration.patch new file mode 100644 index 00000000000..92e63549d96 --- /dev/null +++ b/pkgs/desktops/cinnamon/remove-sessionmigration.patch @@ -0,0 +1,19 @@ +--- a/cinnamon-session/csm-session-fill.c ++++ b/cinnamon-session/csm-session-fill.c +@@ -228,15 +228,6 @@ + load_standard_apps (CsmManager *manager, + GKeyFile *keyfile) + { +- GError *error; +- +- g_debug ("fill: *** Executing user migration"); +- error = NULL; +- if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) { +- g_warning ("Error while executing session-migration: %s", error->message); +- g_error_free (error); +- } +- + g_debug ("fill: *** Adding required components"); + handle_required_components (keyfile, !csm_manager_get_failsafe (manager), + append_required_components_helper, manager); + diff --git a/pkgs/desktops/cinnamon/timeout.patch b/pkgs/desktops/cinnamon/timeout.patch new file mode 100644 index 00000000000..59d1f9ab5f3 --- /dev/null +++ b/pkgs/desktops/cinnamon/timeout.patch @@ -0,0 +1,26 @@ +diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c +--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c 2012-02-02 15:33:01.000000000 +0100 ++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c 2012-06-10 02:39:46.184348462 +0200 +@@ -36,7 +36,7 @@ + #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider" + + /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */ +-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */ ++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */ + + typedef void (*GsmFillHandleProvider) (const char *provides, + const char *default_provider, +diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c +cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c +--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 ++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200 +@@ -30,7 +30,7 @@ + #include + + /* Wait up to this long for a running check to finish */ +-#define PROPERTY_CHANGE_TIMEOUT 5000 ++#define PROPERTY_CHANGE_TIMEOUT 12000 + + /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ + #define NO_ACCEL 0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eccce1181de..8b72bf7ac22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9591,6 +9591,8 @@ let callPackage = newScope pkgs.cinnamon; inherit (gnome3) gnome_common; + cinnamon-session = callPackage ../desktop/cinnamon/cinnamon-session.nix{ } ; + cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { }; cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; -- cgit 1.4.1 From 23bacdf6ea2d30b484c71bb784f59153c346c079 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sun, 8 Dec 2013 21:40:52 +0100 Subject: added cinnamon-session.nix --- pkgs/desktops/cinnamon/cinnamon-session.nix | 18 ++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix index 3411633a289..30b78ba143a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib, -upower, json_glib,intltool, systemd, hicolor_icon_theme, makeWrapper}: +upower, json_glib,intltool, systemd, hicolor_icon_theme, cinnamon-session}: let version = "2.0.6"; @@ -21,19 +21,17 @@ stdenv.mkDerivation { pkgconfig autoreconfHook glib gettext gnome_common gtk3 dbus_glib upower json_glib - intltool systemd makeWrapper + intltool systemd ]; preBuild = "patchShebangs ./scripts"; - installPhase = '' - wrapProgram $out/bin/cinnamon-session \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" - ''; - - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; + + postInstall = '' + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + rm $out/share/icons/hicolor/icon-theme.cache + ''; + meta = { homepage = "http://cinnamon.linuxmint.com"; description = "the cinnamon session files " ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b72bf7ac22..b3c8b784406 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9591,7 +9591,7 @@ let callPackage = newScope pkgs.cinnamon; inherit (gnome3) gnome_common; - cinnamon-session = callPackage ../desktop/cinnamon/cinnamon-session.nix{ } ; + cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ; cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { }; -- cgit 1.4.1 From f144a3b963e4b577574fa3eedfcb1c6af27c7e21 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 9 Dec 2013 10:37:07 +0100 Subject: changed gnome-desktop --- pkgs/desktops/cinnamon/cinnamon-desktop.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix index d3cf04e835d..b38098b33d0 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation { xkeyboard_config libxkbfile libX11 libXrandr libXext ]; + postInstall = '' + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + meta = { homepage = "http://cinnamon.linuxmint.com"; description = "Library and data for various Cinnamon modules"; -- cgit 1.4.1 From 4f8e940c403650e0514e4b01fba6fb33a2086dfd Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 9 Dec 2013 10:38:59 +0100 Subject: changed gnome-desktop --- pkgs/desktops/cinnamon/cinnamon-desktop.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix index b38098b33d0..d3cf04e835d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix @@ -22,10 +22,6 @@ stdenv.mkDerivation { xkeyboard_config libxkbfile libX11 libXrandr libXext ]; - postInstall = '' - ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - ''; - meta = { homepage = "http://cinnamon.linuxmint.com"; description = "Library and data for various Cinnamon modules"; -- cgit 1.4.1 From 493eaf95dd18f62512fa3eeaef6b2820c922ba0c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 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') 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 3941c15b599db36528ac3f0ff98bbbd7ab39114a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 10 Dec 2013 12:43:20 +0100 Subject: gnuplot: pass aquaterm request explicitely (see #1197) --- pkgs/tools/graphics/gnuplot/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index beb32ed9bea..dc1a476b6e7 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -16,7 +16,9 @@ , coreutils ? null }: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); - +let + withX = libX11 != null && !aquaterm; +in stdenv.mkDerivation rec { name = "gnuplot-4.6.3"; @@ -25,8 +27,6 @@ stdenv.mkDerivation rec { sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz"; }; - withX = libX11 != null && !aquaterm; - buildInputs = [ zlib gd texinfo readline emacs lua texLive pango cairo pkgconfig makeWrapper ] @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { # compiling with wxGTK causes a malloc (double free) error on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK; - configureFlags = if withX then ["--with-x"] else ["--without-x"]; + configureFlags = + (if withX then ["--with-x"] else ["--without-x"]) + ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]) + ; postInstall = stdenv.lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ -- cgit 1.4.1 From 9c8789e8bc96f670bb11bbc01d21c2b485514ecb Mon Sep 17 00:00:00 2001 From: Song Wenwu 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') 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 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') 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 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') 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 785befb6b2427ebecbbb103fb17b00e57e3e2b09 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 10 Dec 2013 13:27:07 +0100 Subject: fribid: fix build via using gtk2 instead of gtk3 This was caused by a gtk3 update. I saw they depend on gtk2 instead in Arch and it fixes the build there. CC @edwtjo --- .../networking/browsers/mozilla-plugins/fribid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 7422654ec98..66bd28424c0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk3, gettext, intltool }: +{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }: let version = "1.0.2"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "d7cd9adf04fedf50b266a5c14ddb427cbb263d3bc160ee0ade03aca9d5356e5c"; }; - buildInputs = [ pkgconfig openssl libX11 gtk3 glib gettext intltool ]; + buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ]; patches = [ ./translation-xgettext-to-intltool.patch ./plugin-linkfix.patch -- cgit 1.4.1 From 93ecc636143e1f6dcbfa2f9c13a5cb351cc60c38 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 10 Dec 2013 13:41:20 +0100 Subject: pa_applet: work around a build problem Also remove wrong homepage. CC @iElectric. --- pkgs/tools/audio/pa-applet/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index c5b45743c34..6d5dd6ffca0 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -17,11 +17,13 @@ stdenv.mkDerivation rec { ./autogen.sh ''; + # work around a problem related to gtk3 updates + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + postInstall = '' ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; description = ""; license = licenses.gpl2; maintainers = with maintainers; [ iElectric ]; -- cgit 1.4.1 From 1d6c351046ecdacc01236ce9429132b68d9d9ec5 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 16 Nov 2013 23:21:22 +0100 Subject: enable osmesa for wine (close #1228) --- pkgs/misc/emulators/wine/stable.nix | 7 ++++--- pkgs/misc/emulators/wine/unstable.nix | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix index a9e0aacba26..5bec6a310d1 100644 --- a/pkgs/misc/emulators/wine/stable.nix +++ b/pkgs/misc/emulators/wine/stable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib +{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper }: @@ -34,7 +34,8 @@ in stdenv.mkDerivation rec { inherit version name src; buildInputs = [ - xlibs.xlibs flex bison xlibs.libXi mesa + pkgconfig + xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite alsaLib ncurses libpng libjpeg lcms fontforge @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa libdrm + freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 2c649900034..38c1c9b26e0 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib +{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper }: @@ -34,7 +34,8 @@ in stdenv.mkDerivation rec { inherit version name src; buildInputs = [ - xlibs.xlibs flex bison xlibs.libXi mesa + pkgconfig + xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite alsaLib ncurses libpng libjpeg lcms fontforge @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa libdrm + freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups -- cgit 1.4.1 From f9f14be6323a2f8659f0f5d2299198e44a3faa48 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 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') 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 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') 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 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') 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 3c013cdec98a29302e10a0a9f0f79a1991dfbe2b Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 10 Dec 2013 21:27:47 +0100 Subject: mu: fix build via disabling mug GUI by default It seems it can't handle gtk-3.10. CC @the-kenny --- pkgs/tools/networking/mu/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index e42dfee7cae..f959ad1d573 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile -, gtk3, webkit, libsoup, icu }: +, gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: stdenv.mkDerivation rec { version = "0.9.9.5"; @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1hwkliyb8fjrz5sw9fcisssig0jkdxzhccw0ld0l9a10q1l9mqhp"; }; - buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile - gtk3 webkit libsoup icu ]; + buildInputs = + [ sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu ] + ++ stdenv.lib.optional withMug [ gtk3 webkit ]; preBuild = '' # Fix mu4e-builddir (set it to $out) @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { ''; # Install mug and msg2pdf - postInstall = '' + postInstall = stdenv.lib.optionalString withMug '' cp -v toys/msg2pdf/msg2pdf $out/bin/ cp -v toys/mug/mug $out/bin/ ''; -- cgit 1.4.1 From 6ca6ad8794ce46130595bacf6661f5b8761d7bce Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 10 Dec 2013 21:52:50 +0100 Subject: gnome3.at_spi2_core on darwin: attempt to fix the build --- pkgs/desktops/gnome-3/core/at-spi2-core/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs') 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 e3aee3f9b32..30b2367a5e9 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib , libX11, xextproto, libSM, libICE, libXtst, libXi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { versionMajor = "2.10"; versionMinor = "2"; moduleName = "at-spi2-core"; @@ -20,3 +20,8 @@ stdenv.mkDerivation rec { # ToDo: on non-NixOS we create a symlink from there? configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; } + // stdenv.lib.optionalAttrs stdenv.isDarwin { + NIX_LDFLAGS = "-lintl"; + } +) + -- cgit 1.4.1 From 1d62c6445fbcdf4b8d020ff94d143e875dfa5fd8 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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@@@' -i chroot-fontconfig/fonts.conf echo "${liberation_ttf}" >> chroot-fontconfig/fonts.conf echo "" >> 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 e215435378601f40cfe45ce357313259113dcd0b Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 10 Dec 2013 22:46:34 +0100 Subject: cinnamon-session: minor tweaks and make schemas available --- pkgs/desktops/cinnamon/cinnamon-desktop.nix | 4 ++++ pkgs/desktops/cinnamon/cinnamon-session.nix | 36 ++++++++++++++++------------- 2 files changed, 24 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix index d3cf04e835d..e158b489884 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation { xkeyboard_config libxkbfile libX11 libXrandr libXext ]; + postInstall = '' + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + meta = { homepage = "http://cinnamon.linuxmint.com"; description = "Library and data for various Cinnamon modules"; diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix index 30b78ba143a..850dd4e6c5a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session.nix @@ -1,44 +1,48 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib, -upower, json_glib,intltool, systemd, hicolor_icon_theme, cinnamon-session}: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib +, upower, json_glib,intltool, systemd, hicolor_icon_theme, xorg, makeWrapper, cinnamon-desktop }: let version = "2.0.6"; in stdenv.mkDerivation { name = "cinnamon-session-${version}"; - + src = fetchurl { url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz"; sha256 = "0rs5w7npj3wf3gkk3sfb83awks2h7vjd6cz8mvfgbh6m3grn66l3"; }; - - - configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ; - patches = [ ./remove-sessionmigration.patch ./timeout.patch]; + + configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ; + + patches = [ ./remove-sessionmigration.patch ./timeout.patch]; buildInputs = [ pkgconfig autoreconfHook glib gettext gnome_common gtk3 dbus_glib upower json_glib - intltool systemd + intltool systemd xorg.xtrans + makeWrapper ]; preBuild = "patchShebangs ./scripts"; - + postInstall = '' - ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = { + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + rm $out/share/icons/hicolor/icon-theme.cache + + for f in "$out"/bin/*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:${cinnamon-desktop}/share" + done + ''; + + meta = { homepage = "http://cinnamon.linuxmint.com"; - description = "the cinnamon session files " ; + description = "The cinnamon session files" ; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.roelof ]; }; } - -- cgit 1.4.1 From e0a959d05f88987411f5319462ed8db6c4dc788d Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 095949bdc8fad821812fef5a75e652aa23712088 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 14 Dec 2013 23:17:15 +0100 Subject: xorg server: maintenance update 1.14.4 -> .5 Also drop dri-path patch which wasn't needed for several months, and now it no longer applied. I tested that drivers are still found. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 5 +---- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- pkgs/servers/x11/xorg/xorgserver-dri-path.patch | 19 ------------------- 4 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 pkgs/servers/x11/xorg/xorgserver-dri-path.patch (limited to 'pkgs') diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3b347504a72..72b0c427910 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1900,11 +1900,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.14.4"; + name = "xorg-server-1.14.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.14.4.tar.bz2; - sha256 = "1hsxyqgrw3hrgdl0sw8n4hbhjlindna0z8w4k1anwpw4zfmcz330"; + url = mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2; + sha256 = "1lb1fkscy7nwnabfj0d2shvxga16i047g11if18plj0n2jzhc3wd"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d70bb54c704..08dc5a92b7d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -192,10 +192,7 @@ in "--with-default-font-path= " # there were only paths containing "${prefix}", # and there are no fonts in this package anyway ]; - patches = - [ ./xorgserver-dri-path.patch - ./xorgserver-xkbcomp-path.patch - ]; + patches = [ ./xorgserver-xkbcomp-path.patch ]; buildInputs = attrs.buildInputs ++ [ xtrans ]; propagatedBuildInputs = [ args.zlib args.udev args.mesa args.dbus.libs diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index d76afd9fbe2..7b56dd541fa 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -164,7 +164,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.14.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch deleted file mode 100644 index 3a5f061eb9a..00000000000 --- a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur xorg-server-1.12.2-orig/glx/glxdricommon.c xorg-server-1.12.2/glx/glxdricommon.c ---- xorg-server-1.12.2-orig/glx/glxdricommon.c 2012-05-17 13:09:02.000000000 -0400 -+++ xorg-server-1.12.2/glx/glxdricommon.c 2012-07-14 14:57:37.972791909 -0400 -@@ -219,10 +219,14 @@ - int i; - void *driver; - char filename[PATH_MAX]; -+ char *real_dri_driver_path; - const __DRIextension **extensions; - -+ real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH"); -+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path; -+ - snprintf(filename, sizeof filename, "%s/%s_dri.so", -- dri_driver_path, driverName); -+ real_dri_driver_path, driverName); - - driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (driver == NULL) { -- cgit 1.4.1 From 458f17ae260b9bcbb22baa4dba49a1e3d5f7b7ed Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 c95b774f524c0fbc4a78f1a071d79efd9469b0a4 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 16 Dec 2013 01:21:23 +0000 Subject: vimPlugins.golang: add expression --- pkgs/misc/vim-plugins/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 01ce5f423c3..40a0d7af496 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which }: +{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit }: /* About Vim and plugins @@ -197,6 +197,22 @@ in rec }; }; + golang = simpleDerivation { + name = "vim-golang-20131127"; + src = fetchgit { + url = "https://github.com/jnwhiteh/vim-golang.git"; + rev = "832d64e5a813511ed52217aa24f0255c49671bab"; + }; + path = "golang"; + meta = with stdenv.lib; { + description = "Vim plugins for Go"; + homepage = https://github.com/jnwhiteh/vim-golang; + license = licenses.publicDomain; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + }; + ipython = simpleDerivation { name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960"; src = fetchurl { -- cgit 1.4.1 From b913699f2add206164942bdea02cb88c29106ae7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 18 Dec 2013 14:49:01 +0100 Subject: obnam: Update to 1.6 --- pkgs/tools/backup/obnam/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 6d550e95a9d..f6a51eb3193 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.4"; + version = "1.6"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz"; - sha256 = "0gipbhh20p9n1x1cdpcil8vg3i20f1saa0xyz2wydb9xl4l2mjff"; + sha256 = "1vg0kppbyngvm7wi2pbg3himixy9v3h8z66lcps6pclw43s1kgpm"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33d4f5734e2..bc5824c26de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7620,11 +7620,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { cliapp = buildPythonPackage rec { name = "cliapp-${version}"; - version = "1.20130313"; + version = "1.20130808"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz"; - sha256 = "0rk13a68668gsrv6yqgzqxskffqnlyjar4qav6k5iyrp77amn7qm"; + sha256 = "0i9fqkahrc16mnxjw8fcr4hwrq3ibfrj2lzzbzzb7v5yk5dlr532"; }; buildInputs = [ sphinx ]; @@ -7713,11 +7713,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { tracing = buildPythonPackage rec { - name = "tracing-0.7"; + name = "tracing-${version}"; + version = "0.8"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.7.orig.tar.gz"; - sha256 = "9954a1b0cc6b957d15975b048f929bbdd46766d397a6fa51bf8f6498b9459276"; + url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; + sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0"; }; buildInputs = [ sphinx ]; @@ -7752,11 +7753,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { ttystatus = buildPythonPackage rec { name = "ttystatus-${version}"; - version = "0.22"; + version = "0.23"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz"; - sha256 = "1hzv0sbrvgcmafflhvzh7plci0dg7wcjlk39i8kqdasg6rw0ag6f"; + sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y"; }; buildInputs = [ sphinx ]; @@ -7773,11 +7774,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { larch = buildPythonPackage rec { name = "larch-${version}"; - version = "1.20130316"; + version = "1.20131130"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz"; - sha256 = "1mkvmy0jdzd7dlvdx2a75wsbj5qw1clawcgndx9jwl816a9iy225"; + sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7"; }; buildInputs = [ sphinx ]; -- cgit 1.4.1 From dd07654ca0588aad41ddc5e97052a58b8715d883 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 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') 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 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') 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 b6b047bdbc7a4ad80c2e928ccaff7aae3c5f85c1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:40:47 +0200 Subject: acct: update from 6.5.5 to 6.6.1 --- pkgs/tools/system/acct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index 1095d702d25..fec739b0e8a 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "acct-6.5.5"; + name = "acct-6.6.1"; src = fetchurl { url = "mirror://gnu/acct/${name}.tar.gz"; - sha256 = "1mbg18acrva5m7kxc9pzhaknsqm4r90nrp7ax9jkm9wjkrxwhqs1"; + sha256 = "1jzz601cavml7894fjalw661gz28ia35002inw990agr3rhiaiam"; }; patches = [ ./no-gets.patch ]; -- cgit 1.4.1 From 7f27479d4ad95581925a5aa66759d45bdb5b2f46 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 13:43:50 +0200 Subject: acct: fix build --- pkgs/tools/system/acct/default.nix | 2 -- pkgs/tools/system/acct/no-gets.patch | 22 ---------------------- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/tools/system/acct/no-gets.patch (limited to 'pkgs') diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index fec739b0e8a..cd9519590cc 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1jzz601cavml7894fjalw661gz28ia35002inw990agr3rhiaiam"; }; - patches = [ ./no-gets.patch ]; - doCheck = true; meta = { diff --git a/pkgs/tools/system/acct/no-gets.patch b/pkgs/tools/system/acct/no-gets.patch deleted file mode 100644 index 3478b66de9d..00000000000 --- a/pkgs/tools/system/acct/no-gets.patch +++ /dev/null @@ -1,22 +0,0 @@ -hack until acct pulls a newer gnulib version - -From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Thu, 29 Mar 2012 13:30:41 -0600 -Subject: [PATCH] stdio: don't assume gets any more - -Gnulib intentionally does not have a gets module, and now that C11 -and glibc have dropped it, we should be more proactive about warning -any user on a platform that still has a declaration of this dangerous -interface. - ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -125,7 +125,6 @@ - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -- cgit 1.4.1 From 55a8f167e268fbba9cf4df4d6dd5aaa9a3cc37ce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 9f152ede35e09191f8dcd7787af145ed709dc8ff Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:48:28 +0200 Subject: archivemount: update from 0.6.1 to 0.8.3 --- pkgs/tools/filesystems/archivemount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 8c7593121bb..4c00252fc2a 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.6.1"; + name = "archivemount-0.8.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "9235d6377a70a7c25aa288dab6b0e8ef906d1d219d43e5b8fcdb8cf3ace98e01"; + sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277"; }; buildInputs = [ pkgconfig fuse libarchive ]; -- cgit 1.4.1 From c9d980eec832cbc88ae2be5261b59b2069677275 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:50:55 +0200 Subject: aria: update from 0.14.0 to 0.16.2 --- pkgs/tools/networking/aria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix index f6432f8aa22..2cd3892eede 100644 --- a/pkgs/tools/networking/aria/default.nix +++ b/pkgs/tools/networking/aria/default.nix @@ -1,11 +1,11 @@ args : with args; -let version="0.14.0"; in +let version="0.16.2"; in rec { src = /* Here a fetchurl expression goes */ fetchurl { url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2"; - sha256 = "0d6vpy7f4228byahsg4dlhalfkbscx941klhdlxd0y5c3mxxwkfr"; + sha256 = "02qj3j7a1r477pmk969nd3aa93m33kh4101azy001i9jacpjvzrp"; }; buildInputs = []; -- cgit 1.4.1 From a1226bfb6d26d698352b0df8fd5f491108630d86 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:52:51 +0200 Subject: aria2: update from 1.17.1 to 1.18.1 --- pkgs/tools/networking/aria2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 75b6492a851..87613695be7 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }: stdenv.mkDerivation rec { - name = "aria2-1.17.1"; + name = "aria2-1.18.1"; src = fetchurl { url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "0v0cdbv6v7fb4870rz5s9vscsj74fzbj70gsa2y4hysai4a0im3y"; + sha256 = "0fwm5d0i4nr9yzckmd8yc80yj4h1acrv6jca3h1vjji0rbgk49zy"; }; buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ]; -- cgit 1.4.1 From aa44e4995a058fc0e17b1784eb4dd84a6fe35550 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 c0a0c0b38e3f6f55732d269ff92263ceba5bc4b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:55:46 +0200 Subject: atanks: update from 4.7 to 4.9 --- pkgs/games/atanks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 211e388b871..7669c443321 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -11,11 +11,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="atanks"; - version="4.7"; + version="4.9"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; - hash="0kd98anwb785irv4qm1gqpk2xnh1q0fxnfazkjqpwjvgrliyj2rh"; + hash="015nwh8jk4k24ci6ilihii8idkyf6g266r4vl50csvykc82slrvd"; }; in rec { -- cgit 1.4.1 From de91f24803d01f54cb308308a0be26b06496cbac Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:58:00 +0200 Subject: atari800: update from 2.0.2 to 2.2.1 --- pkgs/misc/emulators/atari800/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 4e499a499fd..5b1576bd97c 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip, zlib, SDL}: stdenv.mkDerivation { - name = "atari800-2.0.2"; + name = "atari800-2.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/atari800/atari800-2.0.2.tar.gz; - md5 = "a81f8a5ace5fd89eb6094faef7c936af"; + url = mirror://sourceforge/atari800/atari800-2.2.1.tar.gz; + sha256 = "0gkhlb3jc0rd7fcqjm41877fsqr7als3a0n552qmnjzrlcczf5yz"; }; rom = fetchurl { url = mirror://sourceforge/atari800/xf25.zip; -- cgit 1.4.1 From 55aaab4f5f1ccac0a3f0047792d2047f2334fe1d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:00:55 +0200 Subject: auctex: update from 11.85 to 11.87 --- pkgs/tools/typesetting/tex/auctex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 3a8b41da660..b3c09952e43 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation ( rec { pname = "auctex"; - version = "11.85"; + version = "11.87"; name = "${pname}-${version}"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e"; + sha256 = "1wjwpmvhpj8q0zd78lj7vyzqhx4rbdhkflslylkzgnw5wllp5mb3"; }; buildInputs = [ emacs texLive ]; -- cgit 1.4.1 From e941f202f191740a4c3b3dd0081c998fca295bb7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 de403540ab64bd34f78ed53a0de2895b845341d4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:07:14 +0200 Subject: avogadro: update from 1.0.3 to 1.1.1 --- pkgs/applications/science/chemistry/avogadro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index e45f5b645fd..e1c4a5f7e7a 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }: stdenv.mkDerivation rec { - name = "avogadro-1.0.3"; + name = "avogadro-1.1.1"; src = fetchurl { url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; - sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg"; + sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; -- cgit 1.4.1 From 37d39237ab52c87cb0ee30795c71599edc239462 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 f7296b70f8a49f5e1c337471dd2f7aaf2b2bd417 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:18:06 +0200 Subject: barcode: update from 0.98 to 0.99 --- pkgs/tools/graphics/barcode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 6f8ec54c4c0..d43540a8b99 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -9,11 +9,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="0.98"; + version="0.99"; baseName="barcode"; name="${baseName}-${version}"; url="mirror://gnu/${baseName}/${name}.tar.gz"; - hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2"; + hash="0r2b2lwg7a9i9ic5spkbnavy1ynrppmrldv46vsl44l1xgriq0vw"; }; in rec { -- cgit 1.4.1 From be11410d4abf13cc84f98ece2418c62f8ec98322 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:18:58 +0200 Subject: batctl: update from 2013.2.0 to 2013.4.0 --- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 2ff9d214bbb..88c7ffd93ee 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - ver = "2013.2.0"; + ver = "2013.4.0"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha1 = "0ba6520c813c9dd2e59e6205e8ea2e60a0c85f52"; + sha256 = "0k6b695h38m92a8wn5gvb3z746m3fm0ygv58yyn163adcsvf7sjd"; }; preBuild = '' -- cgit 1.4.1 From 296e2d5207dc1a4812f36b7476b19e60b62bfdd6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:21:11 +0200 Subject: bazaarTools: update from 2.2.0 to 2.5 --- pkgs/applications/version-management/bazaar/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index 19a00d2b841..f10fb5e65ce 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -1,10 +1,10 @@ args : with args; rec { - version = "2.2.0"; + version = "2.5"; src = fetchurl { url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; - sha256 = "835e0dc2b3b798d3c88b960bf719fe3b4cec7ae241908aafeb6aafe4c83f591b"; + sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw"; }; buildInputs = []; -- cgit 1.4.1 From b07899be3251763e36d5a4ea4e6f84058d67ebc5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:21:54 +0200 Subject: bibletime: update from 2.9.1 to 2.9.2 --- pkgs/applications/misc/bibletime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 36366d6ee72..689bcf89ef9 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "2.9.1"; + version = "2.9.2"; name = "bibletime-${version}"; src = fetchurl { url = "mirror://sourceforge/bibletime/${name}.tar.bz2"; - sha256 = "1d8kh213rpx4d63sxl5mk1s94xv363l5prrq2kh06cpnl7a8d2ih"; + sha256 = "1j4kc24qvhqlbqspczmkxvw09mnvgg9m4zs1y9f68505kd0pfg1r"; }; prePatch = '' -- cgit 1.4.1 From 01a474bce4b0e2e8397e6ff536bcee8c6675e39d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:24:58 +0200 Subject: bird: update from 1.3.11 to 1.4.0 --- pkgs/servers/bird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index ae50091add1..5e86d60871d 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison, readline }: stdenv.mkDerivation rec { - name = "bird-1.3.11"; + name = "bird-1.4.0"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "15c4d9cyd6l8jdlrvmzvwmpga81llm8zxqvbsir9gvwgzn6zbmna"; + sha256 = "1ickqvzpnyycq4a0l4d0kvf25pvq2vjayc0whqfv1233nb5426ys"; }; buildInputs = [ flex bison readline ]; -- cgit 1.4.1 From fe6522309e570811d6fe12cc2ab257e9ffa547c9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 e66756f350031eca12f6357efebe9f7814aca6af Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:28:10 +0200 Subject: bitcoin: update from 0.8.5 to 0.8.6 --- pkgs/applications/misc/bitcoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index a6a289168c4..9e20be0dcbc 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "0.8.6"; name = "bitcoin-${version}"; src = fetchurl { url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz"; - sha256 = "0qqzwx1lihlrj7r08alsyznjfqvwncfm0nnxi1pcx0jyvq83ym44"; + sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk"; }; buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; -- cgit 1.4.1 From a94aa7cf497c113b19b4d06a97339e2daf6bccbe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:29:41 +0200 Subject: bluez5: update from 5.8 to 5.12 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 3f5d85e8f6f..4938f7f4470 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.8"; + name = "bluez-5.12"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1l33lq1lpg7hy26138ir5dj4gl3mql2qxpj20rjnnwyckc3jk700"; + sha256 = "0zk183gjsxissq9gma962cyvyqxydai8n6jgslxx0mpk2m7mgvvm"; }; pythonPath = with pythonPackages; -- cgit 1.4.1 From 146bcfe7b196a7ac4e680865c12cf4ff59b8e396 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 a2b26be374cbcc74006cc2151ef12043ba312981 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:38:07 +0200 Subject: byobu: update from 5.37 to 5.68 --- pkgs/tools/misc/byobu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 03b3719c9f0..909e44d9809 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "byobu-5.37"; + name = "byobu-5.68"; src = fetchurl { - url = "https://launchpad.net/byobu/trunk/5.37/+download/byobu_5.37.orig.tar.gz"; - sha256 = "e9fec9c03ebdfbeb42d08e8e7a7e45d873e1a5d5f7984a39793e37fe7cc30688"; + url = "https://launchpad.net/byobu/trunk/5.68/+download/byobu_5.68.orig.tar.gz"; + sha256 = "1xf2m18zx3075c0qvx4fzvn5afm274j5dl0jps7p2lbaq4k1lyhm"; }; doCheck = true; -- cgit 1.4.1 From c7a7cfc9d2b835c49a8a411db9ae4ef5fe0875bc Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:39:56 +0200 Subject: calibre: update from 1.14.0 to 1.15.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6c007aadd32..67031e20722 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.14.0"; + name = "calibre-1.15.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1nwrahh8rkllazwjgwv1a5fxcg0x221760ixm3707ikz33i0qvx6"; + sha256 = "0kisdrvsbdpfkirg0p8ifzcm7fjidx74xsw4bdb96gry2wmpjwf7"; }; inherit python; -- cgit 1.4.1 From 32b2973807c6e84576175963b7a78cc814e82175 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 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') 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 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') 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 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') 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 69bb44994e1eb69d92d10fb140d4ce79e15cad6a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 14:53:36 +0200 Subject: avogadro: build documentation --- pkgs/applications/science/chemistry/avogadro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index e1c4a5f7e7a..1e9f3ee521b 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig doxygen ]; NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; -- cgit 1.4.1 From 6fb71755b824160047cfbc288bdeb7cd204ff6d7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:57:25 +0200 Subject: cinepaint: update from 1.0 to 1.1 --- pkgs/applications/graphics/cinepaint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 8d88e570f27..41a4b102a6f 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -5,11 +5,11 @@ mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : stdenv.mkDerivation rec { - name = "cinepaint-1.0"; + name = "cinepaint-1.1"; src = fetchurl { url = "mirror://sourceforge/cinepaint/${name}.tgz"; - sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7"; + sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w"; }; buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg -- cgit 1.4.1 From f52514956d72cf8988a470bd15530c470e54d57c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 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') 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 8e9ed874bf0884ba3add231971feec6f016ea275 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:05:26 +0200 Subject: csound: update from 5.18.02 to 5.19.01 --- pkgs/applications/audio/csound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 34e98ae620d..19c590330f6 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation { - name = "csound-5.18.02"; + name = "csound-5.19.01"; enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/csound/Csound5.18.02.tar.gz; - sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8"; + url = mirror://sourceforge/csound/Csound5.19.01.tar.gz; + sha256 = "078i69jwgadmxwa5ffn8h1py7cmd9asa8swnh38fyp56lzgzn669"; }; buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; -- cgit 1.4.1 From 0b276be28baeadc8d338e643d879423c7111266f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 e4258fe1a7a8d87b6aadb2bbb81604708be0a114 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:08:51 +0200 Subject: cupsBjnp: update from 0.5.4 to 1.2.1 --- pkgs/misc/cups/drivers/cups-bjnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 483ec7aab97..1ed74c57435 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cups}: stdenv.mkDerivation rec { - name = "cups-bjnp-0.5.4"; + name = "cups-bjnp-1.2.1"; src = fetchurl { url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz"; - sha256 = "1q5npis0jgs44yvczrr6pz87glk1d9lv3vr2s4nqrk3l0q4xplf6"; + sha256 = "0fjpp0mmmwfcr790hfjs0brsxxb7dz7v2xab6wc30rwzkqmgz95x"; }; preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; -- cgit 1.4.1 From 191f3490522540f696967f7a325f0669b533cdf7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:13:04 +0200 Subject: cvc3: update from 2.2 to 2.4.1 --- pkgs/applications/science/logic/cvc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 9bb8f8cde4c..07b87e3cf07 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -12,10 +12,10 @@ let ++ [(a.lib.overrideDerivation x.gmp (y: {dontDisableStatic=true;}))]; sourceInfo = rec { baseName="cvc3"; - version="2.2"; + version="2.4.1"; name="${baseName}-${version}"; url="http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz"; - hash="1dw12d5vrixfr6l9j6j7026vrr22zb433xyl6n5yxx4hgfywi0ji"; + hash="1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym"; }; in rec { -- cgit 1.4.1 From 362f26dec73838cdfff50de90a8e60673679e11d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:14:36 +0200 Subject: d1x_rebirth: update from 0.57.3 to 0.58.1 --- pkgs/games/d1x-rebirth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix index 471eca78cf1..ca348592d1d 100644 --- a/pkgs/games/d1x-rebirth/default.nix +++ b/pkgs/games/d1x-rebirth/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: stdenv.mkDerivation rec { - name = "d1x-rebirth-0.57.3"; + name = "d1x-rebirth-0.58.1"; src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.57.3-src.tar.gz"; - sha256 = "07dbjza5flsczdsas0adb5xhn13gmhlpixa8ycp8hjm20y9kw1za"; + url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz"; + sha256 = "13p3nfqaa78h6bl0k8mdsn90ai99wbqaj6qlsjsgsn8imficivsv"; }; buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; -- cgit 1.4.1 From 113a5782a3d68240bce61a3db8e4c97850fbe93f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:15:12 +0200 Subject: d2x_rebirth: update from 0.57.3 to 0.58.1 --- pkgs/games/d2x-rebirth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix index b52e2995198..644c2703599 100644 --- a/pkgs/games/d2x-rebirth/default.nix +++ b/pkgs/games/d2x-rebirth/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: stdenv.mkDerivation rec { - name = "d2x-rebirth-0.57.3"; + name = "d2x-rebirth-0.58.1"; src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.57.3-src.tar.gz"; - sha256 = "0yyandmxz12bbpnd746nddjlqh5i7dylwm006shixis3w3giz77c"; + url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.58.1-src.tar.gz"; + sha256 = "08mg831afc1v068c0ds70lhmxk8a54494jls7s9hwf02ffhv3sx8"; }; buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; -- cgit 1.4.1 From 0abf7e62244bd3c334bd47e0a89f904ba6f0f5a9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:16:35 +0200 Subject: dash: update from 0.5.6 to 0.5.7 --- pkgs/shells/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 3918be2afc1..bb4b39f1cc3 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.6"; + name = "dash-0.5.7"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "0qnqx14y70ay1mn0w0hrknpll9266pvj0426k8niww9s7fzv89w5"; + sha256 = "0fafpbpq6jghs0fr392x525dybym9kq1s3kly2679ds526gzm2df"; }; meta = { -- cgit 1.4.1 From 99c9ff6442221d3bad66ddfda7e60454ffeb6dc7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 a699697f144d2615de5069952136fbe5059ee1aa Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:20:20 +0200 Subject: disper: update from 0.3.0 to 0.3.1 --- pkgs/tools/misc/disper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index b4a159745d4..777f7b48675 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation rec { - name = "disper-0.3.0"; + name = "disper-0.3.1"; buildInputs = [python]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.0.tar.gz; - sha256 = "1mfqidm5c89nknzksabqgjygdp57xpszz7hy2dxh39hpgrsk3l58"; + url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz; + sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw"; }; meta = { -- cgit 1.4.1 From 8d2d9f6d217bbe343f0130d0b732b8ad3bef8bf2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 b89bcaef223fba6ad590377d81bc9263c82661a0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:29:36 +0200 Subject: dos2unix: update from 5.3.1 to 6.0.3 --- pkgs/tools/text/dos2unix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index dcc4116813b..a0033771b67 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation { - name = "dos2unix-5.3.1"; + name = "dos2unix-6.0.3"; src = fetchurl { - url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-5.3.1.tar.gz; - sha256 = "0bwqw3wi0j4f1x8d39xw5v57ac0bc58j41vjx8v2qm1smg9jyci1"; + url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.3.tar.gz; + sha256 = "014sxyidqmjvc5xp5dmcimxd3apl8gyv6whc44vkb65151dqq9pm"; }; configurePhase = '' -- cgit 1.4.1 From 6b0e77f8b5d3139651e746d83bb351ff564e2849 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:32:52 +0200 Subject: dovecot: update from 2.1.8 to 2.1.17 --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index cb29c9ebc89..46cf742c452 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}: stdenv.mkDerivation rec { - name = "dovecot-2.1.8"; + name = "dovecot-2.1.17"; buildInputs = [openssl pam bzip2 zlib inotifyTools openldap]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; - sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028"; + sha256 = "06j2s5bcrmc0dhjsyavqiss3k65p6xn00a7sffpsv6w3yngv777m"; }; # It will hardcode this for /var/lib/dovecot. -- cgit 1.4.1 From 74c3965b92f88e73484ec05f5973c903015ff1c7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:37:12 +0200 Subject: enca: update from 1.13 to 1.15 --- pkgs/tools/text/enca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index ce1c7401a4e..68748e62640 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv ? null }: stdenv.mkDerivation rec { - name = "enca-1.13"; + name = "enca-1.15"; src = fetchurl { url = "http://dl.cihar.com/enca/${name}.tar.bz2"; - sha256 = "6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432"; + sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv"; }; buildInputs = (stdenv.lib.optional (libiconv != null) libiconv); -- cgit 1.4.1 From 74ced3209ee63dc87a19e6c049716571d982423e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 15:41:35 +0200 Subject: enca: update dependencies --- pkgs/tools/text/enca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 68748e62640..23223572bb2 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv ? null }: +{ stdenv, fetchurl, libiconvOrNull, recode }: stdenv.mkDerivation rec { name = "enca-1.15"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv"; }; - buildInputs = (stdenv.lib.optional (libiconv != null) libiconv); + buildInputs = [ recode libiconvOrNull ]; meta = { homepage = http://freecode.com/projects/enca; -- cgit 1.4.1 From 490dfa536371c7424c1b6fa82da0dd3751061e57 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 8d2853102bc814e8f8ab8025f15005e3eaedda68 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:45:48 +0200 Subject: ethtool: update from 3.10 to 3.11 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 90d345daa13..01b45cd6d8b 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ethtool-3.10"; + name = "ethtool-3.11"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "0h0wvi0s6s80v26plkh66aiyybpfyi18sjg5pl9idrd0ccdr93gq"; + sha256 = "1m1gc2g5ym7xmbq64ysw9avp9bbsagbi7x624mzki5ba3535agym"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 0a6ec77d3a3687045b86f959dce2875903016a25 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 46a632eef39e634f87a78d0c97e7ea2edd17dc43 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:51:33 +0200 Subject: figlet: update from 2.2.4 to 2.2.5 --- pkgs/tools/misc/figlet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 488f8020b63..7f22a35e8de 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "figlet-2.2.4"; + name = "figlet-2.2.5"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.4.tar.gz; - sha256 = "19qcmm9cmf78w1z7gbpyj9wmrfjzjl25sax9f2j37sijznrh263f"; + url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz; + sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; installPhase = "make prefix=$out install"; -- cgit 1.4.1 From 05288d3ad5f0c939d91c0daf30e978927d4d2e45 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 c47477d06e29299f0e7adc50532afb3538ce404e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:58:25 +0200 Subject: foomatic_filters: update from 4.0.12 to 4.0.17 --- pkgs/misc/drivers/foomatic-filters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index ff03770014d..f618a28b4d6 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, cups, dbus }: stdenv.mkDerivation rec { - name = "foomatic-filters-4.0.12"; + name = "foomatic-filters-4.0.17"; src = fetchurl { url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz"; - sha256 = "17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8"; + sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; buildInputs = [ pkgconfig perl cups dbus ]; -- cgit 1.4.1 From f3bbb6ff5d2fb596a48b7c79a2430f45771ff750 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 fa78387a3869ae1f345857a59be78e70718af362 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:01:32 +0200 Subject: freeipmi: update from 1.1.3 to 1.3.4 --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 82377aa92f5..2bfa77164b8 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.1.3"; + name = "freeipmi-1.3.4"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "11kawxzk8cp9g3q5hdm1sqgzanprc2gagjdnm33lyz5df8xjfkmk"; + sha256 = "0gadf3yj019y3rvgf34pxk502p0p6nrhy6nwldvvir5rknndxh63"; }; buildInputs = [ libgcrypt readline ]; -- cgit 1.4.1 From 46d3388196b750ebaff8bc7b81ac4ba9ececfe0b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:03:29 +0200 Subject: gemrb: update from 0.6.1 to 0.8.0.1 --- pkgs/games/gemrb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index aae7241cf88..31e8ae05d00 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -3,11 +3,11 @@ assert stdenv.gcc.libc != null; stdenv.mkDerivation rec { - name = "gemrb-0.6.1"; + name = "gemrb-0.8.0.1"; src = fetchurl { url = "mirror://sourceforge/gemrb/${name}.tar.gz"; - sha256 = "1jnid5nrasy0lglnx71zkvv2p59cxsnhvagy7r8lsmjild1k5l93"; + sha256 = "0v9iypls4iawnfkc91hcdnmc4vyg3ix7v7lmw3knv73q145v0ksd"; }; buildInputs = [ cmake python openal SDL zlib libpng libvorbis ]; -- cgit 1.4.1 From 767a9d575a2ebfa8f16b0e0b037a2ef686eb2ed9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:04:30 +0200 Subject: getmail: update from 4.42.0 to 4.43.0 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 06e7789eca3..80d29835da5 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "getmail-4.42.0"; + name = "getmail-4.43.0"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0n6sxp8vwa19ffr7bagzwp0hvxfjiy43xpz9sa1qmsyjs7c3xdqj"; + sha256 = "0abcj4d2jp9y56c85kq7265d8wcij91w9lpzib9q6j9lcs4la8hy"; }; doCheck = false; -- cgit 1.4.1 From 3cd09215c7ce7b9a07016520bcdbf92afcbc7aa6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:05:45 +0200 Subject: gifsicle: update from 1.52 to 1.78 --- pkgs/tools/graphics/gifsicle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 515858bd439..f3f17692df8 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xproto, libXt, libX11 }: stdenv.mkDerivation { - name = "gifsicle-1.52"; + name = "gifsicle-1.78"; src = fetchurl { - url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz; - sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk"; + url = http://www.lcdf.org/gifsicle/gifsicle-1.78.tar.gz; + sha256 = "0dzp5sg82klji4lbj1m4cyg9fb3l837gkipdx657clib97klyv53"; }; buildInputs = [ xproto libXt libX11 ]; -- cgit 1.4.1 From 20f3c4de3d8f6022f7fc776832cbe8e3c4a212e8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:08:06 +0200 Subject: gimp: update from 2.8.8 to 2.8.10 --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index d6b005e8e3d..af7d9e3399b 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: stdenv.mkDerivation rec { - name = "gimp-2.8.8"; + name = "gimp-2.8.10"; src = fetchurl { url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - md5 = "ef2547c3514a1096931637bd6250635a"; + sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7"; }; buildInputs = -- cgit 1.4.1 From 8fa0f4debf7a19357059c16bec38ada2723d64dc Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:10:35 +0200 Subject: gitAndTools.git: update from 1.8.5.1 to 1.8.5.2 --- pkgs/applications/version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index e364a8ea87b..dd8821711de 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.5.1"; + version = "1.8.5.2"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m"; + sha256 = "12iyj6f89dmb1cn2pvym5lrf23g4m71mp9pwkbi1zscb9d998ih2"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; -- cgit 1.4.1 From efa05777b0a815d8fa497ee7365f3914ba1be8b7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 68e201b41cd0b03079c1c5191c7d5e7928e4ba4e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:37:55 +0200 Subject: gnome.libgnomeprintui: update from 2.18.4 to 2.18.6 --- pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index da7673de419..a19b20e86b5 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}: stdenv.mkDerivation { - name = "libgnomeprintui-2.18.4"; + name = "libgnomeprintui-2.18.6"; src = fetchurl { - url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2; - sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490"; + url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2; + sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; -- cgit 1.4.1 From 882ddb2b1d7712372858d9438ea49bae87e1ffea Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:39:48 +0200 Subject: gnome3.gnome_keyring: update from 3.6.2 to 3.6.3 --- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 5983b74c0f4..9e08c6fa663 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -2,11 +2,11 @@ , gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }: stdenv.mkDerivation rec { - name = "gnome-keyring-3.6.2"; + name = "gnome-keyring-3.6.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz"; - sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f"; + sha256 = "0la107v75vh8v165lk391xg820h8hxa209766wr98pm22qzkl5g0"; }; buildInputs = [ -- cgit 1.4.1 From f40d79adf6de1c3b20f7d09a84e3227eed0f360d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 24c79d66261d0d4a71feb14bc57a59e97f071ab8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:49:50 +0200 Subject: gromacsDouble: update from 4.5.5 to 4.6.5 --- pkgs/applications/science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index de4bb171497..b9abf7b55b4 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { - name = "gromacs-4.5.5"; + name = "gromacs-4.6.5"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; - md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz"; + sha256 = "02ggrplh8fppqib86y3rfk4qm08yddlrb1yjgzl138b3b4qjy957"; }; buildInputs = [cmake fftw]; -- cgit 1.4.1 From 965c3464e181008e2e3ff9f745f7cb224ae64c25 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 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') 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 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') 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 8fd04f45c563b94b2df136025cc17003f7a79001 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:58:28 +0200 Subject: gtkgnutella: update from 0.97 to 1.0.0 --- pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index e30192598cc..4c3ee0c4d6f 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -2,14 +2,14 @@ let name = "gtk-gnutella"; - version = "0.97"; + version = "1.0.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0l2gdzp517hjk31318djq0sww6kzckzl9rfqvhgspihn874lm9hb"; + sha256 = "11nri43q99zbxql9wg3pkq98vcgzvbndpzc3a1jlg3lzh7css0hc"; }; buildInputs = [pkgconfig glib gtk libxml2 bison gettext zlib]; -- cgit 1.4.1 From 0aef5b8381be4da80928f2f44b20b742f59912e4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:59:52 +0200 Subject: gtkwave: update from 3.3.39 to 3.3.53 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index bb4b969f062..0bc6b60e721 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-3.3.39"; + name = "gtkwave-3.3.53"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1va506anlbpbha7l6h94s44xjdy6ch22iv629swn4bh5m3qi33bg"; + sha256 = "1jmrk2p2azjca250h2bi4c8v0cp1gqd3c027dx18sxy3cgw1fsp1"; }; buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; -- cgit 1.4.1 From 0b3d2c0cacfe8d69f3106466ca8378548be444bf Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 1ef60acae5b0fbd9913e3bea2787ffd2e4358d70 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:03:40 +0200 Subject: highlight: update from 3.5 to 3.9 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 40a3bcf78ea..9bca0a91d4f 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, getopt, lua, boost }: stdenv.mkDerivation rec { - name = "highlight-3.5"; + name = "highlight-3.9"; src = fetchurl { url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "0jpidd2fwn5mbrgzjmh53qvfmqqp6g0mah7i5zsf9bd71ga1lp28"; + sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja"; }; buildInputs = [ getopt lua boost ]; -- cgit 1.4.1 From d315309339cb7624cacf78c62c92ea9335e96fe2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:06:19 +0200 Subject: impressive: update from 0.10.2 to 0.10.3 --- pkgs/applications/office/impressive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index f1de422fa24..de6517923b6 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -2,7 +2,7 @@ , xpdf, pil, pyopengl, pygame , setuptools, mesa, freeglut }: -let version = "0.10.2"; +let version = "0.10.3"; in stdenv.mkDerivation { # This project was formerly known as KeyJNote. @@ -12,7 +12,7 @@ in src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "1py36h9085ycxj3qnmqdps0dfghlr5qb2i62l0ynzngn55dgz950"; + sha256 = "0ppr9bckswpi3gav56dhrk91ibxvqbfhpxmm0zikzpxhdlvnaj5v"; }; # Note: We need to have `setuptools' in the path to be able to use -- cgit 1.4.1 From 14e0d3d693743ee111dab95d2aacde87f8ab8ea2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 6b76ba365d1465cf8ae1f00d478a56906a4b0d2e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:09:51 +0200 Subject: jackmeter: update from 0.3 to 0.4 --- pkgs/applications/audio/jackmeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 97c39982a65..98fcb8943af 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jackaudio, pkgconfig }: stdenv.mkDerivation rec { - name = "jackmeter-0.3"; + name = "jackmeter-0.4"; src = fetchurl { url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz"; - sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp"; + sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; buildInputs = [ jackaudio pkgconfig ]; -- cgit 1.4.1 From b3f1ee3863ab1eb0794f48f80ee8f003a06d5c0f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:11:14 +0200 Subject: jags: update from 2.2.0 to 3.4.0 --- pkgs/applications/science/math/jags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 3043df15da7..a93386149bd 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gfortran, liblapack, blas}: stdenv.mkDerivation rec { - name = "JAGS-2.2.0"; + name = "JAGS-3.4.0"; src = fetchurl { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; - sha256 = "016xml4k99lmdwwjiabxin95k9p3q2zh4pcci8wwcqwlq5y205b6"; + sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib"; }; buildInputs = [gfortran liblapack blas]; -- cgit 1.4.1 From 3f39947054a35083e2da7b4273210cde576c852f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:12:23 +0200 Subject: jetty61: update from 6.1.21 to 6.1.26 --- pkgs/servers/http/jetty/6.1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/http/jetty/6.1/default.nix b/pkgs/servers/http/jetty/6.1/default.nix index 10913a65641..894a21fdece 100644 --- a/pkgs/servers/http/jetty/6.1/default.nix +++ b/pkgs/servers/http/jetty/6.1/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "jetty-6.1.21"; + name = "jetty-6.1.26"; builder = ./bin-builder.sh; buildInputs = [unzip]; src = fetchurl { - url = http://dist.codehaus.org/jetty/jetty-6.1.21/jetty-6.1.21.zip; - sha256 = "1nrjglrmf29m1j1c80nskngmlqmc5vc7c48fggczn605l722cwaw"; + url = http://dist.codehaus.org/jetty/jetty-6.1.26/jetty-6.1.26.zip; + sha256 = "11w1ciayv8zvxjg45xzs0kwc7k45x97sbnxkqb62sxy3gsw8xh4n"; }; } -- cgit 1.4.1 From 3e97ec3a0175301da195d6bc658886e0d3df19b5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:14:27 +0200 Subject: kde4.kwooty: update from 0.8.1 to 0.8.4 --- pkgs/applications/networking/newsreaders/kwooty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix index 15b1c6c6b4e..e49e2c6fe26 100644 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -5,14 +5,14 @@ , unrar, p7zip, par2cmdline, coreutils }: -let version = "0.8.1"; +let version = "0.8.4"; name = "kwooty-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/kwooty/${name}.tar.gz"; - sha256 = "746ed50ec3c067711932c89dc3ee5527c126f37c6922b3eda49535eb83c245e4"; + sha256 = "0i3zmh7y52n5k0yn3xc6zjpjz75f48nly40n394i6sxy89psgfc2"; }; patches = [ ./searchPath.patch ]; -- cgit 1.4.1 From 6ac1c01e51415fe4ff339b19b79ffc77dca82f90 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:15:13 +0200 Subject: kde4.rekonq: update from 1.70 to 1.80 --- pkgs/applications/networking/browsers/rekonq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index c8542ad7a52..3deabd42e01 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -3,11 +3,11 @@ assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 stdenv.mkDerivation rec { - name = "rekonq-1.70"; # >=1.80 need kde >=4.9.0 + name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0 src = fetchurl { url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; - sha256 = "05zqm329vajsn32l5b5nlbw92gl3irdcx8kifr4y921i9bkzigad"; + sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g"; }; buildInputs = [ kde4.kdelibs qca2 qoauth ]; -- cgit 1.4.1 From 4ed5c4df73a4774806e4026e3125470915a93f8f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 947f0a2282ea794e8bed2e7594943c2c333f8fce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:58:12 +0200 Subject: lmodern: update from 2.004.1 to 2.004.4 --- pkgs/data/fonts/lmodern/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 1368537c2a1..543a4894f30 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "lmodern-2.004.1"; + name = "lmodern-2.004.4"; src = fetchurl { - url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.1.orig.tar.gz; - sha256 = "1bvlf8p39667q58pvyfzy3yl0mylf0ak96flwp8vj01vqbi3rfaz"; + url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; + sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw"; }; installPhase = '' -- cgit 1.4.1 From b2fc677345e0d350d2532355ef988832cb6c695f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 50bfd93274a2f438340f251591b444d28b3c9327 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:00:40 +0200 Subject: mate-icon-theme: update from 1.6.1 to 1.6.2 --- pkgs/misc/themes/mate-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/misc/themes/mate-icon-theme/default.nix index 65965e46b32..fe19a45b2ac 100644 --- a/pkgs/misc/themes/mate-icon-theme/default.nix +++ b/pkgs/misc/themes/mate-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }: stdenv.mkDerivation { - name = "mate-icon-theme-1.6.1"; + name = "mate-icon-theme-1.6.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz"; - sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x"; + url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.2.tar.xz"; + sha256 = "1ahijywk6vj8yyiglqdpc56dkczyj1v99ziblaaclmhi4sxxb5jm"; }; buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ]; -- cgit 1.4.1 From 231e9cff364c481c26e024d027f853e170ee72c0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:01:19 +0200 Subject: mate-themes: update from 1.6.1 to 1.6.2 --- pkgs/misc/themes/mate-themes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix index 0f0f41af638..32d1a24cbf4 100644 --- a/pkgs/misc/themes/mate-themes/default.nix +++ b/pkgs/misc/themes/mate-themes/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation { - name = "mate-themes-1.6.1"; + name = "mate-themes-1.6.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz"; - sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp"; + url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.2.tar.xz"; + sha256 = "145mjdijjvkpjjgqdfwjp30jvvs0qzxlnh15q6mig8df6drg5fn6"; }; buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ]; -- cgit 1.4.1 From 22b9ebd4f05888ad7b5e5119a4112e4bf9129ba4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 9a35ac20f375b7429c700b5c77524a38b6504dd9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:09:53 +0200 Subject: pinentry: update from 0.8.2 to 0.8.3 --- pkgs/tools/security/pinentry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 543c5d81ba1..81efd4841a6 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,11 +6,11 @@ assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { - name = "pinentry-0.8.2"; + name = "pinentry-0.8.3"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "1c9r99ck8072y7nkirddg3p372xadl95y65hyc1m6wn5mavbg12h"; + sha256 = "1bd047crf7xb8g61mval8v6qww98rddlsw2dz6j8h8qbnl4hp2sn"; }; buildInputs = let opt = stdenv.lib.optional; in [] -- cgit 1.4.1 From 5725ac31e1eed41db1411bb0e644aabefd8a9782 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 6f17df861eb3c76246ea5d14dd8eadf14fc3c470 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:16:06 +0200 Subject: wineUnstable: update from 1.7.7 to 1.7.8 --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 2c649900034..47f5b1ccc04 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.7"; + version = "1.7.8"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "19xcspll0ljbr2v0y7xy4943pgqalya2zrzndqsl2d7kpyv061hi"; + sha256 = "010qa6xn0b0161kcmm43yr0bp39iddb6d5i27mpl229shrgpzq9h"; }; gecko = fetchurl { -- cgit 1.4.1 From 8e97719684e8db13881751006beef66b632d81e0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 01a051292f718bd387f0644efdafbb28a3895a2a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 18 Dec 2013 12:35:07 -0500 Subject: Linux 3.12.5 Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 842d2911f77..74ad329fb55 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.4"; + version = "3.12.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb"; + sha256 = "48181474f3943f77c1e62bed676b09a9fed64364d5847ce14a45b8d947112719"; }; features.iwlwifi = true; -- cgit 1.4.1 From 0c246250c0192fe4798ffe597f3c310c0d1b845f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 18e81a5365f35605f7fde00024822743f9ad2c58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 18:34:14 +0100 Subject: haskell-packages.nix: OpenAL builds only with the latest OpenGL --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 37d560ff439..b43d2a39f2a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1658,7 +1658,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x oeis = callPackage ../development/libraries/haskell/oeis {}; - OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL { + OpenGL = self.OpenGL_2_9_1_0; + }; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; -- cgit 1.4.1 From 43498628e8a3eb7d6acbabe2b1918e21bd1a30f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 21:31:30 +0100 Subject: haskell-packages.nix: the latest OpenGL needs the latest OpenGLRaw to compile --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b43d2a39f2a..5078076350d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1668,7 +1668,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; + OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix { + OpenGLRaw = self.OpenGLRaw_1_4_0_0; + }; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; -- cgit 1.4.1 From bcf507f3c25279cc7e20130e2f27ba8c9a961952 Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Wed, 18 Dec 2013 22:29:00 +0100 Subject: pythonPackages.webob: 1.2.3 -> 1.3.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc5824c26de..7cdc5ee5ff0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6860,12 +6860,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { webob = buildPythonPackage rec { - version = "1.2.3"; + version = "1.3.1"; name = "webob-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.tar.gz"; - md5 = "11825b7074ba7043e157805e4e6e0f55"; + md5 = "20918251c5726956ba8fef22d1556177"; }; propagatedBuildInputs = [ nose modules.ssl ]; -- cgit 1.4.1 From 57713cd258a8f636ae892df8868ac18250f86a4c Mon Sep 17 00:00:00 2001 From: Peter Simons 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 f1ed3433e838b87faad51a99298a247aa70e6a96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Dec 2013 17:20:46 +0100 Subject: gnupg1: update to version 1.4.16 --- pkgs/tools/security/gnupg1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index 192970b5cae..362ec3a25bb 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.15"; + name = "gnupg-1.4.16"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha1 = "63ebf0ab375150903c65738070e4105200197fd4"; + sha256 = "0bsa1yqa3ybhvmc4ys73amdpcmckrlq1fsxjl2980cxada778fvv"; }; buildInputs = [ readline bzip2 ]; -- cgit 1.4.1 From 2504dedaf68e2a2a4c88dbfc0353375b845c1003 Mon Sep 17 00:00:00 2001 From: Peter Simons 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') 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 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') 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 b40393438e1de8315423b08056080fec35e86ce0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Dec 2013 18:11:20 +0100 Subject: LambdaHack: jailbreak to fix build with recent versions of hashable and pretty-show --- pkgs/games/LambdaHack/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index b9b66f4be69..c9fd9706c0e 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { hashable keys miniutter mtl prettyShow random stm text transformers unorderedContainers zlib ]; + jailbreak = true; meta = { homepage = "http://github.com/kosmikus/LambdaHack"; description = "A roguelike game engine in early and active development"; -- cgit 1.4.1 From b18a2b580eb980756761a211a19bf9139e3fa9bd Mon Sep 17 00:00:00 2001 From: Peter Simons 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') 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 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') 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 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') 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 74f63a62f80f4a35bb4e9dbc563aa1c0421c46db Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Wed, 25 Sep 2013 23:30:02 +0200 Subject: docbook2odf: new package Tested like this: nix-build -A docbook2odf ./result/bin/docbook2odf --verbose --debug result/share/doc/docbook2odf/examples/book.docbook swriter book.odt # verify that the document looks ok --- pkgs/tools/typesetting/docbook2odf/default.nix | 47 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/typesetting/docbook2odf/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix new file mode 100644 index 00000000000..90b2ff61f34 --- /dev/null +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, perl, makeWrapper, zip, libxslt, PerlMagick }: + +stdenv.mkDerivation rec { + name = "docbook2odf-0.244"; + + src = fetchurl { + url = "http://open.comsultia.com/docbook2odf/dwn/${name}.tar.gz"; + sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; + }; + + buildInputs = [ perl makeWrapper ]; + + installPhase = '' + mkdir -p "$out/bin/" + mkdir -p "$out/share/docbook2odf/" + mkdir -p "$out/share/doc/docbook2odf/" + mkdir -p "$out/share/man/man1/" + mkdir -p "$out/share/applications/" + + cp utils/docbook2odf "$out/bin/" + cp docs/docbook2odf.1 "$out/share/man/man1/" + cp -r examples/ "$out/share/doc/docbook2odf/" + cp -r xsl/ "$out/share/docbook2odf/" + cp bindings/desktop/docbook2odf.desktop "$out/share/applications/" + + sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf" + + wrapProgram "$out/bin/docbook2odf" \ + --prefix PATH : "${zip}/bin:${libxslt}/bin" \ + --prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}" + ''; + + meta = with stdenv.lib; { + description = "Convert DocBook to OpenDocument Format (ODF)"; + longDescription = '' + Docbook2odf is a toolkit that automaticaly converts DocBook to OASIS + OpenDocument (ODF, the ISO standardized format used for texts, + spreadsheets and presentations). Conversion is based on a XSLT which + makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these + documents are XML based. + ''; + homepage = http://open.comsultia.com/docbook2odf/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe463051fbc..17446d568c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -790,6 +790,10 @@ let dmg2img = callPackage ../tools/misc/dmg2img { }; + docbook2odf = callPackage ../tools/typesetting/docbook2odf { + inherit (perlPackages) PerlMagick; + }; + docbook2x = callPackage ../tools/typesetting/docbook2x { inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; texinfo = texinfo5; -- cgit 1.4.1 From 778539e871cee3df1a5e9da8125c191e27597778 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra 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') 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 3f799e7233ad9cc2dc56eea9fa53e449f1e2237f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Dec 2013 17:38:22 +0100 Subject: cacert: Update to 20131205 --- pkgs/data/misc/cacert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index aafb9104e22..ac5beaeee81 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20121229"; + name = "cacert-20131205"; src = fetchurl { url = "http://tarballs.nixos.org/${name}.pem.bz2"; - sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif"; + sha256 = "049cm3nrhawkh9xpfjhgis6w58zji5ppi4d9yyjzrr7mpw0a34df"; }; unpackPhase = "true"; -- cgit 1.4.1 From e76c33475676d4959a9b93a911aef9637abb39e1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra 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') 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 76da6e6ed32e05dadaad2133af229b9c13d092e8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 20 Dec 2013 13:45:45 -0500 Subject: Linux 3.12.6 Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 74ad329fb55..569b8a89196 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.5"; + version = "3.12.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "48181474f3943f77c1e62bed676b09a9fed64364d5847ce14a45b8d947112719"; + sha256 = "085c4d6663f7e85afe8ae196231f291b28187d4237e46492fa63e1726db04412"; }; features.iwlwifi = true; -- cgit 1.4.1 From 778a55d352ffd9bce2c1bdaf5ce9c4958deec96e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Dec 2013 00:05:29 +0100 Subject: ess-mode: enable Hydra builds on Linux --- pkgs/applications/editors/emacs-modes/ess/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix index a5b9cc184f3..46e20a58ee6 100644 --- a/pkgs/applications/editors/emacs-modes/ess/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Emacs Speaks Statistics"; homepage = "http://ess.r-project.org/"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From df80be16d2a77b9e13fc684d0a7fc4b814b6b5e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Dec 2013 00:05:38 +0100 Subject: dash: enable Hydra builds on Linux --- pkgs/shells/dash/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index bb4b39f1cc3..a66ab994c81 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "dash-0.5.7"; - + src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; sha256 = "0fafpbpq6jghs0fr392x525dybym9kq1s3kly2679ds526gzm2df"; }; - + meta = { homepage = http://gondor.apana.org.au/~herbert/dash/; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; + hydraPlatforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From 5d0f0097181bf5a43a1ab98588530172e91b9a8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Dec 2013 00:08:44 +0100 Subject: gnuplot: there is point in having Hydra try to build this package on BSD Unix --- pkgs/tools/graphics/gnuplot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 23d57f5b652..c41bf032a60 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gnuplot.info; description = "A portable command-line driven graphing utility for many platforms"; - platforms = platforms.all; + hydraPlatforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ lovek323 ]; }; } -- cgit 1.4.1 From b17324265ae5e96a8fb4668d046fd11dd4dbf483 Mon Sep 17 00:00:00 2001 From: Peter Simons 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') 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 c857d906194cc62d516084a215767ab8c7ee5c4b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 20 Dec 2013 16:15:44 +0200 Subject: nut: update from 2.6.5 to 2.7.1; fix nut-scanner --- pkgs/applications/misc/nut/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 078ea7fcbd8..92cd0de8b31 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi -, libtool }: +, libtool, makeWrapper }: stdenv.mkDerivation rec { - name = "nut-2.6.5"; + name = "nut-2.7.1"; src = fetchurl { - url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz"; - sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1"; + url = "http://www.networkupstools.org/source/2.7/${name}.tar.gz"; + sha256 = "1667n9h8jcz7k6h24fn615khqahlq5z22zxs4s0q046rsqxdg9ki"; }; buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; configureFlags = [ "--with-all" @@ -21,10 +21,17 @@ stdenv.mkDerivation rec { "--without-cgi" "--without-hal" "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" + "--with-udev-dir=$(out)/etc/udev" ]; enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ + "$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib" + ''; + meta = { description = "Network UPS Tools"; longDescription = '' @@ -33,6 +40,7 @@ stdenv.mkDerivation rec { It uses a layered approach to connect all of the parts. ''; homepage = http://www.networkupstools.org/; + repositories.git = https://github.com/networkupstools/nut.git; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pierron ]; priority = 10; -- cgit 1.4.1 From fe6862f8ab65e34b6b746fa950d0e92edd1c2f3e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin 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') 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 0ee8be3a190c75d89abf499e90e3046e274b03bd Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 20 Dec 2013 16:57:22 +0200 Subject: warmux: fix build --- pkgs/games/warmux/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index ff2ce6bb819..ad633d15a8c 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -30,10 +30,12 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; configureFlags = "CFLAGS=\"-include ${zlib}/include/zlib.h\""; + patches = [ ./gcc-fix.patch ]; + meta = { description = "Ballistics turn-based battle game between teams"; maintainers = with a.lib.maintainers; -- cgit 1.4.1 From d9885f2887214c1bbfcbb16ac160147e1c57469b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 d9952c5b40f3e258be396e031955f33900cfd84b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:40:59 +0200 Subject: namazu: update from 2.0.20 to 2.0.21 --- pkgs/tools/text/namazu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 9f019440775..21024c4aaad 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "namazu-2.0.20"; + name = "namazu-2.0.21"; src = fetchurl { url = "http://namazu.org/stable/${name}.tar.gz"; - sha256 = "1czw3l6wmz8887wfjpgds9di8hcg0hsmbc0mc6bkahj8g7lvrnyd"; + sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w"; }; buildInputs = [ perl ]; -- cgit 1.4.1 From fc9d6f37af4f1c0a6f73a1de481a1a58fc2a8396 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:42:30 +0200 Subject: ndisc6: update from 1.0.1 to 1.0.2 --- pkgs/tools/networking/ndisc6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 1d66d30aaba..5ea6c8f6895 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "ndisc6-1.0.1"; + name = "ndisc6-1.0.2"; src = fetchurl { url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; - sha256 = "1pggc9x3zki1sv08rs8x4fm7pmd3sn1nwkan3szax19xg049xbqx"; + sha256 = "0ynacanjhlib4japqmf7n2c0bv5f2qq6rx2nhk4kmylyrfhcikka"; }; buildInputs = [ perl ]; -- cgit 1.4.1 From 0b195054cb9db89f84c9c687ee452292a5fd1d76 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 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') 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 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') 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 2a3d4274690dd15225df8b4b387963a7636c62b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:51:24 +0200 Subject: oslrd: update from 0.6.5.4 to 0.6.6.1 --- pkgs/tools/networking/oslrd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix index 18fdae2a44f..44f32e93474 100644 --- a/pkgs/tools/networking/oslrd/default.nix +++ b/pkgs/tools/networking/oslrd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "olsrd-0.6.5.4"; + name = "olsrd-0.6.6.1"; src = fetchurl { url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2"; - sha256 = "757327b9a22b066bd0cab2a8e1cdd1c462f474bb99864a175388aa5f0c70504c"; + sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8"; }; buildInputs = [ bison flex ]; -- cgit 1.4.1 From 7289affced5f7f9d58e840ba098c85d8ab8318e0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:52:17 +0200 Subject: pari: update from 2.5.4 to 2.5.5 --- pkgs/applications/science/math/pari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 5fda04fed4f..576a28b054f 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp, readline }: stdenv.mkDerivation rec { - name = "pari-2.5.4"; + name = "pari-2.5.5"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "0gpsj5n8d1gyl7nq2y915sscs3d334ryrv8qgjdwqf3cr95f2dwz"; + sha256 = "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn"; }; buildInputs = [gmp readline]; -- cgit 1.4.1 From 439888c1f4f1baea830158dea489077d913a307b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:52:58 +0200 Subject: perlPackages.CPANChanges: update from 0.23 to 0.27 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6873e214544..64caff5eec7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1502,10 +1502,10 @@ rec { }; CPANChanges = buildPerlPackage { - name = "CPAN-Changes-0.23"; + name = "CPAN-Changes-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.23.tar.gz; - sha256 = "445a5c751d047c2a2e20680aa86d8bdab25e52891bac24681e9b4f24e98a347c"; + url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.27.tar.gz; + sha256 = "14dizyvgzp81hmg0djwnvvkdhqd3bsmms462cj0ai84z221scv1q"; }; meta = { description = "Read and write Changes files"; -- cgit 1.4.1 From a2eec3410f1483322ff3790dbd31ac423932bd0b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:53:36 +0200 Subject: perlPackages.CPANUploader: update from 0.103004 to 0.103006 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64caff5eec7..8b321b83803 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1570,10 +1570,10 @@ rec { }; CPANUploader = buildPerlPackage { - name = "CPAN-Uploader-0.103004"; + name = "CPAN-Uploader-0.103006"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103004.tar.gz; - sha256 = "cfaf6d4ad32a92cdefabb3abaf1f43c7c11aca5afd5561ea6f691065ac396e97"; + url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103006.tar.gz; + sha256 = "1hkbi2j0a9v4577jxfzw586rvpzw0af61qbiggh3dd7j9b183w39"; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive HTTPMessage LWP LWPProtocolhttps TermReadKey ]; meta = { -- cgit 1.4.1 From 208a412d2b97d53768e4c0d4bfe31b3a00a7a234 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:56:26 +0200 Subject: perlPackages.CompressZlib: update from 2.060 to 2.063 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b321b83803..0b6b4def76c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4186,10 +4186,10 @@ rec { }; IOCompress = buildPerlPackage { - name = "IO-Compress-2.060"; + name = "IO-Compress-2.063"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.060.tar.gz; - sha256 = "03zaq9xzg0z9wcgj1hws8zhzdgdlwiz48nh6sy663bn7rzxm5k28"; + url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.063.tar.gz; + sha256 = "1198jqsfyshc8pc74dvn04gmqa0x6nwngkbf731zgd4chrjlylhd"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { -- cgit 1.4.1 From ea3fee8e8842f06fec99a4dd490d01fb6eb46df0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:56:56 +0200 Subject: perlPackages.Coro: update from 6.31 to 6.33 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0b6b4def76c..ffb727053a7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1489,10 +1489,10 @@ rec { }; Coro = buildPerlPackage { - name = "Coro-6.31"; + name = "Coro-6.33"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.31.tar.gz; - sha256 = "a73ace48d940b28e3dfb32d2f3507205d3ddfdc6610075ecc72e19476bb6de44"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.33.tar.gz; + sha256 = "1497wd9df10y65rb0w5h4h6wiy3smw9maw7z0gbz6dir774znfb5"; }; propagatedBuildInputs = [ AnyEvent Guard CommonSense ]; meta = { -- cgit 1.4.1 From bfa9f1a9f961c06b096f902d4c852519b40054d4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 dfdc9ea8ac28f72562ace177816926f9c50f6286 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:58:26 +0200 Subject: perlPackages.DBI: update from 1.625 to 1.630 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ffb727053a7..0c80de966ad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2192,10 +2192,10 @@ rec { }; DBI = buildPerlPackage { - name = "DBI-1.625"; + name = "DBI-1.630"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.625.tar.gz; - sha256 = "1rl1bnirf1hshc0z04vk41qplx2ixzciabvwy50a1sld7vs46q4w"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.630.tar.gz; + sha256 = "18szayj2bl28fm9frf9v1dwncj67bx3rvw8ny1zwbvc6alshs5ji"; }; meta = { homepage = http://dbi.perl.org/; -- cgit 1.4.1 From 12c8a903446f51343d678c8bb6fad61e6ee333bf Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:58:52 +0200 Subject: perlPackages.DataDump: update from 1.21 to 1.22 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c80de966ad..ab8004f7e53 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1749,10 +1749,10 @@ rec { }; DataDump = buildPerlPackage { - name = "Data-Dump-1.21"; + name = "Data-Dump-1.22"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.21.tar.gz; - sha256 = "1fcy6q8p406ag8g50l7znns3kxazfb458l6kw8pbsp4axnkz9ydx"; + url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.22.tar.gz; + sha256 = "1ciqlwsy1q35s94dry9bjy1pwanbq6b7q4rhxm9z8prgkzbslg2k"; }; meta = { description = "Pretty printing of data structures"; -- cgit 1.4.1 From d68f7d47e3eae7b176eac985174388a7520b57f0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 17:59:30 +0200 Subject: perlPackages.DataOptList: update from 0.107 to 0.109 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ab8004f7e53..5cb0a9ab752 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1803,10 +1803,10 @@ rec { }; DataOptList = buildPerlPackage { - name = "Data-OptList-0.107"; + name = "Data-OptList-0.109"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.107.tar.gz; - sha256 = "0r2sbvh1kj69al5crg394v5j5wkffvqdb17fz1rjfgb6h3v93xi8"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.109.tar.gz; + sha256 = "1j44rm2spprlq3bc80cxni3dzs3gfjiqv1qc9q7820n1qj0wgmqw"; }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { -- cgit 1.4.1 From acbbb9c7aa4113dd2d1c4499d02f9a5c7c4483a7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 18:00:28 +0200 Subject: perlPackages.EmailValid: update from 0.179 to 1.192 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5cb0a9ab752..64f70a1b7b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2966,10 +2966,10 @@ rec { }; EmailValid = buildPerlPackage { - name = "Email-Valid-0.179"; + name = "Email-Valid-1.192"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-0.179.tar.gz; - sha256 = "13yfjll63cp1y4xqzdcr1mjhfncn48v6hckk5mvwi47w3ccj934a"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.192.tar.gz; + sha256 = "0vpqgbr5bj4bvrd7c2fh9hs1mz0m6nfybl2rdn5yb4h67bmxfkbp"; }; propagatedBuildInputs = [MailTools NetDNS]; doCheck = false; -- cgit 1.4.1 From bd5fe93e71aac752da8b0bc2ef3f7bf1b970b665 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 18:00:55 +0200 Subject: perlPackages.Encode: update from 2.44 to 2.55 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64f70a1b7b2..f24119b9ade 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2976,10 +2976,10 @@ rec { }; Encode = buildPerlPackage { - name = "Encode-2.44"; + name = "Encode-2.55"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.44.tar.gz; - sha256 = "c121f9c8ae03e718d1b5d5465d66bb3138af429188735966326656f99a9499c6"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.55.tar.gz; + sha256 = "0bpnfan0034k644gz6yg9xfddmsqxr2p7vbavijwbxc5k2c2sarz"; }; }; -- cgit 1.4.1 From bea201392284a65e912977c80ffe4ade8989ba9d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 18:01:33 +0200 Subject: perlPackages.ExtUtilsMakeMaker: update from 6.66 to 6.84 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f24119b9ade..6d02dc90b3b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3185,10 +3185,10 @@ rec { }; ExtUtilsMakeMaker = buildPerlPackage rec{ - name = "ExtUtils-MakeMaker-6.66"; + name = "ExtUtils-MakeMaker-6.84"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "1w9pbjajas60a9i29j8h10nz9jf86w7jb197llnfs9fqcf4yvfha"; + sha256 = "1s3fn1fkm9l6pjhz7dbzsc6nhw1jm2hpf08fqhsqh1h50nj5pv5b"; }; propagatedBuildInputs = [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta -- cgit 1.4.1 From b2c7cd3f7d8220c58b1c9c695c0f3c0aa9d442d1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 18:01:51 +0200 Subject: perlPackages.FileRemove: update from 1.42 to 1.52 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6d02dc90b3b..f4f3efb6777 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3453,10 +3453,10 @@ rec { }; FileRemove = buildPerlPackage rec { - name = "File-Remove-1.42"; + name = "File-Remove-1.52"; src = fetchurl { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "2ec2643c4e1a721965ed70ce184b72ae831c82b577420612a59eba8a0ce2a504"; + sha256 = "1p8bal9qhwkjbghivxn1d5m3qdj2qwm1agrjbmakm6la9dbxqm21"; }; }; -- cgit 1.4.1 From d8f62e85e5583a08170851b67b570e1823513c42 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 18:04:26 +0200 Subject: python27Packages.pysvn: update from 1.7.6 to 1.7.8 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cdc5ee5ff0..e92bb181df2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5360,11 +5360,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pysvn = pkgs.stdenv.mkDerivation { - name = "pysvn-1.7.6"; + name = "pysvn-1.7.8"; src = fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.6.tar.gz"; - sha256 = "0wwb9h3rw2r8hzqya8mv5z8pgjpa6y3i15a3cccdv2mil44289a7"; + url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.8.tar.gz"; + sha256 = "1qk7af0laby1f79bd07l9p0dxn5xmcmfwlcb9l1hk29zwwq6x4v0"; }; buildInputs = [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] -- cgit 1.4.1 From a469d995af471f590f8fb1e7a0098671f010721e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 18:05:44 +0200 Subject: swfmill: update from 0.3.2 to 0.3.3 --- pkgs/tools/video/swfmill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index b48cc7cddcc..8e7fbdaeaf3 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "swfmill-0.3.2"; + name = "swfmill-0.3.3"; src = fetchurl { url = "http://swfmill.org/releases/${name}.tar.gz"; - sha256 = "077agf62q0xz95dxj4cq9avcqwin94vldrpb80iqwjskvkwpz9gy"; + sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r"; }; buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ]; -- cgit 1.4.1 From 9a1f7564d7cb0d2bce7b3412d29c7b3164b24323 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 20 Dec 2013 18:06:38 +0200 Subject: surfraw: update from 2.2.8 to 2.2.9 --- pkgs/tools/networking/surfraw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index bd3a1135a84..712665ebbd2 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "surfraw-2.2.8"; + name = "surfraw-2.2.9"; src = fetchurl { - url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.8.tar.gz"; - sha256 = "925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec"; + url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.9.tar.gz"; + sha256 = "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa"; }; configureFlags = [ -- cgit 1.4.1 From 9cb5fd0ff699947ac6c72e8a23bfbcf1eb24ca5e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 20 Dec 2013 18:07:44 +0200 Subject: surfraw: add platforms --- pkgs/tools/networking/surfraw/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index 712665ebbd2..401e252a294 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; homepage = "http://surfraw.alioth.debian.org"; maintainers = []; + platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From b8eb00bcde7a1d3b62bf943ffc8e8199971e8e8c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 d5bc459fe27a8cbf74125c1201e5358a77ba3684 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 00:07:04 +0200 Subject: youtubeDL: update from 2013.12.11.2 to 2013.12.17.2 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 01ef17845c4..cab3e69688c 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2013.12.11.2"; + version = "2013.12.17.2"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1ar0shbk22dfnq37z8kxd1bv7dk3vm3439f4zhgc9ylvn6n0hnkq"; + sha256 = "1dmv14v623v9afxfn0rw1gfdd91sngfgj4dg7hwbmnqsja0qxydv"; }; buildInputs = [ python ]; -- cgit 1.4.1 From 156ff88ed22e5f339fa556b562d1a8bf95abb365 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 00:12:05 +0200 Subject: zabbix.agent: update from 1.8.18rc1 to 1.8.19, potentially fixes CVE-2013-6824 --- pkgs/servers/monitoring/zabbix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 22c10a6e972..bf0366f20b1 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.18rc1"; + version = "1.8.19"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "1pa4656dcl5r7r36nwk05zy38z49np6j717wjmmd8sqlz6szw01n"; + sha256 = "0xgki1lrqyhfvx2691v8mk7a868zz35cnvrhiyqgksq2kshm11ph"; }; preConfigure = -- cgit 1.4.1 From 335cfe188d89790915419d610d02064b6858ba6c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 00:12:50 +0200 Subject: zabbix20.agent: update from 2.0.9 to 2.0.10 --- pkgs/servers/monitoring/zabbix/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index f4fde2dadef..c9976581a51 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -5,11 +5,11 @@ assert enableJabber -> minmay != null; let - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "057fjqww0qzs56nm8m3c36kbrhwriysvjvqzgwm9j2bg9ylixvym"; + sha256 = "0p86m634j08w0gbr2rwqr3h5p6md7k0c688w5yxc1ii3l9fmnhbi"; }; preConfigure = -- cgit 1.4.1 From 3ed05c26e48783b8134c434d2259f80dde9f63f5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 00:14:01 +0200 Subject: xscreensaver: update from 5.19 to 5.26 --- pkgs/misc/screensavers/xscreensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index e3932744286..3bf2e316dea 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "5.19"; + version = "5.26"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0"; + sha256 = "0m8v9zxl1pyqndqqinhsvpc8s3byg397vy6i4ihkjiqrw5kdr91c"; }; buildInputs = -- cgit 1.4.1 From 102a88e469d73ad10c9287ee8eb1303a96b92e27 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 00:15:26 +0200 Subject: xsane: update from 0.998 to 0.999 --- pkgs/applications/graphics/sane/xsane.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 32b39c0160d..7b1ffb1f2be 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -6,11 +6,11 @@ assert gimpSupport -> gimp_2_8 != null; stdenv.mkDerivation rec { - name = "xsane-0.998"; + name = "xsane-0.999"; src = fetchurl { url = "http://www.xsane.org/download/${name}.tar.gz"; - sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3"; + sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; }; preConfigure = '' -- cgit 1.4.1 From f3b1680fcc567d4349b6d52747b354f8156aff65 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 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') 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 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') 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 3d167f9375bd5290a664f18fdd5b157270d3f4da Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 00:59:56 +0200 Subject: xorriso: update from 1.2.2 to 1.3.4 --- pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 514b69a1992..3388ae38fa3 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }: stdenv.mkDerivation rec { - name = "xorriso-1.2.2"; + name = "xorriso-1.3.4"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "0kw4fiqn24vya3zhay6minzrbz10zlxm8sjs272z7l5s2kwcjypx"; + sha256 = "0wvxbvkpdydcbmqi9xz7nv8cna6vp9726ahmmxxyx56cz4xifr4x"; }; doCheck = true; -- cgit 1.4.1 From ad5bb4018d482082fd53ffb10ecce605a2e74dd2 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 21 Dec 2013 01:01:41 +0200 Subject: xorriso: add missing attr dependency --- pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 3388ae38fa3..62a802ebab5 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }: +{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: stdenv.mkDerivation rec { name = "xorriso-1.3.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ libcdio zlib bzip2 readline ] + buildInputs = [ libcdio zlib bzip2 readline attr ] ++ stdenv.lib.optional stdenv.isLinux acl; meta = { -- cgit 1.4.1 From 3e2fc2338cb4ff1b08c221439564b379a5e3a187 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:02:11 +0200 Subject: xfontsel: update from 1.0.2 to 1.0.5 --- pkgs/applications/misc/xfontsel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index b159dd282e2..215ea75105f 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -4,11 +4,11 @@ {stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: stdenv.mkDerivation rec { - name = "xfontsel-1.0.2"; + name = "xfontsel-1.0.5"; src = fetchurl { url = "mirror://xorg/individual/app/${name}.tar.bz2"; - sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks"; + sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p"; }; buildInputs = [libX11 makeWrapper pkgconfig libXaw]; -- cgit 1.4.1 From bb1b1bb1a51a765044b8ffefb6ad11bd79793b9b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:03:23 +0200 Subject: xchm: update from 1.18 to 1.23 --- pkgs/applications/misc/xchm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index aed55c67c10..c6bfa07cb88 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wxGTK, chmlib}: stdenv.mkDerivation { - name = "xchm-1.18"; + name = "xchm-1.23"; src = fetchurl { - url = mirror://sourceforge/xchm/xchm-1.18.tar.gz; - sha256 = "1wvvyzqbmj3c6i46x4vpxkawjwmmp276r84ifvlzaj5q4b52g5gw"; + url = mirror://sourceforge/xchm/xchm-1.23.tar.gz; + sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg"; }; buildInputs = [wxGTK chmlib]; -- cgit 1.4.1 From 8ae313bdf05194b62d728ea8ccce7e7d23388d51 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:05:25 +0200 Subject: wavemon: update from 0.7.2 to 0.7.5 --- pkgs/tools/networking/wavemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 13c5a5d9260..e9c102817e1 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="wavemon"; - version="0.7.2"; + version="0.7.5"; name="${baseName}-${version}"; url="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${name}.tar.bz2"; - hash="1w1nq082mpjkcj7q6qs80104vki9kddwqv1wch6nmwwh0l72dgma"; + hash="0b1fx00aar2fsw49a10w5bpiyjpz8h8f4nrlwb1acfw36yi1pfkd"; }; in rec { -- cgit 1.4.1 From e64b7663f668201cda68b78e2a9dcc5a0a85eb42 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:07:32 +0200 Subject: v4l_utils: update from 0.9.3 to 1.0.0 --- pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 8e6584465d0..c220d2d2dd0 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -4,11 +4,11 @@ assert withQt4 -> qt4 != null; stdenv.mkDerivation rec { - name = "v4l-utils-0.9.3"; + name = "v4l-utils-1.0.0"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0gaag38x47wlvmp4j60wgf9ma1rxzfyg7i12zxxxi4m3cpcb0bah"; + sha256 = "0c2z500ijxr1ldzb4snasfpwi2icp04f8pk7akiqjkp0k4h8iqqx"; }; buildInputs = [ which ]; -- cgit 1.4.1 From ca02b0d0c202504e646be65c880c25cea8b14436 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:09:06 +0200 Subject: unbound: update from 1.4.13 to 1.4.21 --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index ea9719dd9b2..d95c5b5f6bb 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, expat, libevent, ldns }: stdenv.mkDerivation rec { - name = "unbound-1.4.13"; + name = "unbound-1.4.21"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "04r379gma1ghr9zjc1fmncpw8kka4f0mpcmrzidsp264aqkxriw3"; + sha256 = "0w09m2rbn688rsk37k5xm3vkk5h2hxhivsr374j7h7vjf9x82bsh"; }; buildInputs = [openssl expat libevent ldns]; -- cgit 1.4.1 From d0e950867c9f26f7b610398b6219a4d626269213 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:10:50 +0200 Subject: ufraw: update from 0.18 to 0.19.2 --- pkgs/applications/graphics/ufraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 6ec1c5fafdc..bee19faa876 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -2,12 +2,12 @@ , libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }: stdenv.mkDerivation rec { - name = "ufraw-0.18"; + name = "ufraw-0.19.2"; src = fetchurl { # XXX: These guys appear to mutate uploaded tarballs! url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "01cjdc748vamjpaw2sbm8a9kwmb2hry4f200j3hlvqg9c6f77zi4"; + sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; }; buildInputs = -- cgit 1.4.1 From c4c10e88261fced6bd6612c00b6beecd25518823 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 21 Dec 2013 01:11:57 +0200 Subject: ufraw: add missing lensfun dependency --- pkgs/applications/graphics/ufraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index bee19faa876..070244d67d2 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib -, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }: +, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }: stdenv.mkDerivation rec { name = "ufraw-0.19.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk gtkimageview gettext bzip2 zlib - libjpeg libtiff cfitsio exiv2 lcms + libjpeg libtiff cfitsio exiv2 lcms lensfun ]; meta = { -- cgit 1.4.1 From 100ad41627b8aa05d8317899907ca6b7de7ea7d4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:14:03 +0200 Subject: udisks2: update from 2.1.0 to 2.1.1 --- pkgs/os-specific/linux/udisks/2-default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 28cdbe18978..537b17550da 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "udisks-2.1.0"; + name = "udisks-2.1.1"; src = fetchurl { url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2"; - sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii"; + sha256 = "1yw6h3l13y796adwgj6m4j3hijv58lgpf98mq24nn9da73zhjfq1"; }; patches = [ ./force-path.patch ]; -- cgit 1.4.1 From 0ebf8e4e9ba04de2ba13a2b7a07d91d80bc6f76d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 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') 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 26f1a52b4beb971f4baddc50d8b7a8da9eae3dda Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:53:33 +0200 Subject: perlPackages.TestTester: update from 0.108 to 0.109 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f4f3efb6777..273398198c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8408,10 +8408,10 @@ rec { }; TestTester = buildPerlPackage { - name = "Test-Tester-0.108"; + name = "Test-Tester-0.109"; src = fetchurl { - url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.108.tar.gz; - sha256 = "1pby9w41b7z0cgnxpgkh397x7z68855sjg5yda48r6lck3lga62h"; + url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.109.tar.gz; + sha256 = "0m9n28z09kq455r5nydj1bnr85lvmbfpcbjdkjfbpmfb5xgciiyk"; }; }; -- cgit 1.4.1 From 17514460293f25b8031436daa826f457bb8878b8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:54:12 +0200 Subject: perlPackages.XMLTwig: update from 3.32 to 3.44 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 273398198c7..bcfe79a33af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9307,10 +9307,10 @@ rec { }; XMLTwig = buildPerlPackage { - name = "XML-Twig-3.32"; + name = "XML-Twig-3.44"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.32.tar.gz; - sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v"; + url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.44.tar.gz; + sha256 = "1fi05ddq4dqpff7xvgsw2rr8p5bah401gmblyb3pvjg225ic2l96"; }; propagatedBuildInputs = [XMLParser]; doCheck = false; # requires lots of extra packages -- cgit 1.4.1 From 197cca98d966099cd137234dc59f16368660950e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:54:58 +0200 Subject: perlPackages.TestFatal: update from 0.010 to 0.013 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bcfe79a33af..f3c99fb5da0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8048,10 +8048,10 @@ rec { }; TestFatal = buildPerlPackage { - name = "Test-Fatal-0.010"; + name = "Test-Fatal-0.013"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.010.tar.gz; - sha256 = "01ck4wyrj4nqyr1cz3lcff6g9nryadsflpf85jmsa6vcl2bq8pl0"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.013.tar.gz; + sha256 = "1rrndzkjff3bdlzzdsfsd3fhng142la2m74ihkgv17islkp17yq2"; }; propagatedBuildInputs = [ TryTiny ]; meta = { -- cgit 1.4.1 From 650f50e1c7f460f780bdbbc77ea99ff8694cb8ed Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:55:40 +0200 Subject: perlPackages.Starman: update from 0.3011 to 0.4008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f3c99fb5da0..9bfe2902a4a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7215,10 +7215,10 @@ rec { }; Starman = buildPerlModule { - name = "Starman-0.3011"; + name = "Starman-0.4008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.3011.tar.gz; - sha256 = "f700e1e9fa8a56609db1b75878ccfbbccfda32454c32e3c33912a1776f583cf2"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4008.tar.gz; + sha256 = "06fc3yp3nmi26d7lcfqanwwk5jxsmqmidyr8n2qfrsa0r7d07c88"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ DataDump HTTPDate HTTPMessage HTTPParserXS NetServer Plack TestTCP ]; -- cgit 1.4.1 From 5b3e4d34dfe1076c5e97ebfb7f95160c41290455 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:56:37 +0200 Subject: perlPackages.Perl6Junction: update from 1.40000 to 1.60000 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9bfe2902a4a..2bf974539c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6657,10 +6657,10 @@ rec { }; Perl6Junction = buildPerlPackage rec { - name = "Perl6-Junction-1.40000"; + name = "Perl6-Junction-1.60000"; src = fetchurl { url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz"; - sha256 = "0sgv8hqrkhx73bcb5jyi8a0b3v5bxqr3aziram1zndx43i1knzp4"; + sha256 = "0r3in9pyrm6wfrhcvxbq5w1617x8x5537lxj9hdzks4pa7l7a8yh"; }; }; -- cgit 1.4.1 From 53652020c84d8dc92e1142f8759fb508d7ee7e97 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:57:33 +0200 Subject: perlPackages.ParseCPANMeta: update from 1.4404 to 1.4409 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2bf974539c7..b2a15e3f006 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6388,10 +6388,10 @@ rec { }; ParseCPANMeta = buildPerlPackage rec { - name = "Parse-CPAN-Meta-1.4404"; + name = "Parse-CPAN-Meta-1.4409"; src = fetchurl { url = "mirror://cpan/modules/by-module/Parse/${name}.tar.gz"; - sha256 = "1y4mr5hmkkl405x4v31kx2nmlahpg0c38k8s65vgqc4s28wxafmh"; + sha256 = "0b7cp78zajmwf4a0968p3b2bb00axkxj3a9nq1rx8cb17hhva819"; }; propagatedBuildInputs = [ CPANMetaYAML JSONPP ]; }; -- cgit 1.4.1 From 0e8209b94ab6ef2171c15e0a570be4c777d989a6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:58:12 +0200 Subject: perlPackages.ModuleCoreList: update from 2.97 to 3.01 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b2a15e3f006..e6353967035 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5080,10 +5080,10 @@ rec { }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-2.97"; + name = "Module-CoreList-3.01"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-2.97.tar.gz; - sha256 = "fa39c487d43088e7010467621f57d8e3f57b72d2bbf711fc509e87a501f35e09"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-3.01.tar.gz; + sha256 = "10vf18x9qk4hdpwazxq8c0qykals36dxj0bjazqqcbp5xfb4fnyg"; }; meta = { homepage = http://dev.perl.org/; -- cgit 1.4.1 From f3da65472a8da14676fc5b6f594e43256ba30fe6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:58:39 +0200 Subject: perlPackages.MIMEBase64: update from 3.09 to 3.14 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e6353967035..172a2f3554f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5001,10 +5001,10 @@ rec { }; MIMEBase64 = buildPerlPackage rec { - name = "MIME-Base64-3.09"; + name = "MIME-Base64-3.14"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "1gi2zyxwkkmyng8jawfnbxpsybvybz6h6ryq0wfdljmmjpjbmzzc"; + sha256 = "1qbcipxij7pv25qhnfdc2lnkqi2cf60frlhlh86gjxslc8kr8nhj"; }; }; -- cgit 1.4.1 From d5e47884ae767a13644676f85958beb494af0b86 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:59:05 +0200 Subject: perlPackages.IPCRun3: update from 0.043 to 0.046 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 172a2f3554f..66ba2b79e1e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4329,10 +4329,10 @@ rec { }; IPCRun3 = buildPerlPackage rec { - name = "IPC-Run3-0.043"; + name = "IPC-Run3-0.046"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "96b534e07e1459529ac12a77393628366f30d122b0dfaaa3ed5ec032079097ad"; + sha256 = "033miv4z6g50q71blj8l1g846frngm1v5l3mcv38dslkjqimxxp4"; }; }; -- cgit 1.4.1 From 99e9b097f2015db324ae5147a2b6c381d7174ebe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 01:59:33 +0200 Subject: perlPackages.IOAll: update from 0.46 to 0.50 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66ba2b79e1e..8d14e94f4e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4162,10 +4162,10 @@ rec { }; IOAll = buildPerlPackage { - name = "IO-All-0.46"; + name = "IO-All-0.50"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/IO-All-0.46.tar.gz; - sha256 = "0rqv270gi7x4sjicfwf1hiqvicwlj3s0zyi2cxqwrc8q9hs2pdya"; + url = mirror://cpan/authors/id/I/IN/INGY/IO-All-0.50.tar.gz; + sha256 = "13mc913jqqfkaily48cd886x0n6x6zw59c00fmkhqc97xh1kdckc"; }; propagatedBuildInputs = [ IOString ]; meta = { -- cgit 1.4.1 From 7c3b70a2ff17fc06f2fd0a44dc2068b2c467ea53 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 02:02:17 +0200 Subject: parcellite: update from 1.1.6 to 1.1.7 --- pkgs/tools/misc/parcellite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 0eceea4a57e..54697f98414 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2 }: stdenv.mkDerivation rec { - name = "parcellite-1.1.6"; + name = "parcellite-1.1.7"; src = fetchurl { url = "mirror://sourceforge/parcellite/${name}.tar.gz"; - sha256 = "0nz951ykj162mfbcn3w9zk525ww6qcqn5yqdx13nx70fnn6rappi"; + sha256 = "0pszw3yd4a08p6jsz7asayr7jir08bxbwvfb16k01cj7ya4kf3w7"; }; buildInputs = [ pkgconfig intltool gtk2 ]; -- cgit 1.4.1 From cb6235c58e42538d0710b14a3ceb6be337bdb7b5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 7af191826ec117af26802b71a2a3d420fa09beec Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 02:17:31 +0200 Subject: upx: update from 3.07 to 3.09 --- pkgs/tools/compression/upx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 4df2947d137..2dd4d7eb794 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ucl, zlib}: stdenv.mkDerivation { - name = "upx-3.07"; + name = "upx-3.09"; src = fetchurl { - url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2; - sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs"; + url = mirror://sourceforge/upx/upx-3.09-src.tar.bz2; + sha256 = "16jwynharr1silfd6vlxl9i94fs8mg79qp72dr48r3wv9mlra6pn"; }; buildInputs = [ ucl zlib ]; -- cgit 1.4.1 From 59c3fb01f51d96e01f769e27cc04edda38a81998 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 02:20:32 +0200 Subject: scribus: update from 1.4.1 to 1.4.3 --- pkgs/applications/office/scribus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index a4f5821c54c..250ce163e4f 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -3,11 +3,11 @@ , zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }: stdenv.mkDerivation rec { - name = "scribus-1.4.1"; + name = "scribus-1.4.3"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "1n67z2bk5ca2sxvv43jvj7yygfr4d2x5yc69zk70v38prm0gqlv8"; + sha256 = "1zxgl2g299rllfy5ihs5skicpv7zcmz149ahraami69gqcag6bn7"; }; enableParallelBuilding = true; -- cgit 1.4.1 From 64bdbc927104515be4585a19a01655bd569eb132 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 02:21:27 +0200 Subject: samplv1: update from 0.3.2 to 0.3.5 --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 584b23b6a01..e2d7adc4a65 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.3.2"; + version = "0.3.5"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1j6q3ywbdsyhskc60p7k8ph058ylrrmjmri3q1wr2d2akcaqvb7m"; + sha256 = "1q4ggcbbz9lfrjh0ybr3grgipjkq6w5fb9gz5k5cryzz92p7ihw9"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; -- cgit 1.4.1 From e65ce68bdf4243141c3adc6099a890bedc54accc Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 02:24:47 +0200 Subject: klavaro: update from 1.9.5 to 2.00 --- pkgs/games/klavaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 6d6370bb97b..cbc445f6216 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, curl, gtk, gtkdatabox }: stdenv.mkDerivation rec { - name = "klavaro-1.9.5"; + name = "klavaro-2.00"; src = fetchurl { url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; - sha256 = "06c35247866fb74f7c1a52a2350b352fdb44dace7216fdbebc1fa54990d14fc9"; + sha256 = "1w94r7r132sg7554xhcgvymxxxgfas99lkgv6j3nmxa8m2fzhwlq"; }; buildInputs = [ pkgconfig intltool curl gtk gtkdatabox ]; -- cgit 1.4.1 From a601ffd00496be8ca7ddd65a4a64bdd592c2319e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:51:39 +0200 Subject: perlPackages.PerlTidy: update from 20090616 to 20130922 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8d14e94f4e4..db008cfc123 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6511,10 +6511,10 @@ rec { }; PerlTidy = buildPerlPackage rec { - name = "Perl-Tidy-20090616"; + name = "Perl-Tidy-20130922"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz"; - sha256 = "c7ca21e287d23c769c235f6742fab7b5779b7c7bf58b6a55ba8cdc492e50a118"; + sha256 = "0qmp6308917lsvms5dbihdj85cnkhy821azc5i6q3p3703qdd375"; }; }; -- cgit 1.4.1 From 7a0d4f13c9e301081dfc5b0e1200830823fc9e57 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:52:22 +0200 Subject: perlPackages.ModuleMetadata: update from 1.000005 to 1.000019 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index db008cfc123..c9e3e911baa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5178,10 +5178,10 @@ rec { }; ModuleMetadata = buildPerlPackage rec { - name = "Module-Metadata-1.000005"; + name = "Module-Metadata-1.000019"; src = fetchurl { url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; - sha256 = "04xxs3542mqdadcs2bdlpyldmbbxdn9x0gwjnyy5p1d5c3ajnq9k"; + sha256 = "0m755qn44nasbaj578628jgdqg0k4ldyn6fm3880hdi1q16skz2s"; }; propagatedBuildInputs = [ version ]; }; -- cgit 1.4.1 From 1dff01fe23da2213deeaceff134596c075da7522 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:52:46 +0200 Subject: perlPackages.MIMETypes: update from 1.38 to 2.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c9e3e911baa..1a6088e2550 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5018,10 +5018,10 @@ rec { }; MIMETypes = buildPerlPackage { - name = "MIME-Types-1.38"; + name = "MIME-Types-2.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.38.tar.gz; - sha256 = "12m8cvj80qbwxckj5jildl5zw6p1jincj3m1s77z6lnw3h59rj4l"; + url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.04.tar.gz; + sha256 = "13yci99n8kl8p4ac5n5f1j968p7va2phlvfc5qgpnn1d6yfhddi2"; }; meta = { description = "Definition of MIME types"; -- cgit 1.4.1 From 1738fff04868fd987c3c0b597fc480b60bda9ae4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:54:56 +0200 Subject: perlPackages.IOSocketInet6: update from 2.69 to 2.71 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a6088e2550..d6e629dcac0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4251,10 +4251,10 @@ rec { }; IOSocketInet6 = buildPerlPackage rec { - name = "IO-Socket-INET6-2.69"; + name = "IO-Socket-INET6-2.71"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "accd565643969d905e199e28e60e833213ccc2026c372432df01e49b044c3045"; + sha256 = "041iv3fdskvk7in73bf7253ah9aiqwxzi4zxfiwkn0jlb7mnqjrl"; }; propagatedBuildInputs = [Socket6]; doCheck = false; -- cgit 1.4.1 From a95acf7a95e999ace36f08590c3fea4554cd52c0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:55:15 +0200 Subject: perlPackages.HTMLTokeParserSimple: update from 3.15 to 3.16 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d6e629dcac0..4ed7cbced48 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3955,10 +3955,10 @@ rec { }; HTMLTokeParserSimple = buildPerlPackage rec { - name = "HTML-TokeParser-Simple-3.15"; + name = "HTML-TokeParser-Simple-3.16"; src = fetchurl { url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; - sha256 = "0ii1ww17h7wps1lcj7bxrjbisa37f6cvlm0xxpgfq1s6iy06q05b"; + sha256 = "17aa1v62sp8ycxcicwhankmj4brs6nnfclk9z7mf1rird1f164gd"; }; propagatedBuildInputs = [HTMLParser SubOverride]; buildInputs = [TestPod]; -- cgit 1.4.1 From 07359cf96cdabf719ec27b40afb3bff4035e8fb3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:55:44 +0200 Subject: perlPackages.HTMLParser: update from 3.69 to 3.71 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ed7cbced48..aebfc1b9f86 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3887,10 +3887,10 @@ rec { }; HTMLParser = buildPerlPackage { - name = "HTML-Parser-3.69"; + name = "HTML-Parser-3.71"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.69.tar.gz; - sha256 = "01i4lj37dgwbj9mna756dzzz5lvx7adcnjk9s0hskqq0cn81r2vl"; + url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.71.tar.gz; + sha256 = "00nqzdgl7c3jilx7mil19k5jwcw3as14pvkjgxi97zyk94vqp4dy"; }; propagatedBuildInputs = [ HTMLTagset ]; meta = { -- cgit 1.4.1 From 77e6b6d470a9fd13a56fbacd428b8cf01300955a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:56:24 +0200 Subject: perlPackages.GetoptLong: update from 2.38 to 2.42 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aebfc1b9f86..4d0c07b229f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3639,10 +3639,10 @@ rec { }; GetoptLong = buildPerlPackage rec { - name = "Getopt-Long-2.38"; + name = "Getopt-Long-2.42"; src = fetchurl { url = "mirror://cpan/authors/id/J/JV/JV/${name}.tar.gz"; - sha256 = "0lrsm8vlqhdnkzfvyaiyfivmaar0rirrnwa2v0qk6l130a497mky"; + sha256 = "12c5pvmx0jxx0mls8qll9ixb1lbacs7p1rwvmciv0dvw3w25dmr7"; }; }; -- cgit 1.4.1 From ef24e49b710afebe6cbece8aa7caec738f26accf Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:57:41 +0200 Subject: perlPackages.ExtUtilsParseXS: update from 3.18 to 3.22 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d0c07b229f..5be3fdef49b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3205,10 +3205,10 @@ rec { }; ExtUtilsParseXS = buildPerlPackage rec { - name = "ExtUtils-ParseXS-3.18"; + name = "ExtUtils-ParseXS-3.22"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0kvbx66vncgk2c72994z31bgh2w3rsrlnx0z7cmxqa7w3hlc4741"; + sha256 = "03i93xfm9064vg2z70mcfwpnbmciafzrng113vmb8w8g117pvr84"; }; }; -- cgit 1.4.1 From 7554c61e3059f5a2ae24cc6f724b0670ecf96760 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 03:58:26 +0200 Subject: perlPackages.DevelSymdump: update from 2.08 to 2.11, potentially fixes CVE-2013-7069 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5be3fdef49b..277b158cc4e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2430,10 +2430,10 @@ rec { }; DevelSymdump = buildPerlPackage rec { - name = "Devel-Symdump-2.08"; + name = "Devel-Symdump-2.11"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "0qzj68zw1yypk8jw77h0w5sdpdcrp4xcmgfghcfyddjr2aim60x5"; + sha256 = "0i5m2w8rsmp5lqi1y5y6b6938pidpz9hg92xahrshaddph00358i"; }; propagatedBuildInputs = [ TestPod /* cyclic dependency: TestPodCoverage */ -- cgit 1.4.1 From 32a2e5dad3da4e4639382120489c99c7f4e856f6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 04:00:19 +0200 Subject: numdiff: update from 5.6.1 to 5.8.1 --- pkgs/tools/text/numdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 1eae8c4d527..d5f8bb9ff35 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "5.6.1"; + version = "5.8.1"; in stdenv.mkDerivation { name = "numdiff-${version}"; src = fetchurl { url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; - sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx"; + sha256 = "00zm9955gjsid0daa94sbw69klk0vrnrrh0ihijza99kysnvmblr"; }; meta = { description = '' -- cgit 1.4.1 From 14d3f044b4a727b48e06dbf63257f91758b7f941 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 04:02:37 +0200 Subject: netatalk: update from 3.0.5 to 3.1.0 --- pkgs/tools/filesystems/netatalk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 21a93774758..9d00288f694 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }: stdenv.mkDerivation rec { - name = "netatalk-3.0.5"; + name = "netatalk-3.1.0"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; - sha256 = "1adlcj509czxsx60r1s96qlznspp5nz7dxc5fws11danidr4fhl8"; + sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq"; }; buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ]; -- cgit 1.4.1 From 22fb324c237756528514838d06c87b66d4a0eeeb Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 04:03:39 +0200 Subject: multitail: update from 5.2.12 to 5.2.13 --- pkgs/tools/misc/multitail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 19bebcf2823..805dbd3f17c 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation { - name = "multitail-5.2.12"; + name = "multitail-5.2.13"; src = fetchurl { - url = http://www.vanheusden.com/multitail/multitail-5.2.12.tgz; - sha256 = "681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c"; + url = http://www.vanheusden.com/multitail/multitail-5.2.13.tgz; + sha256 = "1axgbdm1xkg570j0p150492x7p3mf11shwvn6dz8g4rha7cak4l6"; }; buildInputs = [ ncurses ]; -- cgit 1.4.1 From 458decf6c4481acb9cfc90070874dd7835452d4b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 04:05:17 +0200 Subject: mhwaveedit: update from 1.4.21 to 1.4.23 --- pkgs/applications/audio/mhwaveedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 8f8fadb02e4..a8287b10a29 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mhwaveedit-${version}"; - version = "1.4.21"; + version = "1.4.23"; src = fetchurl { url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2"; - sha256 = "0jl7gvhwsz4fcn5d146h4m6i3hlxdsw4mmj280cv9g70p6zqi1w7"; + sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3"; }; buildInputs = -- cgit 1.4.1 From f760304aaa4987a9cf1c513d17417fcc8f33ab0b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 69e6bd8707b0774f4035c02f92ba0f3199a838aa Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 04:07:50 +0200 Subject: mairix: update from 0.22 to 0.23 --- pkgs/tools/text/mairix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index feaf3afe52b..551d0b9f74a 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, bison, flex }: stdenv.mkDerivation rec { - name = "mairix-0.22"; + name = "mairix-0.23"; src = fetchurl { url = "mirror://sourceforge/mairix/${name}.tar.gz"; - sha256 = "0kwxq738nbv8ip5gkq2bw320qs1vg0pnv7wsc0p5cxwzxxrv47ql"; + sha256 = "1yzjpmsih6c60ks0d0ia153z9g35nj7dmk98383m0crw31dj6kl0"; }; buildInputs = [ zlib bzip2 bison flex ]; -- cgit 1.4.1 From ba9e03472cf9ed7bc75e7d14d84e5c8f591f0796 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin 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') 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 ae4ded3a5c12c7e2e33e632619b2f349631b781b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 21 Dec 2013 07:10:59 +0200 Subject: warmux: forgot to add the patch --- pkgs/games/warmux/gcc-fix.patch | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/games/warmux/gcc-fix.patch (limited to 'pkgs') diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch new file mode 100644 index 00000000000..1ac476b92a3 --- /dev/null +++ b/pkgs/games/warmux/gcc-fix.patch @@ -0,0 +1,36 @@ +## i-love-you-lordheavy.patch [diff] +diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp +--- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100 +@@ -81,7 +81,7 @@ + } + + // Build an action from a network packet +-Action::Action(const char *buffer, DistantComputer* _creator) ++Action::Action(char *buffer, DistantComputer* _creator) + { + m_creator = _creator; + +diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h +--- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100 +@@ -168,7 +168,7 @@ + Action(Action_t type, Double value1, Double value2); + + // Build an action from a network packet +- Action(const char* buffer, DistantComputer* _creator); ++ Action(char* buffer, DistantComputer* _creator); + + ~Action(); + +Description: Fix FTBFS with gcc 4.7. +Author: Felix Geyer + +--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp ++++ warmux-11.04.1+repack/tools/list_games/main.cpp +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include -- cgit 1.4.1 From e16d2b7e03c1e8a12a98bc896377ba47b260b9b8 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin 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') 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 d6a95753d5066dc190ce92c2644f673ae5bda23f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 10:51:52 +0200 Subject: python33Packages.pygit2: update from 0.18.1 to 0.20.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e92bb181df2..8de9d43d5ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4670,11 +4670,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pygit2 = buildPythonPackage rec { - name = "pygit2-0.18.1"; + name = "pygit2-0.20.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz"; - md5 = "8d27f84509a96d6791a6c393ae67d7c8"; + sha256 = "04132q7bn8k7q7ky7nj3bkza8r9xkzkdpfv462b6rgjsd1x6h340"; }; preConfigure = ( if stdenv.isDarwin then '' -- cgit 1.4.1 From f6b3e2ca547639bd7bcacfe88022c123185cdd13 Mon Sep 17 00:00:00 2001 From: James Cook 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') 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 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') 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 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') 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 270acdc68228468b1e59ed7f42eb9695afe47eea Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 21 Dec 2013 18:13:03 +0200 Subject: gnumeric: update from 1.12.0 to 1.12.9, potentially fixes CVE-2013-6836 --- pkgs/applications/office/gnumeric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 1bdc41d1fb5..f4389716b76 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnumeric-1.12.0"; + name = "gnumeric-1.12.9"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"; + sha256 = "1rv2ifw6rp0iza4fkf3bffvdkyi77dwvzdnvcbpqcyn2kxfsvlsc"; }; configureFlags = "--disable-component"; -- cgit 1.4.1 From f7fafb6931e25cab937ffeedf697dcbf786ff62a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 4c71072c35cdbb6d7780c2441ba96b74c052eec1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:26:16 +0200 Subject: telepathy_haze: update from 0.7.0 to 0.8.0 --- .../networking/instant-messengers/telepathy/haze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index b2fd13837d7..ffc29a52aa1 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "telepathy-haze"; - name = "${pname}-0.7.0"; + name = "${pname}-0.8.0"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1gaj8518ilm3gnzqf3lmiqgnwkay8wfbsqngcz15whzji8sl608b"; + sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; -- cgit 1.4.1 From 907788ffd7970fbb5670e5ba8776a590a18f4511 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:27:16 +0200 Subject: telepathy_mission_control: update from 5.14.1 to 5.16.0 --- .../instant-messengers/telepathy/mission-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 97683ff56de..5d44f97a1be 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }: stdenv.mkDerivation rec { - name = "${pname}-5.14.1"; + name = "${pname}-5.16.0"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb"; + sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd"; }; buildInputs = [ telepathy_glib ]; -- cgit 1.4.1 From 49060a6adebe42350c7f662cc33e924c8b56efee Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:28:29 +0200 Subject: telepathy_rakia: update from 0.7.4 to 0.8.0 --- .../networking/instant-messengers/telepathy/rakia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index a60e207b752..538a8d7f6d2 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "telepathy-rakia"; - name = "${pname}-0.7.4"; + name = "${pname}-0.8.0"; src = fetchurl { url = "${meta.homepage}/releases/${pname}/${name}.tar.gz"; - sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf"; + sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv"; }; nativeBuildInputs = [pkgconfigUpstream libxslt python]; -- cgit 1.4.1 From 78ad8b0a38252b977ac48e57a076e1ddf1d7064e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:29:01 +0200 Subject: telepathy_salut: update from 0.8.0 to 0.8.1 --- .../networking/instant-messengers/telepathy/salut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 4300ac15c99..b1341af7a9d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "telepathy-salut"; - name = "${pname}-0.8.0"; + name = "${pname}-0.8.1"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1kmmpwjbfph37bjvpkfphff8dzhr896i55knf311f778fbsgl17m"; + sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls -- cgit 1.4.1 From 4228fe8377af592a02106a2506a4fb4db2cae09e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:32:15 +0200 Subject: perlPackages.SubInstall: update from 0.926 to 0.927 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 277b158cc4e..a7edd74f5ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7543,10 +7543,10 @@ rec { }; SubInstall = buildPerlPackage { - name = "Sub-Install-0.926"; + name = "Sub-Install-0.927"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.926.tar.gz; - sha256 = "0gkns6p11j46j6yzacanhbqgd4ws5r0ppg6yivz7cjbq8dk4kcmc"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.927.tar.gz; + sha256 = "0nmgsdbwi8f474jkyd6w9jfnpav99xp8biydcdri8qri623f6plm"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; -- cgit 1.4.1 From 576cbb389aad960790e8eb583556abf17b608bb3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:37:17 +0200 Subject: perlPackages.DataUUIDMT: update from 1.000 to 1.001 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a7edd74f5ec..62b8c03d9f2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1884,10 +1884,10 @@ rec { }; DataUUIDMT = buildPerlPackage { - name = "Data-UUID-MT-1.000"; + name = "Data-UUID-MT-1.001"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.000.tar.gz; - sha256 = "1bwrxv8fp4arwrmslsb7jlnafs8cww1p5f409d1l5kpyfj2vpsyp"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz; + sha256 = "0bb7qibq1c5lhaihxa1sck9pb744p8c7172jgx5zh4c32ac4nk1h"; }; buildInputs = [ ListAllUtils ]; propagatedBuildInputs = [ MathRandomMTAuto ]; -- cgit 1.4.1 From 5b7f766c9621290e0faf6946e12fb8b71f3dff6f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:37:54 +0200 Subject: perlPackages.DateTime: update from 1.03 to 1.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62b8c03d9f2..f3925dfae6c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1937,10 +1937,10 @@ rec { }; DateTime = buildPerlModule { - name = "DateTime-1.03"; + name = "DateTime-1.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.03.tar.gz; - sha256 = "384f97c73da02492d771d6b5c3b37f6b18c2e12f4db3246b1d61ff19c6d6ad6d"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.04.tar.gz; + sha256 = "1krnrp8hv0m4v1lxrvwgc3vvcycld21ygvjy5p7vaf5h1jpjzrwz"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; -- cgit 1.4.1 From 586929827fcb199c2cfa858f3a1ad6795e1fe3f3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:39:47 +0200 Subject: perlPackages.DateTimeTimeZone: update from 1.59 to 1.63 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f3925dfae6c..c5ec3a9c891 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2109,10 +2109,10 @@ rec { }; DateTimeTimeZone = buildPerlPackage { - name = "DateTime-TimeZone-1.59"; + name = "DateTime-TimeZone-1.63"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.59.tar.gz; - sha256 = "b1d50f6abde68671da1db883168ef8d6793a11ba75de02174f42e1dfd16b2522"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.63.tar.gz; + sha256 = "02a3kyz3cyrag98b1949k19axm03fa5ri82gdc1y4lnxjvjvxkfw"; }; buildInputs = [ TestOutput ]; propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ]; -- cgit 1.4.1 From aeef356d57f115d3aea56187699c19304879667c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:55:21 +0200 Subject: perlPackages.ExtUtilsCBuilder: update from 0.280205 to 0.280212 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c5ec3a9c891..8738cf3365f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3105,10 +3105,10 @@ rec { }; ExtUtilsCBuilder = buildPerlPackage rec { - name = "ExtUtils-CBuilder-0.280205"; + name = "ExtUtils-CBuilder-0.280212"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0nfrr3zd71gnsbp5xacdb70n17slrzj421s4nyr11zg5cqsj3ngs"; + sha256 = "0zc4hkcb8wk7nm0b2b6pb1lpih52blx6x2w6x99bcr0d581807xg"; }; buildInputs = [ PerlOSType ]; }; -- cgit 1.4.1 From d4977fc8bf7ff108ccccb0d07cd865c414bc4aa1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:55:57 +0200 Subject: perlPackages.ExtUtilsManifest: update from 1.61 to 1.63 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8738cf3365f..0290b11c43e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3197,10 +3197,10 @@ rec { }; ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.61"; + name = "ExtUtils-Manifest-1.63"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "18jj4lrip2g580b2fw5khxvdx6h3pavgihvb87snggrlgabpj20n"; + sha256 = "0p4hj03nb5n6mk7pskpw066n1i3hr80nq7k7rc3fgl329v6syfmg"; }; }; -- cgit 1.4.1 From 9fe09564f3ed37f58d0a45da1e63cf249d90f596 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:57:00 +0200 Subject: perlPackages.Filechdir: update from 0.1006 to 0.1008 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0290b11c43e..a9cfe1a8648 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3302,10 +3302,10 @@ rec { }; Filechdir = buildPerlPackage rec { - name = "File-chdir-0.1006"; + name = "File-chdir-0.1008"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "b26e91f8b5480544da599412612ff9287007be9703d41c35251f09c5ff19879a"; + sha256 = "0n8dz80fgk3shfxncyr4aff5hnsd846c5np6d68kc0mxqj2g0flr"; }; }; -- cgit 1.4.1 From d77f263dad2259e586cd3202618451fc56f76256 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 01:59:44 +0200 Subject: perlPackages.GD: update from 2.49 to 2.50 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a9cfe1a8648..cc9064d7963 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3591,10 +3591,10 @@ rec { }; GD = buildPerlPackage rec { - name = "GD-2.49"; + name = "GD-2.50"; src = fetchurl { url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; - sha256 = "03wwvhvni22cs7arai7d3wkb2qfa9p20grrb32hdxv41nqxqpihh"; + sha256 = "1qm8l0z2568byw4zmaqf954y3rm8nzx1nnz6cxnxd3d4cz894lvd"; }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype -- cgit 1.4.1 From 668cea45e289ed7df4ca1e73a4f03ded9ad425d8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:00:46 +0200 Subject: perlPackages.GeoIP: update from 1.39 to 1.43 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cc9064d7963..bab91287dc8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3629,10 +3629,10 @@ rec { }; GeoIP = buildPerlPackage rec { - name = "Geo-IP-1.39"; + name = "Geo-IP-1.43"; src = fetchurl { url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; - sha256 = "1yc0rn67nk4z8aq8d82axhfmgi0l91rkksqbf27ylasrhyb6ykx5"; + sha256 = "0p7mcn4rzvhrblx72f5a1yg88mqgv6f46mq0rvhhkmkpwckb0yjq"; }; makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; doCheck = false; # seems to access the network -- cgit 1.4.1 From 8de67b05f785a9ed91b2c96f0b882e6647fd4e09 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:03:50 +0200 Subject: perlPackages.HTMLFormFu: update from 0.09007 to 0.09010 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bab91287dc8..583b93a5f0b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3852,10 +3852,10 @@ rec { }; HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-0.09007"; + name = "HTML-FormFu-0.09010"; src = fetchurl { url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; - sha256 = "1yg9fy6s8f1jscfxf7a9hm91x43cjhk3ijw46z94sw8133h50rvy"; + sha256 = "08hf6z35yhfd1521ip8x5hpwb7h09k643s9sqf6ddmi9yvqini1k"; }; propagatedBuildInputs = [ ClassAccessorChained Clone ConfigAny -- cgit 1.4.1 From aea195b7df228df5e1672e6520deefef24628207 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 22 Dec 2013 02:14:53 +0200 Subject: perlPackages.HTMLFormFu: add missing test dependency --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 583b93a5f0b..4733bdd462a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3857,6 +3857,7 @@ rec { url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; sha256 = "08hf6z35yhfd1521ip8x5hpwb7h09k643s9sqf6ddmi9yvqini1k"; }; + buildInputs = [ CGISimple ]; propagatedBuildInputs = [ ClassAccessorChained Clone ConfigAny DateCalc ListMoreUtils EmailValid -- cgit 1.4.1 From c117823aa6ce1b70b19fc70985ac99fdf81f5e9b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:24:05 +0200 Subject: perlPackages.ImageExifTool: update from 8.41 to 9.27 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4733bdd462a..34e8cf95c76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4346,11 +4346,11 @@ rec { }; ImageExifTool = buildPerlPackage rec { - name = "Image-ExifTool-8.41"; + name = "Image-ExifTool-9.27"; src = fetchurl { url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "1fdjic0bhbai8zzl3287i9wcs88khiv8qx5slx9n3gzvbnxacvqg"; + sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c"; }; meta = { -- cgit 1.4.1 From 54a56fbd2918a0017328b453edc7c9c2d98df50d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:26:02 +0200 Subject: perlPackages.JSON: update from 2.53 to 2.90 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 34e8cf95c76..114bcb58d97 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4443,10 +4443,10 @@ rec { }; JSON = buildPerlPackage { - name = "JSON-2.53"; + name = "JSON-2.90"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.53.tar.gz; - sha256 = "0rfms17d0pkai26kqyzaylbr5wxcrrhyjkyshq85l41xb0g1iplh"; + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz; + sha256 = "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd"; }; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; -- cgit 1.4.1 From ae091656f446bc5b9d6aa98d4a45d7ff8edfa2fa Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 22 Dec 2013 02:27:02 +0200 Subject: perlPackages.JSON: add missing test dependency --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 114bcb58d97..a2314b74088 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4448,6 +4448,7 @@ rec { url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz; sha256 = "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd"; }; + buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; license = "perl"; -- cgit 1.4.1 From d4eb37715ba373e6a1d6ed66e08a877b1f8a4097 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:28:39 +0200 Subject: perlPackages.JSONPP: update from 2.27200 to 2.27203 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a2314b74088..2e184fef16a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4469,10 +4469,10 @@ rec { }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-2.27200"; + name = "JSON-PP-2.27203"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27200.tar.gz; - sha256 = "1lv9riws9f72gya2fsp5jvbd1fbzyi8423x38a491ryy9cai2ph3"; + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27203.tar.gz; + sha256 = "0ljwya1fb4969pckcq2j1g6axgx8qh9yscxbs6qf62qxf8wkj1mp"; }; meta = { description = "JSON::XS compatible pure-Perl module"; -- cgit 1.4.1 From 4f986a613cd712032cf0d73f6dd8a5391cb1dd35 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:32:19 +0200 Subject: perlPackages.LogDispatch: update from 2.39 to 2.41 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2e184fef16a..8ba420cb2e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4690,10 +4690,10 @@ rec { }; LogDispatch = buildPerlPackage { - name = "Log-Dispatch-2.39"; + name = "Log-Dispatch-2.41"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.39.tar.gz; - sha256 = "1bi2nza0nc66i0ls2zkxi6bbwkh456pl0q8h57mq6skbhbmcwbb8"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.41.tar.gz; + sha256 = "0vsmlkx2g9lc13pl9v96kn575yszfvd79a236b8v0s1di83gm09z"; }; propagatedBuildInputs = [ ClassLoad ParamsValidate ]; meta = { -- cgit 1.4.1 From d24adec7aafc471c25f278248e3775306b8213ce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:32:51 +0200 Subject: perlPackages.MailDKIM: update from 0.39 to 0.40 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ba420cb2e0..c03b4d5f87f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4847,10 +4847,10 @@ rec { }; MailDKIM = buildPerlPackage rec { - name = "Mail-DKIM-0.39"; + name = "Mail-DKIM-0.40"; src = fetchurl { url = "mirror://cpan/authors/id/J/JA/JASLONG/${name}.tar.gz"; - sha256 = "b1425a540f514c483e80566fb3decc2c1db4162306f6ae8794cef72a2d73557b"; + sha256 = "1wd6mab4fp47v1nh85jfxsjmysnyv5mwvfv47cn5m2h2lb1s0piw"; }; propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ]; doCheck = false; # tries to access the domain name system -- cgit 1.4.1 From 34b917b1a2ec450731f72337694b385d8d53eaf3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:35:01 +0200 Subject: perlPackages.MooseXSetOnce: update from 0.200001 to 0.200002 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c03b4d5f87f..30bd91fe7e3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5645,10 +5645,10 @@ rec { }; MooseXSetOnce = buildPerlPackage rec { - name = "MooseX-SetOnce-0.200001"; + name = "MooseX-SetOnce-0.200002"; src = fetchurl { url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6"; + sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose ]; -- cgit 1.4.1 From 73bf6eba5e3cd49dd747c7adf5b3e4f7f9e9ed66 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:35:50 +0200 Subject: perlPackages.PerlPrereqScanner: update from 1.016 to 1.018 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30bd91fe7e3..0ad22e01714 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6681,10 +6681,10 @@ rec { }; PerlPrereqScanner = buildPerlPackage { - name = "Perl-PrereqScanner-1.016"; + name = "Perl-PrereqScanner-1.018"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.016.tar.gz; - sha256 = "1ab70723f3d036ef91684572beacab40bf99f5ed69922769aa077664c778c474"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.018.tar.gz; + sha256 = "11zkam8svpgcjhjda0ap3afd797a69ndcc64fy3xw0j8v8kxa6hc"; }; buildInputs = [ PPI TryTiny ]; propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ]; -- cgit 1.4.1 From 888c27f152b8aab133d0b37cf397be4d4b25bcc9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:36:53 +0200 Subject: perlPackages.PodWeaver: update from 3.101638 to 4.004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0ad22e01714..34e158c4899 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6828,10 +6828,10 @@ rec { }; PodWeaver = buildPerlPackage { - name = "Pod-Weaver-3.101638"; + name = "Pod-Weaver-4.004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-3.101638.tar.gz; - sha256 = "1232b761016221e331a266a42661fa352447d0da075ebdb41dc4c4d71e60629c"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.004.tar.gz; + sha256 = "0hw500qkbmnwm385za5x7ypijx0lqk8cfc9jq232v95ka0hqcg29"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli Moose MooseAutobox ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; -- cgit 1.4.1 From 5e668f601f19f1521ea1f02e555d93c445cae4e5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 02:38:34 +0200 Subject: perlPackages.TestPod: update from 1.45 to 1.48 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 34e158c4899..03b1af896a7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8265,10 +8265,10 @@ rec { }; TestPod = buildPerlPackage { - name = "Test-Pod-1.45"; + name = "Test-Pod-1.48"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.45.tar.gz; - sha256 = "0yv0bglm4b9zfi9l5z6x2dy6pzlh8n5z9yl7py5v6h48mwgk74fk"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.48.tar.gz; + sha256 = "1hmwwhabyng4jrnll926b4ab73r40w3pfchlrvs0yx6kh6kwwy14"; }; meta = { homepage = http://search.cpan.org/dist/Test-Pod/; -- cgit 1.4.1 From f9c701a2b8a7fd5161ac2a0d249e0506ff307cd3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 22 Dec 2013 14:49:18 +0200 Subject: youtubeDL: update from 2013.12.17.2 to 2013.12.20 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index cab3e69688c..eb6baf41fe4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2013.12.17.2"; + version = "2013.12.20"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1dmv14v623v9afxfn0rw1gfdd91sngfgj4dg7hwbmnqsja0qxydv"; + sha256 = "0cqr0rpa247gfk5fg65sj94x4d9a1s85343gnqmc763h5h8v50zb"; }; buildInputs = [ python ]; -- cgit 1.4.1 From a7a7e414f092e902eb822bde2438f07e6bc65667 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sun, 22 Dec 2013 19:00:05 +0100 Subject: Updating mpv, and making it use ffmpeg_2 --- pkgs/applications/video/mpv/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index bb91ca5beb5..e382481b6f6 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -55,11 +55,12 @@ let in stdenv.mkDerivation rec { - name = "mpv-20130812"; + name = "mpv-20131222"; src = fetchgit { url = "https://github.com/mpv-player/mpv.git"; - rev = "62925a5c15a76568c155259bafa1361ec139c66b"; + rev = "e6bea0ec5a"; + sha256 = "984c7d19b1916b7e5befc370ffb7f6c31e560c64c47090b924a115d00c35a1a8"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2d9b9e9ce1..c1e9bf72ce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8519,7 +8519,7 @@ let }; mpv = callPackage ../applications/video/mpv { - ffmpeg = ffmpeg_1; + ffmpeg = ffmpeg_2; bs2bSupport = true; quviSupport = true; cacaSupport = true; -- cgit 1.4.1 From a0297b7be4acae29c78f5a6d12afcb69d7493217 Mon Sep 17 00:00:00 2001 From: Karn Kallio 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') 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 c23bf0548e1ab10184326e8ec8b50ce85425913c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 03:27:46 +0200 Subject: xterm: update from 281 to 300 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index ef2d846dd2e..1d050182da3 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-281"; + name = "xterm-300"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "1yrjjya7z5s3fi0iiaxgna35jh0ib2zx1yafyng35jma6qbwhxx7"; + sha256 = "1k8p7q4d1gpk6zikb8hys8b30yq2v001nlp3r9g40my31ij9al31"; }; buildInputs = -- cgit 1.4.1 From e36a27155d523f74a8f49286d294485b70564908 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 03:30:33 +0200 Subject: vacuum: update from 1.2.0 to 1.2.3 --- pkgs/applications/networking/instant-messengers/vacuum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 63f18ee7dc4..ad8b677a2ec 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -12,11 +12,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="1.2.0"; + version="1.2.3"; baseName="vacuum-im"; name="${baseName}-${version}"; url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz"; - hash="55a2c27aaaf79c7a4de127c22d3845ede35970283d35ee57fd5ceca581b085fc"; + hash="037k2b2kkp2ywkrshqa0fj18mkd2jq60x4x62kzbrsvb85qcbbxh"; }; in rec { -- cgit 1.4.1 From 7b5c0b39d206f6ed7bc41c956947f4307bf7c15d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 3d9e43ace2dd36446a1d798e983f49ba7e5b5ec6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 05:15:40 +0200 Subject: tcpdump: update from 4.4.0 to 4.5.1 --- pkgs/tools/networking/tcpdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index f987d6fa6ba..acea2d6da6a 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.4.0"; + name = "tcpdump-4.5.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1g9h2p31xwpdg88v7wv9hc8calq8sjs25800vzd9i45q5knln9qj"; + sha256 = "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"; }; buildInputs = [ libpcap ]; -- cgit 1.4.1 From 751e111a87aed2f547dfed04e01922235472ca07 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 05:18:34 +0200 Subject: squids.latest: update from 3.2.2 to 3.2.13, potentially fixes CVE-2012-5643, CVE-2013-0189, CVE-2013-1839, CVE-2013-4123 --- pkgs/servers/squid/squids.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index a94c05d5627..a41343c0cf9 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -30,10 +30,10 @@ rec { }; squid32 = squid30.merge rec { - name = "squid-3.2.2"; + name = "squid-3.2.13"; src = args.fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2"; - sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l"; + sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j"; }; buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2 libtool openssl]; -- cgit 1.4.1 From ab32224e7b7d289d73b3a5ca047a6b067b7ed328 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 05:19:22 +0200 Subject: smplayer: update from 0.8.5 to 0.8.6 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index ab48d74c00d..8bd5b7c6160 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smplayer-0.8.5"; + name = "smplayer-0.8.6"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0vbfvaqg5c25vabq1mf9xg6kzgvxnpd0i172y1gjznnlpcw2fxrw"; + sha256 = "1p70929j8prc4mgqxvsbcjxy8zwp4r9jk0mp0iddxl7vfyck74g0"; }; buildInputs = [ qt4 ]; -- cgit 1.4.1 From 424c47be8832ed172f90db231e41ba910ca30e51 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor 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') 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 7e3e830e81b22297f49967a93afeb83060747cc8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 05:21:36 +0200 Subject: qjackctl: update from 0.3.9 to 0.3.10 --- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index e70d51ce857..1531fd87b95 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }: stdenv.mkDerivation rec { - version = "0.3.9"; + version = "0.3.10"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y"; + sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw"; }; buildInputs = [ qt4 alsaLib jackaudio dbus ]; -- cgit 1.4.1 From dc2cb043a919ba31579021789383afc1733800a3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 05:22:37 +0200 Subject: powertop: update from 2.2 to 2.5 --- pkgs/os-specific/linux/powertop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 4de8ad6db0f..702ebc5d828 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.2"; + name = "powertop-2.5"; src = fetchurl { url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; - sha256 = "0a5haxawcjrlwwxx4j5kd4ad05gjmcr13v8gswfwfxcn7fyf2f8k"; + sha256 = "02rwqbpasdayl201v0549gbp2f82rd0hqiv3i111r7npanjhhb4b"; }; buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; -- cgit 1.4.1 From f3c93eaa1ef4ceea12e23a866393ee3a091a3708 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 05:24:47 +0200 Subject: pidginmsnpecan: update from 0.1.0 to 0.1.4 --- .../instant-messengers/pidgin-plugins/msn-pecan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 2e1b745790a..a63468a9ee7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pidgin} : stdenv.mkDerivation { - name = "pidgin-msn-pecan-0.1.0"; + name = "pidgin-msn-pecan-0.1.4"; src = fetchurl { - url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.0.tar.bz2; - sha256 = "06cgkdlv2brv2g5hpx8g8p6j296cnvd29l8fap30i1k0mznbjxf4"; + url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2; + sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2"; }; meta = { -- cgit 1.4.1 From 3f20e8f44e8016d103345fb34d1c97ca26232392 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 05:26:09 +0200 Subject: oxygen_gtk: update from 1.3.4 to 1.4.1 --- pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 3a619220bcf..fb51985afd1 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -2,12 +2,12 @@ cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.3.4"; + version = "1.4.1"; name = "oxygen-gtk2-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj"; + sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd"; }; buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf -- cgit 1.4.1 From 786b828f334b14888f40b7710ceedb8bc70f98b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 23 Dec 2013 05:27:10 +0200 Subject: ngspice: update from 24 to 25 --- pkgs/applications/science/electronics/ngspice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 579492248ea..493af97d156 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}: stdenv.mkDerivation { - name = "ng-spice-rework-24"; + name = "ng-spice-rework-25"; src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-24.tar.gz"; - sha256 = "0rgh75hbqrsljz767whbj65wi6369yc286v0qk8jxnv2da7p9ll6"; + url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz"; + sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h"; }; buildInputs = [ readline libX11 bison libICE libXaw libXext ]; -- cgit 1.4.1 From 10f250f65c3a47c63d3f34eb8a4494362d28bbf8 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell 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') 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 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') 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 5771888f4e5e87cdaaf6d80d2d5da4973a3e3ed8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 12 Nov 2013 09:04:20 +0100 Subject: wireshark: upgrade to 1.10.3 - cleaned up dependencies - python support is deprecated (upstream) in favor of pyreshark --- .../networking/sniffers/wireshark/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 7e5fdc6ccd3..a5ca5e7b488 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison -, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip -, heimdal, python, lynx, lua5 -, makeDesktopItem +{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares, gnutls, libgcrypt +, geoip, heimdal, lua5, gtk, makeDesktopItem }: -let version = "1.8.11"; in +let version = "1.10.3"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "1nwgizs9z1dalicpp2fd9pqafidy49j0v3d1rml0spfqrkbjpfpw"; + sha256 = "1329zph63z5mcij9lp111bh6b2w88z3d40gvjld2rjmhmqv1nr61"; }; buildInputs = - [ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt - glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5 - ]; + [ bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls geoip libnl c-ares gtk ]; - configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor"; + configureFlags = "--disable-usr-local --enable-packet-editor --with-ssl"; desktopItem = makeDesktopItem { name = "Wireshark"; -- cgit 1.4.1 From 64266a2197366b176a4f1ade9d8b719463255bc3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 7 Dec 2013 20:08:46 +0100 Subject: opus-tools: upgrade to 0.1.8 --- pkgs/applications/audio/opus-tools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index a543aa32eea..791763ced36 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}: +{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}: stdenv.mkDerivation rec { - name = "opus-tools-0.1.6"; + name = "opus-tools-0.1.8"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc"; + sha256 = "1xm2lhdz92n9zmk496lyagisyzja46kx8q340vay9i51krbqiqg4"; }; - buildInputs = [ libogg libao pkgconfig libopus ]; + buildInputs = [ libogg libao pkgconfig libopus flac ]; meta = { description = "Tools to work with opus encoded audio streams"; -- cgit 1.4.1 From 1b9884b7aea3b60c02889343e4a40ea151974c64 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 7 Dec 2013 20:09:08 +0100 Subject: opusfile: new package --- pkgs/applications/audio/opusfile/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/audio/opusfile/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix new file mode 100644 index 00000000000..50df35b974f --- /dev/null +++ b/pkgs/applications/audio/opusfile/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}: + +stdenv.mkDerivation rec { + name = "opusfile-0.4"; + src = fetchurl { + url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; + sha256 = "0h4iwyqgid0cibqwzckz3r94qfp09099nk1cx5nz6i3cf08yldlq"; + }; + + buildInputs = [ pkgconfig openssl libogg libopus ]; + + meta = { + description = "High-level API for decoding and seeking in .opus files"; + homepage = http://www.opus-codec.org/; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b6d7411a76..2fc58874f77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8646,6 +8646,8 @@ let inherit (pkgs.kde4) kdelibs; }; + opusfile = callPackage ../applications/audio/opusfile { }; + opusTools = callPackage ../applications/audio/opus-tools { }; pan = callPackage ../applications/networking/newsreaders/pan { -- cgit 1.4.1 From 56cf3c115f71cfac6b0685aba553d618da694c24 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 9 Dec 2013 14:49:34 +0100 Subject: mplayer2: upgrade to git 04/28 --- pkgs/applications/video/mplayer2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 24f53884e39..74b74037e50 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -66,12 +66,12 @@ let in stdenv.mkDerivation rec { - name = "mplayer2-20130130"; + name = "mplayer2-20130428"; src = fetchgit { url = "git://git.mplayer2.org/mplayer2.git"; - rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225"; - sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys"; + rev = "6c87a981baa4972fd71c25dfddea017b5a972e89"; + sha256 = "b09c1331141dd0939dfa424ae14dc0bdf82c8a72bb32c78e3ad15e3ee1d2c851"; }; prePatch = '' -- cgit 1.4.1 From 1f42e5c565a9d0f62929f0ffb9eb90f23dfb7dd3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik 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') 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 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') 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 e2e923644fef2a419818a9f52095044fa4603fea Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 8 Nov 2013 23:45:57 +0100 Subject: add rethinkdb --- pkgs/servers/nosql/rethinkdb/default.nix | 35 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/nosql/rethinkdb/default.nix (limited to 'pkgs') diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix new file mode 100644 index 00000000000..9231310abd8 --- /dev/null +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, which, protobuf, v8, ncurses, gperftools, boost, m4 }: + +stdenv.mkDerivation rec { + name = "rethinkdb-1.11.2"; + + src = fetchurl { + url = "http://download.rethinkdb.com/dist/${name}.tgz"; + sha256 = "04wz07y891vygc5ksrvkk1ch05xj16nahv20bnxwcllkbl4gf9lj"; + }; + + preConfigure = '' + export ALLOW_WARNINGS=1 + ''; + + configureFlags = "--lib-path ${gperftools}/lib"; + + buildInputs = [ protobuf v8 ncurses boost ]; + + nativeBuildInputs = [ which m4 ]; + + + meta = { + description = "An open-source distributed database built with love"; + longDescription = '' + RethinkDB is built to store JSON documents, and scale to multiple machines with very little + effort. It has a pleasant query language that supports really useful queries like table joins + and group by, and is easy to setup and learn. + ''; + homepage = http://www.rethinkdb.com; + license = "AGPLv3"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fc58874f77..df683c3ad1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6429,6 +6429,8 @@ let restund = callPackage ../servers/restund {}; + rethinkdb = callPackage ../servers/nosql/rethinkdb { }; + spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL; -- cgit 1.4.1 From 98334e1d0abf8b20c8f3622b48c8b29a1539dfc5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 9f83c13ddecc0c1aaf0af8f498a3ef7e3d3d9a16 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 12 Dec 2013 15:45:25 +0100 Subject: go: change default to 1.2 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df683c3ad1c..1c0ec422f9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2791,7 +2791,7 @@ let go_1_2 = callPackage ../development/compilers/go/1.2.nix { }; - go = go_1_1; + go = go_1_2; gprolog = callPackage ../development/compilers/gprolog { }; -- cgit 1.4.1 From e9a61d523e35439afcb68a100c7630c54b9d3dc7 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:12:09 +0100 Subject: firefox: use system icu - cleanup of debug/optimize flags --- .../networking/browsers/firefox/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 49c1e5951b6..47e6d20cc9a 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base +, cairo, gstreamer, gst_plugins_base, icu , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -33,11 +33,7 @@ rec { }; commonConfigureFlags = - [ "--enable-optimize" - #"--enable-profiling" - (if debugBuild then "--enable-debug" else "--disable-debug") - "--enable-strip" - "--with-system-jpeg" + [ "--with-system-jpeg" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" @@ -45,18 +41,23 @@ rec { "--with-system-libevent" "--with-system-libvpx" "--with-system-png" - "--enable-startup-notification" + "--with-system-icu" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" "--enable-system-cairo" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-installer" "--disable-updater" - ]; + ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--enable-optimize" "--enable-strip" ]); xulrunner = stdenv.mkDerivation rec { @@ -72,7 +73,7 @@ rec { xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base + gstreamer gst_plugins_base icu ]; configureFlags = @@ -138,7 +139,7 @@ rec { dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip pysqlite hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base + gstreamer gst_plugins_base icu ]; patches = [ -- cgit 1.4.1 From 34527353b5cc654c5ea9fa378681f8cc0bd9edaf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 13 Dec 2013 00:10:17 +0100 Subject: conkeror: upgrade to more recent git "release" --- pkgs/applications/networking/browsers/conkeror/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index b44a39d87aa..fc84f7fcecc 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20130817-1"; + name = "conkeror-1.0pre-20131116-1"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "refs/tags/debian-1.0--pre+git130817-1"; - sha256 = "aef3c782ac98c031e7b99852f42538e225e151cd226cde3094823a5cae015fcf"; + rev = "refs/tags/debian-1.0--pre+git131116-1"; + sha256 = "6fe0f30487c5bb8f2183dc7c2e15cf29df7cc8b1950b5fc15c26510c74a1f7d3"; }; buildInputs = [ unzip makeWrapper ]; -- cgit 1.4.1 From 2de160c5943b76494572c385e919d20026dc22b8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 a508d30c5376cf9e67e9a71c3a2262091730e106 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:25:01 +0100 Subject: openimageio: hash change --- pkgs/applications/graphics/openimageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index f8160e4d688..8748c808dc0 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "196iq15waa2yyryiwhf6ynlpqnpknm4cc4azakg01xs70yiphsfl"; + sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6"; }; - buildInputs = [ + buildInputs = [ boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip ]; -- cgit 1.4.1 From c5d05a5652c54009c318fa451e525dacc28a48ba Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:26:29 +0100 Subject: jigdo: depend on db4 instead of db45 --- pkgs/applications/misc/jigdo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 6ceca2ea871..24edc0e128a 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, db45, gtk, bzip2 }: +{ stdenv, fetchurl, db4, gtk, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; - # Debian sources + # Debian sources src = fetchurl { url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz; sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; @@ -13,12 +13,12 @@ stdenv.mkDerivation { url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz; sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; }; - - buildInputs = [ db45 gtk bzip2 ]; + + buildInputs = [ db4 gtk bzip2 ]; configureFlags = "--without-libdb"; - meta = { + meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = http://atterer.net/jigdo/; license = "GPLv2"; -- cgit 1.4.1 From e966ebd5e148e83d7fddac483a9c5501883669c4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:27:59 +0100 Subject: kdesvn: upgrade to 1.6.0 --- pkgs/applications/version-management/kdesvn/default.nix | 13 ++++++------- pkgs/applications/version-management/kdesvn/docbook.patch | 13 ------------- .../version-management/kdesvn/virtual_inheritance.patch | 11 ----------- 3 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/version-management/kdesvn/docbook.patch delete mode 100644 pkgs/applications/version-management/kdesvn/virtual_inheritance.patch (limited to 'pkgs') diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 59fb1f5a867..6373eb9f7f9 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: +# the homepage mentions this is the final release. +# from now on, kdesvn will be part of the official kde software distribution stdenv.mkDerivation rec { - name = "kdesvn-1.5.5"; + name = "kdesvn-1.6.0"; - src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; - sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2"; + md5 = "7e6adc98ff4777a06d5752d3f2b58fa3"; }; prePatch = '' sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - patches = [ ./docbook.patch ./virtual_inheritance.patch ]; - - buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/version-management/kdesvn/docbook.patch b/pkgs/applications/version-management/kdesvn/docbook.patch deleted file mode 100644 index 54f43c77958..00000000000 --- a/pkgs/applications/version-management/kdesvn/docbook.patch +++ /dev/null @@ -1,13 +0,0 @@ -The name of the dtd changed in kdelibs 4.5, so we need to increase it. - -diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook -index 8747869..a9676aa 100644 ---- a/doc/nl/index.docbook -+++ b/doc/nl/index.docbook -@@ -1,5 +1,5 @@ - --kdesvn"> - - diff --git a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch deleted file mode 100644 index faaf6afcd6b..00000000000 --- a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h -+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h -@@ -49,7 +49,7 @@ typedef svn::SharedPointer - */ --class RevGraphView : virtual public QGraphicsView -+class RevGraphView : public QGraphicsView - { - Q_OBJECT - public: -- cgit 1.4.1 From 4a909c7be369bc3c384c54a151f97e350e641a76 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik 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') 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 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') 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 c9cf6ecd40ebd7cb093dbb33ee1ade3096944edf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:30:55 +0100 Subject: bogofilter: get rid of bdb alias --- pkgs/tools/misc/bogofilter/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 2ec7f433596..09d8e888837 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, flex, bdb}: +{fetchurl, stdenv, flex, db4}: stdenv.mkDerivation rec { name = "bogofilter-1.2.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # FIXME: We would need `pax' as a "propagated build input" (for use # by the `bf_tar' script) but we don't have it currently. - buildInputs = [ flex bdb ]; + buildInputs = [ flex db4 ]; meta = { homepage = http://bogofilter.sourceforge.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c0ec422f9e..42957a9db36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -612,9 +612,7 @@ let inherit unzip; }; - bogofilter = callPackage ../tools/misc/bogofilter { - bdb = db4; - }; + bogofilter = callPackage ../tools/misc/bogofilter { }; bsdiff = callPackage ../tools/compression/bsdiff { }; -- cgit 1.4.1 From e9a9fcc8d1c72c538a544a163bcff2943596b298 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik 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') 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 3493b7cacfe330c7c218eb8d95a5fb3e0258b991 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:38:38 +0100 Subject: webkit: pin to bison 2.7 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42957a9db36..72c9c41dcfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5866,20 +5866,22 @@ let inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild inherit gtk3 glib atk cairo pango fontconfig freetype; inherit (gnome) gtkdoc libsoup; - inherit pkgconfig libtool intltool autoconf automake gperf bison flex + inherit pkgconfig libtool intltool autoconf automake gperf flex libjpeg libpng libtiff libxml2 libxslt sqlite icu curl which libproxy geoclue enchant python ruby perl mesa xlibs; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; + bison = bison2; }; webkit_gtk2 = builderDefsPackage ../development/libraries/webkit/gtk2.nix { inherit gtk2 glib atk cairo pango fontconfig freetype; inherit (gnome) gtkdoc libsoup; - inherit pkgconfig libtool intltool autoconf automake gperf bison flex + inherit pkgconfig libtool intltool autoconf automake gperf flex libjpeg libpng libtiff libxml2 libxslt sqlite icu curl which libproxy geoclue enchant python ruby perl mesa xlibs; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; + bison = bison2; }; wildmidi = callPackage ../development/libraries/wildmidi { }; -- cgit 1.4.1 From cf9cc60a8db221f2ad1314cf6de2bc026b156e40 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik 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') 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 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') 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 d2ccef5140daa898b13ebe21c39fde612c7fe22f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 11 Dec 2013 01:04:26 +0100 Subject: ffmpeg: order and cleanup versions --- pkgs/top-level/all-packages.nix | 14 +++++++------- pkgs/top-level/release-python.nix | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38d5f25fa1a..24055cf747f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4126,20 +4126,20 @@ let fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { + ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { vpxSupport = !stdenv.isMips; - - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; }; - ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { + ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { vpxSupport = !stdenv.isMips; }; - ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { + ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { vpxSupport = !stdenv.isMips; + + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; }; ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 5aafba980b9..ef7b1da92ab 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -334,7 +334,6 @@ let ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ffmpeg_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; -- cgit 1.4.1 From 5b4635d6fa12b7577f799aefb1cd2ae826a31a1a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 11 Dec 2013 01:05:03 +0100 Subject: ffmpeg: change default 0.10 -> 2.0 This commit, and the "pinnings" that follow should not cause major issues. I personally checked (build-only) each and every package that depends on ffmpeg to find the maximum supported version. I performed this on stdenv-updates+glibc2.18+x-updates but I don't expect that to matter. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24055cf747f..c64856f7198 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4152,7 +4152,7 @@ let texinfo = texinfo5; }; - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_2; ffms = callPackage ../development/libraries/ffms { }; -- cgit 1.4.1 From 70c2d2416bbe23beacd68c955ea0afa16a4b38f5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 11 Dec 2013 01:05:25 +0100 Subject: gst-ffmpeg: stick to ffmpeg 0.10 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c64856f7198..f3302190a66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4415,7 +4415,9 @@ let gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {}; - gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {}; + gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg { + ffmpeg = ffmpeg_0_10; + }; gst_python = callPackage ../development/libraries/gstreamer/gst-python {}; -- cgit 1.4.1 From 72ad48fd324b140d04ec31be93f39f49d703864d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:32:25 +0100 Subject: xpra: depend on ffmpeg instead of ffmpeg_1, now default became 1+ --- pkgs/tools/X11/xpra/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b8995430f92..d7d1533b3be 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, buildPythonPackage , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo -, ffmpeg_1, x264, libvpx, pil, libwebp }: +, ffmpeg, x264, libvpx, pil, libwebp }: buildPythonPackage rec { name = "xpra-0.9.5"; - + src = fetchurl { url = "http://xpra.org/src/${name}.tar.bz2"; sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw"; }; - buildInputs = [ - python cython pkgconfig + buildInputs = [ + python cython pkgconfig xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto @@ -21,10 +21,10 @@ buildPythonPackage rec { pango cairo gdk_pixbuf atk gtk glib - ffmpeg_1 libvpx x264 libwebp + ffmpeg libvpx x264 libwebp ]; - propagatedBuildInputs = [ + propagatedBuildInputs = [ pil pygtk pygobject ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" python ./setup.py build --enable-Xdummy ''; - + meta = { homepage = http://xpra.org/; description = "Persistent remote applications for X"; -- cgit 1.4.1 From d73501454803c5f5388d7373ee65ea67be89bb3e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:33:31 +0100 Subject: acoustid_fingerprinter: pin to ffmpeg_1 --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3302190a66..7962e369886 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -392,8 +392,9 @@ let acct = callPackage ../tools/system/acct { }; - acoustidFingerprinter = callPackage - ../tools/audio/acoustid-fingerprinter { }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { + ffmpeg = ffmpeg_1; + }; actdiag = pythonPackages.actdiag; -- cgit 1.4.1 From ef214655d6c5dd87fd1e3868095f8524f831e99d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:34:39 +0100 Subject: cfdg: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7962e369886..379497b40de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -642,8 +642,7 @@ let cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cfdg = builderDefsPackage ../tools/graphics/cfdg { - inherit libpng bison flex; - ffmpeg = ffmpeg_1; + inherit libpng bison flex ffmpeg; }; checkinstall = callPackage ../tools/package-management/checkinstall { }; -- cgit 1.4.1 From bda93fb1e89975ecf0bb3ff20bf7b38e3fafd4cb Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:35:02 +0100 Subject: minidlna: pin to ffmpeg 0.10 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 379497b40de..fe291356f9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1200,7 +1200,9 @@ let klavaro = callPackage ../games/klavaro {}; - minidlna = callPackage ../tools/networking/minidlna { }; + minidlna = callPackage ../tools/networking/minidlna { + ffmpeg = ffmpeg_0_10; + }; mmv = callPackage ../tools/misc/mmv { }; -- cgit 1.4.1 From caaa4d1122484019ddb6a595ca3fc1729c30f59e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:36:15 +0100 Subject: openscenegraph: pin to ffmpeg 0.10 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe291356f9e..8c77aed3f9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5436,6 +5436,7 @@ let openscenegraph = callPackage ../development/libraries/openscenegraph { giflib = giflib_4_1; + ffmpeg = ffmpeg_0_10; }; openssl = callPackage ../development/libraries/openssl { -- cgit 1.4.1 From 2c8835c9db4f65efe65343b633373231f001a72f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:37:04 +0100 Subject: xbmc: pin to ffmpeg 1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c77aed3f9e..b4cc9955045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9225,7 +9225,9 @@ let xbindkeys = callPackage ../tools/X11/xbindkeys { }; - xbmc = callPackage ../applications/video/xbmc { }; + xbmc = callPackage ../applications/video/xbmc { + ffmpeg = ffmpeg_1; + }; xca = callPackage ../applications/misc/xca { }; -- cgit 1.4.1 From 8e9232e797800f91f41ad8ae6479a25ba86aeddf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:38:07 +0100 Subject: baresip: pin to ffmpeg 1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4cc9955045..dbac8087f6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7537,7 +7537,9 @@ let }; awesome = awesome-3-5; - baresip = callPackage ../applications/networking/instant-messengers/baresip {}; + baresip = callPackage ../applications/networking/instant-messengers/baresip { + ffmpeg = ffmpeg_1; + }; batik = callPackage ../applications/graphics/batik { }; -- cgit 1.4.1 From 31a14a4d0bb0934170edf854fac802e33c216f50 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:38:19 +0100 Subject: xinelib: pin to ffmpeg 1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbac8087f6e..b5ecae0f2d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5932,7 +5932,9 @@ let xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; - xineLib = callPackage ../development/libraries/xine-lib { }; + xineLib = callPackage ../development/libraries/xine-lib { + ffmpeg = ffmpeg_1; + }; xautolock = callPackage ../misc/screensavers/xautolock { }; -- cgit 1.4.1 From d1b14af0e56ce787fe16d755541718165ff791d4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:40:04 +0100 Subject: grass: pin to ffmpeg 0.10 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5ecae0f2d1..fb3432780a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7951,8 +7951,9 @@ let lib flex bison cairo fontconfig gdal zlib ncurses gdbm proj pkgconfig swig blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python - readline sqlite tcl tk libtiff freetype ffmpeg makeWrapper wxGTK; + readline sqlite tcl tk libtiff freetype makeWrapper wxGTK; fftw = fftwSinglePrec; + ffmpeg = ffmpeg_0_10; motif = lesstif; opendwg = libdwg; wxPython = wxPython28; -- cgit 1.4.1 From 7177855e4d5a1b794600190ee8e7d6e6e30960ba Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:49:01 +0100 Subject: renpy: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3432780a0..3269a331397 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3333,7 +3333,6 @@ let regina = callPackage ../development/interpreters/regina {}; renpy = callPackage ../development/interpreters/renpy { - ffmpeg = ffmpeg_1; wrapPython = pythonPackages.wrapPython; }; -- cgit 1.4.1 From 575a8c5f226ffaa9f8e9f2a9de7467a99c5198a0 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:49:18 +0100 Subject: mediastreamer: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3269a331397..b292d528c89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5256,9 +5256,7 @@ let mdds = callPackage ../development/libraries/mdds { }; # failed to build - mediastreamer = callPackage ../development/libraries/mediastreamer { - ffmpeg = ffmpeg_1; - }; + mediastreamer = callPackage ../development/libraries/mediastreamer { }; mesaSupported = lib.elem system lib.platforms.mesaPlatforms; -- cgit 1.4.1 From 3a1d772861567dff23d4349542f5a87f01c0478b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:49:23 +0100 Subject: mlt: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b292d528c89..ddc009f9728 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5300,9 +5300,7 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mlt = callPackage ../development/libraries/mlt { - ffmpeg = ffmpeg_1; - }; + mlt = callPackage ../development/libraries/mlt { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; -- cgit 1.4.1 From 4fdeca4c57876f97ffa4be98c0c791b09284c87f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:50:07 +0100 Subject: opencv: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddc009f9728..631400925cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5401,12 +5401,9 @@ let openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { - ffmpeg = ffmpeg_0_6_90; - }; + opencv = callPackage ../development/libraries/opencv { }; opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { - ffmpeg = ffmpeg_0_6_90; libpng = libpng12; }; -- cgit 1.4.1 From c6b59a6281efc7da516fda374ae5c6b3d7e6c47e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:50:20 +0100 Subject: mediatomb: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 631400925cf..8344ea8be16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6300,9 +6300,7 @@ let mailman = callPackage ../servers/mail/mailman { }; - mediatomb = callPackage ../servers/mediatomb { - ffmpeg = ffmpeg_0_6_90; - }; + mediatomb = callPackage ../servers/mediatomb { }; memcached = callPackage ../servers/memcached {}; -- cgit 1.4.1 From 9bd9ac6e8d54c5c3b14a694df062e9d3c91d2f6f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:50:56 +0100 Subject: audacity: pin to ffmpeg 0.10 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8344ea8be16..aecf5b82c01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7501,7 +7501,9 @@ let audacious = callPackage ../applications/audio/audacious { }; - audacity = callPackage ../applications/audio/audacity { }; + audacity = callPackage ../applications/audio/audacity { + ffmpeg = ffmpeg_0_10; + }; milkytracker = callPackage ../applications/audio/milkytracker { }; -- cgit 1.4.1 From 70f3d42729478853235f85114684e2564a2d6e2f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:51:07 +0100 Subject: freerdp: pin to ffmpeg 1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aecf5b82c01..1f8ad807f13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8023,7 +8023,9 @@ let xfontsel = callPackage ../applications/misc/xfontsel { }; xlsfonts = callPackage ../applications/misc/xlsfonts { }; - freerdp = callPackage ../applications/networking/remote/freerdp { }; + freerdp = callPackage ../applications/networking/remote/freerdp { + ffmpeg = ffmpeg_1; + }; freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { }; -- cgit 1.4.1 From f7500f9571aa16fb2c6c94d96d8b834fde0a2a23 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:51:15 +0100 Subject: mplayer2: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f8ad807f13..208b9119a46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8518,9 +8518,7 @@ let pulseSupport = config.pulseaudio or false; }; - mplayer2 = callPackage ../applications/video/mplayer2 { - ffmpeg = ffmpeg_1; - }; + mplayer2 = callPackage ../applications/video/mplayer2 { }; MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { -- cgit 1.4.1 From 2f166b3a3c5648fb1984718f334c210983221ab9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:51:22 +0100 Subject: vlc: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 208b9119a46..5e6a14c2adf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9112,9 +9112,7 @@ let inherit (xlibs) libX11; }; - vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_1; - }; + vlc = callPackage ../applications/video/vlc { }; vnstat = callPackage ../applications/networking/vnstat { }; -- cgit 1.4.1 From 8adf5a4f0ca5fc37f4e5d9250649161457852dfb Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 10:51:57 +0100 Subject: kde-4.1*: use default/latest ffmpeg --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e6a14c2adf..eb6ac09aba4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9693,7 +9693,6 @@ let eigen = eigen2; libotr = libotr_3_2; libusb = libusb1; - ffmpeg = ffmpeg_1; libcanberra = libcanberra_kde; }) ../desktops/kde-4.10; @@ -9702,7 +9701,6 @@ let eigen = eigen2; libotr = libotr_3_2; libusb = libusb1; - ffmpeg = ffmpeg_1; libcanberra = libcanberra_kde; }) ../desktops/kde-4.11; -- cgit 1.4.1 From 0be65b20a3c9a5b6b5e69996a9ab55ca4475c1c7 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 10 Dec 2013 15:43:47 +0100 Subject: db4: change default 4.5 -> 4.8 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb6ac09aba4..5023182542c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4055,7 +4055,7 @@ let cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { }; - db4 = db45; + db4 = db48; db44 = callPackage ../development/libraries/db4/db4-4.4.nix { }; -- cgit 1.4.1 From 7ad65e860e9db15aadfc279ad02385a02b5ad222 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:30:35 +0100 Subject: netatalk: depend on db4 instead of db48, now the db4 default became db48 --- pkgs/tools/filesystems/netatalk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 9d00288f694..26ffc9d50c2 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }: +{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }: stdenv.mkDerivation rec { name = "netatalk-3.1.0"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq"; }; - buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ]; + buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ]; configureFlags = [ - "--with-bdb=${db48}" + "--with-bdb=${db4}" "--with-openssl=${openssl}" ]; -- cgit 1.4.1 From 992e69abf47b300322b2a1b12bcb8981438789c7 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:37:21 +0100 Subject: freicoin: use default db4 now db48 is default --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5023182542c..b55d72b485e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8029,9 +8029,7 @@ let freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { }; - freicoin = callPackage ../applications/misc/freicoin { - db4 = db48; - }; + freicoin = callPackage ../applications/misc/freicoin { }; fspot = callPackage ../applications/graphics/f-spot { inherit (gnome) libgnome libgnomeui; -- cgit 1.4.1 From d94aa966485fad9033cbb374066eb3ed556b985d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:37:57 +0100 Subject: bitcoin: use default db4 now db48 is default --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b55d72b485e..58ca8c62d96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7550,9 +7550,7 @@ let bibletime = callPackage ../applications/misc/bibletime { }; - bitcoin = callPackage ../applications/misc/bitcoin { - db4 = db48; - }; + bitcoin = callPackage ../applications/misc/bitcoin { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { # For some reason, TLS support is broken when using GnuTLS 3.0 (can't -- cgit 1.4.1 From a067bd0ffc1cde0ca3cdfc7bf61e69e4dcf10ea1 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 11 Dec 2013 00:51:21 +0100 Subject: node-packages: upgrade all --- pkgs/top-level/node-packages-generated.nix | 1450 ++++++++++++++++++---------- 1 file changed, 919 insertions(+), 531 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 9baf51c2d3d..f526885ca80 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -509,35 +509,53 @@ self.by-version."async"."0.2.9"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.9"; + by-spec."async-foreach"."~0.1.3" = + self.by-version."async-foreach"."0.1.3"; + by-version."async-foreach"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "async-foreach-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"; + sha1 = "36121f845c0578172de419a97dbeb1d16ec34542"; + }) + ]; + buildInputs = + (self.nativeDeps."async-foreach" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async-foreach" ]; + }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.0-rc1"; - by-version."aws-sdk"."2.0.0-rc1" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.0-rc1"; + self.by-version."aws-sdk"."2.0.0-rc2"; + by-version."aws-sdk"."2.0.0-rc2" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.0.0-rc2"; src = [ - (self.patchSource fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc1.tgz"; - sha1 = "8f3b045ffa2050695a692f12ea76eff6d01a2349"; + (fetchurl { + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc2.tgz"; + sha1 = "26087265045b9506749244c9a2beb5611b18dc59"; }) ]; buildInputs = (self.nativeDeps."aws-sdk" or []); deps = [ self.by-version."xml2js"."0.2.4" - self.by-version."xmlbuilder"."1.0.2" + self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc1"; + "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc2"; by-spec."aws-sdk".">=1.2.0 <2" = - self.by-version."aws-sdk"."1.13.0"; - by-version."aws-sdk"."1.13.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.13.0"; + self.by-version."aws-sdk"."1.14.0"; + by-version."aws-sdk"."1.14.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-1.14.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.13.0.tgz"; - sha1 = "575b56296006d555bc0d14c1109174d44c194545"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.14.0.tgz"; + sha1 = "e79b92cda9a74522ad90d0d8357eb01fd14de008"; }) ]; buildInputs = @@ -586,6 +604,24 @@ ]; passthru.names = [ "aws-sign" ]; }; + by-spec."aws-sign2"."~0.5.0" = + self.by-version."aws-sign2"."0.5.0"; + by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sign2-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }) + ]; + buildInputs = + (self.nativeDeps."aws-sign2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "aws-sign2" ]; + }; by-spec."backbone"."*" = self.by-version."backbone"."1.1.0"; by-version."backbone"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -825,7 +861,7 @@ self.by-version."graceful-fs"."2.0.1" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" - self.by-version."junk"."0.2.1" + self.by-version."junk"."0.2.2" self.by-version."mkdirp"."0.3.5" self.by-version."mout"."0.7.1" self.by-version."nopt"."2.1.2" @@ -837,12 +873,12 @@ self.by-version."request"."2.27.0" self.by-version."request-progress"."0.3.1" self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."semver"."2.1.0" self.by-version."stringify-object"."0.1.7" self.by-version."sudo-block"."0.2.1" - self.by-version."tar"."0.1.18" - self.by-version."tmp"."0.0.22" + self.by-version."tar"."0.1.19" + self.by-version."tmp"."0.0.23" self.by-version."update-notifier"."0.1.7" self.by-version."which"."1.0.5" self.by-version."p-throttler"."0.0.1" @@ -976,7 +1012,7 @@ self.by-version."lru-cache"."2.3.1" self.by-version."request"."2.27.0" self.by-version."request-replay"."0.2.0" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."mkdirp"."0.3.5" ]; peerDependencies = [ @@ -1046,7 +1082,7 @@ deps = [ self.by-version."hat"."0.0.3" self.by-version."connect"."2.11.2" - self.by-version."request"."2.27.0" + self.by-version."request"."2.29.0" ]; peerDependencies = [ ]; @@ -1096,7 +1132,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.3.tgz"; - sha1 = "d9f6c343fd9f146e27da03b60f2e13e1406a1aea"; + sha1 = "7651d2c4ec7cb90d10b5de0ef61663273b784839"; }) ]; buildInputs = @@ -1363,45 +1399,43 @@ }; by-spec."chalk"."~0.2.1" = self.by-version."chalk"."0.2.1"; - by-spec."character-parser"."1.2.0" = - self.by-version."character-parser"."1.2.0"; - by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "character-parser-1.2.0"; + by-spec."chalk"."~0.3.0" = + self.by-version."chalk"."0.3.0"; + by-version."chalk"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "chalk-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"; - sha1 = "94134d6e5d870a39be359f7d22460935184ddef6"; + url = "http://registry.npmjs.org/chalk/-/chalk-0.3.0.tgz"; + sha1 = "1c98437737f1199ebcc1d4c48fd41b9f9c8e8f23"; }) ]; buildInputs = - (self.nativeDeps."character-parser" or []); + (self.nativeDeps."chalk" or []); deps = [ + self.by-version."has-color"."0.1.1" + self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ ]; - passthru.names = [ "character-parser" ]; + passthru.names = [ "chalk" ]; }; - by-spec."cheerio"."~0.10.8" = - self.by-version."cheerio"."0.10.8"; - by-version."cheerio"."0.10.8" = lib.makeOverridable self.buildNodePackage { - name = "cheerio-0.10.8"; + by-spec."character-parser"."1.2.0" = + self.by-version."character-parser"."1.2.0"; + by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "character-parser-1.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.10.8.tgz"; - sha1 = "ece5ad0c8baa9b9adc87394bbdb1c68bc4552ba0"; + url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"; + sha1 = "94134d6e5d870a39be359f7d22460935184ddef6"; }) ]; buildInputs = - (self.nativeDeps."cheerio" or []); + (self.nativeDeps."character-parser" or []); deps = [ - self.by-version."cheerio-select"."0.0.3" - self.by-version."htmlparser2"."2.6.0" - self.by-version."underscore"."1.4.4" - self.by-version."entities"."0.3.0" ]; peerDependencies = [ ]; - passthru.names = [ "cheerio" ]; + passthru.names = [ "character-parser" ]; }; by-spec."cheerio"."~0.12.0" = self.by-version."cheerio"."0.12.4"; @@ -1578,25 +1612,6 @@ ]; passthru.names = [ "cli-color" ]; }; - by-spec."cli-table"."~0.2.0" = - self.by-version."cli-table"."0.2.0"; - by-version."cli-table"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "cli-table-0.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cli-table/-/cli-table-0.2.0.tgz"; - sha1 = "34c63eb532c206e9e5e4ae0cb0104bd1fd27317c"; - }) - ]; - buildInputs = - (self.nativeDeps."cli-table" or []); - deps = [ - self.by-version."colors"."0.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cli-table" ]; - }; by-spec."cliff"."0.1.8" = self.by-version."cliff"."0.1.8"; by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -1719,13 +1734,13 @@ }; by-spec."coffee-script"."~1.6" = self.by-version."coffee-script"."1.6.3"; - by-spec."coffee-script-redux"."git://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" = + by-spec."coffee-script-redux"."git+https://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" = self.by-version."coffee-script-redux"."2.0.0-beta4"; by-version."coffee-script-redux"."2.0.0-beta4" = lib.makeOverridable self.buildNodePackage { name = "coffee-script-redux-2.0.0-beta4"; src = [ (fetchgit { - url = "git://github.com/michaelficarra/CoffeeScriptRedux.git"; + url = "https://github.com/michaelficarra/CoffeeScriptRedux.git"; rev = "9895cd1641fdf3a2424e662ab7583726bb0e35b3"; sha256 = "d70e659aa7cdb50a98959dec0e2a8c916200e31cb770f04faa2ae92a55d1e66d"; }) @@ -1797,24 +1812,6 @@ ]; passthru.names = [ "color-string" ]; }; - by-spec."colors"."0.3.0" = - self.by-version."colors"."0.3.0"; - by-version."colors"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.3.0.tgz"; - sha1 = "c247d64d34db0ca4dc8e43f3ecd6da98d0af94e7"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; by-spec."colors"."0.5.x" = self.by-version."colors"."0.5.1"; by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -2015,22 +2012,23 @@ by-spec."config-chain"."~1.1.8" = self.by-version."config-chain"."1.1.8"; by-spec."configstore"."~0.1.0" = - self.by-version."configstore"."0.1.5"; - by-version."configstore"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "configstore-0.1.5"; + self.by-version."configstore"."0.1.6"; + by-version."configstore"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "configstore-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/configstore/-/configstore-0.1.5.tgz"; - sha1 = "807cfd60ef69c87f4a7b60561d940190a438503e"; + url = "http://registry.npmjs.org/configstore/-/configstore-0.1.6.tgz"; + sha1 = "3a437dd231db3da8d2d0d6b7be2da64d87a397a6"; }) ]; buildInputs = (self.nativeDeps."configstore" or []); deps = [ - self.by-version."lodash"."1.3.1" + self.by-version."lodash"."2.4.1" self.by-version."mkdirp"."0.3.5" self.by-version."js-yaml"."2.1.3" self.by-version."osenv"."0.0.3" + self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ ]; @@ -2273,13 +2271,13 @@ passthru.names = [ "connect-flash" ]; }; by-spec."connect-jade-static"."*" = - self.by-version."connect-jade-static"."0.1.1"; - by-version."connect-jade-static"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "connect-jade-static-0.1.1"; + self.by-version."connect-jade-static"."0.1.3"; + by-version."connect-jade-static"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "connect-jade-static-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.1.tgz"; - sha1 = "11d16fa00aca28cb004e89cd0a7d6b0fa0342cdb"; + url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.3.tgz"; + sha1 = "ad0e0538c9124355d6da03de13fae63f7b5e0b1b"; }) ]; buildInputs = @@ -2291,7 +2289,7 @@ ]; passthru.names = [ "connect-jade-static" ]; }; - "connect-jade-static" = self.by-version."connect-jade-static"."0.1.1"; + "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3"; by-spec."connect-mongo"."*" = self.by-version."connect-mongo"."0.4.0"; by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -2305,13 +2303,31 @@ buildInputs = (self.nativeDeps."connect-mongo" or []); deps = [ - self.by-version."mongodb"."1.3.20" + self.by-version."mongodb"."1.3.19" ]; peerDependencies = [ ]; passthru.names = [ "connect-mongo" ]; }; "connect-mongo" = self.by-version."connect-mongo"."0.4.0"; + by-spec."connection-parse"."0.0.x" = + self.by-version."connection-parse"."0.0.7"; + by-version."connection-parse"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "connection-parse-0.0.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; + }) + ]; + buildInputs = + (self.nativeDeps."connection-parse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "connection-parse" ]; + }; by-spec."console-browserify"."0.1.x" = self.by-version."console-browserify"."0.1.6"; by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -2343,7 +2359,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.6" + self.by-version."uglify-js"."2.4.7" ]; peerDependencies = [ ]; @@ -2542,7 +2558,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = [ - self.by-version."request"."2.27.0" + self.by-version."request"."2.29.0" ]; peerDependencies = [ ]; @@ -2551,13 +2567,13 @@ by-spec."couch-login"."~0.1.18" = self.by-version."couch-login"."0.1.19"; by-spec."coveralls"."*" = - self.by-version."coveralls"."2.5.0"; - by-version."coveralls"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "coveralls-2.5.0"; + self.by-version."coveralls"."2.6.0"; + by-version."coveralls"."2.6.0" = lib.makeOverridable self.buildNodePackage { + name = "coveralls-2.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.5.0.tgz"; - sha1 = "96d9bdb844438cd98ee9cdcb435a4d6d6aea326f"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.6.0.tgz"; + sha1 = "4bee45246010b5f99d803ebc48ad5b3858708274"; }) ]; buildInputs = @@ -2572,7 +2588,7 @@ ]; passthru.names = [ "coveralls" ]; }; - "coveralls" = self.by-version."coveralls"."2.5.0"; + "coveralls" = self.by-version."coveralls"."2.6.0"; by-spec."crc"."0.2.0" = self.by-version."crc"."0.2.0"; by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -2928,6 +2944,31 @@ ]; passthru.names = [ "debuglog" ]; }; + by-spec."decompress"."~0.1.0" = + self.by-version."decompress"."0.1.4"; + by-version."decompress"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "decompress-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/decompress/-/decompress-0.1.4.tgz"; + sha1 = "b5608768911f794017bfb8017344be6a7cfaf919"; + }) + ]; + buildInputs = + (self.nativeDeps."decompress" or []); + deps = [ + self.by-version."adm-zip"."0.4.3" + self.by-version."mkdirp"."0.3.5" + self.by-version."mout"."0.6.0" + self.by-version."rimraf"."2.2.5" + self.by-version."stream-combiner"."0.0.2" + self.by-version."tar"."0.1.19" + self.by-version."temp"."0.6.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "decompress" ]; + }; by-spec."decompress-zip"."~0.0.3" = self.by-version."decompress-zip"."0.0.3"; by-version."decompress-zip"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -3162,25 +3203,6 @@ ]; passthru.names = [ "domhandler" ]; }; - by-spec."domutils"."1.0" = - self.by-version."domutils"."1.0.1"; - by-version."domutils"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.0.1.tgz"; - sha1 = "58b58d774774911556c16b8b02d99c609d987869"; - }) - ]; - buildInputs = - (self.nativeDeps."domutils" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domutils" ]; - }; by-spec."domutils"."1.1" = self.by-version."domutils"."1.1.6"; by-version."domutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { @@ -3219,6 +3241,29 @@ ]; passthru.names = [ "domutils" ]; }; + by-spec."download"."~0.1.6" = + self.by-version."download"."0.1.7"; + by-version."download"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "download-0.1.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/download/-/download-0.1.7.tgz"; + sha1 = "78be2278a5600e515eff6b01cbf41d694baee855"; + }) + ]; + buildInputs = + (self.nativeDeps."download" or []); + deps = [ + self.by-version."decompress"."0.1.4" + self.by-version."mkdirp"."0.3.5" + self.by-version."request"."2.25.0" + self.by-version."through2"."0.1.0" + self.by-version."async-foreach"."0.1.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "download" ]; + }; by-spec."dtrace-provider"."0.2.8" = self.by-version."dtrace-provider"."0.2.8"; by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage { @@ -3237,6 +3282,24 @@ ]; passthru.names = [ "dtrace-provider" ]; }; + by-spec."duplexer"."~0.0.3" = + self.by-version."duplexer"."0.0.4"; + by-version."duplexer"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "duplexer-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/duplexer/-/duplexer-0.0.4.tgz"; + sha1 = "afcb7f1f8b8d74f820726171d5d64ac9e4a8ff20"; + }) + ]; + buildInputs = + (self.nativeDeps."duplexer" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "duplexer" ]; + }; by-spec."editor"."0.0.5" = self.by-version."editor"."0.0.5"; by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -3384,20 +3447,21 @@ }; "escape-html" = self.by-version."escape-html"."1.0.0"; by-spec."escodegen"."*" = - self.by-version."escodegen"."1.0.0"; - by-version."escodegen"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.0.0"; + self.by-version."escodegen"."1.0.1"; + by-version."escodegen"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.0.tgz"; - sha1 = "8428e45aec9f8d15ccd57859a83c34a91688fd2d"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.1.tgz"; + sha1 = "84c92c4a07440271b90e6b78e620973bf721226e"; }) ]; buildInputs = (self.nativeDeps."escodegen" or []); deps = [ self.by-version."esprima"."1.0.4" - self.by-version."estraverse"."1.4.0" + self.by-version."estraverse"."1.5.0" + self.by-version."esutils"."1.0.0" self.by-version."source-map"."0.1.31" ]; peerDependencies = [ @@ -3449,6 +3513,8 @@ self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.2" = self.by-version."esprima"."1.0.4"; + by-spec."esprima"."~1.0.4" = + self.by-version."esprima"."1.0.4"; by-spec."estraverse"."*" = self.by-version."estraverse"."1.5.0"; by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage { @@ -3485,23 +3551,25 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse"."~1.4.0" = - self.by-version."estraverse"."1.4.0"; - by-version."estraverse"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.4.0"; + by-spec."estraverse"."~1.5.0" = + self.by-version."estraverse"."1.5.0"; + by-spec."esutils"."~1.0.0" = + self.by-version."esutils"."1.0.0"; + by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "esutils-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.4.0.tgz"; - sha1 = "c6e1ad13b3f1b389da32214f2debe4788382bfc6"; + url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; }) ]; buildInputs = - (self.nativeDeps."estraverse" or []); + (self.nativeDeps."esutils" or []); deps = [ ]; peerDependencies = [ ]; - passthru.names = [ "estraverse" ]; + passthru.names = [ "esutils" ]; }; by-spec."event-emitter"."~0.2.2" = self.by-version."event-emitter"."0.2.2"; @@ -3979,6 +4047,31 @@ ]; passthru.names = [ "faye-websocket" ]; }; + by-spec."file-utils"."~0.1.1" = + self.by-version."file-utils"."0.1.5"; + by-version."file-utils"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "file-utils-0.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz"; + sha1 = "dc8153c855387cb4dacb0a1725531fa444a6b48c"; + }) + ]; + buildInputs = + (self.nativeDeps."file-utils" or []); + deps = [ + self.by-version."lodash"."2.1.0" + self.by-version."iconv-lite"."0.2.11" + self.by-version."rimraf"."2.2.5" + self.by-version."glob"."3.2.7" + self.by-version."minimatch"."0.2.12" + self.by-version."findup-sync"."0.1.2" + self.by-version."isbinaryfile"."0.1.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "file-utils" ]; + }; by-spec."fileset"."0.1.x" = self.by-version."fileset"."0.1.5"; by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -4123,14 +4216,32 @@ ]; passthru.names = [ "forEachAsync" ]; }; + by-spec."foreach"."~2.0.1" = + self.by-version."foreach"."2.0.4"; + by-version."foreach"."2.0.4" = lib.makeOverridable self.buildNodePackage { + name = "foreach-2.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/foreach/-/foreach-2.0.4.tgz"; + sha1 = "cc5d0d8ae1d46cc9a555c2682f910977859935df"; + }) + ]; + buildInputs = + (self.nativeDeps."foreach" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "foreach" ]; + }; by-spec."forever"."*" = - self.by-version."forever"."0.10.9"; - by-version."forever"."0.10.9" = lib.makeOverridable self.buildNodePackage { - name = "forever-0.10.9"; + self.by-version."forever"."0.10.10"; + by-version."forever"."0.10.10" = lib.makeOverridable self.buildNodePackage { + name = "forever-0.10.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.10.9.tgz"; - sha1 = "e4849f459ec27d5a6524fd466e67dfd6222bd9bb"; + url = "http://registry.npmjs.org/forever/-/forever-0.10.10.tgz"; + sha1 = "2328bc366bd392e1536f34f866ec39d31ddf5a12"; }) ]; buildInputs = @@ -4144,7 +4255,7 @@ self.by-version."nssocket"."0.5.1" self.by-version."optimist"."0.4.0" self.by-version."pkginfo"."0.3.0" - self.by-version."timespan"."2.0.1" + self.by-version."timespan"."2.1.0" self.by-version."watch"."0.7.0" self.by-version."utile"."0.1.7" self.by-version."winston"."0.7.1" @@ -4153,7 +4264,7 @@ ]; passthru.names = [ "forever" ]; }; - "forever" = self.by-version."forever"."0.10.9"; + "forever" = self.by-version."forever"."0.10.10"; by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -4430,7 +4541,7 @@ self.by-version."ncp"."0.4.2" self.by-version."mkdirp"."0.3.5" self.by-version."jsonfile"."1.0.1" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" ]; peerDependencies = [ ]; @@ -4490,7 +4601,7 @@ buildInputs = (self.nativeDeps."fstream" or []); deps = [ - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."mkdirp"."0.3.5" self.by-version."graceful-fs"."2.0.1" self.by-version."inherits"."2.0.1" @@ -4551,13 +4662,13 @@ passthru.names = [ "fstream-npm" ]; }; by-spec."generator-angular"."*" = - self.by-version."generator-angular"."0.6.0-rc.2"; - by-version."generator-angular"."0.6.0-rc.2" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.6.0-rc.2"; + self.by-version."generator-angular"."0.6.0"; + by-version."generator-angular"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "generator-angular-0.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0-rc.2.tgz"; - sha1 = "775a858e5dd9dc9f0a85730274d02c6af5d232b1"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0.tgz"; + sha1 = "84479e9ab2476dfbf571feb45e6fe8edbad2c951"; }) ]; buildInputs = @@ -4567,11 +4678,11 @@ ]; peerDependencies = [ self.by-version."generator-karma"."0.6.0" - self.by-version."yo"."1.0.4" + self.by-version."yo"."1.0.5" ]; passthru.names = [ "generator-angular" ]; }; - "generator-angular" = self.by-version."generator-angular"."0.6.0-rc.2"; + "generator-angular" = self.by-version."generator-angular"."0.6.0"; by-spec."generator-karma"."~0.6.0" = self.by-version."generator-karma"."0.6.0"; by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -4588,26 +4699,27 @@ self.by-version."yeoman-generator"."0.13.4" ]; peerDependencies = [ - self.by-version."yo"."1.0.4" + self.by-version."yo"."1.0.5" ]; passthru.names = [ "generator-karma" ]; }; by-spec."generator-mocha"."~0.1.1" = - self.by-version."generator-mocha"."0.1.1"; - by-version."generator-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "generator-mocha-0.1.1"; + self.by-version."generator-mocha"."0.1.2"; + by-version."generator-mocha"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "generator-mocha-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.1.tgz"; - sha1 = "818f7028a1c149774a882a0e3c7c04ba9852d7d1"; + url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.2.tgz"; + sha1 = "f59f93e08aeeceeb8150e39ef2b35925fb30692c"; }) ]; buildInputs = (self.nativeDeps."generator-mocha" or []); deps = [ - self.by-version."yeoman-generator"."0.10.5" + self.by-version."yeoman-generator"."0.14.1" ]; peerDependencies = [ + self.by-version."yo"."1.0.5" ]; passthru.names = [ "generator-mocha" ]; }; @@ -4628,8 +4740,8 @@ self.by-version."cheerio"."0.12.4" ]; peerDependencies = [ - self.by-version."yo"."1.0.4" - self.by-version."generator-mocha"."0.1.1" + self.by-version."yo"."1.0.5" + self.by-version."generator-mocha"."0.1.2" ]; passthru.names = [ "generator-webapp" ]; }; @@ -4845,6 +4957,8 @@ self.by-version."graceful-fs"."2.0.1"; by-spec."graceful-fs"."~2.0.0" = self.by-version."graceful-fs"."2.0.1"; + by-spec."graceful-fs"."~2.0.1" = + self.by-version."graceful-fs"."2.0.1"; by-spec."gridfs-stream"."*" = self.by-version."gridfs-stream"."0.4.0"; by-version."gridfs-stream"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -5017,13 +5131,13 @@ }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.7.2"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.8.2"; - by-version."grunt-contrib-less"."0.8.2" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-less-0.8.2"; + self.by-version."grunt-contrib-less"."0.8.3"; + by-version."grunt-contrib-less"."0.8.3" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-less-0.8.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.2.tgz"; - sha1 = "d94e5c69251aec1a48ee154147b808a10ff6f711"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.3.tgz"; + sha1 = "8a0e9183577339ad08729f57a9a4adeff6c41410"; }) ]; buildInputs = @@ -5037,7 +5151,7 @@ ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.2"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.3"; by-spec."grunt-contrib-requirejs"."*" = self.by-version."grunt-contrib-requirejs"."0.4.1"; by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage { @@ -5072,7 +5186,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.by-version."uglify-js"."2.4.6" + self.by-version."uglify-js"."2.4.7" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -5082,13 +5196,13 @@ }; "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.2.7"; by-spec."grunt-karma"."*" = - self.by-version."grunt-karma"."0.7.1"; - by-version."grunt-karma"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-karma-0.7.1"; + self.by-version."grunt-karma"."0.7.2"; + by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "grunt-karma-0.7.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.1.tgz"; - sha1 = "7fb8c40988b8e88da454afb821a7a925ed05ff81"; + url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.2.tgz"; + sha1 = "1d041d9833671c2bca671cd66bd874c96b2a631e"; }) ]; buildInputs = @@ -5098,11 +5212,11 @@ ]; peerDependencies = [ self.by-version."grunt"."0.4.2" - self.by-version."karma"."0.10.7" + self.by-version."karma"."0.11.9" ]; passthru.names = [ "grunt-karma" ]; }; - "grunt-karma" = self.by-version."grunt-karma"."0.7.1"; + "grunt-karma" = self.by-version."grunt-karma"."0.7.2"; by-spec."grunt-lib-contrib"."~0.6.0" = self.by-version."grunt-lib-contrib"."0.6.1"; by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -5248,6 +5362,26 @@ ]; passthru.names = [ "hasher" ]; }; + by-spec."hashring"."1.0.1" = + self.by-version."hashring"."1.0.1"; + by-version."hashring"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "hashring-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz"; + sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c"; + }) + ]; + buildInputs = + (self.nativeDeps."hashring" or []); + deps = [ + self.by-version."connection-parse"."0.0.7" + self.by-version."simple-lru-cache"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hashring" ]; + }; by-spec."hat"."*" = self.by-version."hat"."0.0.3"; by-version."hat"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -5485,27 +5619,6 @@ ]; passthru.names = [ "hooks" ]; }; - by-spec."htmlparser2"."2.x" = - self.by-version."htmlparser2"."2.6.0"; - by-version."htmlparser2"."2.6.0" = lib.makeOverridable self.buildNodePackage { - name = "htmlparser2-2.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-2.6.0.tgz"; - sha1 = "b28564ea9d1ba56a104ace6a7b0fdda2f315836f"; - }) - ]; - buildInputs = - (self.nativeDeps."htmlparser2" or []); - deps = [ - self.by-version."domhandler"."2.0.3" - self.by-version."domutils"."1.0.1" - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "htmlparser2" ]; - }; by-spec."htmlparser2"."3.1.4" = self.by-version."htmlparser2"."3.1.4"; by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage { @@ -5655,14 +5768,14 @@ passthru.names = [ "i18next" ]; }; "i18next" = self.by-version."i18next"."1.7.1"; - by-spec."ibrik"."~0.0.4" = - self.by-version."ibrik"."0.0.4"; - by-version."ibrik"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "ibrik-0.0.4"; + by-spec."ibrik"."~1.0.1" = + self.by-version."ibrik"."1.0.1"; + by-version."ibrik"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "ibrik-1.0.1"; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/ibrik/-/ibrik-0.0.4.tgz"; - sha1 = "1ce60747afe56ecee03cd1f6f0db30ce579961e4"; + url = "http://registry.npmjs.org/ibrik/-/ibrik-1.0.1.tgz"; + sha1 = "ba9c0cf9302c51a812dc4a92038b3de579c0aefb"; }) ]; buildInputs = @@ -5671,7 +5784,7 @@ self.by-version."coffee-script-redux"."2.0.0-beta4" self.by-version."istanbul"."0.1.46" self.by-version."optimist"."0.6.0" - self.by-version."escodegen"."1.0.0" + self.by-version."escodegen"."1.0.1" self.by-version."mkdirp"."0.3.5" self.by-version."which"."1.0.5" self.by-version."estraverse"."1.5.0" @@ -5700,6 +5813,24 @@ }; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; + by-spec."indexof"."~0.0.1" = + self.by-version."indexof"."0.0.1"; + by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "indexof-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }) + ]; + buildInputs = + (self.nativeDeps."indexof" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "indexof" ]; + }; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5833,14 +5964,14 @@ }; by-spec."inquirer"."~0.3.1" = self.by-version."inquirer"."0.3.5"; - by-spec."insight"."~0.2.0" = - self.by-version."insight"."0.2.0"; - by-version."insight"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "insight-0.2.0"; + by-spec."insight"."~0.3.0" = + self.by-version."insight"."0.3.0"; + by-version."insight"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "insight-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/insight/-/insight-0.2.0.tgz"; - sha1 = "3b430f3c903558d690d1b96c7479b6f1b9186a5e"; + url = "http://registry.npmjs.org/insight/-/insight-0.3.0.tgz"; + sha1 = "9d922133f560f7633abfc8f91451bda5e2cf2f71"; }) ]; buildInputs = @@ -5848,7 +5979,7 @@ deps = [ self.by-version."chalk"."0.2.1" self.by-version."request"."2.27.0" - self.by-version."configstore"."0.1.5" + self.by-version."configstore"."0.1.6" self.by-version."async"."0.2.9" self.by-version."lodash"."1.3.1" self.by-version."inquirer"."0.2.5" @@ -5910,6 +6041,42 @@ passthru.names = [ "ironhorse" ]; }; "ironhorse" = self.by-version."ironhorse"."0.0.9"; + by-spec."is"."~0.2.6" = + self.by-version."is"."0.2.6"; + by-version."is"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "is-0.2.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is/-/is-0.2.6.tgz"; + sha1 = "36681b7c4328a75a6dd4b6d8f7131e4f81de55c0"; + }) + ]; + buildInputs = + (self.nativeDeps."is" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "is" ]; + }; + by-spec."is-object"."~0.1.2" = + self.by-version."is-object"."0.1.2"; + by-version."is-object"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "is-object-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz"; + sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7"; + }) + ]; + buildInputs = + (self.nativeDeps."is-object" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "is-object" ]; + }; by-spec."is-promise"."~1" = self.by-version."is-promise"."1.0.0"; by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5946,6 +6113,8 @@ ]; passthru.names = [ "isbinaryfile" ]; }; + by-spec."isbinaryfile"."~0.1.9" = + self.by-version."isbinaryfile"."0.1.9"; by-spec."istanbul"."*" = self.by-version."istanbul"."0.1.46"; by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage { @@ -6340,13 +6509,13 @@ passthru.names = [ "jsprim" ]; }; by-spec."junk"."~0.2.0" = - self.by-version."junk"."0.2.1"; - by-version."junk"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "junk-0.2.1"; + self.by-version."junk"."0.2.2"; + by-version."junk"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "junk-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/junk/-/junk-0.2.1.tgz"; - sha1 = "e8a4c42c421746da34b354d0510507cb79f3c583"; + url = "http://registry.npmjs.org/junk/-/junk-0.2.2.tgz"; + sha1 = "d595eb199b37930cecd1f2c52820847e80e48ae7"; }) ]; buildInputs = @@ -6358,107 +6527,25 @@ passthru.names = [ "junk" ]; }; by-spec."karma"."*" = - self.by-version."karma"."0.11.7"; - "karma" = self.by-version."karma"."0.11.7"; - by-spec."karma".">=0.9" = - self.by-version."karma"."0.11.7"; - by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.11.7"; - by-spec."karma"."~0.10.0" = - self.by-version."karma"."0.10.7"; - by-version."karma"."0.10.7" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.7"; + self.by-version."karma"."0.11.9"; + by-version."karma-jasmine"."0.1.4" = self.by-version."karma"."0.11.9"; + by-version."karma-requirejs"."0.2.0" = self.by-version."karma"."0.11.9"; + by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma"."0.11.9"; + by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma"."0.11.9"; + by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma"."0.11.9"; + by-version."karma-firefox-launcher"."0.1.2" = self.by-version."karma"."0.11.9"; + by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma"."0.11.9"; + by-version."karma-script-launcher"."0.1.0" = self.by-version."karma"."0.11.9"; + by-version."karma"."0.11.9" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.11.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.7.tgz"; - sha1 = "de49e2323a187ecb688470c2ad3be6a30bc7c270"; + url = "http://registry.npmjs.org/karma/-/karma-0.11.9.tgz"; + sha1 = "0726f8fe8424179c660eff358476fb8b502b7d0f"; }) - ]; - buildInputs = - (self.nativeDeps."karma" or []); - deps = [ - self.by-version."di"."0.0.1" - self.by-version."socket.io"."0.9.16" - self.by-version."chokidar"."0.7.1" - self.by-version."glob"."3.1.21" - self.by-version."minimatch"."0.2.12" - self.by-version."http-proxy"."0.10.3" - self.by-version."optimist"."0.3.7" - self.by-version."coffee-script"."1.6.3" - self.by-version."rimraf"."2.1.4" - self.by-version."q"."0.9.7" - self.by-version."colors"."0.6.0-1" - self.by-version."lodash"."1.1.1" - self.by-version."mime"."1.2.11" - self.by-version."log4js"."0.6.9" - self.by-version."useragent"."2.0.7" - self.by-version."graceful-fs"."1.2.3" - self.by-version."connect"."2.8.8" - ]; - peerDependencies = [ - self.by-version."karma-jasmine"."0.1.3" - self.by-version."karma-requirejs"."0.2.0" - self.by-version."karma-coffee-preprocessor"."0.1.1" - self.by-version."karma-html2js-preprocessor"."0.1.0" - self.by-version."karma-chrome-launcher"."0.1.1" - self.by-version."karma-firefox-launcher"."0.1.2" - self.by-version."karma-phantomjs-launcher"."0.1.1" - self.by-version."karma-script-launcher"."0.1.0" - ]; - passthru.names = [ "karma" ]; - }; - by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.1"; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.1"; - by-spec."karma-coffee-preprocessor"."*" = - self.by-version."karma-coffee-preprocessor"."0.1.1"; - by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.1.3"; - by-version."karma-coverage"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "karma-coverage-0.1.3"; - src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.3.tgz"; - sha1 = "4a936fa89a2c06c339ad953a10c6d25eb6794204"; - }) - ]; - buildInputs = - (self.nativeDeps."karma-coverage" or []); - deps = [ - self.by-version."istanbul"."0.1.46" - self.by-version."ibrik"."0.0.4" - self.by-version."dateformat"."1.0.6-1.2.3" - ]; - peerDependencies = [ - self.by-version."karma"."0.11.7" - ]; - passthru.names = [ "karma-coverage" ]; - }; - "karma-coverage" = self.by-version."karma-coverage"."0.1.3"; - by-spec."karma-firefox-launcher"."*" = - self.by-version."karma-firefox-launcher"."0.1.2"; - by-spec."karma-html2js-preprocessor"."*" = - self.by-version."karma-html2js-preprocessor"."0.1.0"; - by-spec."karma-jasmine"."*" = - self.by-version."karma-jasmine"."0.1.3"; - by-version."karma"."0.11.7" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-requirejs"."0.2.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-firefox-launcher"."0.1.2" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-script-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-jasmine"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "karma-jasmine-0.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz"; - sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.7.tgz"; - sha1 = "86f44de1c44016e5af3492bceb6dea99799b18fb"; + url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.4.tgz"; + sha1 = "6731409c0b587f3895c9b0966c249058d650b3d3"; }) (fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.0.tgz"; @@ -6490,8 +6577,8 @@ }) ]; buildInputs = - (self.nativeDeps."karma-jasmine" or []) - ++ (self.nativeDeps."karma" or []) + (self.nativeDeps."karma" or []) + ++ (self.nativeDeps."karma-jasmine" or []) ++ (self.nativeDeps."karma-requirejs" or []) ++ (self.nativeDeps."karma-coffee-preprocessor" or []) ++ (self.nativeDeps."karma-html2js-preprocessor" or []) @@ -6517,13 +6604,54 @@ self.by-version."useragent"."2.0.7" self.by-version."graceful-fs"."1.2.3" self.by-version."connect"."2.8.8" - self.by-version."phantomjs"."1.9.2-4" + self.by-version."phantomjs"."1.9.2-5" ]; peerDependencies = [ self.by-version."requirejs"."2.1.9" ]; - passthru.names = [ "karma-jasmine" "karma" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; + passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; + }; + "karma" = self.by-version."karma"."0.11.9"; + by-spec."karma".">=0.9" = + self.by-version."karma"."0.11.9"; + by-spec."karma".">=0.9.3" = + self.by-version."karma"."0.11.9"; + by-spec."karma"."~0.11.0" = + self.by-version."karma"."0.11.9"; + by-spec."karma-chrome-launcher"."*" = + self.by-version."karma-chrome-launcher"."0.1.1"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.1"; + by-spec."karma-coffee-preprocessor"."*" = + self.by-version."karma-coffee-preprocessor"."0.1.1"; + by-spec."karma-coverage"."*" = + self.by-version."karma-coverage"."0.1.4"; + by-version."karma-coverage"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "karma-coverage-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.4.tgz"; + sha1 = "53766bad4dc2aa26dcc1be95ded7809be8032d8e"; + }) + ]; + buildInputs = + (self.nativeDeps."karma-coverage" or []); + deps = [ + self.by-version."istanbul"."0.1.46" + self.by-version."ibrik"."1.0.1" + self.by-version."dateformat"."1.0.6-1.2.3" + ]; + peerDependencies = [ + self.by-version."karma"."0.11.9" + ]; + passthru.names = [ "karma-coverage" ]; }; + "karma-coverage" = self.by-version."karma-coverage"."0.1.4"; + by-spec."karma-firefox-launcher"."*" = + self.by-version."karma-firefox-launcher"."0.1.2"; + by-spec."karma-html2js-preprocessor"."*" = + self.by-version."karma-html2js-preprocessor"."0.1.0"; + by-spec."karma-jasmine"."*" = + self.by-version."karma-jasmine"."0.1.4"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.1"; by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -6540,7 +6668,7 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.11.7" + self.by-version."karma"."0.11.9" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -6560,7 +6688,7 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.7" + self.by-version."karma"."0.11.9" self.by-version."mocha"."1.15.1" ]; passthru.names = [ "karma-mocha" ]; @@ -6590,7 +6718,7 @@ self.by-version."saucelabs"."0.1.1" ]; peerDependencies = [ - self.by-version."karma"."0.11.7" + self.by-version."karma"."0.11.9" ]; passthru.names = [ "karma-sauce-launcher" ]; }; @@ -6793,7 +6921,7 @@ passthru.names = [ "lcov-result-merger" ]; }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; - by-spec."less"."~1.5.0" = + by-spec."less"."~1.5.1" = self.by-version."less"."1.5.1"; by-version."less"."1.5.1" = lib.makeOverridable self.buildNodePackage { name = "less-1.5.1"; @@ -6807,7 +6935,7 @@ (self.nativeDeps."less" or []); deps = [ self.by-version."mime"."1.2.11" - self.by-version."request"."2.27.0" + self.by-version."request"."2.29.0" self.by-version."mkdirp"."0.3.5" self.by-version."clean-css"."2.0.2" self.by-version."source-map"."0.1.31" @@ -6944,8 +7072,6 @@ ]; passthru.names = [ "lodash" ]; }; - by-spec."lodash"."~1.1.1" = - self.by-version."lodash"."1.1.1"; by-spec."lodash"."~1.2.1" = self.by-version."lodash"."1.2.1"; by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -6984,6 +7110,42 @@ }; by-spec."lodash"."~1.3.1" = self.by-version."lodash"."1.3.1"; + by-spec."lodash"."~2.1.0" = + self.by-version."lodash"."2.1.0"; + by-version."lodash"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "lodash-2.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"; + sha1 = "0637eaaa36a8a1cfc865c3adfb942189bfb0998d"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash" ]; + }; + by-spec."lodash"."~2.2.1" = + self.by-version."lodash"."2.2.1"; + by-version."lodash"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "lodash-2.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz"; + sha1 = "ca935fd14ab3c0c872abacf198b9cda501440867"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash" ]; + }; by-spec."lodash"."~2.3.0" = self.by-version."lodash"."2.3.0"; by-version."lodash"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -7002,6 +7164,24 @@ ]; passthru.names = [ "lodash" ]; }; + by-spec."lodash"."~2.4.1" = + self.by-version."lodash"."2.4.1"; + by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "lodash-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"; + sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash" ]; + }; by-spec."log-driver"."1.2.1" = self.by-version."log-driver"."1.2.1"; by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -7610,13 +7790,13 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.3.20"; - by-version."mongodb"."1.3.20" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.20"; + self.by-version."mongodb"."1.4.0-rc2"; + by-version."mongodb"."1.4.0-rc2" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.4.0-rc2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.20.tgz"; - sha1 = "257f1570295fe020248ea8329b58d47ec9ceac62"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc2.tgz"; + sha1 = "00396d1af8ec807c6954e8608df84360d8cd2c07"; }) ]; buildInputs = @@ -7629,7 +7809,7 @@ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.3.20"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc2"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -7670,7 +7850,7 @@ passthru.names = [ "mongodb" ]; }; by-spec."mongodb"."1.3.x" = - self.by-version."mongodb"."1.3.20"; + self.by-version."mongodb"."1.3.19"; by-spec."mongoose"."*" = self.by-version."mongoose"."3.8.1"; by-version."mongoose"."3.8.1" = lib.makeOverridable self.buildNodePackage { @@ -8084,6 +8264,24 @@ ]; passthru.names = [ "nan" ]; }; + by-spec."nan"."~0.6.0" = + self.by-version."nan"."0.6.0"; + by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "nan-0.6.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz"; + sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; by-spec."natural"."0.0.69" = self.by-version."natural"."0.0.69"; by-version."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage { @@ -8303,24 +8501,25 @@ }; "nijs" = self.by-version."nijs"."0.0.12"; by-spec."node-expat"."*" = - self.by-version."node-expat"."2.0.0"; - by-version."node-expat"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-expat-2.0.0"; + self.by-version."node-expat"."2.1.3"; + by-version."node-expat"."2.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-expat-2.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.0.0.tgz"; - sha1 = "a10271b3463484fa4b59895df61693a1de4ac735"; + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.3.tgz"; + sha1 = "c5c5c3bc3f3922d281087ca46e3f9926b9f55dc9"; }) ]; buildInputs = (self.nativeDeps."node-expat" or []); deps = [ + self.by-version."nan"."0.6.0" ]; peerDependencies = [ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.0.0"; + "node-expat" = self.by-version."node-expat"."2.1.3"; by-spec."node-gyp"."*" = self.by-version."node-gyp"."0.12.1"; by-version."node-gyp"."0.12.1" = lib.makeOverridable self.buildNodePackage { @@ -8342,10 +8541,10 @@ self.by-version."nopt"."2.1.2" self.by-version."npmlog"."0.0.6" self.by-version."osenv"."0.0.3" - self.by-version."request"."2.27.0" - self.by-version."rimraf"."2.2.4" + self.by-version."request"."2.29.0" + self.by-version."rimraf"."2.2.5" self.by-version."semver"."2.2.1" - self.by-version."tar"."0.1.18" + self.by-version."tar"."0.1.19" self.by-version."which"."1.0.5" ]; peerDependencies = [ @@ -8356,13 +8555,13 @@ by-spec."node-gyp"."~0.12.0" = self.by-version."node-gyp"."0.12.1"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.6.1"; - by-version."node-inspector"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.6.1"; + self.by-version."node-inspector"."0.6.2"; + by-version."node-inspector"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.6.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.1.tgz"; - sha1 = "9ed1b1dd4410fe4f2929b93c98c55378a3edd6f0"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.2.tgz"; + sha1 = "0471a3f4ef5c53e4e567466f93b179d77d1ba5c6"; }) ]; buildInputs = @@ -8380,7 +8579,7 @@ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.6.1"; + "node-inspector" = self.by-version."node-inspector"."0.6.2"; by-spec."node-swt".">=0.1.1" = self.by-version."node-swt"."0.1.1"; by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -8399,14 +8598,14 @@ ]; passthru.names = [ "node-swt" ]; }; - by-spec."node-syslog"."1.1.3" = - self.by-version."node-syslog"."1.1.3"; - by-version."node-syslog"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-syslog-1.1.3"; + by-spec."node-syslog"."1.1.7" = + self.by-version."node-syslog"."1.1.7"; + by-version."node-syslog"."1.1.7" = lib.makeOverridable self.buildNodePackage { + name = "node-syslog-1.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.3.tgz"; - sha1 = "dce11e3091d39889a2af166501e67e0098a0bb64"; + url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz"; + sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb"; }) ]; buildInputs = @@ -8568,13 +8767,13 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."0.9.10"; - by-version."nodemon"."0.9.10" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-0.9.10"; + self.by-version."nodemon"."0.9.14"; + by-version."nodemon"."0.9.14" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-0.9.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.10.tgz"; - sha1 = "4faca02a4df262cda9334ef24bfadca14c5c3112"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.14.tgz"; + sha1 = "41c401aaea5b4306aab6ba71f12d3c8a1e693440"; }) ]; buildInputs = @@ -8586,7 +8785,7 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."0.9.10"; + "nodemon" = self.by-version."nodemon"."0.9.14"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -8711,10 +8910,10 @@ self.by-version."graceful-fs"."2.0.1" self.by-version."minimatch"."0.2.12" self.by-version."nopt"."2.1.2" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."request"."2.27.0" self.by-version."which"."1.0.5" - self.by-version."tar"."0.1.18" + self.by-version."tar"."0.1.19" self.by-version."fstream"."0.1.25" self.by-version."block-stream"."0.0.7" self.by-version."mkdirp"."0.3.5" @@ -8736,7 +8935,7 @@ self.by-version."lockfile"."0.4.2" self.by-version."retry"."0.6.0" self.by-version."once"."1.3.0" - self.by-version."npmconf"."0.1.6" + self.by-version."npmconf"."0.1.7" self.by-version."opener"."1.3.0" self.by-version."chmodr"."0.1.0" self.by-version."cmd-shim"."1.1.1" @@ -8767,13 +8966,13 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.27.0" + self.by-version."request"."2.29.0" self.by-version."graceful-fs"."2.0.1" self.by-version."semver"."2.0.11" self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."retry"."0.6.0" self.by-version."couch-login"."0.1.19" self.by-version."npmlog"."0.0.6" @@ -8795,13 +8994,13 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.27.0" + self.by-version."request"."2.29.0" self.by-version."graceful-fs"."2.0.1" self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."retry"."0.6.0" self.by-version."couch-login"."0.1.19" self.by-version."npmlog"."0.0.6" @@ -8908,13 +9107,13 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.6"; - by-version."npmconf"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.6"; + self.by-version."npmconf"."0.1.7"; + by-version."npmconf"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.6.tgz"; - sha1 = "e23b5c028758877d31ef6daf8a566059442459b6"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.7.tgz"; + sha1 = "f0be6f90c672046b562175b6d99c2d152bd9f17c"; }) ]; buildInputs = @@ -8934,7 +9133,7 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.6" = - self.by-version."npmconf"."0.1.6"; + self.by-version."npmconf"."0.1.7"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -9050,6 +9249,27 @@ ]; passthru.names = [ "object-additions" ]; }; + by-spec."object-keys"."~0.2.0" = + self.by-version."object-keys"."0.2.0"; + by-version."object-keys"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "object-keys-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz"; + sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67"; + }) + ]; + buildInputs = + (self.nativeDeps."object-keys" or []); + deps = [ + self.by-version."foreach"."2.0.4" + self.by-version."indexof"."0.0.1" + self.by-version."is"."0.2.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "object-keys" ]; + }; by-spec."once"."1.1.1" = self.by-version."once"."1.1.1"; by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -9458,13 +9678,13 @@ passthru.names = [ "pause" ]; }; by-spec."phantomjs"."~1.9" = - self.by-version."phantomjs"."1.9.2-4"; - by-version."phantomjs"."1.9.2-4" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.2-4"; + self.by-version."phantomjs"."1.9.2-5"; + by-version."phantomjs"."1.9.2-5" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.2-5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-4.tgz"; - sha1 = "fbf6c8df9dc963f9a4020764495152e0099d6d42"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-5.tgz"; + sha1 = "455f8fb45bab776715e016fea3086ccc34ff102b"; }) ]; buildInputs = @@ -9475,7 +9695,7 @@ self.by-version."ncp"."0.4.2" self.by-version."npmconf"."0.0.24" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" self.by-version."which"."1.0.5" ]; peerDependencies = [ @@ -9483,7 +9703,7 @@ passthru.names = [ "phantomjs" ]; }; by-spec."phantomjs"."~1.9.1-2" = - self.by-version."phantomjs"."1.9.2-4"; + self.by-version."phantomjs"."1.9.2-5"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -9739,7 +9959,7 @@ ]; passthru.names = [ "ps-tree" ]; }; - by-spec."punycode"."~1.2.3" = + by-spec."punycode".">=0.2.0" = self.by-version."punycode"."1.2.3"; by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage { name = "punycode-1.2.3"; @@ -9757,6 +9977,8 @@ ]; passthru.names = [ "punycode" ]; }; + by-spec."punycode"."~1.2.3" = + self.by-version."punycode"."1.2.3"; by-spec."q"."0.9.x" = self.by-version."q"."0.9.7"; by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage { @@ -10415,13 +10637,13 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.27.0"; - by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.27.0"; + self.by-version."request"."2.29.0"; + by-version."request"."2.29.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.29.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; - sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; + url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz"; + sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3"; }) ]; buildInputs = @@ -10430,24 +10652,24 @@ self.by-version."qs"."0.6.6" self.by-version."json-stringify-safe"."5.0.0" self.by-version."forever-agent"."0.5.0" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign"."0.3.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."cookie-jar"."0.3.0" self.by-version."node-uuid"."1.4.1" self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.9.15" self.by-version."form-data"."0.1.2" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" ]; peerDependencies = [ ]; passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.27.0"; + self.by-version."request"."2.29.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.27.0"; + self.by-version."request"."2.29.0"; by-spec."request"."2.16.2" = self.by-version."request"."2.16.2"; by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { @@ -10525,11 +10747,9 @@ passthru.names = [ "request" ]; }; by-spec."request".">=2.12.0" = - self.by-version."request"."2.27.0"; + self.by-version."request"."2.29.0"; by-spec."request"."~2" = - self.by-version."request"."2.27.0"; - by-spec."request"."~2.16.6" = - self.by-version."request"."2.16.6"; + self.by-version."request"."2.29.0"; by-spec."request"."~2.21.0" = self.by-version."request"."2.21.0"; by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage { @@ -10592,6 +10812,34 @@ }; by-spec."request"."~2.27.0" = self.by-version."request"."2.27.0"; + by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.27.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; + sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.0" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign"."0.3.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."cookie-jar"."0.3.0" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."form-data"."0.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; by-spec."request-progress"."~0.3.0" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -10778,28 +11026,27 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.4"; - by-version."rimraf"."2.2.4" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.4"; + self.by-version."rimraf"."2.2.5"; + by-version."rimraf"."2.2.5" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.4.tgz"; - sha1 = "9f0b530f829f7b655a6e4d2fd8cf4c042336ef58"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.5.tgz"; + sha1 = "4e5c4f667b121afa806d0c5b58920996f9478aa0"; }) ]; buildInputs = (self.nativeDeps."rimraf" or []); deps = [ - self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2.x.x" = - self.by-version."rimraf"."2.2.4"; + self.by-version."rimraf"."2.2.5"; by-spec."rimraf"."~2" = - self.by-version."rimraf"."2.2.4"; + self.by-version."rimraf"."2.2.5"; by-spec."rimraf"."~2.0.2" = self.by-version."rimraf"."2.0.3"; by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10843,9 +11090,9 @@ by-spec."rimraf"."~2.1.4" = self.by-version."rimraf"."2.1.4"; by-spec."rimraf"."~2.2.0" = - self.by-version."rimraf"."2.2.4"; + self.by-version."rimraf"."2.2.5"; by-spec."rimraf"."~2.2.2" = - self.by-version."rimraf"."2.2.4"; + self.by-version."rimraf"."2.2.5"; by-spec."s3http"."*" = self.by-version."s3http"."0.0.3"; by-version."s3http"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10859,7 +11106,7 @@ buildInputs = (self.nativeDeps."s3http" or []); deps = [ - self.by-version."aws-sdk"."1.13.0" + self.by-version."aws-sdk"."1.14.0" self.by-version."commander"."2.0.0" self.by-version."http-auth"."2.0.7" self.by-version."express"."3.4.4" @@ -10913,13 +11160,13 @@ passthru.names = [ "saucelabs" ]; }; by-spec."sax"."0.5.x" = - self.by-version."sax"."0.5.5"; - by-version."sax"."0.5.5" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.5.5"; + self.by-version."sax"."0.5.8"; + by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage { + name = "sax-0.5.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.5.5.tgz"; - sha1 = "b1ec13d77397248d059bcc18bb9530d8210bb5d3"; + url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }) ]; buildInputs = @@ -10931,15 +11178,15 @@ passthru.names = [ "sax" ]; }; by-spec."sax".">=0.4.2" = - self.by-version."sax"."0.5.5"; + self.by-version."sax"."0.5.8"; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.37.0"; - by-version."selenium-webdriver"."2.37.0" = lib.makeOverridable self.buildNodePackage { - name = "selenium-webdriver-2.37.0"; + self.by-version."selenium-webdriver"."2.38.1"; + by-version."selenium-webdriver"."2.38.1" = lib.makeOverridable self.buildNodePackage { + name = "selenium-webdriver-2.38.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.37.0.tgz"; - sha1 = "02a8c9240203c22d0400d466253d4af3f63748b8"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.38.1.tgz"; + sha1 = "9299e3b808bec401334ca4e80cb0b70b872be651"; }) ]; buildInputs = @@ -10950,7 +11197,7 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.37.0"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.38.1"; by-spec."semver"."*" = self.by-version."semver"."2.2.1"; by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -11184,14 +11431,32 @@ }; by-spec."shelljs"."~0.1.4" = self.by-version."shelljs"."0.1.4"; + by-spec."shelljs"."~0.2.6" = + self.by-version."shelljs"."0.2.6"; + by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "shelljs-0.2.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"; + sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378"; + }) + ]; + buildInputs = + (self.nativeDeps."shelljs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shelljs" ]; + }; by-spec."should"."*" = - self.by-version."should"."2.1.0"; - by-version."should"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "should-2.1.0"; + self.by-version."should"."2.1.1"; + by-version."should"."2.1.1" = lib.makeOverridable self.buildNodePackage { + name = "should-2.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-2.1.0.tgz"; - sha1 = "6bffa59a47892206fed91fe0f2b7217bda61e9ca"; + url = "http://registry.npmjs.org/should/-/should-2.1.1.tgz"; + sha1 = "c648b13a8b464465c2f838ea0c93f12e4ae06c6b"; }) ]; buildInputs = @@ -11202,7 +11467,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."2.1.0"; + "should" = self.by-version."should"."2.1.1"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -11243,6 +11508,24 @@ self.by-version."signals"."1.0.0"; by-spec."signals"."~1.0.0" = self.by-version."signals"."1.0.0"; + by-spec."simple-lru-cache"."0.0.x" = + self.by-version."simple-lru-cache"."0.0.1"; + by-version."simple-lru-cache"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "simple-lru-cache-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz"; + sha1 = "0334171e40ed4a4861ac29250eb1db23300be4f0"; + }) + ]; + buildInputs = + (self.nativeDeps."simple-lru-cache" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "simple-lru-cache" ]; + }; by-spec."simplesmtp".">= 0.1.22" = self.by-version."simplesmtp"."0.3.16"; by-version."simplesmtp"."0.3.16" = lib.makeOverridable self.buildNodePackage { @@ -11642,26 +11925,46 @@ passthru.names = [ "stack-trace" ]; }; by-spec."statsd"."*" = - self.by-version."statsd"."0.6.0"; - by-version."statsd"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "statsd-0.6.0"; + self.by-version."statsd"."0.7.0"; + by-version."statsd"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "statsd-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/statsd/-/statsd-0.6.0.tgz"; - sha1 = "9902dba319c46726f0348ced9b7b3e20184de1c4"; + url = "http://registry.npmjs.org/statsd/-/statsd-0.7.0.tgz"; + sha1 = "13354345392c50a30221d3ab524bffcdda90272e"; }) ]; buildInputs = (self.nativeDeps."statsd" or []); deps = [ - self.by-version."node-syslog"."1.1.3" + self.by-version."node-syslog"."1.1.7" + self.by-version."hashring"."1.0.1" self.by-version."winser"."0.0.11" ]; peerDependencies = [ ]; passthru.names = [ "statsd" ]; }; - "statsd" = self.by-version."statsd"."0.6.0"; + "statsd" = self.by-version."statsd"."0.7.0"; + by-spec."stream-combiner"."~0.0.2" = + self.by-version."stream-combiner"."0.0.2"; + by-version."stream-combiner"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "stream-combiner-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.2.tgz"; + sha1 = "dfe0e74675742565e76c6056788ea5c23bd97db4"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-combiner" or []); + deps = [ + self.by-version."duplexer"."0.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-combiner" ]; + }; by-spec."stream-counter"."~0.1.0" = self.by-version."stream-counter"."0.1.0"; by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -11794,13 +12097,13 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.41.0"; - by-version."stylus"."0.41.0" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.41.0"; + self.by-version."stylus"."0.41.2"; + by-version."stylus"."0.41.2" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.41.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.41.0.tgz"; - sha1 = "b9609d5663c9624d11b28952f3e6b23cde10ac28"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.41.2.tgz"; + sha1 = "68bca2b317d32c85e7cdf7afe7ee044da9afe983"; }) ]; buildInputs = @@ -11809,13 +12112,13 @@ self.by-version."cssom"."0.2.5" self.by-version."mkdirp"."0.3.5" self.by-version."debug"."0.7.4" - self.by-version."sax"."0.5.5" + self.by-version."sax"."0.5.8" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.41.0"; + "stylus" = self.by-version."stylus"."0.41.2"; by-spec."stylus"."0.27.2" = self.by-version."stylus"."0.27.2"; by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { @@ -11970,13 +12273,13 @@ by-spec."sylvester".">= 0.0.8" = self.by-version."sylvester"."0.0.21"; by-spec."tar"."*" = - self.by-version."tar"."0.1.18"; - by-version."tar"."0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.18"; + self.by-version."tar"."0.1.19"; + by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage { + name = "tar-0.1.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz"; - sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635"; + url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz"; + sha1 = "fe45941799e660ce1ea52d875d37481b4bf13eac"; }) ]; buildInputs = @@ -11990,9 +12293,9 @@ ]; passthru.names = [ "tar" ]; }; - "tar" = self.by-version."tar"."0.1.18"; + "tar" = self.by-version."tar"."0.1.19"; by-spec."tar"."0" = - self.by-version."tar"."0.1.18"; + self.by-version."tar"."0.1.19"; by-spec."tar"."0.1.17" = self.by-version."tar"."0.1.17"; by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage { @@ -12015,9 +12318,9 @@ passthru.names = [ "tar" ]; }; by-spec."tar"."~0.1.17" = - self.by-version."tar"."0.1.18"; + self.by-version."tar"."0.1.19"; by-spec."tar"."~0.1.18" = - self.by-version."tar"."0.1.18"; + self.by-version."tar"."0.1.19"; by-spec."temp"."*" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -12041,6 +12344,8 @@ "temp" = self.by-version."temp"."0.6.0"; by-spec."temp"."0.6.0" = self.by-version."temp"."0.6.0"; + by-spec."temp"."~0.6.0" = + self.by-version."temp"."0.6.0"; by-spec."text-table"."~0.1.1" = self.by-version."text-table"."0.1.1"; by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -12059,6 +12364,24 @@ ]; passthru.names = [ "text-table" ]; }; + by-spec."text-table"."~0.2.0" = + self.by-version."text-table"."0.2.0"; + by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "text-table-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }) + ]; + buildInputs = + (self.nativeDeps."text-table" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "text-table" ]; + }; by-spec."throttleit"."~0.0.2" = self.by-version."throttleit"."0.0.2"; by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -12077,14 +12400,34 @@ ]; passthru.names = [ "throttleit" ]; }; - by-spec."timespan"."2.0.1" = - self.by-version."timespan"."2.0.1"; - by-version."timespan"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "timespan-2.0.1"; + by-spec."through2"."~0.1.0" = + self.by-version."through2"."0.1.0"; + by-version."through2"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "through2-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/through2/-/through2-0.1.0.tgz"; + sha1 = "54e756cc6a543c72bb5adf55e8a248686b84c9cc"; + }) + ]; + buildInputs = + (self.nativeDeps."through2" or []); + deps = [ + self.by-version."readable-stream"."1.0.17" + self.by-version."xtend"."2.0.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "through2" ]; + }; + by-spec."timespan"."2.1.0" = + self.by-version."timespan"."2.1.0"; + by-version."timespan"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "timespan-2.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/timespan/-/timespan-2.0.1.tgz"; - sha1 = "479b45875937e14d0f4be1625f2abd08d801f68a"; + url = "http://registry.npmjs.org/timespan/-/timespan-2.1.0.tgz"; + sha1 = "9a410fbbf26e213362d956f4836349e65e573832"; }) ]; buildInputs = @@ -12133,13 +12476,13 @@ passthru.names = [ "tinycolor" ]; }; by-spec."tmp"."~0.0.20" = - self.by-version."tmp"."0.0.22"; - by-version."tmp"."0.0.22" = lib.makeOverridable self.buildNodePackage { - name = "tmp-0.0.22"; + self.by-version."tmp"."0.0.23"; + by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage { + name = "tmp-0.0.23"; src = [ (fetchurl { - url = "http://registry.npmjs.org/tmp/-/tmp-0.0.22.tgz"; - sha1 = "92133c8a93785fbbd3971c9454561921d58283cd"; + url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz"; + sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74"; }) ]; buildInputs = @@ -12169,6 +12512,25 @@ ]; passthru.names = [ "touch" ]; }; + by-spec."tough-cookie"."~0.9.15" = + self.by-version."tough-cookie"."0.9.15"; + by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { + name = "tough-cookie-0.9.15"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; + sha1 = "75617ac347e3659052b0350131885829677399f6"; + }) + ]; + buildInputs = + (self.nativeDeps."tough-cookie" or []); + deps = [ + self.by-version."punycode"."1.2.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tough-cookie" ]; + }; by-spec."traceback".">=0.3.0 && < 0.4" = self.by-version."traceback"."0.3.0"; by-version."traceback"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -12398,13 +12760,13 @@ passthru.names = [ "uglify-js" ]; }; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.6"; - by-version."uglify-js"."2.4.6" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.6"; + self.by-version."uglify-js"."2.4.7"; + by-version."uglify-js"."2.4.7" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz"; - sha1 = "31766a4d822babf5f32c14096251ed9259298ad3"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.7.tgz"; + sha1 = "9f3b5bd1c657d16aaad7134a7adbeaa88e67c5ae"; }) ]; buildInputs = @@ -12638,7 +13000,7 @@ (self.nativeDeps."update-notifier" or []); deps = [ self.by-version."request"."2.27.0" - self.by-version."configstore"."0.1.5" + self.by-version."configstore"."0.1.6" self.by-version."semver"."2.1.0" self.by-version."chalk"."0.2.1" ]; @@ -12748,7 +13110,7 @@ self.by-version."i"."0.3.2" self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.4.2" - self.by-version."rimraf"."2.2.4" + self.by-version."rimraf"."2.2.5" ]; peerDependencies = [ ]; @@ -13011,13 +13373,13 @@ passthru.names = [ "wd" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.37.0-1"; - by-version."webdrvr"."2.37.0-1" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.37.0-1"; + self.by-version."webdrvr"."2.38.0-0"; + by-version."webdrvr"."2.38.0-0" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.38.0-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.37.0-1.tgz"; - sha1 = "8f1f2fbcc184b8964d26f0fca73264e0c1d595ea"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.38.0-0.tgz"; + sha1 = "b5388a672ac512e09df24d00f80b3d619dc15e5c"; }) ]; buildInputs = @@ -13026,16 +13388,16 @@ self.by-version."adm-zip"."0.4.3" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.6" - self.by-version."phantomjs"."1.9.2-4" - self.by-version."tmp"."0.0.22" + self.by-version."npmconf"."0.1.7" + self.by-version."phantomjs"."1.9.2-5" + self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.37.0-1"; + "webdrvr" = self.by-version."webdrvr"."2.38.0-0"; by-spec."websocket-driver".">=0.3.0" = self.by-version."websocket-driver"."0.3.1"; by-version."websocket-driver"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -13332,7 +13694,7 @@ buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.5.5" + self.by-version."sax"."0.5.8" ]; peerDependencies = [ ]; @@ -13351,7 +13713,7 @@ buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.5.5" + self.by-version."sax"."0.5.8" ]; peerDependencies = [ ]; @@ -13370,8 +13732,8 @@ buildInputs = (self.nativeDeps."xml2js" or []); deps = [ - self.by-version."sax"."0.5.5" - self.by-version."xmlbuilder"."1.0.2" + self.by-version."sax"."0.5.8" + self.by-version."xmlbuilder"."1.1.0" ]; peerDependencies = [ ]; @@ -13379,45 +13741,43 @@ }; by-spec."xml2js".">=0.1.7" = self.by-version."xml2js"."0.4.0"; - by-spec."xmlbuilder"."*" = - self.by-version."xmlbuilder"."1.0.2"; - by-version."xmlbuilder"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-1.0.2"; + by-spec."xmlbuilder"."0.4.2" = + self.by-version."xmlbuilder"."0.4.2"; + by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-1.0.2.tgz"; - sha1 = "f3939d049e91c8c8af6165411944380798ed8e82"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; + sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; }) ]; buildInputs = (self.nativeDeps."xmlbuilder" or []); deps = [ - self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "xmlbuilder" ]; }; - by-spec."xmlbuilder"."0.4.2" = - self.by-version."xmlbuilder"."0.4.2"; - by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-0.4.2"; + by-spec."xmlbuilder".">=0.4.2" = + self.by-version."xmlbuilder"."1.1.0"; + by-version."xmlbuilder"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; - sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-1.1.0.tgz"; + sha1 = "2b4935395f17c549e73b55730ea5e206a9c7d1c5"; }) ]; buildInputs = (self.nativeDeps."xmlbuilder" or []); deps = [ + self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "xmlbuilder" ]; }; - by-spec."xmlbuilder".">=0.4.2" = - self.by-version."xmlbuilder"."1.0.2"; by-spec."xmlhttprequest"."1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { @@ -13454,6 +13814,26 @@ ]; passthru.names = [ "xoauth2" ]; }; + by-spec."xtend"."~2.0.6" = + self.by-version."xtend"."2.0.6"; + by-version."xtend"."2.0.6" = lib.makeOverridable self.buildNodePackage { + name = "xtend-2.0.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz"; + sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee"; + }) + ]; + buildInputs = + (self.nativeDeps."xtend" or []); + deps = [ + self.by-version."is-object"."0.1.2" + self.by-version."object-keys"."0.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "xtend" ]; + }; by-spec."yaml"."0.2.3" = self.by-version."yaml"."0.2.3"; by-version."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -13472,60 +13852,65 @@ ]; passthru.names = [ "yaml" ]; }; - by-spec."yeoman-generator"."~0.10.0" = - self.by-version."yeoman-generator"."0.10.5"; - by-version."yeoman-generator"."0.10.5" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.10.5"; + by-spec."yeoman-generator"."~0.13.0" = + self.by-version."yeoman-generator"."0.13.4"; + by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.13.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.10.5.tgz"; - sha1 = "67b28a6c453addc785e43180236df65e2f93554a"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; + sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34"; }) ]; buildInputs = (self.nativeDeps."yeoman-generator" or []); deps = [ - self.by-version."cheerio"."0.10.8" - self.by-version."request"."2.16.6" - self.by-version."rimraf"."2.1.4" - self.by-version."tar"."0.1.18" + self.by-version."cheerio"."0.12.4" + self.by-version."request"."2.25.0" + self.by-version."rimraf"."2.2.5" + self.by-version."tar"."0.1.19" self.by-version."diff"."1.0.7" self.by-version."mime"."1.2.11" self.by-version."underscore.string"."2.3.3" - self.by-version."lodash"."1.1.1" + self.by-version."lodash"."1.3.1" self.by-version."mkdirp"."0.3.5" - self.by-version."read"."1.0.5" - self.by-version."glob"."3.1.21" - self.by-version."nopt"."2.1.2" - self.by-version."cli-table"."0.2.0" + self.by-version."glob"."3.2.7" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" + self.by-version."dargs"."0.1.0" + self.by-version."async"."0.2.9" + self.by-version."inquirer"."0.3.5" + self.by-version."iconv-lite"."0.2.11" + self.by-version."shelljs"."0.1.4" + self.by-version."findup-sync"."0.1.2" + self.by-version."chalk"."0.2.1" + self.by-version."text-table"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "yeoman-generator" ]; }; - by-spec."yeoman-generator"."~0.13.0" = + by-spec."yeoman-generator"."~0.13.1" = self.by-version."yeoman-generator"."0.13.4"; - by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.13.4"; + by-spec."yeoman-generator"."~0.14.0" = + self.by-version."yeoman-generator"."0.14.1"; + by-version."yeoman-generator"."0.14.1" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.14.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; - sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.1.tgz"; + sha1 = "d99358d6f65d8df0e384b45ff82f13560e06c78f"; }) ]; buildInputs = (self.nativeDeps."yeoman-generator" or []); deps = [ self.by-version."cheerio"."0.12.4" - self.by-version."request"."2.25.0" - self.by-version."rimraf"."2.2.4" - self.by-version."tar"."0.1.18" + self.by-version."rimraf"."2.2.5" self.by-version."diff"."1.0.7" self.by-version."mime"."1.2.11" self.by-version."underscore.string"."2.3.3" - self.by-version."lodash"."1.3.1" + self.by-version."lodash"."2.2.1" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.7" self.by-version."debug"."0.7.4" @@ -13534,37 +13919,38 @@ self.by-version."async"."0.2.9" self.by-version."inquirer"."0.3.5" self.by-version."iconv-lite"."0.2.11" - self.by-version."shelljs"."0.1.4" + self.by-version."shelljs"."0.2.6" self.by-version."findup-sync"."0.1.2" - self.by-version."chalk"."0.2.1" - self.by-version."text-table"."0.1.1" + self.by-version."chalk"."0.3.0" + self.by-version."text-table"."0.2.0" + self.by-version."download"."0.1.7" + self.by-version."request"."2.27.0" + self.by-version."file-utils"."0.1.5" ]; peerDependencies = [ ]; passthru.names = [ "yeoman-generator" ]; }; - by-spec."yeoman-generator"."~0.13.1" = - self.by-version."yeoman-generator"."0.13.4"; - by-spec."yeoman-generator"."~0.13.2" = - self.by-version."yeoman-generator"."0.13.4"; + by-spec."yeoman-generator"."~0.14.1" = + self.by-version."yeoman-generator"."0.14.1"; by-spec."yo"."*" = - self.by-version."yo"."1.0.4"; - by-version."yo"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "yo-1.0.4"; + self.by-version."yo"."1.0.5"; + by-version."yo"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "yo-1.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yo/-/yo-1.0.4.tgz"; - sha1 = "666b5965a8e920df877d351da793f89bd1c8707a"; + url = "http://registry.npmjs.org/yo/-/yo-1.0.5.tgz"; + sha1 = "4454720eb262d06395e950269fbb6ca25ed68c9e"; }) ]; buildInputs = (self.nativeDeps."yo" or []); deps = [ - self.by-version."yeoman-generator"."0.13.4" + self.by-version."yeoman-generator"."0.14.1" self.by-version."nopt"."2.1.2" - self.by-version."lodash"."1.3.1" + self.by-version."lodash"."2.2.1" self.by-version."update-notifier"."0.1.7" - self.by-version."insight"."0.2.0" + self.by-version."insight"."0.3.0" self.by-version."sudo-block"."0.2.1" self.by-version."async"."0.2.9" self.by-version."open"."0.0.4" @@ -13576,9 +13962,11 @@ ]; passthru.names = [ "yo" ]; }; - "yo" = self.by-version."yo"."1.0.4"; + "yo" = self.by-version."yo"."1.0.5"; + by-spec."yo".">=1.0.0" = + self.by-version."yo"."1.0.5"; by-spec."yo".">=1.0.0-rc.1.1" = - self.by-version."yo"."1.0.4"; + self.by-version."yo"."1.0.5"; by-spec."zeparser"."0.0.5" = self.by-version."zeparser"."0.0.5"; by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { -- cgit 1.4.1 From 3c265cefdb1cdc41ca3aecd5d930730a7cac3edf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 11 Dec 2013 00:53:45 +0100 Subject: add node-protobuf + binary dep --- pkgs/top-level/node-packages-generated.nix | 19 +++++++++++++++++++ pkgs/top-level/node-packages.json | 1 + pkgs/top-level/node-packages.nix | 1 + 3 files changed, 21 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index f526885ca80..8a07c833bdd 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -8580,6 +8580,25 @@ passthru.names = [ "node-inspector" ]; }; "node-inspector" = self.by-version."node-inspector"."0.6.2"; + by-spec."node-protobuf"."*" = + self.by-version."node-protobuf"."1.0.9"; + by-version."node-protobuf"."1.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-protobuf-1.0.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.9.tgz"; + sha1 = "6b2e7682bb65e01a10e19179f8e162ac9a66a6e6"; + }) + ]; + buildInputs = + (self.nativeDeps."node-protobuf" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-protobuf" ]; + }; + "node-protobuf" = self.by-version."node-protobuf"."1.0.9"; by-spec."node-swt".">=0.1.1" = self.by-version."node-swt"."0.1.1"; by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 6e525d7bd4f..c51c355cac5 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -110,4 +110,5 @@ , "meat" , "hipache" , "posix" +, "node-protobuf" ] diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 3daaa262280..448904ce385 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -5,6 +5,7 @@ rec { "node-expat" = [ pkgs.expat ]; "rbytes" = [ pkgs.openssl ]; "phantomjs" = [ pkgs.phantomjs ]; + "node-protobuf" = [ pkgs.protobuf ]; }; buildNodePackage = import ../development/web/nodejs/build-node-package.nix { -- cgit 1.4.1 From af7df9a37b2ccdb4c3c104a17baf992f929849ba Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 11 Dec 2013 00:54:33 +0100 Subject: add node rethinkdb driver --- pkgs/top-level/node-packages-generated.nix | 133 +++++++++++++++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 134 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 8a07c833bdd..92f23ed1400 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -364,6 +364,26 @@ }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.15"; + by-spec."ascli"."*" = + self.by-version."ascli"."0.3.0"; + by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "ascli-0.3.0"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; + sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; + }) + ]; + buildInputs = + (self.nativeDeps."ascli" or []); + deps = [ + self.by-version."colour"."0.7.1" + self.by-version."optjs"."3.2.1-boom" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ascli" ]; + }; by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { @@ -1241,6 +1261,25 @@ ]; passthru.names = [ "bunyan" ]; }; + by-spec."bytebuffer".">=2.1 && <3" = + self.by-version."bytebuffer"."2.1.0"; + by-version."bytebuffer"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bytebuffer-2.1.0"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.1.0.tgz"; + sha1 = "931ae9a46fcb3868614ad3368a569dc7ce4e9ab9"; + }) + ]; + buildInputs = + (self.nativeDeps."bytebuffer" or []); + deps = [ + self.by-version."long"."1.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bytebuffer" ]; + }; by-spec."bytes"."0.1.0" = self.by-version."bytes"."0.1.0"; by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -1872,6 +1911,24 @@ self.by-version."colors"."0.6.2"; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; + by-spec."colour"."*" = + self.by-version."colour"."0.7.1"; + by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "colour-0.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; + sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; + }) + ]; + buildInputs = + (self.nativeDeps."colour" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "colour" ]; + }; by-spec."combined-stream"."~0.0.4" = self.by-version."combined-stream"."0.0.4"; by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -7221,6 +7278,24 @@ ]; passthru.names = [ "log4js" ]; }; + by-spec."long"."*" = + self.by-version."long"."1.1.2"; + by-version."long"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "long-1.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz"; + sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53"; + }) + ]; + buildInputs = + (self.nativeDeps."long" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "long" ]; + }; by-spec."lru-cache"."2" = self.by-version."lru-cache"."2.5.0"; by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { @@ -9526,6 +9601,24 @@ ]; passthru.names = [ "options" ]; }; + by-spec."optjs"."*" = + self.by-version."optjs"."3.2.1-boom"; + by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage { + name = "optjs-3.2.1-boom"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz"; + sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758"; + }) + ]; + buildInputs = + (self.nativeDeps."optjs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "optjs" ]; + }; by-spec."optparse"."*" = self.by-version."optparse"."1.0.4"; by-version."optparse"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -9959,6 +10052,26 @@ ]; passthru.names = [ "proto-list" ]; }; + by-spec."protobufjs".">= 1.1.4" = + self.by-version."protobufjs"."2.0.0-rc4"; + by-version."protobufjs"."2.0.0-rc4" = lib.makeOverridable self.buildNodePackage { + name = "protobufjs-2.0.0-rc4"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.0-rc4.tgz"; + sha1 = "298d218346a7fb44566de2d74d440f664712f3ad"; + }) + ]; + buildInputs = + (self.nativeDeps."protobufjs" or []); + deps = [ + self.by-version."bytebuffer"."2.1.0" + self.by-version."ascli"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "protobufjs" ]; + }; by-spec."ps-tree"."0.0.x" = self.by-version."ps-tree"."0.0.3"; by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10988,6 +11101,26 @@ ]; passthru.names = [ "restify" ]; }; + by-spec."rethinkdb"."*" = + self.by-version."rethinkdb"."1.11.0-1"; + by-version."rethinkdb"."1.11.0-1" = lib.makeOverridable self.buildNodePackage { + name = "rethinkdb-1.11.0-1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-1.tgz"; + sha1 = "beab3376b9efa9ecf7f2fbf39c58ce80c8bd5dfd"; + }) + ]; + buildInputs = + (self.nativeDeps."rethinkdb" or []); + deps = [ + self.by-version."protobufjs"."2.0.0-rc4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "rethinkdb" ]; + }; + "rethinkdb" = self.by-version."rethinkdb"."1.11.0-1"; by-spec."retry"."0.6.0" = self.by-version."retry"."0.6.0"; by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index c51c355cac5..c11b7ee360e 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -111,4 +111,5 @@ , "hipache" , "posix" , "node-protobuf" +, "rethinkdb" ] -- cgit 1.4.1 From 82131d50138c9ee00e67c066dab7313aaa51ec6d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik 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') 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 82d02565fc83e0028394a6d5dc8b52334c822786 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 11:59:46 +0100 Subject: rethinkdb: /usr/bin/env is not available in chroot builds --- pkgs/servers/nosql/rethinkdb/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 9231310abd8..e81ccb39632 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { preConfigure = '' export ALLOW_WARNINGS=1 + patchShebangs . ''; configureFlags = "--lib-path ${gperftools}/lib"; -- cgit 1.4.1 From 939a0d3b4a60979d8617aad0aaea056f4293bc84 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 15:48:02 +0100 Subject: firefox: enable gstreamer for h.264 support in HTML5 video --- pkgs/applications/networking/browsers/firefox/default.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 47e6d20cc9a..27363482be0 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -47,6 +47,7 @@ rec { "--enable-system-pixman" "--enable-system-sqlite" "--enable-system-cairo" + "--enable-gstreamer" "--enable-startup-notification" # "--enable-content-sandbox" # available since 26.0, but not much info available # "--enable-content-sandbox-reporter" # keeping disabled for now diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9609334820..e9c59d9ad67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9193,10 +9193,8 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ); - libs = - if cfg.enableQuakeLive or false - then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] - else [ ]; + libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) + (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); gtk_modules = [ libcanberra ]; }; -- cgit 1.4.1 From bd0d2aa1496dae36572de28fe9e5917a2ba28c9e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 23 Dec 2013 15:49:54 +0100 Subject: Update dd-agent to 4.0.1 --- pkgs/tools/networking/dd-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 91061a457d4..ae0007c1f2d 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python, sysstat, unzip }: stdenv.mkDerivation rec { - version = "3.8.0"; + version = "4.0.1"; name = "dd-agent-${version}"; src = fetchurl { url = "https://github.com/DataDog/dd-agent/archive/${version}.zip"; - sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx"; + sha256 = "0gybdbjkj7qwnzic03xkypagb30zhm22gp3nkwrdhi8fdmwz3nm1"; }; buildInputs = [ python unzip ]; -- cgit 1.4.1 From a8df968ac4002c9f41423103af51912b8e8ea3ac Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 23 Dec 2013 17:42:20 +0100 Subject: Upgrade rsyslog to latest stable, 7.4.7. Include systemd journal support. --- pkgs/tools/system/rsyslog/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index c4e955056f4..97020ce2e42 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}: +{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}: stdenv.mkDerivation { - name = "rsyslog-7.2.7"; + name = "rsyslog-7.4.7"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz; - sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8"; + url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz; + sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21"; }; - buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls]; + buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd]; - configureFlags = "--enable-gnutls"; + preConfigure = '' + export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system" + ''; meta = { homepage = "http://www.rsyslog.com/"; -- cgit 1.4.1 From a1cfb23d7300e76a602772ec159067213213c18b Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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') 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 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') 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 4f8809a0910840c266dec28952f15e2dec68b0df Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 23 Dec 2013 18:23:54 +0100 Subject: libXtst: forgotten security update --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 72b0c427910..1be17e623f7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -790,11 +790,11 @@ let })) // {inherit libICE kbproto libSM libX11 xproto ;}; libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) { - name = "libXtst-1.2.1"; + name = "libXtst-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2; - sha256 = "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky"; + url = mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2; + sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg"; }; buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 7b56dd541fa..4cf9c0362e0 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -77,7 +77,7 @@ mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2 +mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXvMC-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 -- cgit 1.4.1 From b89ab32c60373ae4c8ca7b6604ea3445afabca85 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 71ee40a0459efa00fc23f5a4b0d43367d91b354a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Dec 2013 19:29:24 +0100 Subject: all-packages.nix: fix Emacs syntax highlighting --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9c59d9ad67..a98600fa7bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6731,7 +6731,7 @@ let # Install gcc plugins. These are needed for compiling dependant packages. postInstall = '' ${args.postInstall or ""} - cp tools/gcc/*.so $out/lib/modules/$version/build/tools/gcc/ + cp "tools/gcc/"*.so $out/lib/modules/$version/build/tools/gcc/ ''; # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins) # include libgmp headers, so we need these extra tweaks -- cgit 1.4.1 From 91ead938116beb93d05a78ff297f47acd6c00ecb Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 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: . --- pkgs/development/interpreters/python/2.6/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs') 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 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') 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 2ac0fedb60964a41a1f2221b1a160004101754df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Dec 2013 17:36:40 +0100 Subject: haskell-git-annex: update to version 5.20131221 --- .../version-management/git-and-tools/git-annex/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 0c9e642d265..ed03826e7ae 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20131213"; - sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn"; + version = "5.20131221"; + sha256 = "1gkb8fc0fjjn0rigajgliqy381pmkpx4ha1rx65dcw15rqnrawb3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -47,6 +47,8 @@ cabal.mkDerivation (self: { checkPhase = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" + cp dist/build/git-annex/git-annex git-annex + ./git-annex test ''; meta = { homepage = "http://git-annex.branchable.com/"; -- cgit 1.4.1 From faedadea2823e8674cf70ccfe751b94b384f3580 Mon Sep 17 00:00:00 2001 From: Peter Simons 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 47a3ece98404326a3890f5d0eccda30bb6d41e6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Dec 2013 18:31:40 +0100 Subject: git-annex: disable test suite to fix build The "lock" test fails. Upstream knows this, and apparently the failure is caused by a bug in the test suite -- not in the application code. --- pkgs/applications/version-management/git-and-tools/git-annex/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index ed03826e7ae..6d9f0f4bd6b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -44,6 +44,7 @@ cabal.mkDerivation (self: { -fTDFA"; preConfigure = "patchShebangs ."; installPhase = "./Setup install"; + doCheck = false; checkPhase = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" -- cgit 1.4.1 From 682dac229ce2e7ef63fdb2658abff95fd4ade028 Mon Sep 17 00:00:00 2001 From: Peter Simons 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 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') 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 a4462d9a032c6022b09039b71105a3ecb17295a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Dec 2013 20:30:39 +0100 Subject: git-annex: fix build some more --- .../version-management/git-and-tools/git-annex/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 6d9f0f4bd6b..b023ac5d160 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -42,12 +42,13 @@ cabal.mkDerivation (self: { -fDNS -fProduction -fTDFA"; - preConfigure = "patchShebangs ."; - installPhase = "./Setup install"; doCheck = false; - checkPhase = '' + installPhase = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" + ./Setup install + ''; + checkPhase = '' cp dist/build/git-annex/git-annex git-annex ./git-annex test ''; -- cgit 1.4.1 From cd27fa7450a17063e99c47dd075e4950fa4c2ab1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 24 Dec 2013 10:48:42 +0100 Subject: Build x11vnc on linux --- pkgs/tools/X11/x11vnc/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 8acb11833da..a8c249116c0 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "A VNC server connected to a real X11 screen"; homepage = http://www.karlrunge.com/x11vnc/; + platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From 18115fbbeaa78ac7bf866223813d095e4a638544 Mon Sep 17 00:00:00 2001 From: Tomasz Kontusz Date: Tue, 24 Dec 2013 09:04:13 +0100 Subject: Change pmount download address and add platforms The URL change is needed as alioth.debian.org is forcing HTTPS with CA we don't recognize. --- pkgs/os-specific/linux/pmount/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 4d555f59c37..f966180a8b6 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -8,10 +8,11 @@ assert stdenv.lib.hasSuffix "/" mediaDir; stdenv.mkDerivation rec { - name = "pmount-0.9.23"; + name = "pmount-${version}"; + version = "0.9.23"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/3310/${name}.tar.gz"; + url = "mirror://debian/pool/main/p/pmount/pmount_${version}.orig.tar.bz2"; sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; @@ -36,5 +37,6 @@ stdenv.mkDerivation rec { homepage = http://pmount.alioth.debian.org/; description = "Mount removable devices as normal user"; license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From 3db725c4679f95ce251f90dd9735e60779d7586b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 23 Dec 2013 15:52:19 +0100 Subject: mpv: ffmpeg defaults to latest now --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a98600fa7bd..a71e712b557 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8525,7 +8525,6 @@ let }; mpv = callPackage ../applications/video/mpv { - ffmpeg = ffmpeg_2; bs2bSupport = true; quviSupport = true; cacaSupport = true; -- cgit 1.4.1 From 0bf0610d1419fa8692dae90e1674ad638df4390b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik 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') 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" 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') 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 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') 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 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') 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 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') 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 109070d78ac82bba8774009710651085447ea3d0 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 24 Dec 2013 22:38:59 +0100 Subject: perlPackages.ExtUtilsTypemapsDefault: Update to 1.05 (fixes tests). Signed-off-by: Moritz Ulrich --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03b1af896a7..9027fbed80f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3233,10 +3233,10 @@ rec { }; ExtUtilsTypemapsDefault = buildPerlModule rec { - name = "ExtUtils-Typemaps-Default-1.01"; + name = "ExtUtils-Typemaps-Default-1.05"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0k03rr7bmhnn6j0505w9id5apss85yvqnx76hxf3javn3klj1m5z"; + sha256 = "1phmha0ks95kvzl00r1kgnd5hvg7qb1q9jmzjmw01p5zgs1zbyix"; }; propagatedBuildInputs = [ ExtUtilsTypemap ExtUtilsParseXS ]; }; -- cgit 1.4.1 From 7129ba057bf7e3e5e8e19df4538934d63e1fd895 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 24 Dec 2013 19:00:26 -0500 Subject: Update nodePackages Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 1880 ++++++++++++++++------------ 1 file changed, 1088 insertions(+), 792 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 92f23ed1400..37a57b88f18 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -2,20 +2,20 @@ { by-spec."CSSselect"."0.x" = - self.by-version."CSSselect"."0.3.11"; - by-version."CSSselect"."0.3.11" = lib.makeOverridable self.buildNodePackage { - name = "CSSselect-0.3.11"; + self.by-version."CSSselect"."0.4.0"; + by-version."CSSselect"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "CSSselect-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.11.tgz"; - sha1 = "0779a069d12da9ff5875dd125a0287599c05b6a5"; + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.0.tgz"; + sha1 = "0ddaecd7d157f482d101dfbe154d3accd9166331"; }) ]; buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ self.by-version."CSSwhat"."0.4.1" - self.by-version."domutils"."1.2.2" + self.by-version."domutils"."1.3.0" ]; peerDependencies = [ ]; @@ -265,6 +265,24 @@ ]; passthru.names = [ "ansi-styles" ]; }; + by-spec."ansi-styles"."~1.0.0" = + self.by-version."ansi-styles"."1.0.0"; + by-version."ansi-styles"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "ansi-styles-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; + sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi-styles" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ansi-styles" ]; + }; by-spec."ansicolors"."~0.2.1" = self.by-version."ansicolors"."0.2.1"; by-version."ansicolors"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -283,6 +301,42 @@ ]; passthru.names = [ "ansicolors" ]; }; + by-spec."ansicolors"."~0.3.2" = + self.by-version."ansicolors"."0.3.2"; + by-version."ansicolors"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "ansicolors-0.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }) + ]; + buildInputs = + (self.nativeDeps."ansicolors" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ansicolors" ]; + }; + by-spec."ansistyles"."~0.1.3" = + self.by-version."ansistyles"."0.1.3"; + by-version."ansistyles"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "ansistyles-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; + sha1 = "5de60415bda071bb37127854c864f41b23254539"; + }) + ]; + buildInputs = + (self.nativeDeps."ansistyles" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ansistyles" ]; + }; by-spec."apparatus".">= 0.0.4" = self.by-version."apparatus"."0.0.8"; by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -302,7 +356,7 @@ ]; passthru.names = [ "apparatus" ]; }; - by-spec."archiver"."~0.4.6" = + by-spec."archiver"."~0.4.10" = self.by-version."archiver"."0.4.10"; by-version."archiver"."0.4.10" = lib.makeOverridable self.buildNodePackage { name = "archiver-0.4.10"; @@ -403,25 +457,25 @@ passthru.names = [ "asn1" ]; }; by-spec."assert"."*" = - self.by-version."assert"."1.0.0"; - by-version."assert"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "assert-1.0.0"; + self.by-version."assert"."1.0.3"; + by-version."assert"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "assert-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/assert/-/assert-1.0.0.tgz"; - sha1 = "11e0629e3bbc13e293bf79570c9febe98b2d7997"; + url = "http://registry.npmjs.org/assert/-/assert-1.0.3.tgz"; + sha1 = "b4876fe43cd32fa93679f49e082e5c47e0e42db1"; }) ]; buildInputs = (self.nativeDeps."assert" or []); deps = [ - self.by-version."util"."0.10.0" + self.by-version."util"."0.10.2" ]; peerDependencies = [ ]; passthru.names = [ "assert" ]; }; - "assert" = self.by-version."assert"."1.0.0"; + "assert" = self.by-version."assert"."1.0.3"; by-spec."assert-plus"."0.1.2" = self.by-version."assert-plus"."0.1.2"; by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -529,32 +583,14 @@ self.by-version."async"."0.2.9"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.9"; - by-spec."async-foreach"."~0.1.3" = - self.by-version."async-foreach"."0.1.3"; - by-version."async-foreach"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "async-foreach-0.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"; - sha1 = "36121f845c0578172de419a97dbeb1d16ec34542"; - }) - ]; - buildInputs = - (self.nativeDeps."async-foreach" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async-foreach" ]; - }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.0-rc2"; - by-version."aws-sdk"."2.0.0-rc2" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.0-rc2"; + self.by-version."aws-sdk"."2.0.0-rc4"; + by-version."aws-sdk"."2.0.0-rc4" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.0.0-rc4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc2.tgz"; - sha1 = "26087265045b9506749244c9a2beb5611b18dc59"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc4.tgz"; + sha1 = "21c23ef7c162f7ec8eed36cef57e3425b0814e8d"; }) ]; buildInputs = @@ -567,15 +603,15 @@ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc2"; + "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc4"; by-spec."aws-sdk".">=1.2.0 <2" = - self.by-version."aws-sdk"."1.14.0"; - by-version."aws-sdk"."1.14.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.14.0"; + self.by-version."aws-sdk"."1.16.0"; + by-version."aws-sdk"."1.16.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-1.16.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.14.0.tgz"; - sha1 = "e79b92cda9a74522ad90d0d8357eb01fd14de008"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.16.0.tgz"; + sha1 = "07a150d6009c2681d67b10faf9b356ddb70da952"; }) ]; buildInputs = @@ -698,6 +734,24 @@ ]; passthru.names = [ "base64id" ]; }; + by-spec."batch"."0.5.0" = + self.by-version."batch"."0.5.0"; + by-version."batch"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "batch-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz"; + sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3"; + }) + ]; + buildInputs = + (self.nativeDeps."batch" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "batch" ]; + }; by-spec."bcrypt"."*" = self.by-version."bcrypt"."0.7.7"; by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage { @@ -870,8 +924,8 @@ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-json"."0.4.0" self.by-version."bower-logger"."0.2.1" - self.by-version."bower-registry-client"."0.1.5" - self.by-version."cardinal"."0.4.2" + self.by-version."bower-registry-client"."0.1.6" + self.by-version."cardinal"."0.4.3" self.by-version."chalk"."0.2.1" self.by-version."chmodr"."0.1.0" self.by-version."decompress-zip"."0.0.3" @@ -1014,13 +1068,13 @@ passthru.names = [ "bower-logger" ]; }; by-spec."bower-registry-client"."~0.1.4" = - self.by-version."bower-registry-client"."0.1.5"; - by-version."bower-registry-client"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "bower-registry-client-0.1.5"; + self.by-version."bower-registry-client"."0.1.6"; + by-version."bower-registry-client"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "bower-registry-client-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.5.tgz"; - sha1 = "1c64d70bfca833c95121ffc23da48a54527912d3"; + url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.6.tgz"; + sha1 = "c3ae74a98f24f50a373bbcb0ef443558be01d4b7"; }) ]; buildInputs = @@ -1039,29 +1093,6 @@ ]; passthru.names = [ "bower-registry-client" ]; }; - by-spec."broadway"."0.2.7" = - self.by-version."broadway"."0.2.7"; - by-version."broadway"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "broadway-0.2.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz"; - sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762"; - }) - ]; - buildInputs = - (self.nativeDeps."broadway" or []); - deps = [ - self.by-version."cliff"."0.1.8" - self.by-version."eventemitter2"."0.4.11" - self.by-version."nconf"."0.6.7" - self.by-version."winston"."0.6.2" - self.by-version."utile"."0.1.7" - ]; - peerDependencies = [ - ]; - passthru.names = [ "broadway" ]; - }; by-spec."broadway"."0.2.9" = self.by-version."broadway"."0.2.9"; by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { @@ -1101,8 +1132,8 @@ (self.nativeDeps."browserchannel" or []); deps = [ self.by-version."hat"."0.0.3" - self.by-version."connect"."2.11.2" - self.by-version."request"."2.29.0" + self.by-version."connect"."2.12.0" + self.by-version."request"."2.30.0" ]; peerDependencies = [ ]; @@ -1164,6 +1195,24 @@ ]; passthru.names = [ "bson" ]; }; + by-spec."bson"."0.2.5" = + self.by-version."bson"."0.2.5"; + by-version."bson"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "bson-0.2.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz"; + sha1 = "835b266883fc91e00e440efa2a905e9ac8c6c9f9"; + }) + ]; + buildInputs = + (self.nativeDeps."bson" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "bson" ]; + }; by-spec."buffer-crc32"."0.1.1" = self.by-version."buffer-crc32"."0.1.1"; by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1221,6 +1270,25 @@ passthru.names = [ "buffers" ]; }; by-spec."buffertools"."*" = + self.by-version."buffertools"."2.0.0"; + by-version."buffertools"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "buffertools-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.0.tgz"; + sha1 = "925a0333a6b089e86a58c0c25c9dda8d515b25e8"; + }) + ]; + buildInputs = + (self.nativeDeps."buffertools" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "buffertools" ]; + }; + "buffertools" = self.by-version."buffertools"."2.0.0"; + by-spec."buffertools".">=1.1.1 <2.0.0" = self.by-version."buffertools"."1.1.1"; by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "buffertools-1.1.1"; @@ -1238,9 +1306,6 @@ ]; passthru.names = [ "buffertools" ]; }; - "buffertools" = self.by-version."buffertools"."1.1.1"; - by-spec."buffertools".">=1.1.1 <2.0.0" = - self.by-version."buffertools"."1.1.1"; by-spec."bunyan"."0.21.1" = self.by-version."bunyan"."0.21.1"; by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage { @@ -1337,13 +1402,13 @@ by-spec."bytes"."~0.2.1" = self.by-version."bytes"."0.2.1"; by-spec."cardinal"."~0.4.0" = - self.by-version."cardinal"."0.4.2"; - by-version."cardinal"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "cardinal-0.4.2"; + self.by-version."cardinal"."0.4.3"; + by-version."cardinal"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "cardinal-0.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.2.tgz"; - sha1 = "b6563a882f58a56c1abd574baec64b5d0b7ef942"; + url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.3.tgz"; + sha1 = "7b74c3d1541002bd3d5b555048206719af91d313"; }) ]; buildInputs = @@ -1458,6 +1523,27 @@ ]; passthru.names = [ "chalk" ]; }; + by-spec."chalk"."~0.4.0" = + self.by-version."chalk"."0.4.0"; + by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "chalk-0.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; + }) + ]; + buildInputs = + (self.nativeDeps."chalk" or []); + deps = [ + self.by-version."has-color"."0.1.1" + self.by-version."ansi-styles"."1.0.0" + self.by-version."strip-ansi"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "chalk" ]; + }; by-spec."character-parser"."1.2.0" = self.by-version."character-parser"."1.2.0"; by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1513,7 +1599,7 @@ buildInputs = (self.nativeDeps."cheerio-select" or []); deps = [ - self.by-version."CSSselect"."0.3.11" + self.by-version."CSSselect"."0.4.0" ]; peerDependencies = [ ]; @@ -1555,14 +1641,14 @@ ]; passthru.names = [ "chmodr" ]; }; - by-spec."chokidar"."~0.7.0" = - self.by-version."chokidar"."0.7.1"; - by-version."chokidar"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.7.1"; + by-spec."chokidar"."~0.8.0" = + self.by-version."chokidar"."0.8.1"; + by-version."chokidar"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.8.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.7.1.tgz"; - sha1 = "a5a5b2d5df265f96d90b9888f45a9e604254112c"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz"; + sha1 = "8ee0c99ef48420902fded73b862eac2dd75da4a6"; }) ]; buildInputs = @@ -1592,13 +1678,13 @@ passthru.names = [ "chownr" ]; }; by-spec."clean-css"."2.0.x" = - self.by-version."clean-css"."2.0.2"; - by-version."clean-css"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.0.2"; + self.by-version."clean-css"."2.0.4"; + by-version."clean-css"."2.0.4" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.0.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.2.tgz"; - sha1 = "69ca3c124f4a476a154c081e9d5a54f1bcdec9c4"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.4.tgz"; + sha1 = "1447e54e14d4bd0fa801f507bb32938cebe77627"; }) ]; buildInputs = @@ -1611,7 +1697,7 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.0.0" = - self.by-version."clean-css"."2.0.2"; + self.by-version."clean-css"."2.0.4"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -2069,13 +2155,13 @@ by-spec."config-chain"."~1.1.8" = self.by-version."config-chain"."1.1.8"; by-spec."configstore"."~0.1.0" = - self.by-version."configstore"."0.1.6"; - by-version."configstore"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "configstore-0.1.6"; + self.by-version."configstore"."0.1.7"; + by-version."configstore"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "configstore-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/configstore/-/configstore-0.1.6.tgz"; - sha1 = "3a437dd231db3da8d2d0d6b7be2da64d87a397a6"; + url = "http://registry.npmjs.org/configstore/-/configstore-0.1.7.tgz"; + sha1 = "57dc701bc2a51eb804d6e1733c8abb9d82a5cede"; }) ]; buildInputs = @@ -2144,20 +2230,21 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.11.2" = - self.by-version."connect"."2.11.2"; - by-version."connect"."2.11.2" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.11.2"; + by-spec."connect"."2.12.0" = + self.by-version."connect"."2.12.0"; + by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.12.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.11.2.tgz"; - sha1 = "cd05c661f686dfe9bcd2e1220c85fe82848db010"; + url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz"; + sha1 = "31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a"; }) ]; buildInputs = (self.nativeDeps."connect" or []); deps = [ - self.by-version."qs"."0.6.5" + self.by-version."batch"."0.5.0" + self.by-version."qs"."0.6.6" self.by-version."cookie-signature"."1.0.1" self.by-version."buffer-crc32"."0.2.1" self.by-version."cookie"."0.1.0" @@ -2259,7 +2346,7 @@ passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.11.2"; + self.by-version."connect"."2.12.0"; by-spec."connect"."~2.8.4" = self.by-version."connect"."2.8.8"; by-version."connect"."2.8.8" = lib.makeOverridable self.buildNodePackage { @@ -2340,7 +2427,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = [ - self.by-version."jade"."0.35.0" + self.by-version."jade"."1.0.0" ]; peerDependencies = [ ]; @@ -2360,7 +2447,7 @@ buildInputs = (self.nativeDeps."connect-mongo" or []); deps = [ - self.by-version."mongodb"."1.3.19" + self.by-version."mongodb"."1.3.23" ]; peerDependencies = [ ]; @@ -2403,7 +2490,7 @@ ]; passthru.names = [ "console-browserify" ]; }; - by-spec."constantinople"."~1.0.1" = + by-spec."constantinople"."~1.0.2" = self.by-version."constantinople"."1.0.2"; by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "constantinople-1.0.2"; @@ -2416,7 +2503,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.7" + self.by-version."uglify-js"."2.4.8" ]; peerDependencies = [ ]; @@ -2615,7 +2702,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = [ - self.by-version."request"."2.29.0" + self.by-version."request"."2.30.0" ]; peerDependencies = [ ]; @@ -2624,13 +2711,13 @@ by-spec."couch-login"."~0.1.18" = self.by-version."couch-login"."0.1.19"; by-spec."coveralls"."*" = - self.by-version."coveralls"."2.6.0"; - by-version."coveralls"."2.6.0" = lib.makeOverridable self.buildNodePackage { - name = "coveralls-2.6.0"; + self.by-version."coveralls"."2.6.1"; + by-version."coveralls"."2.6.1" = lib.makeOverridable self.buildNodePackage { + name = "coveralls-2.6.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.6.0.tgz"; - sha1 = "4bee45246010b5f99d803ebc48ad5b3858708274"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.6.1.tgz"; + sha1 = "0de635bba15fd48f4fc557ae9ac21309c013d2de"; }) ]; buildInputs = @@ -2645,7 +2732,7 @@ ]; passthru.names = [ "coveralls" ]; }; - "coveralls" = self.by-version."coveralls"."2.6.0"; + "coveralls" = self.by-version."coveralls"."2.6.1"; by-spec."crc"."0.2.0" = self.by-version."crc"."0.2.0"; by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -2850,13 +2937,13 @@ passthru.names = [ "ctype" ]; }; by-spec."cycle"."1.0.x" = - self.by-version."cycle"."1.0.2"; - by-version."cycle"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "cycle-1.0.2"; + self.by-version."cycle"."1.0.3"; + by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "cycle-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cycle/-/cycle-1.0.2.tgz"; - sha1 = "269aca6f1b8d2baeefc8ccbc888b459f322c4e60"; + url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }) ]; buildInputs = @@ -2904,13 +2991,13 @@ passthru.names = [ "dateformat" ]; }; by-spec."dateformat"."~1.0.6" = - self.by-version."dateformat"."1.0.6-1.2.3"; - by-version."dateformat"."1.0.6-1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "dateformat-1.0.6-1.2.3"; + self.by-version."dateformat"."1.0.7-1.2.3"; + by-version."dateformat"."1.0.7-1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "dateformat-1.0.7-1.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.6-1.2.3.tgz"; - sha1 = "6b3de9f974f698d8b2d3ff9094bbaac8d696c16b"; + url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz"; + sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c"; }) ]; buildInputs = @@ -3002,13 +3089,13 @@ passthru.names = [ "debuglog" ]; }; by-spec."decompress"."~0.1.0" = - self.by-version."decompress"."0.1.4"; - by-version."decompress"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "decompress-0.1.4"; + self.by-version."decompress"."0.1.5"; + by-version."decompress"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "decompress-0.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/decompress/-/decompress-0.1.4.tgz"; - sha1 = "b5608768911f794017bfb8017344be6a7cfaf919"; + url = "http://registry.npmjs.org/decompress/-/decompress-0.1.5.tgz"; + sha1 = "0925d42a2164bead83f0822a7a2b4ad02e99c76c"; }) ]; buildInputs = @@ -3018,7 +3105,7 @@ self.by-version."mkdirp"."0.3.5" self.by-version."mout"."0.6.0" self.by-version."rimraf"."2.2.5" - self.by-version."stream-combiner"."0.0.2" + self.by-version."stream-combiner"."0.0.4" self.by-version."tar"."0.1.19" self.by-version."temp"."0.6.0" ]; @@ -3070,13 +3157,13 @@ passthru.names = [ "deep-eql" ]; }; by-spec."deep-equal"."*" = - self.by-version."deep-equal"."0.1.0"; - by-version."deep-equal"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.1.0"; + self.by-version."deep-equal"."0.1.2"; + by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "deep-equal-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.0.tgz"; - sha1 = "81fcefc84551d9d67cccdd80e1fced7f355e146f"; + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; }) ]; buildInputs = @@ -3180,11 +3267,27 @@ passthru.names = [ "diff" ]; }; by-spec."diff"."~1.0.3" = - self.by-version."diff"."1.0.7"; + self.by-version."diff"."1.0.8"; + by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage { + name = "diff-1.0.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }) + ]; + buildInputs = + (self.nativeDeps."diff" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "diff" ]; + }; by-spec."diff"."~1.0.4" = - self.by-version."diff"."1.0.7"; + self.by-version."diff"."1.0.8"; by-spec."diff"."~1.0.7" = - self.by-version."diff"."1.0.7"; + self.by-version."diff"."1.0.8"; by-spec."director"."1.1.10" = self.by-version."director"."1.1.10"; by-version."director"."1.1.10" = lib.makeOverridable self.buildNodePackage { @@ -3279,14 +3382,14 @@ ]; passthru.names = [ "domutils" ]; }; - by-spec."domutils"."1.2" = - self.by-version."domutils"."1.2.2"; - by-version."domutils"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.2.2"; + by-spec."domutils"."1.3" = + self.by-version."domutils"."1.3.0"; + by-version."domutils"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "domutils-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.2.2.tgz"; - sha1 = "bd59d149cf2c034fec81a1ce063bc20fb572a2ab"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; + sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192"; }) ]; buildInputs = @@ -3305,17 +3408,17 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/download/-/download-0.1.7.tgz"; - sha1 = "78be2278a5600e515eff6b01cbf41d694baee855"; + sha1 = "d2a941a878a6d2fdaba60588ffffadab32b788b4"; }) ]; buildInputs = (self.nativeDeps."download" or []); deps = [ - self.by-version."decompress"."0.1.4" + self.by-version."decompress"."0.1.5" + self.by-version."each-async"."0.1.1" self.by-version."mkdirp"."0.3.5" self.by-version."request"."2.25.0" self.by-version."through2"."0.1.0" - self.by-version."async-foreach"."0.1.3" ]; peerDependencies = [ ]; @@ -3339,14 +3442,14 @@ ]; passthru.names = [ "dtrace-provider" ]; }; - by-spec."duplexer"."~0.0.3" = - self.by-version."duplexer"."0.0.4"; - by-version."duplexer"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "duplexer-0.0.4"; + by-spec."duplexer"."~0.1.1" = + self.by-version."duplexer"."0.1.1"; + by-version."duplexer"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "duplexer-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/duplexer/-/duplexer-0.0.4.tgz"; - sha1 = "afcb7f1f8b8d74f820726171d5d64ac9e4a8ff20"; + url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; }) ]; buildInputs = @@ -3357,6 +3460,24 @@ ]; passthru.names = [ "duplexer" ]; }; + by-spec."each-async"."~0.1.1" = + self.by-version."each-async"."0.1.1"; + by-version."each-async"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "each-async-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/each-async/-/each-async-0.1.1.tgz"; + sha1 = "32bcef7e3cdc741d630e29846348be4ecca624ff"; + }) + ]; + buildInputs = + (self.nativeDeps."each-async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "each-async" ]; + }; by-spec."editor"."0.0.5" = self.by-version."editor"."0.0.5"; by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -3485,13 +3606,13 @@ passthru.names = [ "es5-ext" ]; }; by-spec."escape-html"."*" = - self.by-version."escape-html"."1.0.0"; - by-version."escape-html"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "escape-html-1.0.0"; + self.by-version."escape-html"."1.0.1"; + by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "escape-html-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.0.tgz"; - sha1 = "fedcd79564444ddaf2bd85b22c9961b3a3a38bf5"; + url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; }) ]; buildInputs = @@ -3502,7 +3623,7 @@ ]; passthru.names = [ "escape-html" ]; }; - "escape-html" = self.by-version."escape-html"."1.0.0"; + "escape-html" = self.by-version."escape-html"."1.0.1"; by-spec."escodegen"."*" = self.by-version."escodegen"."1.0.1"; by-version."escodegen"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -3666,24 +3787,6 @@ ]; passthru.names = [ "event-stream" ]; }; - by-spec."eventemitter2"."0.4.11" = - self.by-version."eventemitter2"."0.4.11"; - by-version."eventemitter2"."0.4.11" = lib.makeOverridable self.buildNodePackage { - name = "eventemitter2-0.4.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.11.tgz"; - sha1 = "8bbf2b6ac7b31e2eea0c8d8f533ef41f849a9e2c"; - }) - ]; - buildInputs = - (self.nativeDeps."eventemitter2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "eventemitter2" ]; - }; by-spec."eventemitter2"."0.4.12" = self.by-version."eventemitter2"."0.4.12"; by-version."eventemitter2"."0.4.12" = lib.makeOverridable self.buildNodePackage { @@ -3761,7 +3864,7 @@ self.by-version."node-swt"."0.1.1" self.by-version."node-wsfederation"."0.1.1" self.by-version."debug"."0.5.0" - self.by-version."express"."3.4.6" + self.by-version."express"."3.4.7" ]; peerDependencies = [ ]; @@ -3786,19 +3889,19 @@ passthru.names = [ "exit" ]; }; by-spec."express"."*" = - self.by-version."express"."3.4.6"; - by-version."express"."3.4.6" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.6"; + self.by-version."express"."3.4.7"; + by-version."express"."3.4.7" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.6.tgz"; - sha1 = "85b6004076f9004f806e9f49c90487d1f6f89c43"; + url = "http://registry.npmjs.org/express/-/express-3.4.7.tgz"; + sha1 = "3b939c47d2aa44dfecf77d50da2123c5bd313366"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."connect"."2.11.2" + self.by-version."connect"."2.12.0" self.by-version."commander"."1.3.2" self.by-version."range-parser"."0.0.4" self.by-version."mkdirp"."0.3.5" @@ -3808,13 +3911,14 @@ self.by-version."methods"."0.1.0" self.by-version."send"."0.1.4" self.by-version."cookie-signature"."1.0.1" + self.by-version."merge-descriptors"."0.0.1" self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."3.4.6"; + "express" = self.by-version."express"."3.4.7"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -3896,7 +4000,7 @@ passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.4.6"; + self.by-version."express"."3.4.7"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -3927,9 +4031,9 @@ passthru.names = [ "express" ]; }; by-spec."express"."~3.4" = - self.by-version."express"."3.4.6"; + self.by-version."express"."3.4.7"; by-spec."express"."~3.4.4" = - self.by-version."express"."3.4.6"; + self.by-version."express"."3.4.7"; by-spec."express-form"."*" = self.by-version."express-form"."0.10.1"; by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage { @@ -3948,7 +4052,7 @@ self.by-version."async"."0.2.9" ]; peerDependencies = [ - self.by-version."express"."3.4.6" + self.by-version."express"."3.4.7" ]; passthru.names = [ "express-form" ]; }; @@ -4121,7 +4225,7 @@ self.by-version."iconv-lite"."0.2.11" self.by-version."rimraf"."2.2.5" self.by-version."glob"."3.2.7" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."findup-sync"."0.1.2" self.by-version."isbinaryfile"."0.1.9" ]; @@ -4142,7 +4246,7 @@ buildInputs = (self.nativeDeps."fileset" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."glob"."3.2.7" ]; peerDependencies = [ @@ -4167,6 +4271,26 @@ ]; passthru.names = [ "findit" ]; }; + by-spec."findup"."~0.1.3" = + self.by-version."findup"."0.1.3"; + by-version."findup"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "findup-0.1.3"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/findup/-/findup-0.1.3.tgz"; + sha1 = "df2b8ecf06fdaa9cc13dc4ba58bf950e3a176941"; + }) + ]; + buildInputs = + (self.nativeDeps."findup" or []); + deps = [ + self.by-version."nopt"."1.0.10" + self.by-version."colors"."0.6.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "findup" ]; + }; by-spec."findup-sync"."~0.1.0" = self.by-version."findup-sync"."0.1.2"; by-version."findup-sync"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -4190,13 +4314,13 @@ by-spec."findup-sync"."~0.1.2" = self.by-version."findup-sync"."0.1.2"; by-spec."flatiron"."*" = - self.by-version."flatiron"."0.3.9"; - by-version."flatiron"."0.3.9" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.3.9"; + self.by-version."flatiron"."0.3.11"; + by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage { + name = "flatiron-0.3.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.9.tgz"; - sha1 = "e18cc2490e6a0f771c77afe75a1644645ec4a406"; + url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.11.tgz"; + sha1 = "1cb0190fc2bd9d860f018e04d95fd35f9bd12555"; }) ]; buildInputs = @@ -4211,30 +4335,9 @@ ]; passthru.names = [ "flatiron" ]; }; - "flatiron" = self.by-version."flatiron"."0.3.9"; - by-spec."flatiron"."0.3.5" = - self.by-version."flatiron"."0.3.5"; - by-version."flatiron"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.5.tgz"; - sha1 = "a91fe730f6a7fc1ea655a0ca48eaa977bef64625"; - }) - ]; - buildInputs = - (self.nativeDeps."flatiron" or []); - deps = [ - self.by-version."broadway"."0.2.7" - self.by-version."optimist"."0.3.5" - self.by-version."prompt"."0.2.9" - self.by-version."director"."1.1.10" - self.by-version."pkginfo"."0.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "flatiron" ]; - }; + "flatiron" = self.by-version."flatiron"."0.3.11"; + by-spec."flatiron"."~0.3.11" = + self.by-version."flatiron"."0.3.11"; by-spec."follow-redirects"."0.0.3" = self.by-version."follow-redirects"."0.0.3"; by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -4292,36 +4395,36 @@ passthru.names = [ "foreach" ]; }; by-spec."forever"."*" = - self.by-version."forever"."0.10.10"; - by-version."forever"."0.10.10" = lib.makeOverridable self.buildNodePackage { - name = "forever-0.10.10"; + self.by-version."forever"."0.10.11"; + by-version."forever"."0.10.11" = lib.makeOverridable self.buildNodePackage { + name = "forever-0.10.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.10.10.tgz"; - sha1 = "2328bc366bd392e1536f34f866ec39d31ddf5a12"; + url = "http://registry.npmjs.org/forever/-/forever-0.10.11.tgz"; + sha1 = "925cae528c074a29c0119809ca08e382ef194ad0"; }) ]; buildInputs = (self.nativeDeps."forever" or []); deps = [ - self.by-version."colors"."0.6.0-1" + self.by-version."colors"."0.6.2" self.by-version."cliff"."0.1.8" - self.by-version."flatiron"."0.3.5" + self.by-version."flatiron"."0.3.11" self.by-version."forever-monitor"."1.2.3" - self.by-version."nconf"."0.6.7" + self.by-version."nconf"."0.6.9" self.by-version."nssocket"."0.5.1" - self.by-version."optimist"."0.4.0" + self.by-version."optimist"."0.6.0" self.by-version."pkginfo"."0.3.0" - self.by-version."timespan"."2.1.0" - self.by-version."watch"."0.7.0" - self.by-version."utile"."0.1.7" - self.by-version."winston"."0.7.1" + self.by-version."timespan"."2.3.0" + self.by-version."watch"."0.8.0" + self.by-version."utile"."0.2.1" + self.by-version."winston"."0.7.2" ]; peerDependencies = [ ]; passthru.names = [ "forever" ]; }; - "forever" = self.by-version."forever"."0.10.10"; + "forever" = self.by-version."forever"."0.10.11"; by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -4372,7 +4475,7 @@ (self.nativeDeps."forever-monitor" or []); deps = [ self.by-version."broadway"."0.2.9" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."pkginfo"."0.3.0" self.by-version."ps-tree"."0.0.3" self.by-version."watch"."0.5.1" @@ -4671,7 +4774,7 @@ self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.22" = self.by-version."fstream"."0.1.25"; - by-spec."fstream"."~0.1.23" = + by-spec."fstream"."~0.1.25" = self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.8" = self.by-version."fstream"."0.1.25"; @@ -4688,7 +4791,7 @@ buildInputs = (self.nativeDeps."fstream-ignore" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."fstream"."0.1.25" self.by-version."inherits"."2.0.1" ]; @@ -4719,27 +4822,29 @@ passthru.names = [ "fstream-npm" ]; }; by-spec."generator-angular"."*" = - self.by-version."generator-angular"."0.6.0"; - by-version."generator-angular"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.6.0"; + self.by-version."generator-angular"."0.7.1"; + by-version."generator-angular"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "generator-angular-0.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0.tgz"; - sha1 = "84479e9ab2476dfbf571feb45e6fe8edbad2c951"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.7.1.tgz"; + sha1 = "51f9faed8d7c0e9d972004101cc1c16ecd1ebf65"; }) ]; buildInputs = (self.nativeDeps."generator-angular" or []); deps = [ self.by-version."yeoman-generator"."0.13.4" + self.by-version."chalk"."0.3.0" + self.by-version."wiredep"."0.4.2" ]; peerDependencies = [ self.by-version."generator-karma"."0.6.0" - self.by-version."yo"."1.0.5" + self.by-version."yo"."1.0.7-pre.2" ]; passthru.names = [ "generator-angular" ]; }; - "generator-angular" = self.by-version."generator-angular"."0.6.0"; + "generator-angular" = self.by-version."generator-angular"."0.7.1"; by-spec."generator-karma"."~0.6.0" = self.by-version."generator-karma"."0.6.0"; by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -4756,53 +4861,53 @@ self.by-version."yeoman-generator"."0.13.4" ]; peerDependencies = [ - self.by-version."yo"."1.0.5" + self.by-version."yo"."1.0.7-pre.2" ]; passthru.names = [ "generator-karma" ]; }; by-spec."generator-mocha"."~0.1.1" = - self.by-version."generator-mocha"."0.1.2"; - by-version."generator-mocha"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "generator-mocha-0.1.2"; + self.by-version."generator-mocha"."0.1.3"; + by-version."generator-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "generator-mocha-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.2.tgz"; - sha1 = "f59f93e08aeeceeb8150e39ef2b35925fb30692c"; + url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.3.tgz"; + sha1 = "d54977bc0839b30c9b15fdd900e0ecd42afe14c8"; }) ]; buildInputs = (self.nativeDeps."generator-mocha" or []); deps = [ - self.by-version."yeoman-generator"."0.14.1" + self.by-version."yeoman-generator"."0.14.2" ]; peerDependencies = [ - self.by-version."yo"."1.0.5" + self.by-version."yo"."1.0.7-pre.2" ]; passthru.names = [ "generator-mocha" ]; }; by-spec."generator-webapp"."*" = - self.by-version."generator-webapp"."0.4.4"; - by-version."generator-webapp"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "generator-webapp-0.4.4"; + self.by-version."generator-webapp"."0.4.6"; + by-version."generator-webapp"."0.4.6" = lib.makeOverridable self.buildNodePackage { + name = "generator-webapp-0.4.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.4.tgz"; - sha1 = "a7f5d7440943e3e5afbd2ad627675faf2456b74e"; + url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.6.tgz"; + sha1 = "6f51516b615aaf807e221a8ac713845fd680648f"; }) ]; buildInputs = (self.nativeDeps."generator-webapp" or []); deps = [ - self.by-version."yeoman-generator"."0.13.4" + self.by-version."yeoman-generator"."0.14.2" self.by-version."cheerio"."0.12.4" ]; peerDependencies = [ - self.by-version."yo"."1.0.5" - self.by-version."generator-mocha"."0.1.2" + self.by-version."yo"."1.0.7-pre.2" + self.by-version."generator-mocha"."0.1.3" ]; passthru.names = [ "generator-webapp" ]; }; - "generator-webapp" = self.by-version."generator-webapp"."0.4.4"; + "generator-webapp" = self.by-version."generator-webapp"."0.4.6"; by-spec."getmac"."~1.0.6" = self.by-version."getmac"."1.0.6"; by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage { @@ -4891,7 +4996,7 @@ buildInputs = (self.nativeDeps."glob" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ @@ -4911,7 +5016,7 @@ buildInputs = (self.nativeDeps."glob" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."graceful-fs"."2.0.1" self.by-version."inherits"."2.0.1" ]; @@ -4936,7 +5041,7 @@ buildInputs = (self.nativeDeps."glob" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."graceful-fs"."1.2.3" self.by-version."inherits"."1.0.0" ]; @@ -5075,7 +5180,7 @@ self.by-version."glob"."3.1.21" self.by-version."hooker"."0.2.3" self.by-version."iconv-lite"."0.2.11" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."nopt"."1.0.10" self.by-version."rimraf"."2.0.3" self.by-version."lodash"."0.9.2" @@ -5157,7 +5262,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ - self.by-version."clean-css"."2.0.2" + self.by-version."clean-css"."2.0.4" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -5243,7 +5348,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.by-version."uglify-js"."2.4.7" + self.by-version."uglify-js"."2.4.8" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -5269,7 +5374,7 @@ ]; peerDependencies = [ self.by-version."grunt"."0.4.2" - self.by-version."karma"."0.11.9" + self.by-version."karma"."0.11.11" ]; passthru.names = [ "grunt-karma" ]; }; @@ -5330,7 +5435,7 @@ (self.nativeDeps."guifi-earth" or []); deps = [ self.by-version."coffee-script"."1.6.3" - self.by-version."jade"."0.35.0" + self.by-version."jade"."1.0.0" self.by-version."q"."0.9.7" self.by-version."xml2js"."0.4.0" self.by-version."msgpack"."0.2.1" @@ -5568,13 +5673,13 @@ }; "hipache" = self.by-version."hipache"."0.2.4"; by-spec."hiredis"."*" = - self.by-version."hiredis"."0.1.15"; - by-version."hiredis"."0.1.15" = lib.makeOverridable self.buildNodePackage { - name = "hiredis-0.1.15"; + self.by-version."hiredis"."0.1.16"; + by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "hiredis-0.1.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.15.tgz"; - sha1 = "00eb2205c85dcf50de838203e513896dc304dd49"; + url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz"; + sha1 = "f6cee1add2589b8b71cef3c4d3936a9fcd638640"; }) ]; buildInputs = @@ -5839,7 +5944,7 @@ (self.nativeDeps."ibrik" or []); deps = [ self.by-version."coffee-script-redux"."2.0.0-beta4" - self.by-version."istanbul"."0.1.46" + self.by-version."istanbul"."0.2.1" self.by-version."optimist"."0.6.0" self.by-version."escodegen"."1.0.1" self.by-version."mkdirp"."0.3.5" @@ -5926,6 +6031,8 @@ ]; passthru.names = [ "inherits" ]; }; + by-spec."inherits"."2.0.1" = + self.by-version."inherits"."2.0.1"; by-spec."inherits"."~1.0.0" = self.by-version."inherits"."1.0.0"; by-spec."inherits"."~2.0.0" = @@ -5952,14 +6059,14 @@ self.by-version."ini"."1.1.0"; by-spec."ini"."~1.1.0" = self.by-version."ini"."1.1.0"; - by-spec."init-package-json"."0.0.13" = - self.by-version."init-package-json"."0.0.13"; - by-version."init-package-json"."0.0.13" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-0.0.13"; + by-spec."init-package-json"."0.0.14" = + self.by-version."init-package-json"."0.0.14"; + by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-0.0.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.13.tgz"; - sha1 = "ce58dd49dc54b4ce516775ab8f9a43066d685bcb"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz"; + sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7"; }) ]; buildInputs = @@ -6036,7 +6143,7 @@ deps = [ self.by-version."chalk"."0.2.1" self.by-version."request"."2.27.0" - self.by-version."configstore"."0.1.6" + self.by-version."configstore"."0.1.7" self.by-version."async"."0.2.9" self.by-version."lodash"."1.3.1" self.by-version."inquirer"."0.2.5" @@ -6081,17 +6188,17 @@ self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" self.by-version."async"."0.2.9" - self.by-version."express"."3.4.6" - self.by-version."jade"."0.35.0" + self.by-version."express"."3.4.7" + self.by-version."jade"."1.0.0" self.by-version."passport"."0.1.17" self.by-version."passport-http"."0.2.2" - self.by-version."js-yaml"."2.1.3" - self.by-version."mongoose"."3.8.1" + self.by-version."js-yaml"."3.0.1" + self.by-version."mongoose"."3.8.3" self.by-version."gridfs-stream"."0.4.0" self.by-version."temp"."0.6.0" self.by-version."kue"."0.6.2" - self.by-version."redis"."0.9.1" - self.by-version."hiredis"."0.1.15" + self.by-version."redis"."0.10.0" + self.by-version."hiredis"."0.1.16" ]; peerDependencies = [ ]; @@ -6172,7 +6279,55 @@ }; by-spec."isbinaryfile"."~0.1.9" = self.by-version."isbinaryfile"."0.1.9"; + by-spec."isbinaryfile"."~2.0.0" = + self.by-version."isbinaryfile"."2.0.0"; + by-version."isbinaryfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "isbinaryfile-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.0.tgz"; + sha1 = "309c09010811d04ebed7c8d026df443d565e9f26"; + }) + ]; + buildInputs = + (self.nativeDeps."isbinaryfile" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "isbinaryfile" ]; + }; by-spec."istanbul"."*" = + self.by-version."istanbul"."0.2.1"; + by-version."istanbul"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.1.tgz"; + sha1 = "21755f7ff0d7627a0747e571ffcea7f2ee9627d8"; + }) + ]; + buildInputs = + (self.nativeDeps."istanbul" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."escodegen"."0.0.23" + self.by-version."handlebars"."1.0.12" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.1.2" + self.by-version."fileset"."0.1.5" + self.by-version."which"."1.0.5" + self.by-version."async"."0.2.9" + self.by-version."abbrev"."1.0.4" + self.by-version."wordwrap"."0.0.2" + self.by-version."resolve"."0.5.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "istanbul" ]; + }; + "istanbul" = self.by-version."istanbul"."0.2.1"; + by-spec."istanbul"."~0.1.45" = self.by-version."istanbul"."0.1.46"; by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage { name = "istanbul-0.1.46"; @@ -6201,17 +6356,14 @@ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.1.46"; - by-spec."istanbul"."~0.1.45" = - self.by-version."istanbul"."0.1.46"; by-spec."jade"."*" = - self.by-version."jade"."0.35.0"; - by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { - name = "jade-0.35.0"; + self.by-version."jade"."1.0.0"; + by-version."jade"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz"; - sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9"; + url = "http://registry.npmjs.org/jade/-/jade-1.0.0.tgz"; + sha1 = "388fab59603843eb4836211a3684f5206cb93b66"; }) ]; buildInputs = @@ -6222,14 +6374,14 @@ self.by-version."transformers"."2.1.0" self.by-version."character-parser"."1.2.0" self.by-version."monocle"."1.1.50" - self.by-version."with"."1.1.1" + self.by-version."with"."2.0.0" self.by-version."constantinople"."1.0.2" ]; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."0.35.0"; + "jade" = self.by-version."jade"."1.0.0"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -6271,15 +6423,15 @@ passthru.names = [ "jade" ]; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."0.35.0"; + self.by-version."jade"."1.0.0"; by-spec."jayschema"."*" = - self.by-version."jayschema"."0.2.0"; - by-version."jayschema"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "jayschema-0.2.0"; + self.by-version."jayschema"."0.2.1"; + by-version."jayschema"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "jayschema-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.0.tgz"; - sha1 = "ab250dd51224ef36ac8119ce143e0525300d99d4"; + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.1.tgz"; + sha1 = "b951c66c9cf48c510d5b920198c2755590f3b691"; }) ]; buildInputs = @@ -6291,7 +6443,7 @@ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.by-version."jayschema"."0.2.0"; + "jayschema" = self.by-version."jayschema"."0.2.1"; by-spec."jedediah"."~0.1.0" = self.by-version."jedediah"."0.1.1"; by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -6311,13 +6463,13 @@ passthru.names = [ "jedediah" ]; }; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."2.1.3"; - by-version."js-yaml"."2.1.3" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-2.1.3"; + self.by-version."js-yaml"."3.0.1"; + by-version."js-yaml"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; - sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; + sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; }) ]; buildInputs = @@ -6330,7 +6482,7 @@ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."2.1.3"; + "js-yaml" = self.by-version."js-yaml"."3.0.1"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -6391,6 +6543,24 @@ }; by-spec."js-yaml"."~2.1.0" = self.by-version."js-yaml"."2.1.3"; + by-version."js-yaml"."2.1.3" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-2.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; + sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; + }) + ]; + buildInputs = + (self.nativeDeps."js-yaml" or []); + deps = [ + self.by-version."argparse"."0.1.15" + self.by-version."esprima"."1.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "js-yaml" ]; + }; by-spec."jsesc"."0.4.3" = self.by-version."jsesc"."0.4.3"; by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage { @@ -6409,6 +6579,8 @@ ]; passthru.names = [ "jsesc" ]; }; + by-spec."jsesc"."~0.4.3" = + self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = self.by-version."jshint"."2.3.0"; by-version."jshint"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -6425,7 +6597,7 @@ self.by-version."shelljs"."0.1.4" self.by-version."underscore"."1.4.4" self.by-version."cli"."0.4.5" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."console-browserify"."0.1.6" ]; peerDependencies = [ @@ -6584,71 +6756,23 @@ passthru.names = [ "junk" ]; }; by-spec."karma"."*" = - self.by-version."karma"."0.11.9"; - by-version."karma-jasmine"."0.1.4" = self.by-version."karma"."0.11.9"; - by-version."karma-requirejs"."0.2.0" = self.by-version."karma"."0.11.9"; - by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma"."0.11.9"; - by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma"."0.11.9"; - by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma"."0.11.9"; - by-version."karma-firefox-launcher"."0.1.2" = self.by-version."karma"."0.11.9"; - by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma"."0.11.9"; - by-version."karma-script-launcher"."0.1.0" = self.by-version."karma"."0.11.9"; - by-version."karma"."0.11.9" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.11.9"; + self.by-version."karma"."0.11.11"; + by-version."karma"."0.11.11" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.11.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.9.tgz"; - sha1 = "0726f8fe8424179c660eff358476fb8b502b7d0f"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.4.tgz"; - sha1 = "6731409c0b587f3895c9b0966c249058d650b3d3"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.0.tgz"; - sha1 = "62facf19e1f4be956b90b67c4bebba7bb84fb054"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.1.tgz"; - sha1 = "32285f28a5f6c97ceeeae3b8a48e0d087c1a952a"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz"; - sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.1.tgz"; - sha1 = "9fc3410063cefc88e06043d233f839651a16a98c"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.2.tgz"; - sha1 = "bf451d98a80a3f3368514db693dfddb70786fd5f"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.1.tgz"; - sha1 = "e3c9511177f45f9dfe65b404be0ddd7190887c95"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"; - sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a"; + url = "http://registry.npmjs.org/karma/-/karma-0.11.11.tgz"; + sha1 = "c5e0fa2220dfee7bb08a3bb085895b40e82197a8"; }) ]; buildInputs = - (self.nativeDeps."karma" or []) - ++ (self.nativeDeps."karma-jasmine" or []) - ++ (self.nativeDeps."karma-requirejs" or []) - ++ (self.nativeDeps."karma-coffee-preprocessor" or []) - ++ (self.nativeDeps."karma-html2js-preprocessor" or []) - ++ (self.nativeDeps."karma-chrome-launcher" or []) - ++ (self.nativeDeps."karma-firefox-launcher" or []) - ++ (self.nativeDeps."karma-phantomjs-launcher" or []) - ++ (self.nativeDeps."karma-script-launcher" or []); + (self.nativeDeps."karma" or []); deps = [ self.by-version."di"."0.0.1" self.by-version."socket.io"."0.9.16" - self.by-version."chokidar"."0.7.1" + self.by-version."chokidar"."0.8.1" self.by-version."glob"."3.1.21" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."http-proxy"."0.10.3" self.by-version."optimist"."0.3.7" self.by-version."coffee-script"."1.6.3" @@ -6661,25 +6785,40 @@ self.by-version."useragent"."2.0.7" self.by-version."graceful-fs"."1.2.3" self.by-version."connect"."2.8.8" - self.by-version."phantomjs"."1.9.2-5" ]; peerDependencies = [ - self.by-version."requirejs"."2.1.9" ]; - passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; + passthru.names = [ "karma" ]; }; - "karma" = self.by-version."karma"."0.11.9"; + "karma" = self.by-version."karma"."0.11.11"; + by-spec."karma".">=0.11.11" = + self.by-version."karma"."0.11.11"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.11.9"; + self.by-version."karma"."0.11.11"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.11.9"; + self.by-version."karma"."0.11.11"; by-spec."karma"."~0.11.0" = - self.by-version."karma"."0.11.9"; + self.by-version."karma"."0.11.11"; by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.1"; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.1"; - by-spec."karma-coffee-preprocessor"."*" = - self.by-version."karma-coffee-preprocessor"."0.1.1"; + self.by-version."karma-chrome-launcher"."0.1.2"; + by-version."karma-chrome-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "karma-chrome-launcher-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.2.tgz"; + sha1 = "f7154d03be01f4c246368d56d43d7232e14ccce6"; + }) + ]; + buildInputs = + (self.nativeDeps."karma-chrome-launcher" or []); + deps = [ + ]; + peerDependencies = [ + self.by-version."karma"."0.11.11" + ]; + passthru.names = [ "karma-chrome-launcher" ]; + }; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2"; by-spec."karma-coverage"."*" = self.by-version."karma-coverage"."0.1.4"; by-version."karma-coverage"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -6695,20 +6834,14 @@ deps = [ self.by-version."istanbul"."0.1.46" self.by-version."ibrik"."1.0.1" - self.by-version."dateformat"."1.0.6-1.2.3" + self.by-version."dateformat"."1.0.7-1.2.3" ]; peerDependencies = [ - self.by-version."karma"."0.11.9" + self.by-version."karma"."0.11.11" ]; passthru.names = [ "karma-coverage" ]; }; "karma-coverage" = self.by-version."karma-coverage"."0.1.4"; - by-spec."karma-firefox-launcher"."*" = - self.by-version."karma-firefox-launcher"."0.1.2"; - by-spec."karma-html2js-preprocessor"."*" = - self.by-version."karma-html2js-preprocessor"."0.1.0"; - by-spec."karma-jasmine"."*" = - self.by-version."karma-jasmine"."0.1.4"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.1"; by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -6725,7 +6858,7 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.11.9" + self.by-version."karma"."0.11.11" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -6745,43 +6878,57 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.9" - self.by-version."mocha"."1.15.1" + self.by-version."karma"."0.11.11" + self.by-version."mocha"."1.16.2" ]; passthru.names = [ "karma-mocha" ]; }; "karma-mocha" = self.by-version."karma-mocha"."0.1.1"; - by-spec."karma-phantomjs-launcher"."*" = - self.by-version."karma-phantomjs-launcher"."0.1.1"; by-spec."karma-requirejs"."*" = - self.by-version."karma-requirejs"."0.2.0"; - "karma-requirejs" = self.by-version."karma-requirejs"."0.2.0"; + self.by-version."karma-requirejs"."0.2.1"; + by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "karma-requirejs-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz"; + sha1 = "7f3ac5df67bccd9d832a928ec658d733ec983c5d"; + }) + ]; + buildInputs = + (self.nativeDeps."karma-requirejs" or []); + deps = [ + ]; + peerDependencies = [ + self.by-version."karma"."0.11.11" + self.by-version."requirejs"."2.1.9" + ]; + passthru.names = [ "karma-requirejs" ]; + }; + "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1"; by-spec."karma-sauce-launcher"."*" = - self.by-version."karma-sauce-launcher"."0.1.5"; - by-version."karma-sauce-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "karma-sauce-launcher-0.1.5"; + self.by-version."karma-sauce-launcher"."0.2.0"; + by-version."karma-sauce-launcher"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "karma-sauce-launcher-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.5.tgz"; - sha1 = "9e95e2b91556ff073105777c838e55d8b57db318"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.0.tgz"; + sha1 = "0994da49a1774be876ff1b107fd47e8768e3ead0"; }) ]; buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.1.5" - self.by-version."sauce-connect-launcher"."0.1.11" + self.by-version."wd"."0.2.8" + self.by-version."sauce-connect-launcher"."0.2.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" ]; peerDependencies = [ - self.by-version."karma"."0.11.9" + self.by-version."karma"."0.11.11" ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.5"; - by-spec."karma-script-launcher"."*" = - self.by-version."karma-script-launcher"."0.1.0"; + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.0"; by-spec."keen.io"."0.0.3" = self.by-version."keen.io"."0.0.3"; by-version."keen.io"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -6992,9 +7139,9 @@ (self.nativeDeps."less" or []); deps = [ self.by-version."mime"."1.2.11" - self.by-version."request"."2.29.0" + self.by-version."request"."2.30.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."2.0.2" + self.by-version."clean-css"."2.0.4" self.by-version."source-map"."0.1.31" ]; peerDependencies = [ @@ -7404,8 +7551,8 @@ ]; passthru.names = [ "lru-cache" ]; }; - by-spec."lru-cache"."~2.3.1" = - self.by-version."lru-cache"."2.3.1"; + by-spec."lru-cache"."~2.5.0" = + self.by-version."lru-cache"."2.5.0"; by-spec."mailcomposer".">= 0.1.27" = self.by-version."mailcomposer"."0.2.6"; by-version."mailcomposer"."0.2.6" = lib.makeOverridable self.buildNodePackage { @@ -7475,6 +7622,24 @@ ]; passthru.names = [ "memoizee" ]; }; + by-spec."merge-descriptors"."0.0.1" = + self.by-version."merge-descriptors"."0.0.1"; + by-version."merge-descriptors"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "merge-descriptors-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.1.tgz"; + sha1 = "2ff0980c924cf81d0b5d1fb601177cb8bb56c0d0"; + }) + ]; + buildInputs = + (self.nativeDeps."merge-descriptors" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "merge-descriptors" ]; + }; by-spec."methods"."0.0.1" = self.by-version."methods"."0.0.1"; by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -7636,13 +7801,13 @@ passthru.names = [ "mimelib" ]; }; by-spec."minimatch"."0" = - self.by-version."minimatch"."0.2.12"; - by-version."minimatch"."0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-0.2.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; }) ]; buildInputs = @@ -7675,40 +7840,79 @@ passthru.names = [ "minimatch" ]; }; by-spec."minimatch"."0.2.x" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."0.x" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."0.x.x" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch".">=0.2.4" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.0" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.11" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.12" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; + by-spec."minimatch"."~0.2.14" = + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = - self.by-version."minimatch"."0.2.12"; + self.by-version."minimatch"."0.2.14"; by-spec."minimist"."~0.0.1" = self.by-version."minimist"."0.0.5"; by-version."minimist"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "minimist-0.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz"; - sha1 = "d7aa327bcecf518f9106ac6b8f003fa3bcea8566"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz"; + sha1 = "d7aa327bcecf518f9106ac6b8f003fa3bcea8566"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."ministyle"."~0.1.3" = + self.by-version."ministyle"."0.1.3"; + by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "ministyle-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz"; + sha1 = "d7a639f29e9450b9d5ebf2255d1fa8d1d9d89900"; }) ]; buildInputs = - (self.nativeDeps."minimist" or []); + (self.nativeDeps."ministyle" or []); deps = [ ]; peerDependencies = [ ]; - passthru.names = [ "minimist" ]; + passthru.names = [ "ministyle" ]; + }; + by-spec."miniwrite"."~0.1.3" = + self.by-version."miniwrite"."0.1.3"; + by-version."miniwrite"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "miniwrite-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz"; + sha1 = "9e893efb435f853454ca0321b86a44378e8c50c6"; + }) + ]; + buildInputs = + (self.nativeDeps."miniwrite" or []); + deps = [ + self.by-version."mkdirp"."0.3.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "miniwrite" ]; }; by-spec."mkdirp"."*" = self.by-version."mkdirp"."0.3.5"; @@ -7782,13 +7986,13 @@ passthru.names = [ "mkpath" ]; }; by-spec."mocha"."*" = - self.by-version."mocha"."1.15.1"; - by-version."mocha"."1.15.1" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.15.1"; + self.by-version."mocha"."1.16.2"; + by-version."mocha"."1.16.2" = lib.makeOverridable self.buildNodePackage { + name = "mocha-1.16.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.15.1.tgz"; - sha1 = "308c3268e16b0b1690d88335355c9d18d4664fc4"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.16.2.tgz"; + sha1 = "57766843f016a1308fe9fddb22f74676d6721ace"; }) ]; buildInputs = @@ -7806,28 +8010,30 @@ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.15.1"; + "mocha" = self.by-version."mocha"."1.16.2"; by-spec."mocha-unfunk-reporter"."*" = - self.by-version."mocha-unfunk-reporter"."0.3.7"; - by-version."mocha-unfunk-reporter"."0.3.7" = lib.makeOverridable self.buildNodePackage { - name = "mocha-unfunk-reporter-0.3.7"; + self.by-version."mocha-unfunk-reporter"."0.4.0"; + by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "mocha-unfunk-reporter-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.7.tgz"; - sha1 = "3d51ac1804dce71ecd471e4e7aa96ce2e9a6dfec"; + url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz"; + sha1 = "59eda97aec6ae6e26d7af4173490a65b7b082d20"; }) ]; buildInputs = (self.nativeDeps."mocha-unfunk-reporter" or []); deps = [ self.by-version."jsesc"."0.4.3" - self.by-version."diff"."1.0.7" + self.by-version."unfunk-diff"."0.0.1" + self.by-version."miniwrite"."0.1.3" + self.by-version."ministyle"."0.1.3" ]; peerDependencies = [ ]; passthru.names = [ "mocha-unfunk-reporter" ]; }; - "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.7"; + "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7865,13 +8071,13 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.0-rc2"; - by-version."mongodb"."1.4.0-rc2" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.4.0-rc2"; + self.by-version."mongodb"."1.4.0-rc3"; + by-version."mongodb"."1.4.0-rc3" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.4.0-rc3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc2.tgz"; - sha1 = "00396d1af8ec807c6954e8608df84360d8cd2c07"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc3.tgz"; + sha1 = "e605a2c85a337f85d766e2ed221a4caa201c0b4f"; }) ]; buildInputs = @@ -7884,7 +8090,7 @@ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.0-rc2"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc3"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -7925,15 +8131,33 @@ passthru.names = [ "mongodb" ]; }; by-spec."mongodb"."1.3.x" = - self.by-version."mongodb"."1.3.19"; + self.by-version."mongodb"."1.3.23"; + by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.3.23"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz"; + sha1 = "874a5212162b16188aeeaee5e06067766c8e9e86"; + }) + ]; + buildInputs = + (self.nativeDeps."mongodb" or []); + deps = [ + self.by-version."bson"."0.2.5" + self.by-version."kerberos"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "mongodb" ]; + }; by-spec."mongoose"."*" = - self.by-version."mongoose"."3.8.1"; - by-version."mongoose"."3.8.1" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.8.1"; + self.by-version."mongoose"."3.8.3"; + by-version."mongoose"."3.8.3" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-3.8.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.1.tgz"; - sha1 = "1efe17d259ae2905330a3b2d91ba4085a090f6b8"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.3.tgz"; + sha1 = "74425eb9ee9ca4a34c87b4624dc055131e0c7d0c"; }) ]; buildInputs = @@ -8400,30 +8624,10 @@ passthru.names = [ "nconf" ]; }; "nconf" = self.by-version."nconf"."0.6.9"; - by-spec."nconf"."0.6.7" = - self.by-version."nconf"."0.6.7"; - by-version."nconf"."0.6.7" = lib.makeOverridable self.buildNodePackage { - name = "nconf-0.6.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz"; - sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c"; - }) - ]; - buildInputs = - (self.nativeDeps."nconf" or []); - deps = [ - self.by-version."async"."0.1.22" - self.by-version."ini"."1.1.0" - self.by-version."optimist"."0.3.7" - self.by-version."pkginfo"."0.2.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "nconf" ]; - }; by-spec."nconf"."0.6.9" = self.by-version."nconf"."0.6.9"; + by-spec."nconf"."~0.6.9" = + self.by-version."nconf"."0.6.9"; by-spec."ncp"."0.2.x" = self.by-version."ncp"."0.2.7"; by-version."ncp"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -8568,7 +8772,7 @@ buildInputs = (self.nativeDeps."nijs" or []); deps = [ - self.by-version."optparse"."1.0.4" + self.by-version."optparse"."1.0.5" ]; peerDependencies = [ ]; @@ -8576,13 +8780,13 @@ }; "nijs" = self.by-version."nijs"."0.0.12"; by-spec."node-expat"."*" = - self.by-version."node-expat"."2.1.3"; - by-version."node-expat"."2.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-expat-2.1.3"; + self.by-version."node-expat"."2.1.4"; + by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-expat-2.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.3.tgz"; - sha1 = "c5c5c3bc3f3922d281087ca46e3f9926b9f55dc9"; + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz"; + sha1 = "e55a82249b71afbce09ffa880705ec37553c5121"; }) ]; buildInputs = @@ -8594,15 +8798,15 @@ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.1.3"; + "node-expat" = self.by-version."node-expat"."2.1.4"; by-spec."node-gyp"."*" = - self.by-version."node-gyp"."0.12.1"; - by-version."node-gyp"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.12.1"; + self.by-version."node-gyp"."0.12.2"; + by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.12.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.1.tgz"; - sha1 = "6da8a1c248b9dc73d2e14e1cd216efef3bdd7911"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; + sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; }) ]; buildInputs = @@ -8611,12 +8815,12 @@ self.by-version."glob"."3.2.7" self.by-version."graceful-fs"."2.0.1" self.by-version."fstream"."0.1.25" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."mkdirp"."0.3.5" self.by-version."nopt"."2.1.2" self.by-version."npmlog"."0.0.6" self.by-version."osenv"."0.0.3" - self.by-version."request"."2.29.0" + self.by-version."request"."2.30.0" self.by-version."rimraf"."2.2.5" self.by-version."semver"."2.2.1" self.by-version."tar"."0.1.19" @@ -8626,9 +8830,9 @@ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.by-version."node-gyp"."0.12.1"; + "node-gyp" = self.by-version."node-gyp"."0.12.2"; by-spec."node-gyp"."~0.12.0" = - self.by-version."node-gyp"."0.12.1"; + self.by-version."node-gyp"."0.12.2"; by-spec."node-inspector"."*" = self.by-version."node-inspector"."0.6.2"; by-version."node-inspector"."0.6.2" = lib.makeOverridable self.buildNodePackage { @@ -8643,7 +8847,7 @@ (self.nativeDeps."node-inspector" or []); deps = [ self.by-version."socket.io"."0.9.16" - self.by-version."express"."3.4.6" + self.by-version."express"."3.4.7" self.by-version."async"."0.2.9" self.by-version."glob"."3.2.7" self.by-version."rc"."0.3.2" @@ -8861,13 +9065,13 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."0.9.14"; - by-version."nodemon"."0.9.14" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-0.9.14"; + self.by-version."nodemon"."0.9.17"; + by-version."nodemon"."0.9.17" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-0.9.17"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.14.tgz"; - sha1 = "41c401aaea5b4306aab6ba71f12d3c8a1e693440"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.17.tgz"; + sha1 = "31fbc65cbda162ebff4d9ff5f774fdd3006bb50b"; }) ]; buildInputs = @@ -8879,7 +9083,7 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."0.9.14"; + "nodemon" = self.by-version."nodemon"."0.9.17"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -8940,14 +9144,14 @@ }; by-spec."nopt"."2.1.x" = self.by-version."nopt"."2.1.2"; - by-spec."nopt"."~1.0.10" = + by-spec."nopt"."https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress" = self.by-version."nopt"."1.0.10"; by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage { name = "nopt-1.0.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress"; + sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad"; }) ]; buildInputs = @@ -8959,18 +9163,20 @@ ]; passthru.names = [ "nopt" ]; }; + by-spec."nopt"."~1.0.10" = + self.by-version."nopt"."1.0.10"; by-spec."nopt"."~2.1.1" = self.by-version."nopt"."2.1.2"; by-spec."nopt"."~2.1.2" = self.by-version."nopt"."2.1.2"; by-spec."normalize-package-data"."~0.2.7" = - self.by-version."normalize-package-data"."0.2.7"; - by-version."normalize-package-data"."0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "normalize-package-data-0.2.7"; + self.by-version."normalize-package-data"."0.2.8"; + by-version."normalize-package-data"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "normalize-package-data-0.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.7.tgz"; - sha1 = "0f075fa2d1f9ba23a854c4c56818c4077638f72a"; + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.8.tgz"; + sha1 = "95dc1bcb54c8d46b3be345c05afbab27e48e2f69"; }) ]; buildInputs = @@ -8985,13 +9191,13 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.3.15"; - by-version."npm"."1.3.15" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.15"; + self.by-version."npm"."1.3.21"; + by-version."npm"."1.3.21" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.21"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.15.tgz"; - sha1 = "25987c35a87d01379ddacb9d5db58e3697369dc6"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.21.tgz"; + sha1 = "fb2bd7fdbc3b511c9dfb8de5559d305391421ec1"; }) ]; buildInputs = @@ -9002,34 +9208,34 @@ self.by-version."slide"."1.1.5" self.by-version."abbrev"."1.0.4" self.by-version."graceful-fs"."2.0.1" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" self.by-version."nopt"."2.1.2" self.by-version."rimraf"."2.2.5" - self.by-version."request"."2.27.0" + self.by-version."request"."2.30.0" self.by-version."which"."1.0.5" self.by-version."tar"."0.1.19" self.by-version."fstream"."0.1.25" self.by-version."block-stream"."0.0.7" self.by-version."mkdirp"."0.3.5" self.by-version."read"."1.0.5" - self.by-version."lru-cache"."2.3.1" - self.by-version."node-gyp"."0.12.1" + self.by-version."lru-cache"."2.5.0" + self.by-version."node-gyp"."0.12.2" self.by-version."fstream-npm"."0.1.6" self.by-version."uid-number"."0.0.3" self.by-version."archy"."0.0.2" self.by-version."chownr"."0.0.1" self.by-version."npmlog"."0.0.6" self.by-version."ansi"."0.2.1" - self.by-version."npm-registry-client"."0.2.30" + self.by-version."npm-registry-client"."0.3.3" self.by-version."read-package-json"."1.1.4" self.by-version."read-installed"."0.2.5" self.by-version."glob"."3.2.7" - self.by-version."init-package-json"."0.0.13" + self.by-version."init-package-json"."0.0.14" self.by-version."osenv"."0.0.3" self.by-version."lockfile"."0.4.2" self.by-version."retry"."0.6.0" self.by-version."once"."1.3.0" - self.by-version."npmconf"."0.1.7" + self.by-version."npmconf"."0.1.9" self.by-version."opener"."1.3.0" self.by-version."chmodr"."0.1.0" self.by-version."cmd-shim"."1.1.1" @@ -9039,14 +9245,18 @@ self.by-version."npm-user-validate"."0.0.3" self.by-version."github-url-from-git"."1.1.1" self.by-version."github-url-from-username-repo"."0.0.2" + self.by-version."text-table"."0.2.0" + self.by-version."ansicolors"."0.3.2" + self.by-version."ansistyles"."0.1.3" + self.by-version."path-is-inside"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.3.15"; + "npm" = self.by-version."npm"."1.3.21"; by-spec."npm"."~1.3.14" = - self.by-version."npm"."1.3.15"; + self.by-version."npm"."1.3.21"; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { @@ -9060,7 +9270,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.29.0" + self.by-version."request"."2.30.0" self.by-version."graceful-fs"."2.0.1" self.by-version."semver"."2.0.11" self.by-version."slide"."1.1.5" @@ -9075,20 +9285,20 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.2.29" = - self.by-version."npm-registry-client"."0.2.30"; - by-version."npm-registry-client"."0.2.30" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.2.30"; + by-spec."npm-registry-client"."~0.3.2" = + self.by-version."npm-registry-client"."0.3.3"; + by-version."npm-registry-client"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.30.tgz"; - sha1 = "f01cae5c51aa0a1c5dc2516cbad3ebde068d3eaa"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.3.tgz"; + sha1 = "da08bb681fb24aa5c988ca71f8c10f27f09daf4a"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.29.0" + self.by-version."request"."2.30.0" self.by-version."graceful-fs"."2.0.1" self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" @@ -9122,13 +9332,13 @@ passthru.names = [ "npm-user-validate" ]; }; by-spec."npm2nix"."*" = - self.by-version."npm2nix"."5.4.0"; - by-version."npm2nix"."5.4.0" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.4.0"; + self.by-version."npm2nix"."5.4.1"; + by-version."npm2nix"."5.4.1" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.0.tgz"; - sha1 = "6185ed1261856a09f2a935eec733ccf1c1843726"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.1.tgz"; + sha1 = "98a0eb1012aacee3baa53eeb8a0084a006153086"; }) ]; buildInputs = @@ -9147,7 +9357,7 @@ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.by-version."npm2nix"."5.4.0"; + "npm2nix" = self.by-version."npm2nix"."5.4.1"; by-spec."npmconf"."0.0.24" = self.by-version."npmconf"."0.0.24"; by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { @@ -9201,13 +9411,13 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.7"; - by-version."npmconf"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.7"; + self.by-version."npmconf"."0.1.9"; + by-version."npmconf"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-0.1.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.7.tgz"; - sha1 = "f0be6f90c672046b562175b6d99c2d152bd9f17c"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.9.tgz"; + sha1 = "a6b256fdd23e347ef2465a2e6d57a9be4deb898f"; }) ]; buildInputs = @@ -9226,8 +9436,8 @@ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."~0.1.6" = - self.by-version."npmconf"."0.1.7"; + by-spec."npmconf"."~0.1.7" = + self.by-version."npmconf"."0.1.9"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -9516,25 +9726,6 @@ ]; passthru.names = [ "optimist" ]; }; - by-spec."optimist"."0.3.5" = - self.by-version."optimist"."0.3.5"; - by-version."optimist"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.3.5.tgz"; - sha1 = "03654b52417030312d109f39b159825b60309304"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = [ - self.by-version."wordwrap"."0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; by-spec."optimist"."0.3.x" = self.by-version."optimist"."0.3.7"; by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -9554,25 +9745,6 @@ ]; passthru.names = [ "optimist" ]; }; - by-spec."optimist"."0.4.0" = - self.by-version."optimist"."0.4.0"; - by-version."optimist"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.4.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.4.0.tgz"; - sha1 = "cb8ec37f2fe3aa9864cb67a275250e7e19620a25"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = [ - self.by-version."wordwrap"."0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; by-spec."optimist"."0.6.0" = self.by-version."optimist"."0.6.0"; by-spec."optimist"."~0.3" = @@ -9620,13 +9792,13 @@ passthru.names = [ "optjs" ]; }; by-spec."optparse"."*" = - self.by-version."optparse"."1.0.4"; - by-version."optparse"."1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "optparse-1.0.4"; + self.by-version."optparse"."1.0.5"; + by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "optparse-1.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz"; - sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1"; + url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }) ]; buildInputs = @@ -9637,9 +9809,9 @@ ]; passthru.names = [ "optparse" ]; }; - "optparse" = self.by-version."optparse"."1.0.4"; + "optparse" = self.by-version."optparse"."1.0.5"; by-spec."optparse".">= 1.0.3" = - self.by-version."optparse"."1.0.4"; + self.by-version."optparse"."1.0.5"; by-spec."osenv"."0" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -9771,6 +9943,24 @@ "passport-local" = self.by-version."passport-local"."0.1.6"; by-spec."passport-local"."0.1.6" = self.by-version."passport-local"."0.1.6"; + by-spec."path-is-inside"."~1.0.0" = + self.by-version."path-is-inside"."1.0.0"; + by-version."path-is-inside"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "path-is-inside-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.0.tgz"; + sha1 = "8ec1c42a4c1a039e3e75f6e9e6029bd0c699016e"; + }) + ]; + buildInputs = + (self.nativeDeps."path-is-inside" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "path-is-inside" ]; + }; by-spec."pause"."0.0.1" = self.by-version."pause"."0.0.1"; by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -9789,14 +9979,14 @@ ]; passthru.names = [ "pause" ]; }; - by-spec."phantomjs"."~1.9" = - self.by-version."phantomjs"."1.9.2-5"; - by-version."phantomjs"."1.9.2-5" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.2-5"; + by-spec."phantomjs"."~1.9.1-2" = + self.by-version."phantomjs"."1.9.2-6"; + by-version."phantomjs"."1.9.2-6" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.2-6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-5.tgz"; - sha1 = "455f8fb45bab776715e016fea3086ccc34ff102b"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-6.tgz"; + sha1 = "71db87e5275489570560a744dbaa649c2f9da0a0"; }) ]; buildInputs = @@ -9814,8 +10004,6 @@ ]; passthru.names = [ "phantomjs" ]; }; - by-spec."phantomjs"."~1.9.1-2" = - self.by-version."phantomjs"."1.9.2-5"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -9965,7 +10153,7 @@ deps = [ self.by-version."pkginfo"."0.3.0" self.by-version."read"."1.0.5" - self.by-version."revalidator"."0.1.5" + self.by-version."revalidator"."0.1.6" self.by-version."utile"."0.2.1" self.by-version."winston"."0.6.2" ]; @@ -9973,29 +10161,6 @@ ]; passthru.names = [ "prompt" ]; }; - by-spec."prompt"."0.2.9" = - self.by-version."prompt"."0.2.9"; - by-version."prompt"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "prompt-0.2.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/prompt/-/prompt-0.2.9.tgz"; - sha1 = "fdd01e3f9654d0c44fbb8671f8d3f6ca009e3c16"; - }) - ]; - buildInputs = - (self.nativeDeps."prompt" or []); - deps = [ - self.by-version."pkginfo"."0.3.0" - self.by-version."read"."1.0.5" - self.by-version."revalidator"."0.1.5" - self.by-version."utile"."0.1.7" - self.by-version."winston"."0.6.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "prompt" ]; - }; by-spec."promptly"."~0.2.0" = self.by-version."promptly"."0.2.0"; by-version."promptly"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -10053,13 +10218,13 @@ passthru.names = [ "proto-list" ]; }; by-spec."protobufjs".">= 1.1.4" = - self.by-version."protobufjs"."2.0.0-rc4"; - by-version."protobufjs"."2.0.0-rc4" = lib.makeOverridable self.buildNodePackage { - name = "protobufjs-2.0.0-rc4"; + self.by-version."protobufjs"."2.0.1"; + by-version."protobufjs"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "protobufjs-2.0.1"; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.0-rc4.tgz"; - sha1 = "298d218346a7fb44566de2d74d440f664712f3ad"; + url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.1.tgz"; + sha1 = "636e8c4a9e0488fbc9c8898c044d844884f8fd96"; }) ]; buildInputs = @@ -10111,7 +10276,7 @@ }; by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.3"; - by-spec."q"."0.9.x" = + by-spec."q".">= 0.0.1" = self.by-version."q"."0.9.7"; by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage { name = "q-0.9.7"; @@ -10129,14 +10294,14 @@ ]; passthru.names = [ "q" ]; }; - by-spec."q".">= 0.0.1" = - self.by-version."q"."0.9.7"; by-spec."q"."~0.9" = self.by-version."q"."0.9.7"; by-spec."q"."~0.9.2" = self.by-version."q"."0.9.7"; by-spec."q"."~0.9.6" = self.by-version."q"."0.9.7"; + by-spec."q"."~0.9.7" = + self.by-version."q"."0.9.7"; by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -10229,7 +10394,7 @@ ]; passthru.names = [ "qs" ]; }; - by-spec."qs".">= 0.4.0" = + by-spec."qs"."0.6.6" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { name = "qs-0.6.6"; @@ -10247,6 +10412,8 @@ ]; passthru.names = [ "qs" ]; }; + by-spec."qs".">= 0.4.0" = + self.by-version."qs"."0.6.6"; by-spec."qs"."~0.5.0" = self.by-version."qs"."0.5.6"; by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage { @@ -10270,13 +10437,13 @@ by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; by-spec."rai"."~0.1" = - self.by-version."rai"."0.1.8"; - by-version."rai"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "rai-0.1.8"; + self.by-version."rai"."0.1.9"; + by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "rai-0.1.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rai/-/rai-0.1.8.tgz"; - sha1 = "f4ac41063cfe544a1eb3735441f096908219654b"; + url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz"; + sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc"; }) ]; buildInputs = @@ -10526,7 +10693,7 @@ deps = [ self.by-version."glob"."3.2.7" self.by-version."lru-cache"."2.5.0" - self.by-version."normalize-package-data"."0.2.7" + self.by-version."normalize-package-data"."0.2.8" self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ @@ -10590,7 +10757,7 @@ buildInputs = (self.nativeDeps."readdirp" or []); deps = [ - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" ]; peerDependencies = [ ]; @@ -10616,13 +10783,13 @@ passthru.names = [ "redeyed" ]; }; by-spec."redis"."*" = - self.by-version."redis"."0.9.1"; - by-version."redis"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.9.1"; + self.by-version."redis"."0.10.0"; + by-version."redis"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "redis-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.9.1.tgz"; - sha1 = "eb7ad2355a2ea52c4c0bae043103fee96400439b"; + url = "http://registry.npmjs.org/redis/-/redis-0.10.0.tgz"; + sha1 = "76864475f71a745cbc3bbb27d794a6d01a96505c"; }) ]; buildInputs = @@ -10633,7 +10800,7 @@ ]; passthru.names = [ "redis" ]; }; - "redis" = self.by-version."redis"."0.9.1"; + "redis" = self.by-version."redis"."0.10.0"; by-spec."redis"."0.7.2" = self.by-version."redis"."0.7.2"; by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -10647,7 +10814,7 @@ buildInputs = (self.nativeDeps."redis" or []); deps = [ - self.by-version."hiredis"."0.1.15" + self.by-version."hiredis"."0.1.16" ]; peerDependencies = [ ]; @@ -10690,7 +10857,7 @@ passthru.names = [ "redis" ]; }; by-spec."redis".">= 0.6.6" = - self.by-version."redis"."0.9.1"; + self.by-version."redis"."0.10.0"; by-spec."reds"."0.1.4" = self.by-version."reds"."0.1.4"; by-version."reds"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -10705,7 +10872,7 @@ (self.nativeDeps."reds" or []); deps = [ self.by-version."natural"."0.0.69" - self.by-version."redis"."0.9.1" + self.by-version."redis"."0.10.0" ]; peerDependencies = [ ]; @@ -10762,20 +10929,20 @@ deps = [ self.by-version."nomnom"."1.6.2" self.by-version."colors"."0.5.1" - self.by-version."minimatch"."0.2.12" + self.by-version."minimatch"."0.2.14" ]; peerDependencies = [ ]; passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.29.0"; - by-version."request"."2.29.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.29.0"; + self.by-version."request"."2.30.0"; + by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.30.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz"; - sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3"; + url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; + sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; }) ]; buildInputs = @@ -10799,9 +10966,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.29.0"; + self.by-version."request"."2.30.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.29.0"; + self.by-version."request"."2.30.0"; by-spec."request"."2.16.2" = self.by-version."request"."2.16.2"; by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { @@ -10879,9 +11046,9 @@ passthru.names = [ "request" ]; }; by-spec."request".">=2.12.0" = - self.by-version."request"."2.29.0"; + self.by-version."request"."2.30.0"; by-spec."request"."~2" = - self.by-version."request"."2.29.0"; + self.by-version."request"."2.30.0"; by-spec."request"."~2.21.0" = self.by-version."request"."2.21.0"; by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage { @@ -10972,6 +11139,38 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."~2.29.0" = + self.by-version."request"."2.29.0"; + by-version."request"."2.29.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.29.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz"; + sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.0" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.9.15" + self.by-version."form-data"."0.1.2" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + by-spec."request"."~2.30.0" = + self.by-version."request"."2.30.0"; by-spec."request-progress"."~0.3.0" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -11114,7 +11313,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = [ - self.by-version."protobufjs"."2.0.0-rc4" + self.by-version."protobufjs"."2.0.1" ]; peerDependencies = [ ]; @@ -11142,13 +11341,13 @@ by-spec."retry"."~0.6.0" = self.by-version."retry"."0.6.0"; by-spec."revalidator"."0.1.x" = - self.by-version."revalidator"."0.1.5"; - by-version."revalidator"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "revalidator-0.1.5"; + self.by-version."revalidator"."0.1.6"; + by-version."revalidator"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "revalidator-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.5.tgz"; - sha1 = "205bc02e4186e63e82a0837498f29ba287be3861"; + url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.6.tgz"; + sha1 = "0af2bab68d7d0e766fc4249660ebc2be28b594ba"; }) ]; buildInputs = @@ -11245,6 +11444,8 @@ self.by-version."rimraf"."2.2.5"; by-spec."rimraf"."~2.2.2" = self.by-version."rimraf"."2.2.5"; + by-spec."rimraf"."~2.2.5" = + self.by-version."rimraf"."2.2.5"; by-spec."s3http"."*" = self.by-version."s3http"."0.0.3"; by-version."s3http"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -11258,7 +11459,7 @@ buildInputs = (self.nativeDeps."s3http" or []); deps = [ - self.by-version."aws-sdk"."1.14.0" + self.by-version."aws-sdk"."1.16.0" self.by-version."commander"."2.0.0" self.by-version."http-auth"."2.0.7" self.by-version."express"."3.4.4" @@ -11272,14 +11473,14 @@ passthru.names = [ "s3http" ]; }; "s3http" = self.by-version."s3http"."0.0.3"; - by-spec."sauce-connect-launcher"."~0.1.10" = - self.by-version."sauce-connect-launcher"."0.1.11"; - by-version."sauce-connect-launcher"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "sauce-connect-launcher-0.1.11"; + by-spec."sauce-connect-launcher"."~0.2.2" = + self.by-version."sauce-connect-launcher"."0.2.2"; + by-version."sauce-connect-launcher"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "sauce-connect-launcher-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.1.11.tgz"; - sha1 = "71ac88bdab7bd8396a3f7d9feb165a4e457c3ecd"; + url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.2.2.tgz"; + sha1 = "cfd951c8b488af38d384aef14920261482e2e05a"; }) ]; buildInputs = @@ -11332,13 +11533,13 @@ by-spec."sax".">=0.4.2" = self.by-version."sax"."0.5.8"; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.38.1"; - by-version."selenium-webdriver"."2.38.1" = lib.makeOverridable self.buildNodePackage { - name = "selenium-webdriver-2.38.1"; + self.by-version."selenium-webdriver"."2.39.0"; + by-version."selenium-webdriver"."2.39.0" = lib.makeOverridable self.buildNodePackage { + name = "selenium-webdriver-2.39.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.38.1.tgz"; - sha1 = "9299e3b808bec401334ca4e80cb0b70b872be651"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.39.0.tgz"; + sha1 = "546225f2f4f53f1f490a3077e5f14092fad3d205"; }) ]; buildInputs = @@ -11349,7 +11550,7 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.38.1"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.39.0"; by-spec."semver"."*" = self.by-version."semver"."2.2.1"; by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -11691,7 +11892,7 @@ buildInputs = (self.nativeDeps."simplesmtp" or []); deps = [ - self.by-version."rai"."0.1.8" + self.by-version."rai"."0.1.9" self.by-version."xoauth2"."0.1.8" ]; peerDependencies = [ @@ -11773,13 +11974,13 @@ by-spec."slide"."~1.1.5" = self.by-version."slide"."1.1.5"; by-spec."smartdc"."*" = - self.by-version."smartdc"."7.1.1"; - by-version."smartdc"."7.1.1" = lib.makeOverridable self.buildNodePackage { - name = "smartdc-7.1.1"; + self.by-version."smartdc"."7.1.2"; + by-version."smartdc"."7.1.2" = lib.makeOverridable self.buildNodePackage { + name = "smartdc-7.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.1.tgz"; - sha1 = "acc4378e0967b43dd8ded8c67f99e6508277bfb9"; + url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.2.tgz"; + sha1 = "11228af972ed5014d3798202ecc370e02f007872"; }) ]; buildInputs = @@ -11797,7 +11998,7 @@ ]; passthru.names = [ "smartdc" ]; }; - "smartdc" = self.by-version."smartdc"."7.1.1"; + "smartdc" = self.by-version."smartdc"."7.1.2"; by-spec."smartdc-auth"."1.0.1" = self.by-version."smartdc-auth"."1.0.1"; by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -12099,19 +12300,19 @@ }; "statsd" = self.by-version."statsd"."0.7.0"; by-spec."stream-combiner"."~0.0.2" = - self.by-version."stream-combiner"."0.0.2"; - by-version."stream-combiner"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "stream-combiner-0.0.2"; + self.by-version."stream-combiner"."0.0.4"; + by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "stream-combiner-0.0.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.2.tgz"; - sha1 = "dfe0e74675742565e76c6056788ea5c23bd97db4"; + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; }) ]; buildInputs = (self.nativeDeps."stream-combiner" or []); deps = [ - self.by-version."duplexer"."0.0.4" + self.by-version."duplexer"."0.1.1" ]; peerDependencies = [ ]; @@ -12229,6 +12430,24 @@ ]; passthru.names = [ "stringify-object" ]; }; + by-spec."strip-ansi"."~0.1.0" = + self.by-version."strip-ansi"."0.1.1"; + by-version."strip-ansi"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "strip-ansi-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; + sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; + }) + ]; + buildInputs = + (self.nativeDeps."strip-ansi" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "strip-ansi" ]; + }; by-spec."strong-data-uri"."~0.1.0" = self.by-version."strong-data-uri"."0.1.0"; by-version."strong-data-uri"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -12249,13 +12468,13 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.41.2"; - by-version."stylus"."0.41.2" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.41.2"; + self.by-version."stylus"."0.41.3"; + by-version."stylus"."0.41.3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.41.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.41.2.tgz"; - sha1 = "68bca2b317d32c85e7cdf7afe7ee044da9afe983"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.41.3.tgz"; + sha1 = "0a49c3f2f4f6b6719e7cca823052b9df87acaeb7"; }) ]; buildInputs = @@ -12270,7 +12489,7 @@ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.41.2"; + "stylus" = self.by-version."stylus"."0.41.3"; by-spec."stylus"."0.27.2" = self.by-version."stylus"."0.27.2"; by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { @@ -12311,6 +12530,25 @@ ]; passthru.names = [ "sudo-block" ]; }; + by-spec."sudo-block"."~0.3.0" = + self.by-version."sudo-block"."0.3.0"; + by-version."sudo-block"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "sudo-block-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.3.0.tgz"; + sha1 = "aec27fbde8763ee32e3e47b8ba3c70584da7eb9c"; + }) + ]; + buildInputs = + (self.nativeDeps."sudo-block" or []); + deps = [ + self.by-version."chalk"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "sudo-block" ]; + }; by-spec."superagent"."0.15.7" = self.by-version."superagent"."0.15.7"; by-version."superagent"."0.15.7" = lib.makeOverridable self.buildNodePackage { @@ -12473,6 +12711,8 @@ self.by-version."tar"."0.1.19"; by-spec."tar"."~0.1.18" = self.by-version."tar"."0.1.19"; + by-spec."tar"."~0.1.19" = + self.by-version."tar"."0.1.19"; by-spec."temp"."*" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -12572,14 +12812,14 @@ ]; passthru.names = [ "through2" ]; }; - by-spec."timespan"."2.1.0" = - self.by-version."timespan"."2.1.0"; - by-version."timespan"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "timespan-2.1.0"; + by-spec."timespan"."~2.3.0" = + self.by-version."timespan"."2.3.0"; + by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "timespan-2.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/timespan/-/timespan-2.1.0.tgz"; - sha1 = "9a410fbbf26e213362d956f4836349e65e573832"; + url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; + sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; }) ]; buildInputs = @@ -12912,13 +13152,13 @@ passthru.names = [ "uglify-js" ]; }; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.7"; - by-version."uglify-js"."2.4.7" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.7"; + self.by-version."uglify-js"."2.4.8"; + by-version."uglify-js"."2.4.8" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.7.tgz"; - sha1 = "9f3b5bd1c657d16aaad7134a7adbeaa88e67c5ae"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.8.tgz"; + sha1 = "70e33bd9bce9a27b896fd4fead4c7da434fcca09"; }) ]; buildInputs = @@ -13092,6 +13332,29 @@ ]; passthru.names = [ "underscore.string" ]; }; + by-spec."underscore.string"."~2.3.3" = + self.by-version."underscore.string"."2.3.3"; + by-spec."unfunk-diff"."~0.0.1" = + self.by-version."unfunk-diff"."0.0.1"; + by-version."unfunk-diff"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "unfunk-diff-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.1.tgz"; + sha1 = "fd01490b7e53bc268f069f222fda10704c8f1265"; + }) + ]; + buildInputs = + (self.nativeDeps."unfunk-diff" or []); + deps = [ + self.by-version."diff"."1.0.8" + self.by-version."jsesc"."0.4.3" + self.by-version."ministyle"."0.1.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "unfunk-diff" ]; + }; by-spec."ungit"."*" = self.by-version."ungit"."0.6.0"; by-version."ungit"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -13105,7 +13368,7 @@ buildInputs = (self.nativeDeps."ungit" or []); deps = [ - self.by-version."express"."3.4.6" + self.by-version."express"."3.4.7" self.by-version."superagent"."0.15.7" self.by-version."lodash"."2.3.0" self.by-version."temp"."0.6.0" @@ -13118,7 +13381,7 @@ self.by-version."winston"."0.7.2" self.by-version."passport"."0.1.17" self.by-version."passport-local"."0.1.6" - self.by-version."npm"."1.3.15" + self.by-version."npm"."1.3.21" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" @@ -13152,7 +13415,7 @@ (self.nativeDeps."update-notifier" or []); deps = [ self.by-version."request"."2.27.0" - self.by-version."configstore"."0.1.6" + self.by-version."configstore"."0.1.7" self.by-version."semver"."2.1.0" self.by-version."chalk"."0.2.1" ]; @@ -13181,19 +13444,20 @@ ]; passthru.names = [ "useragent" ]; }; - by-spec."util"."0.10.0" = - self.by-version."util"."0.10.0"; - by-version."util"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "util-0.10.0"; + by-spec."util"."0.10.2" = + self.by-version."util"."0.10.2"; + by-version."util"."0.10.2" = lib.makeOverridable self.buildNodePackage { + name = "util-0.10.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/util/-/util-0.10.0.tgz"; - sha1 = "b11c0823c74c077ea6911ad334394055b680fb5e"; + url = "http://registry.npmjs.org/util/-/util-0.10.2.tgz"; + sha1 = "8180519cf690fb88bc56480fe55087531f446304"; }) ]; buildInputs = (self.nativeDeps."util" or []); deps = [ + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; @@ -13218,7 +13482,7 @@ ]; passthru.names = [ "util" ]; }; - by-spec."utile"."0.1.7" = + by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "utile-0.1.7"; @@ -13232,7 +13496,7 @@ (self.nativeDeps."utile" or []); deps = [ self.by-version."async"."0.1.22" - self.by-version."deep-equal"."0.1.0" + self.by-version."deep-equal"."0.1.2" self.by-version."i"."0.3.2" self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.2.7" @@ -13242,8 +13506,6 @@ ]; passthru.names = [ "utile" ]; }; - by-spec."utile"."0.1.x" = - self.by-version."utile"."0.1.7"; by-spec."utile"."0.2.1" = self.by-version."utile"."0.2.1"; by-version."utile"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -13258,7 +13520,7 @@ (self.nativeDeps."utile" or []); deps = [ self.by-version."async"."0.2.9" - self.by-version."deep-equal"."0.1.0" + self.by-version."deep-equal"."0.1.2" self.by-version."i"."0.3.2" self.by-version."mkdirp"."0.3.5" self.by-version."ncp"."0.4.2" @@ -13272,6 +13534,8 @@ self.by-version."utile"."0.2.1"; by-spec."utile"."~0.1.7" = self.by-version."utile"."0.1.7"; + by-spec."utile"."~0.2.1" = + self.by-version."utile"."0.2.1"; by-spec."uuid"."1.4.1" = self.by-version."uuid"."1.4.1"; by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { @@ -13436,7 +13700,7 @@ (self.nativeDeps."vows" or []); deps = [ self.by-version."eyes"."0.1.8" - self.by-version."diff"."1.0.7" + self.by-version."diff"."1.0.8" ]; peerDependencies = [ ]; @@ -13482,14 +13746,14 @@ ]; passthru.names = [ "watch" ]; }; - by-spec."watch"."0.7.0" = - self.by-version."watch"."0.7.0"; - by-version."watch"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "watch-0.7.0"; + by-spec."watch"."~0.8.0" = + self.by-version."watch"."0.8.0"; + by-version."watch"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "watch-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/watch/-/watch-0.7.0.tgz"; - sha1 = "3d6e715648af867ec7f1149302b526479e726856"; + url = "http://registry.npmjs.org/watch/-/watch-0.8.0.tgz"; + sha1 = "1bb0eea53defe6e621e9c8c63c0358007ecbdbcc"; }) ]; buildInputs = @@ -13500,14 +13764,14 @@ ]; passthru.names = [ "watch" ]; }; - by-spec."wd"."~0.1.5" = - self.by-version."wd"."0.1.5"; - by-version."wd"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.1.5"; + by-spec."wd"."~0.2.8" = + self.by-version."wd"."0.2.8"; + by-version."wd"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.1.5.tgz"; - sha1 = "c0a9c8fb5f62ed6628a6f6e1d1958f9316dadfec"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.8.tgz"; + sha1 = "397ccb8058e72af3ae6e7c485f4368f4fb514631"; }) ]; buildInputs = @@ -13519,6 +13783,7 @@ self.by-version."request"."2.21.0" self.by-version."archiver"."0.4.10" self.by-version."lodash"."1.3.1" + self.by-version."underscore.string"."2.3.3" ]; peerDependencies = [ ]; @@ -13540,8 +13805,8 @@ self.by-version."adm-zip"."0.4.3" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.7" - self.by-version."phantomjs"."1.9.2-5" + self.by-version."npmconf"."0.1.9" + self.by-version."phantomjs"."1.9.2-6" self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" ]; @@ -13647,7 +13912,7 @@ deps = [ self.by-version."async"."0.2.9" self.by-version."colors"."0.6.2" - self.by-version."cycle"."1.0.2" + self.by-version."cycle"."1.0.3" self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.3.0" self.by-version."request"."2.16.6" @@ -13673,7 +13938,7 @@ deps = [ self.by-version."async"."0.1.22" self.by-version."colors"."0.6.2" - self.by-version."cycle"."1.0.2" + self.by-version."cycle"."1.0.3" self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.2.3" self.by-version."request"."2.9.203" @@ -13685,43 +13950,38 @@ }; by-spec."winston"."0.6.x" = self.by-version."winston"."0.6.2"; - by-spec."winston"."0.7.1" = - self.by-version."winston"."0.7.1"; - by-version."winston"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "winston-0.7.1"; + by-spec."winston"."0.7.2" = + self.by-version."winston"."0.7.2"; + by-spec."winston"."~0.7.2" = + self.by-version."winston"."0.7.2"; + by-spec."wiredep"."~0.4.2" = + self.by-version."wiredep"."0.4.2"; + by-version."wiredep"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "wiredep-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.7.1.tgz"; - sha1 = "e291ab24eddbf79ea40ff532619277a0d30b0eb3"; + url = "http://registry.npmjs.org/wiredep/-/wiredep-0.4.2.tgz"; + sha1 = "42d4cf07422576f26e3a04045edc163da101a66f"; }) ]; buildInputs = - (self.nativeDeps."winston" or []); + (self.nativeDeps."wiredep" or []); deps = [ - self.by-version."async"."0.2.9" - self.by-version."colors"."0.6.2" - self.by-version."cycle"."1.0.2" - self.by-version."eyes"."0.1.8" - self.by-version."pkginfo"."0.3.0" - self.by-version."request"."2.16.6" - self.by-version."stack-trace"."0.0.7" + self.by-version."lodash"."1.3.1" + self.by-version."chalk"."0.1.1" ]; peerDependencies = [ ]; - passthru.names = [ "winston" ]; + passthru.names = [ "wiredep" ]; }; - by-spec."winston"."0.7.2" = - self.by-version."winston"."0.7.2"; - by-spec."winston"."~0.7.2" = - self.by-version."winston"."0.7.2"; - by-spec."with"."~1.1.0" = - self.by-version."with"."1.1.1"; - by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "with-1.1.1"; + by-spec."with"."~2.0.0" = + self.by-version."with"."2.0.0"; + by-version."with"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "with-2.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz"; - sha1 = "66bd6664deb318b2482dd0424ccdebe822434ac0"; + url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz"; + sha1 = "ec01ff021db9df05639047147ede012f5e6d0afd"; }) ]; buildInputs = @@ -13885,7 +14145,7 @@ (self.nativeDeps."xml2js" or []); deps = [ self.by-version."sax"."0.5.8" - self.by-version."xmlbuilder"."1.1.0" + self.by-version."xmlbuilder"."2.0.1" ]; peerDependencies = [ ]; @@ -13912,13 +14172,13 @@ passthru.names = [ "xmlbuilder" ]; }; by-spec."xmlbuilder".">=0.4.2" = - self.by-version."xmlbuilder"."1.1.0"; - by-version."xmlbuilder"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-1.1.0"; + self.by-version."xmlbuilder"."2.0.1"; + by-version."xmlbuilder"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-1.1.0.tgz"; - sha1 = "2b4935395f17c549e73b55730ea5e206a9c7d1c5"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.0.1.tgz"; + sha1 = "b0f9b16bd2a260e734f5f8e30d9bf1db217fe79b"; }) ]; buildInputs = @@ -14021,7 +14281,7 @@ self.by-version."request"."2.25.0" self.by-version."rimraf"."2.2.5" self.by-version."tar"."0.1.19" - self.by-version."diff"."1.0.7" + self.by-version."diff"."1.0.8" self.by-version."mime"."1.2.11" self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."1.3.1" @@ -14042,16 +14302,14 @@ ]; passthru.names = [ "yeoman-generator" ]; }; - by-spec."yeoman-generator"."~0.13.1" = - self.by-version."yeoman-generator"."0.13.4"; by-spec."yeoman-generator"."~0.14.0" = - self.by-version."yeoman-generator"."0.14.1"; - by-version."yeoman-generator"."0.14.1" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.14.1"; + self.by-version."yeoman-generator"."0.14.2"; + by-version."yeoman-generator"."0.14.2" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.14.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.1.tgz"; - sha1 = "d99358d6f65d8df0e384b45ff82f13560e06c78f"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.2.tgz"; + sha1 = "6d3e306d1118c83c25ac12a9d3dcb7870aa53397"; }) ]; buildInputs = @@ -14059,7 +14317,7 @@ deps = [ self.by-version."cheerio"."0.12.4" self.by-version."rimraf"."2.2.5" - self.by-version."diff"."1.0.7" + self.by-version."diff"."1.0.8" self.by-version."mime"."1.2.11" self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."2.2.1" @@ -14083,30 +14341,68 @@ ]; passthru.names = [ "yeoman-generator" ]; }; - by-spec."yeoman-generator"."~0.14.1" = - self.by-version."yeoman-generator"."0.14.1"; + by-spec."yeoman-generator"."~0.15.0" = + self.by-version."yeoman-generator"."0.15.0-pre.2"; + by-version."yeoman-generator"."0.15.0-pre.2" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.15.0-pre.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.15.0-pre.2.tgz"; + sha1 = "d6a2f2994209e891517f7f6823b03fffe3c18878"; + }) + ]; + buildInputs = + (self.nativeDeps."yeoman-generator" or []); + deps = [ + self.by-version."cheerio"."0.12.4" + self.by-version."rimraf"."2.2.5" + self.by-version."diff"."1.0.8" + self.by-version."mime"."1.2.11" + self.by-version."underscore.string"."2.3.3" + self.by-version."lodash"."2.4.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."glob"."3.2.7" + self.by-version."debug"."0.7.4" + self.by-version."isbinaryfile"."2.0.0" + self.by-version."dargs"."0.1.0" + self.by-version."async"."0.2.9" + self.by-version."inquirer"."0.3.5" + self.by-version."iconv-lite"."0.2.11" + self.by-version."shelljs"."0.2.6" + self.by-version."findup-sync"."0.1.2" + self.by-version."chalk"."0.3.0" + self.by-version."text-table"."0.2.0" + self.by-version."download"."0.1.7" + self.by-version."request"."2.29.0" + self.by-version."file-utils"."0.1.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yeoman-generator" ]; + }; by-spec."yo"."*" = - self.by-version."yo"."1.0.5"; - by-version."yo"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "yo-1.0.5"; + self.by-version."yo"."1.0.7-pre.2"; + by-version."yo"."1.0.7-pre.2" = lib.makeOverridable self.buildNodePackage { + name = "yo-1.0.7-pre.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yo/-/yo-1.0.5.tgz"; - sha1 = "4454720eb262d06395e950269fbb6ca25ed68c9e"; + url = "http://registry.npmjs.org/yo/-/yo-1.0.7-pre.2.tgz"; + sha1 = "0301500c8b92e81409a7a68459501e8dece0609f"; }) ]; buildInputs = (self.nativeDeps."yo" or []); deps = [ - self.by-version."yeoman-generator"."0.14.1" + self.by-version."yeoman-generator"."0.15.0-pre.2" self.by-version."nopt"."2.1.2" - self.by-version."lodash"."2.2.1" + self.by-version."lodash"."2.4.1" self.by-version."update-notifier"."0.1.7" self.by-version."insight"."0.3.0" - self.by-version."sudo-block"."0.2.1" + self.by-version."sudo-block"."0.3.0" self.by-version."async"."0.2.9" self.by-version."open"."0.0.4" - self.by-version."chalk"."0.2.1" + self.by-version."chalk"."0.4.0" + self.by-version."findup"."0.1.3" ]; peerDependencies = [ self.by-version."grunt-cli"."0.1.11" @@ -14114,11 +14410,11 @@ ]; passthru.names = [ "yo" ]; }; - "yo" = self.by-version."yo"."1.0.5"; + "yo" = self.by-version."yo"."1.0.7-pre.2"; by-spec."yo".">=1.0.0" = - self.by-version."yo"."1.0.5"; + self.by-version."yo"."1.0.7-pre.2"; by-spec."yo".">=1.0.0-rc.1.1" = - self.by-version."yo"."1.0.5"; + self.by-version."yo"."1.0.7-pre.2"; by-spec."zeparser"."0.0.5" = self.by-version."zeparser"."0.0.5"; by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { -- cgit 1.4.1 From 2abbce201a0187fda2997337d690bda0d49d118c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 c744a7e106aba084a56deb28db96ae644ae4736a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 25 Dec 2013 10:30:44 +0100 Subject: netpbm: fix build --- pkgs/tools/graphics/netpbm/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 39e134ad906..dc16f4887d9 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -18,9 +18,7 @@ stdenv.mkDerivation { cp config.mk.in config.mk substituteInPlace "config.mk" \ --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \ - --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" \ - --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \ - --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N" + --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" ''; preBuild = '' -- cgit 1.4.1 From 15a5894ab3ed1e8ebafb72dc903052b091b6155f Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 25 Dec 2013 11:08:19 +0100 Subject: netpbm: fix CVE-2005-2471 --- pkgs/tools/graphics/netpbm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index dc16f4887d9..2e3274ca0ff 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation { sha256 = "0csx6g0ci66nx1a6z0a9dkpfp66mdvcpp5r7g6zrx4jp18r9hzb2"; }; + postPatch = /* CVE-2005-2471, from Arch */ '' + substituteInPlace converter/other/pstopnm.c \ + --replace '"-DSAFER"' '"-DPARANOIDSAFER"' + ''; + NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 libtiff ]; -- cgit 1.4.1 From 545216ee02d888b8d696dbb6a678a5d068d72eb0 Mon Sep 17 00:00:00 2001 From: Malcolm Matalka 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 --- 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') 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 Date: Wed, 25 Dec 2013 14:43:23 +0100 Subject: Opam 1.1: Constrain supported ocaml versions. Signed-off-by: Moritz Ulrich --- 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') 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 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') 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 378f962c0ef006a19ba1d7f7e3fd67bba8be0960 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 22 Dec 2013 18:37:41 +0100 Subject: Aegisub: New Package Adding Aegisub: an advanced movie subtitle editor --- pkgs/applications/video/aegisub/default.nix | 59 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/video/aegisub/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix new file mode 100644 index 00000000000..cbbb23b04a0 --- /dev/null +++ b/pkgs/applications/video/aegisub/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl +, libX11, gettext, wxGTK +, libiconv, fontconfig, freetype +, mesa +, libass, fftw, ffms +, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies +, spellChecking ? true, hunspell ? null +, automationSupport ? true, lua ? null +, openalSupport ? false, openal ? null +, alsaSupport ? true, alsaLib ? null +, pulseaudioSupport ? true, pulseaudio ? null +, portaudioSupport ? false, portaudio ? null +}: + +assert spellChecking -> (hunspell != null); +assert automationSupport -> (lua != null); +assert openalSupport -> (openal != null); +assert alsaSupport -> (alsaLib != null); +assert pulseaudioSupport -> (pulseaudio != null); +assert portaudioSupport -> (portaudio != null); + +stdenv.mkDerivation rec { + name = "aegisub-${version}"; + version = "3.0.4"; + + src = fetchurl { + url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz"; + md5 = "0f22d63ed4c502f3801795fa623a4f41"; + }; + + buildInputs = with stdenv.lib; + [ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib ] + ++ optional spellChecking hunspell + ++ optional automationSupport lua + ++ optional openalSupport openal + ++ optional alsaSupport alsaLib + ++ optional pulseaudioSupport pulseaudio + ++ optional portaudioSupport portaudio + ; + + NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm"; + + preConfigure = "cd aegisub"; + + postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub"; + + meta = { + description = "An advanced subtitle editor"; + longDescription = '' + Aegisub is a free, cross-platform open source tool for creating and + modifying subtitles. Aegisub makes it quick and easy to time subtitles to + audio, and features many powerful tools for styling them, including a + built-in real-time video preview. + ''; + homepage = http://www.aegisub.org/; + license = "BSD"; # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd softwares + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a75135604d..91f842a9aac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -400,6 +400,11 @@ let aefs = callPackage ../tools/filesystems/aefs { }; + aegisub = callPackage ../applications/video/aegisub { + wxGTK = wxGTK29; + lua = lua5_1; + }; + aespipe = callPackage ../tools/security/aespipe { }; aescrypt = callPackage ../tools/misc/aescrypt { }; -- cgit 1.4.1 From 01c39bdefc8ad6c9eb4177a977004ee7960454f7 Mon Sep 17 00:00:00 2001 From: Edward Tjörnhammar Date: Thu, 5 Dec 2013 23:09:41 +0100 Subject: Adding IntelliJ IDEA13 Community and Ultimate --- pkgs/applications/editors/idea/default.nix | 104 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 106 insertions(+) create mode 100644 pkgs/applications/editors/idea/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix new file mode 100644 index 00000000000..74dbaf78dac --- /dev/null +++ b/pkgs/applications/editors/idea/default.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk +, coreutils, gnugrep, which, git +}: + +let + + buildIdea = + { name, src, description, license }: + + stdenv.mkDerivation rec { + inherit name src license; + ideaItem = makeDesktopItem { + name = "IDEA"; + exec = "idea"; + comment = "Integrated Development Environment"; + desktopName = "IntelliJ IDEA"; + genericName = "Integrated Development Environment"; + categories = "Application;Development;"; + }; + + buildInputs = [ makeWrapper patchelf p7zip ]; + + buildCommand = '' + tar xvzf $src + mkdir -p $out + cp -a $name $out + + interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + + 7z x $out/$name/lib/snappy-java-1.0.5.jar + rm $out/$name/lib/snappy-java-1.0.5.jar + if [ "${stdenv.system}" == "x86_64-linux" ];then + patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier64 + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so + else + patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier + patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so + fi + 7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar . + + mkdir -p $out/bin + makeWrapper $out/$name/bin/idea.sh $out/bin/idea \ + --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \ + --prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \ + --prefix JDK_HOME : ${jdk} \ + --prefix IDEA_JDK : ${jdk} + + mkdir -p $out/share/applications + cp ${ideaItem}/share/applications/* $out/share/applications + patchShebangs $out + ''; + + meta = { + homepage = http://www.jetbrains.com/idea/; + inherit description; + inherit license; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + platforms = stdenv.lib.platforms.linux; + }; + }; + +in { + + idea_community_1301 = buildIdea { + name = "idea-IC-133.331"; + description = "IntelliJ IDEA 13 Community Edition"; + license = stdenv.lib.licenses.asl20.shortName; + src = fetchurl { + url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.1.tar.gz; + sha256 = "6f268bb1dbe61ed0274fd2ea9b4b7403f50da11bdde208bcfc8c391d235d7c02"; + }; + }; + + idea_ultimate_1301 = buildIdea { + name = "idea-IU-133.331"; + description = "IntelliJ IDEA 13 Ultimate Edition"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.1.tar.gz; + sha256 = "d3638d97b719773459d5027ba096b52695325b241cbf5e31e535165a5f19849d"; + }; + }; + + idea_community_13 = buildIdea { + name = "idea-IC-133.193"; + description = "IntelliJ IDEA 13 Community Edition"; + license = stdenv.lib.licenses.asl20.shortName; + src = fetchurl { + url = http://download-ln.jetbrains.com/idea/ideaIC-13.tar.gz; + sha256 = "5cd88b8effc5e4e55d999df1cec6f54c53b5adf0b88e49400b3a185bef7db13a"; + }; + }; + + idea_ultimate_13 = buildIdea { + name = "idea-IU-133.193"; + description = "IntelliJ IDEA 13 Ultimate Edition"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = http://download-ln.jetbrains.com/idea/ideaIU-13.tar.gz; + sha256 = "211a782654d04f2fe5fce9084043edfb8355a7bc4dc41fee7dc79cfe604d4654"; + }; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc34533b279..1febf855795 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8088,6 +8088,8 @@ let slibGuile = slibGuile.override { scheme = guile_1_8; }; }; + ideas = recurseIntoAttrs (callPackage ../applications/editors/idea { }); + libquvi = callPackage ../applications/video/quvi/library.nix { }; mi2ly = callPackage ../applications/audio/mi2ly {}; -- cgit 1.4.1 From 46f627e8f7697a51f7c6fa16c259662b6508e804 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 26 Dec 2013 00:44:16 +0100 Subject: git-repo-1.19 --- .../version-management/git-repo/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/version-management/git-repo/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix new file mode 100644 index 00000000000..8b6e31039fb --- /dev/null +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation { + name = "git-repo-1.19"; + src = fetchurl { + url = "https://git-repo.googlecode.com/files/repo-1.19"; + sha1 = "e48d46e36194859fe8565e8cbdf4c5d1d8768ef3"; + }; + + unpackPhase = "true"; + installPhase = '' + mkdir -p $out/bin + install $src $out/bin/repo + ''; + + meta = { + homepage = "http://source.android.com/source/downloading.html"; + description = "Android's repo management tool"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1febf855795..65d2f234f27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8075,6 +8075,10 @@ let gitFull = gitAndTools.gitFull; gitSVN = gitAndTools.gitSVN; + gitRepo = callPackage ../applications/version-management/git-repo { + python = python27; + }; + giv = callPackage ../applications/graphics/giv { pcre = pcre.override { unicodeSupport = true; }; }; -- cgit 1.4.1 From 7a988c62af89fc220d91bcb1062f593b82c326d6 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 26 Dec 2013 01:01:01 +0100 Subject: git-repo-1.20, update and pin python --- pkgs/applications/version-management/git-repo/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 8b6e31039fb..7f8091067cb 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation { - name = "git-repo-1.19"; + name = "git-repo-1.20"; src = fetchurl { - url = "https://git-repo.googlecode.com/files/repo-1.19"; - sha1 = "e48d46e36194859fe8565e8cbdf4c5d1d8768ef3"; + # I could not find a versioned url for the 1.20 version. In case + # the sha mismatches, check the homepage for new version and sha. + url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo"; + sha1 = "e197cb48ff4ddda4d11f23940d316e323b29671c"; }; unpackPhase = "true"; installPhase = '' mkdir -p $out/bin - install $src $out/bin/repo + sed -e 's,!/usr/bin/env python,!${python}/bin/python,' < $src > $out/bin/repo + chmod +x $out/bin/repo ''; meta = { -- cgit 1.4.1 From 46c1216fd0d0e0b4dd2a56df098e4f83fe2e8036 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 26 Dec 2013 04:23:53 +0200 Subject: kde411: expose it to nix-env with a lower priority. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65d2f234f27..528720bcce2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9705,6 +9705,8 @@ let kde4 = recurseIntoAttrs pkgs.kde410; + kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde411 ); + kde410 = kdePackagesFor (pkgs.kde410 // { boost = boost149; eigen = eigen2; -- cgit 1.4.1 From 0889c86b865e259afa54fd2feb20546bc8c5d8ea Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Thu, 26 Dec 2013 13:48:17 +0800 Subject: midori: update from 0.4.4 to 0.5.6 (close #1411) --- .../networking/browsers/midori/default.nix | 74 +++++++++------------- pkgs/top-level/all-packages.nix | 10 +-- 2 files changed, 31 insertions(+), 53 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index e39e377147a..791725272a9 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,51 +1,37 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - doPatchShebangs = args.doPatchShebangs; - makeManyWrappers = args.makeManyWrappers; +{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper +, webkitgtk, librsvg, libnotify +, glib_networking, gsettings_desktop_schemas +}: - version = "0.4"; - release = "4"; - buildInputs = with args; [ - intltool python imagemagick gtk3 glib webkit libxml2 - gtksourceview pkgconfig which gettext makeWrapper - file libidn sqlite docutils libnotify libsoup vala - kbproto xproto scrnsaverproto libXScrnSaver dbus_glib - glib_networking - ]; -in -rec { - src = fetchurl { - url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2"; - sha256 = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2"; +stdenv.mkDerivation rec { + name = "midori-0.5.6"; + + meta = { + description = "Lightweight WebKitGTK+ web browser"; + homepage = "http://www.midori-browser.org"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ]; }; - inherit buildInputs; - configureFlags = ["--enable-gtk3"]; + src = fetchurl { + url = "${meta.homepage}/downloads/midori_0.5.6_all_.tar.bz2"; + sha256 = "0jpj8cw0dzamzylzslayamjhv0is0xd99dyaql4nyxrkk5fipgn5"; + }; - /* doConfigure should be specified separately */ - phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure" - "doMakeInstall" "shebangsInstalled" "wrapWK" - ]; + buildInputs = [ + cmake pkgconfig intltool vala makeWrapper + webkitgtk librsvg libnotify + ]; - setVars = args.fullDepEntry '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify" - '' []; - - shebangsHere = (doPatchShebangs "."); - shebangsInstalled = (doPatchShebangs "$out/bin"); - wrapWK = (makeManyWrappers "$out/bin/*" - '' - --set WEBKIT_IGNORE_SSL_ERRORS 1 \ - --prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules" - ''); + cmakeFlags = '' + -DUSE_GTK3=1 + -DUSE_ZEITGEIST=OFF + ''; - name = "midori-${version}.${release}"; - meta = { - description = "Light WebKit-based web browser with GTK GUI"; - maintainers = [args.lib.maintainers.raskin]; - platforms = with args.lib.platforms; - linux; - }; + postInstall = '' + wrapProgram $out/bin/midori \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share" + ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 528720bcce2..82dcfa778a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8448,15 +8448,7 @@ let mid2key = callPackage ../applications/audio/mid2key { }; - midori = builderDefsPackage (import ../applications/networking/browsers/midori) { - inherit imagemagick intltool python pkgconfig webkit libxml2 - which gettext makeWrapper file libidn sqlite docutils libnotify - vala dbus_glib glib_networking; - inherit gtk3 glib; - inherit (gnome) gtksourceview; - inherit (webkit.passthru.args) libsoup; - inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto; - }; + midori = callPackage ../applications/networking/browsers/midori { }; midoriWrapper = wrapFirefox { browser = midori; browserName = "midori"; desktopName = "Midori"; -- cgit 1.4.1 From b345bdf5d292d41c9d7d8211118768c3df7638b3 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Tue, 24 Dec 2013 14:19:12 +0100 Subject: tmpwatch: Add platforms to meta (unix). According to web pages of tmpwatch it seems that it can be build on unixes (Mac OS X, solaris). Not much information is here though. --- pkgs/tools/misc/tmpwatch/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 2257fb50293..befe517c225 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."; licence = "GPLv2"; maintainers = with stdenv.lib.maintainers; [ vlstill ]; + platforms = stdenv.lib.platforms.unix; }; } -- cgit 1.4.1 From f5374c123c43d4241f77d308f44344ab5d13167a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 17 Dec 2013 22:16:50 -0600 Subject: Add targetcli-fb as well as necessary dependencies --- pkgs/top-level/python-packages.nix | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8de9d43d5ae..74eef17950f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1000,6 +1000,29 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); + configshell_fb = buildPythonPackage rec { + version = "1.1.fb10"; + name = "configshell-fb-${version}"; + + src = fetchurl { + url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz"; + sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy"; + }; + + propagatedBuildInputs = [ + pyparsing + modules.readline + urwid + ]; + + meta = { + description = "A Python library for building configuration shells"; + homepage = "https://github.com/agrover/configshell-fb"; + platforms = stdenv.lib.platforms.linux; + }; + }; + + construct = buildPythonPackage rec { name = "construct-2.5.1"; @@ -5797,6 +5820,21 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + rtslib_fb = buildPythonPackage rec { + version = "2.1.fb43"; + name = "rtslib-fb-${version}"; + + src = fetchurl { + url = "https://github.com/agrover/rtslib-fb/archive/v${version}.tar.gz"; + sha256 = "1b59vyy12g6rix9l2fxx0hjiq33shkb79v57gwffs57vh74wc53v"; + }; + + meta = { + description = "A Python object API for managing the Linux LIO kernel target"; + homepage = "https://github.com/agrover/rtslib-fb"; + platforms = stdenv.lib.platforms.linux; + }; + }; seqdiag = buildPythonPackage rec { name = "seqdiag-0.9.0"; @@ -6460,6 +6498,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { # doCheck = false; # }; + targetcli_fb = buildPythonPackage rec { + version = "2.1.fb33"; + name = "targetcli-fb-${version}"; + + src = fetchurl { + url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz"; + sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42"; + }; + + propagatedBuildInputs = [ + configshell_fb + rtslib_fb + ]; + + meta = { + description = "A command shell for managing the Linux LIO kernel target"; + homepage = "https://github.com/agrover/targetcli-fb"; + platforms = stdenv.lib.platforms.linux; + }; + }; + taskcoach = buildPythonPackage rec { name = "TaskCoach-1.3.22"; -- cgit 1.4.1 From 73e78c24fb4f62b018d695fffbca7c281e7acad4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 26 Dec 2013 06:43:21 -0500 Subject: Update node packages to npm2nix-5.4.2 to fix tarball Thanks @vcunat for pointing it out Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 819 +++++++++++++++++++++++++++-- 1 file changed, 778 insertions(+), 41 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 37a57b88f18..c96f8c2c28b 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -8,6 +8,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.0.tgz"; + name = "CSSselect-0.4.0.tgz"; sha1 = "0ddaecd7d157f482d101dfbe154d3accd9166331"; }) ]; @@ -28,6 +29,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.1.tgz"; + name = "CSSwhat-0.4.1.tgz"; sha1 = "fe6580461b2a3ad550d2a7785a051234974dfca7"; }) ]; @@ -46,6 +48,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/StringScanner/-/StringScanner-0.0.3.tgz"; + name = "StringScanner-0.0.3.tgz"; sha1 = "bf06ecfdc90046711f4e6175549243b78ceb38aa"; }) ]; @@ -64,6 +67,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; + name = "abbrev-1.0.4.tgz"; sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd"; }) ]; @@ -86,6 +90,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; + name = "active-x-obfuscator-0.0.1.tgz"; sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; }) ]; @@ -105,6 +110,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.0.tgz"; + name = "addressparser-0.2.0.tgz"; sha1 = "853383313b7b60259ba4558ef1c0bc30efac08fc"; }) ]; @@ -123,6 +129,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz"; + name = "adm-zip-0.2.1.tgz"; sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }) ]; @@ -141,6 +148,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.3.tgz"; + name = "adm-zip-0.4.3.tgz"; sha1 = "28d6a3809abb7845a0ffa38f9fff455c2c6f6f6c"; }) ]; @@ -159,6 +167,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/almond/-/almond-0.2.7.tgz"; + name = "almond-0.2.7.tgz"; sha1 = "9cda2385a3198cbd8fea8e0c6edc79d5a2c354c2"; }) ]; @@ -178,6 +187,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; + name = "amdefine-0.1.0.tgz"; sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227"; }) ]; @@ -199,6 +209,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"; + name = "ansi-0.2.1.tgz"; sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017"; }) ]; @@ -217,6 +228,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz"; + name = "ansi-remover-0.0.2.tgz"; sha1 = "7020086289f10e195d85d828de065ccdd50e6e66"; }) ]; @@ -236,6 +248,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.1.2.tgz"; + name = "ansi-styles-0.1.2.tgz"; sha1 = "5bab27c2e0bbe944ee42057cf23adee970abc7c6"; }) ]; @@ -254,6 +267,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-0.2.0.tgz"; + name = "ansi-styles-0.2.0.tgz"; sha1 = "359ab4b15dcd64ba6d74734b72c36360a9af2c19"; }) ]; @@ -272,6 +286,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; + name = "ansi-styles-1.0.0.tgz"; sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; }) ]; @@ -290,6 +305,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz"; + name = "ansicolors-0.2.1.tgz"; sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef"; }) ]; @@ -308,6 +324,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + name = "ansicolors-0.3.2.tgz"; sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; }) ]; @@ -326,6 +343,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; + name = "ansistyles-0.1.3.tgz"; sha1 = "5de60415bda071bb37127854c864f41b23254539"; }) ]; @@ -344,6 +362,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz"; + name = "apparatus-0.0.8.tgz"; sha1 = "14e8aeb84189208b7f8d77f09d9f0307778b079a"; }) ]; @@ -363,6 +382,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/archiver/-/archiver-0.4.10.tgz"; + name = "archiver-0.4.10.tgz"; sha1 = "df0feac8f1d1295e5eceb3a205559072d21f4747"; }) ]; @@ -383,6 +403,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz"; + name = "archy-0.0.2.tgz"; sha1 = "910f43bf66141fc335564597abc189df44b3d35e"; }) ]; @@ -403,6 +424,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + name = "argparse-0.1.15.tgz"; sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; }) ]; @@ -425,6 +447,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; + name = "ascli-0.3.0.tgz"; sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; }) ]; @@ -445,6 +468,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }) ]; @@ -463,6 +487,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/assert/-/assert-1.0.3.tgz"; + name = "assert-1.0.3.tgz"; sha1 = "b4876fe43cd32fa93679f49e082e5c47e0e42db1"; }) ]; @@ -483,6 +508,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + name = "assert-plus-0.1.2.tgz"; sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; }) ]; @@ -501,6 +527,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz"; + name = "assertion-error-1.0.0.tgz"; sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b"; }) ]; @@ -519,6 +546,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + name = "async-0.2.9.tgz"; sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; }) ]; @@ -538,6 +566,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/async/-/async-0.1.15.tgz"; + name = "async-0.1.15.tgz"; sha1 = "2180eaca2cf2a6ca5280d41c0585bec9b3e49bd3"; }) ]; @@ -556,6 +585,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; + name = "async-0.1.22.tgz"; sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; }) ]; @@ -590,6 +620,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc4.tgz"; + name = "aws-sdk-2.0.0-rc4.tgz"; sha1 = "21c23ef7c162f7ec8eed36cef57e3425b0814e8d"; }) ]; @@ -611,6 +642,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.16.0.tgz"; + name = "aws-sdk-1.16.0.tgz"; sha1 = "07a150d6009c2681d67b10faf9b356ddb70da952"; }) ]; @@ -631,6 +663,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; + name = "aws-sign-0.2.0.tgz"; sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; }) ]; @@ -649,6 +682,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"; + name = "aws-sign-0.3.0.tgz"; sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9"; }) ]; @@ -667,6 +701,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; }) ]; @@ -685,6 +720,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/backbone/-/backbone-1.1.0.tgz"; + name = "backbone-1.1.0.tgz"; sha1 = "a3c845ea707dc210aa12b0dc16fceca4bbc18a3e"; }) ]; @@ -705,6 +741,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz"; + name = "backoff-2.1.0.tgz"; sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09"; }) ]; @@ -723,6 +760,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + name = "base64id-0.1.0.tgz"; sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; }) ]; @@ -741,6 +779,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz"; + name = "batch-0.5.0.tgz"; sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3"; }) ]; @@ -759,6 +798,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz"; + name = "bcrypt-0.7.7.tgz"; sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868"; }) ]; @@ -779,6 +819,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + name = "binary-0.3.0.tgz"; sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; }) ]; @@ -799,6 +840,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz"; + name = "bindings-1.1.1.tgz"; sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3"; }) ]; @@ -817,6 +859,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz"; + name = "bindings-1.0.0.tgz"; sha1 = "c3ccde60e9de6807c6f1aa4ef4843af29191c828"; }) ]; @@ -835,6 +878,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + name = "block-stream-0.0.7.tgz"; sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; }) ]; @@ -856,6 +900,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz"; + name = "blueimp-md5-1.1.0.tgz"; sha1 = "041ed794862f3c5f2847282a7481329f1d2352cd"; }) ]; @@ -874,6 +919,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; + name = "boom-0.3.8.tgz"; sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; }) ]; @@ -893,6 +939,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; }) ]; @@ -912,6 +959,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower/-/bower-1.2.8.tgz"; + name = "bower-1.2.8.tgz"; sha1 = "f63c0804a267d5ffaf2fd3fd488367e73dce202f"; }) ]; @@ -973,6 +1021,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.5.tgz"; + name = "bower-config-0.4.5.tgz"; sha1 = "baa7cee382f53b13bb62a4afaee7c05f20143c13"; }) ]; @@ -995,6 +1044,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz"; + name = "bower-config-0.5.0.tgz"; sha1 = "d081d43008816b1beb876dee272219851dd4c89c"; }) ]; @@ -1017,6 +1067,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz"; + name = "bower-endpoint-parser-0.2.1.tgz"; sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f"; }) ]; @@ -1035,6 +1086,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz"; + name = "bower-json-0.4.0.tgz"; sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766"; }) ]; @@ -1056,6 +1108,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz"; + name = "bower-logger-0.2.1.tgz"; sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }) ]; @@ -1074,6 +1127,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.6.tgz"; + name = "bower-registry-client-0.1.6.tgz"; sha1 = "c3ae74a98f24f50a373bbcb0ef443558be01d4b7"; }) ]; @@ -1100,6 +1154,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/broadway/-/broadway-0.2.9.tgz"; + name = "broadway-0.2.9.tgz"; sha1 = "887008b2257f4171089de5cb9b656969b6c8c9e8"; }) ]; @@ -1125,6 +1180,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz"; + name = "browserchannel-1.0.8.tgz"; sha1 = "96da83d139d8943f5bd616c334f148bd008dbac4"; }) ]; @@ -1147,6 +1203,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; + name = "bson-0.1.8.tgz"; sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; }) ]; @@ -1165,6 +1222,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz"; + name = "bson-0.2.2.tgz"; sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60"; }) ]; @@ -1183,6 +1241,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.3.tgz"; + name = "bson-0.2.3.tgz"; sha1 = "7651d2c4ec7cb90d10b5de0ef61663273b784839"; }) ]; @@ -1202,6 +1261,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz"; + name = "bson-0.2.5.tgz"; sha1 = "835b266883fc91e00e440efa2a905e9ac8c6c9f9"; }) ]; @@ -1220,6 +1280,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; + name = "buffer-crc32-0.1.1.tgz"; sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526"; }) ]; @@ -1238,6 +1299,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + name = "buffer-crc32-0.2.1.tgz"; sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; }) ]; @@ -1258,6 +1320,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; + name = "buffers-0.1.1.tgz"; sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; }) ]; @@ -1276,6 +1339,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/buffertools/-/buffertools-2.0.0.tgz"; + name = "buffertools-2.0.0.tgz"; sha1 = "925a0333a6b089e86a58c0c25c9dda8d515b25e8"; }) ]; @@ -1295,6 +1359,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz"; + name = "buffertools-1.1.1.tgz"; sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d"; }) ]; @@ -1313,6 +1378,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz"; + name = "bunyan-0.21.1.tgz"; sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a"; }) ]; @@ -1333,6 +1399,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.1.0.tgz"; + name = "bytebuffer-2.1.0.tgz"; sha1 = "931ae9a46fcb3868614ad3368a569dc7ce4e9ab9"; }) ]; @@ -1352,6 +1419,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; + name = "bytes-0.1.0.tgz"; sha1 = "c574812228126d6369d1576925a8579db3f8e5a2"; }) ]; @@ -1370,6 +1438,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; + name = "bytes-0.2.0.tgz"; sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; }) ]; @@ -1388,6 +1457,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; + name = "bytes-0.2.1.tgz"; sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; }) ]; @@ -1408,6 +1478,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.3.tgz"; + name = "cardinal-0.4.3.tgz"; sha1 = "7b74c3d1541002bd3d5b555048206719af91d313"; }) ]; @@ -1428,6 +1499,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chai/-/chai-1.8.1.tgz"; + name = "chai-1.8.1.tgz"; sha1 = "cc77866d5e7ebca2bd75144b1edc370a88785f72"; }) ]; @@ -1449,6 +1521,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + name = "chainsaw-0.1.0.tgz"; sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; }) ]; @@ -1468,6 +1541,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.1.1.tgz"; + name = "chalk-0.1.1.tgz"; sha1 = "fe6d90ae2c270424720c87ed92d36490b7d36ea0"; }) ]; @@ -1488,6 +1562,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.2.1.tgz"; + name = "chalk-0.2.1.tgz"; sha1 = "7613e1575145b21386483f7f485aa5ffa8cbd10c"; }) ]; @@ -1510,6 +1585,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.3.0.tgz"; + name = "chalk-0.3.0.tgz"; sha1 = "1c98437737f1199ebcc1d4c48fd41b9f9c8e8f23"; }) ]; @@ -1530,6 +1606,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + name = "chalk-0.4.0.tgz"; sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; }) ]; @@ -1551,6 +1628,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"; + name = "character-parser-1.2.0.tgz"; sha1 = "94134d6e5d870a39be359f7d22460935184ddef6"; }) ]; @@ -1569,6 +1647,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.4.tgz"; + name = "cheerio-0.12.4.tgz"; sha1 = "c199626e9e1eb0d4233a91a4793e7f8aaa69a18b"; }) ]; @@ -1593,6 +1672,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cheerio-select/-/cheerio-select-0.0.3.tgz"; + name = "cheerio-select-0.0.3.tgz"; sha1 = "3f2420114f3ccb0b1b075c245ccfaae5d617a388"; }) ]; @@ -1612,6 +1692,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"; + name = "child-process-close-0.1.1.tgz"; sha1 = "c153ede7a5eb65ac69e78a38973b1a286377f75f"; }) ]; @@ -1630,6 +1711,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz"; + name = "chmodr-0.1.0.tgz"; sha1 = "e09215a1d51542db2a2576969765bcf6125583eb"; }) ]; @@ -1648,6 +1730,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz"; + name = "chokidar-0.8.1.tgz"; sha1 = "8ee0c99ef48420902fded73b862eac2dd75da4a6"; }) ]; @@ -1666,6 +1749,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz"; + name = "chownr-0.0.1.tgz"; sha1 = "51d18189d9092d5f8afd623f3288bfd1c6bf1a62"; }) ]; @@ -1684,6 +1768,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.4.tgz"; + name = "clean-css-2.0.4.tgz"; sha1 = "1447e54e14d4bd0fa801f507bb32938cebe77627"; }) ]; @@ -1705,6 +1790,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; + name = "cli-0.4.5.tgz"; sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; }) ]; @@ -1724,6 +1810,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz"; + name = "cli-color-0.2.3.tgz"; sha1 = "0a25ceae5a6a1602be7f77d28563c36700274e88"; }) ]; @@ -1744,6 +1831,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz"; + name = "cliff-0.1.8.tgz"; sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272"; }) ]; @@ -1765,6 +1853,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; + name = "clone-0.1.5.tgz"; sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042"; }) ]; @@ -1783,6 +1872,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; + name = "clone-0.1.6.tgz"; sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; }) ]; @@ -1801,6 +1891,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz"; + name = "cmd-shim-1.1.1.tgz"; sha1 = "348b292db32ed74c8283fcf6c48549b84c6658a7"; }) ]; @@ -1821,6 +1912,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; + name = "coffee-script-1.6.3.tgz"; sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }) ]; @@ -1846,6 +1938,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"; + name = "coffee-script-1.3.3.tgz"; sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4"; }) ]; @@ -1887,6 +1980,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/color/-/color-0.4.4.tgz"; + name = "color-0.4.4.tgz"; sha1 = "f8bae8a848854616328704e64ce4a94ab336b7b5"; }) ]; @@ -1907,6 +2001,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/color-convert/-/color-convert-0.2.1.tgz"; + name = "color-convert-0.2.1.tgz"; sha1 = "363cab23c94b31a0d64db71048b8c6a940f8c68c"; }) ]; @@ -1925,6 +2020,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/color-string/-/color-string-0.1.2.tgz"; + name = "color-string-0.1.2.tgz"; sha1 = "a413fb7dd137162d5d4ea784cbeb36d931ad9b4a"; }) ]; @@ -1944,6 +2040,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; + name = "colors-0.5.1.tgz"; sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; }) ]; @@ -1962,6 +2059,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz"; + name = "colors-0.6.0-1.tgz"; sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; }) ]; @@ -1980,6 +2078,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }) ]; @@ -2004,6 +2103,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; + name = "colour-0.7.1.tgz"; sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; }) ]; @@ -2022,6 +2122,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz"; + name = "combined-stream-0.0.4.tgz"; sha1 = "2d1a43347dbe9515a4a2796732e5b88473840b22"; }) ]; @@ -2041,6 +2142,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + name = "commander-2.1.0.tgz"; sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }) ]; @@ -2059,6 +2161,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + name = "commander-0.6.1.tgz"; sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }) ]; @@ -2077,6 +2180,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + name = "commander-1.3.2.tgz"; sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; }) ]; @@ -2096,6 +2200,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; + name = "commander-2.0.0.tgz"; sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; }) ]; @@ -2118,6 +2223,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz"; + name = "config-0.4.15.tgz"; sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; }) ]; @@ -2139,6 +2245,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz"; + name = "config-chain-1.1.8.tgz"; sha1 = "0943d0b7227213a20d4eaff4434f4a1c0a052cad"; }) ]; @@ -2161,6 +2268,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/configstore/-/configstore-0.1.7.tgz"; + name = "configstore-0.1.7.tgz"; sha1 = "57dc701bc2a51eb804d6e1733c8abb9d82a5cede"; }) ]; @@ -2184,6 +2292,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + name = "connect-1.9.2.tgz"; sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; }) ]; @@ -2205,6 +2314,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; + name = "connect-2.11.0.tgz"; sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; }) ]; @@ -2237,6 +2347,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz"; + name = "connect-2.12.0.tgz"; sha1 = "31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a"; }) ]; @@ -2270,6 +2381,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; + name = "connect-2.3.9.tgz"; sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }) ]; @@ -2296,6 +2408,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz"; + name = "connect-2.7.5.tgz"; sha1 = "139111b4b03f0533a524927a88a646ae467b2c02"; }) ]; @@ -2324,6 +2437,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; + name = "connect-2.7.6.tgz"; sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738"; }) ]; @@ -2354,6 +2468,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz"; + name = "connect-2.8.8.tgz"; sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d"; }) ]; @@ -2384,6 +2499,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz"; + name = "connect-flash-0.1.1.tgz"; sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30"; }) ]; @@ -2403,6 +2519,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; + name = "connect-flash-0.1.0.tgz"; sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; }) ]; @@ -2421,6 +2538,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.3.tgz"; + name = "connect-jade-static-0.1.3.tgz"; sha1 = "ad0e0538c9124355d6da03de13fae63f7b5e0b1b"; }) ]; @@ -2441,6 +2559,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz"; + name = "connect-mongo-0.4.0.tgz"; sha1 = "4cb33728334a8f10f2d9e43d31369dbc2f856336"; }) ]; @@ -2461,6 +2580,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + name = "connection-parse-0.0.7.tgz"; sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; }) ]; @@ -2479,6 +2599,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz"; + name = "console-browserify-0.1.6.tgz"; sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c"; }) ]; @@ -2497,6 +2618,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz"; + name = "constantinople-1.0.2.tgz"; sha1 = "0e64747dc836644d3f659247efd95231b48c3e71"; }) ]; @@ -2516,6 +2638,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; + name = "cookie-0.0.4.tgz"; sha1 = "5456bd47aee2666eac976ea80a6105940483fe98"; }) ]; @@ -2534,6 +2657,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; + name = "cookie-0.0.5.tgz"; sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; }) ]; @@ -2552,6 +2676,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; + name = "cookie-0.1.0.tgz"; sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; }) ]; @@ -2570,6 +2695,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; + name = "cookie-jar-0.2.0.tgz"; sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; }) ]; @@ -2588,6 +2714,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"; + name = "cookie-jar-0.3.0.tgz"; sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc"; }) ]; @@ -2606,6 +2733,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz"; + name = "cookie-signature-1.0.0.tgz"; sha1 = "0044f332ac623df851c914e88eacc57f0c9704fe"; }) ]; @@ -2624,6 +2752,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; + name = "cookie-signature-1.0.1.tgz"; sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; }) ]; @@ -2642,6 +2771,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz"; + name = "cookiejar-1.3.0.tgz"; sha1 = "dd00b35679021e99cbd4e855b9ad041913474765"; }) ]; @@ -2660,6 +2790,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cookies/-/cookies-0.3.8.tgz"; + name = "cookies-0.3.8.tgz"; sha1 = "92fe50918f3d55aec4ae9d978bcddda2ada28ce9"; }) ]; @@ -2678,6 +2809,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.0.tgz"; + name = "core-util-is-1.0.0.tgz"; sha1 = "740c74c400e72707b95cc75d509543f8ad7f83de"; }) ]; @@ -2696,6 +2828,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.19.tgz"; + name = "couch-login-0.1.19.tgz"; sha1 = "5c472f64670dfb43fc381d290629b223edb64afa"; }) ]; @@ -2717,6 +2850,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/coveralls/-/coveralls-2.6.1.tgz"; + name = "coveralls-2.6.1.tgz"; sha1 = "0de635bba15fd48f4fc557ae9ac21309c013d2de"; }) ]; @@ -2740,6 +2874,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; + name = "crc-0.2.0.tgz"; sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; }) ]; @@ -2758,6 +2893,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz"; + name = "crossroads-0.12.0.tgz"; sha1 = "24114f9de3abfa0271df66b4ec56c3b984b7f56e"; }) ]; @@ -2777,6 +2913,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; + name = "cryptiles-0.1.3.tgz"; sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; }) ]; @@ -2796,6 +2933,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; }) ]; @@ -2815,6 +2953,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; + name = "crypto-0.0.3.tgz"; sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0"; }) ]; @@ -2833,6 +2972,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz"; + name = "css-1.0.8.tgz"; sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; }) ]; @@ -2853,6 +2993,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; + name = "css-parse-1.0.4.tgz"; sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; }) ]; @@ -2871,6 +3012,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; + name = "css-stringify-1.0.5.tgz"; sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; }) ]; @@ -2889,6 +3031,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz"; + name = "cssom-0.2.5.tgz"; sha1 = "2682709b5902e7212df529116ff788cd5b254894"; }) ]; @@ -2907,6 +3050,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz"; + name = "ctype-0.5.0.tgz"; sha1 = "672673ec67587eb495c1ed694da1abb964ff65e3"; }) ]; @@ -2925,6 +3069,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + name = "ctype-0.5.2.tgz"; sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; }) ]; @@ -2943,6 +3088,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + name = "cycle-1.0.3.tgz"; sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }) ]; @@ -2961,6 +3107,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dargs/-/dargs-0.1.0.tgz"; + name = "dargs-0.1.0.tgz"; sha1 = "2364ad9f441f976dcd5fe9961e21715665a5e3c3"; }) ]; @@ -2979,6 +3126,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; + name = "dateformat-1.0.2-1.2.3.tgz"; sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; }) ]; @@ -2997,6 +3145,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz"; + name = "dateformat-1.0.7-1.2.3.tgz"; sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c"; }) ]; @@ -3015,6 +3164,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + name = "debug-0.7.4.tgz"; sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }) ]; @@ -3033,6 +3183,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; + name = "debug-0.5.0.tgz"; sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; }) ]; @@ -3051,6 +3202,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz"; + name = "debug-0.7.0.tgz"; sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08"; }) ]; @@ -3077,6 +3229,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz"; + name = "debuglog-0.0.2.tgz"; sha1 = "6c0dcf07e2c3f74524629b741668bd46c7b362eb"; }) ]; @@ -3095,6 +3248,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/decompress/-/decompress-0.1.5.tgz"; + name = "decompress-0.1.5.tgz"; sha1 = "0925d42a2164bead83f0822a7a2b4ad02e99c76c"; }) ]; @@ -3120,6 +3274,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.3.tgz"; + name = "decompress-zip-0.0.3.tgz"; sha1 = "14b174e5b6a528f0aa6c2e2157b7aa0152e7915a"; }) ]; @@ -3144,6 +3299,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; + name = "deep-eql-0.1.3.tgz"; sha1 = "ef558acab8de25206cd713906d74e56930eb69f2"; }) ]; @@ -3163,6 +3319,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + name = "deep-equal-0.1.2.tgz"; sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; }) ]; @@ -3181,6 +3338,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; + name = "deep-equal-0.0.0.tgz"; sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; }) ]; @@ -3199,6 +3357,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.6.tgz"; + name = "deep-extend-0.2.6.tgz"; sha1 = "1f767e02b46d88d0a4087affa4b11b1b0b804250"; }) ]; @@ -3219,6 +3378,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; }) ]; @@ -3237,6 +3397,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz"; + name = "di-0.0.1.tgz"; sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; }) ]; @@ -3255,6 +3416,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; + name = "diff-1.0.7.tgz"; sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; }) ]; @@ -3273,6 +3435,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + name = "diff-1.0.8.tgz"; sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; }) ]; @@ -3295,6 +3458,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/director/-/director-1.1.10.tgz"; + name = "director-1.1.10.tgz"; sha1 = "e6c1d64f2f079216f19ea83b566035dde9901179"; }) ]; @@ -3313,6 +3477,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz"; + name = "dkim-signer-0.1.0.tgz"; sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b"; }) ]; @@ -3333,6 +3498,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz"; + name = "domelementtype-1.1.1.tgz"; sha1 = "7887acbda7614bb0a3dbe1b5e394f77a8ed297cf"; }) ]; @@ -3351,6 +3517,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/domhandler/-/domhandler-2.0.3.tgz"; + name = "domhandler-2.0.3.tgz"; sha1 = "889f8df626403af0788e29d66d5d5c6f7ebf0fd6"; }) ]; @@ -3363,6 +3530,26 @@ ]; passthru.names = [ "domhandler" ]; }; + by-spec."domhandler"."2.1" = + self.by-version."domhandler"."2.1.0"; + by-version."domhandler"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "domhandler-2.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz"; + name = "domhandler-2.1.0.tgz"; + sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"; + }) + ]; + buildInputs = + (self.nativeDeps."domhandler" or []); + deps = [ + self.by-version."domelementtype"."1.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "domhandler" ]; + }; by-spec."domutils"."1.1" = self.by-version."domutils"."1.1.6"; by-version."domutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { @@ -3370,6 +3557,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz"; + name = "domutils-1.1.6.tgz"; sha1 = "bddc3de099b9a2efacc51c623f28f416ecc57485"; }) ]; @@ -3389,6 +3577,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; + name = "domutils-1.3.0.tgz"; sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192"; }) ]; @@ -3408,6 +3597,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/download/-/download-0.1.7.tgz"; + name = "download-0.1.7.tgz"; sha1 = "d2a941a878a6d2fdaba60588ffffadab32b788b4"; }) ]; @@ -3431,6 +3621,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz"; + name = "dtrace-provider-0.2.8.tgz"; sha1 = "e243f19219aa95fbf0d8f2ffb07f5bd64e94fe20"; }) ]; @@ -3449,6 +3640,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + name = "duplexer-0.1.1.tgz"; sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; }) ]; @@ -3467,6 +3659,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/each-async/-/each-async-0.1.1.tgz"; + name = "each-async-0.1.1.tgz"; sha1 = "32bcef7e3cdc741d630e29846348be4ecca624ff"; }) ]; @@ -3485,6 +3678,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz"; + name = "editor-0.0.5.tgz"; sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a"; }) ]; @@ -3503,6 +3697,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; + name = "ejs-0.8.3.tgz"; sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f"; }) ]; @@ -3521,6 +3716,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/emitter-component/-/emitter-component-0.0.6.tgz"; + name = "emitter-component-0.0.6.tgz"; sha1 = "c155d82f6d0c01b5bee856d58074a4cc59795bca"; }) ]; @@ -3539,6 +3735,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz"; + name = "emitter-component-1.0.0.tgz"; sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f"; }) ]; @@ -3557,6 +3754,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/encoding/-/encoding-0.1.7.tgz"; + name = "encoding-0.1.7.tgz"; sha1 = "25cc19b34e9225d120c2ea769f9136c91cecc908"; }) ]; @@ -3576,6 +3774,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/entities/-/entities-0.3.0.tgz"; + name = "entities-0.3.0.tgz"; sha1 = "6ccead6010fee0c5a06f538d242792485cbfa256"; }) ]; @@ -3594,6 +3793,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz"; + name = "es5-ext-0.9.2.tgz"; sha1 = "d2e309d1f223b0718648835acf5b8823a8061f8a"; }) ]; @@ -3612,6 +3812,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + name = "escape-html-1.0.1.tgz"; sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; }) ]; @@ -3631,6 +3832,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.1.tgz"; + name = "escodegen-1.0.1.tgz"; sha1 = "84c92c4a07440271b90e6b78e620973bf721226e"; }) ]; @@ -3653,6 +3855,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.23.tgz"; + name = "escodegen-0.0.23.tgz"; sha1 = "9acf978164368e42276571f18839c823b3a844df"; }) ]; @@ -3674,6 +3877,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + name = "esprima-1.0.4.tgz"; sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; }) ]; @@ -3700,6 +3904,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.0.tgz"; + name = "estraverse-1.5.0.tgz"; sha1 = "248ec3f0d4bf39a940109c92a05ceb56d59e53ee"; }) ]; @@ -3718,6 +3923,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz"; + name = "estraverse-0.0.4.tgz"; sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2"; }) ]; @@ -3738,6 +3944,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + name = "esutils-1.0.0.tgz"; sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; }) ]; @@ -3756,6 +3963,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.2.2.tgz"; + name = "event-emitter-0.2.2.tgz"; sha1 = "c81e3724eb55407c5a0d5ee3299411f700f54291"; }) ]; @@ -3775,6 +3983,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + name = "event-stream-0.5.3.tgz"; sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; }) ]; @@ -3794,6 +4003,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz"; + name = "eventemitter2-0.4.12.tgz"; sha1 = "6cf14249fdc8799be7416e871e73fd2bb89e35e0"; }) ]; @@ -3812,6 +4022,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz"; + name = "eventemitter2-0.4.13.tgz"; sha1 = "0a8ab97f9c1b563361b8927f9e80606277509153"; }) ]; @@ -3832,6 +4043,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; + name = "events.node-0.4.9.tgz"; sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }) ]; @@ -3850,6 +4062,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; + name = "everyauth-0.4.5.tgz"; sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; }) ]; @@ -3877,6 +4090,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + name = "exit-0.1.2.tgz"; sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }) ]; @@ -3895,6 +4109,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-3.4.7.tgz"; + name = "express-3.4.7.tgz"; sha1 = "3b939c47d2aa44dfecf77d50da2123c5bd313366"; }) ]; @@ -3926,6 +4141,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; + name = "express-2.5.11.tgz"; sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; }) ]; @@ -3948,6 +4164,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz"; + name = "express-3.2.0.tgz"; sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; }) ]; @@ -3977,6 +4194,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz"; + name = "express-3.4.4.tgz"; sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; }) ]; @@ -4008,6 +4226,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz"; + name = "express-3.1.2.tgz"; sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7"; }) ]; @@ -4041,6 +4260,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz"; + name = "express-form-0.10.1.tgz"; sha1 = "542f43cf276c33f8ec8836b571aa3365505609a8"; }) ]; @@ -4064,6 +4284,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; + name = "express-partials-0.0.6.tgz"; sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; }) ]; @@ -4082,6 +4303,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + name = "extend-1.2.1.tgz"; sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }) ]; @@ -4101,6 +4323,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz"; + name = "extract-opts-2.2.0.tgz"; sha1 = "1fa28eba7352c6db480f885ceb71a46810be6d7d"; }) ]; @@ -4120,6 +4343,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; + name = "extsprintf-1.0.0.tgz"; sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }) ]; @@ -4138,6 +4362,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + name = "extsprintf-1.0.2.tgz"; sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }) ]; @@ -4156,6 +4381,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }) ]; @@ -4176,6 +4402,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.1.tgz"; + name = "faye-websocket-0.7.1.tgz"; sha1 = "72fe630d122333e0f36ac453f593ed70e1cb6baa"; }) ]; @@ -4196,6 +4423,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; + name = "faye-websocket-0.7.0.tgz"; sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be"; }) ]; @@ -4215,6 +4443,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz"; + name = "file-utils-0.1.5.tgz"; sha1 = "dc8153c855387cb4dacb0a1725531fa444a6b48c"; }) ]; @@ -4240,6 +4469,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz"; + name = "fileset-0.1.5.tgz"; sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94"; }) ]; @@ -4260,6 +4490,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz"; + name = "findit-1.1.0.tgz"; sha1 = "7104c60060f838d2298bd526b16add6ce733f9ac"; }) ]; @@ -4278,6 +4509,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/findup/-/findup-0.1.3.tgz"; + name = "findup-0.1.3.tgz"; sha1 = "df2b8ecf06fdaa9cc13dc4ba58bf950e3a176941"; }) ]; @@ -4298,6 +4530,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz"; + name = "findup-sync-0.1.2.tgz"; sha1 = "da2b96ca9f800e5a13d0a11110f490b65f62e96d"; }) ]; @@ -4320,6 +4553,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.11.tgz"; + name = "flatiron-0.3.11.tgz"; sha1 = "1cb0190fc2bd9d860f018e04d95fd35f9bd12555"; }) ]; @@ -4345,6 +4579,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; + name = "follow-redirects-0.0.3.tgz"; sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }) ]; @@ -4364,6 +4599,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.0.tgz"; + name = "forEachAsync-2.2.0.tgz"; sha1 = "093b32ce868cb69f5166dcf331fae074adc71cee"; }) ]; @@ -4383,6 +4619,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/foreach/-/foreach-2.0.4.tgz"; + name = "foreach-2.0.4.tgz"; sha1 = "cc5d0d8ae1d46cc9a555c2682f910977859935df"; }) ]; @@ -4401,6 +4638,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever/-/forever-0.10.11.tgz"; + name = "forever-0.10.11.tgz"; sha1 = "925cae528c074a29c0119809ca08e382ef194ad0"; }) ]; @@ -4432,6 +4670,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; + name = "forever-agent-0.2.0.tgz"; sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; }) ]; @@ -4450,6 +4689,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz"; + name = "forever-agent-0.5.0.tgz"; sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0"; }) ]; @@ -4468,6 +4708,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz"; + name = "forever-monitor-1.2.3.tgz"; sha1 = "b27ac3acb6fdcc7315d6cd85830f2d004733028b"; }) ]; @@ -4493,6 +4734,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz"; + name = "forever-monitor-1.1.0.tgz"; sha1 = "439ce036f999601cff551aea7f5151001a869ef9"; }) ]; @@ -4519,6 +4761,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz"; + name = "form-data-0.0.8.tgz"; sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5"; }) ]; @@ -4540,6 +4783,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; + name = "form-data-0.0.10.tgz"; sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }) ]; @@ -4561,6 +4805,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; + name = "form-data-0.1.2.tgz"; sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; }) ]; @@ -4582,6 +4827,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; + name = "formidable-1.0.11.tgz"; sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; }) ]; @@ -4600,6 +4846,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz"; + name = "formidable-1.0.13.tgz"; sha1 = "70caf0f9d69692a77e04021ddab4f46b01c82aea"; }) ]; @@ -4618,6 +4865,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + name = "formidable-1.0.14.tgz"; sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; }) ]; @@ -4636,6 +4884,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz"; + name = "formidable-1.0.9.tgz"; sha1 = "419e3bccead3e8874d539f5b3e72a4c503b31a98"; }) ]; @@ -4656,6 +4905,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; + name = "fresh-0.1.0.tgz"; sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; }) ]; @@ -4674,6 +4924,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; + name = "fresh-0.2.0.tgz"; sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; }) ]; @@ -4692,6 +4943,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; + name = "fs-extra-0.6.4.tgz"; sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; }) ]; @@ -4714,6 +4966,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz"; + name = "fs-walk-0.0.1.tgz"; sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335"; }) ]; @@ -4734,6 +4987,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz"; + name = "fs.extra-1.2.1.tgz"; sha1 = "060bf20264f35e39ad247e5e9d2121a2a75a1733"; }) ]; @@ -4755,6 +5009,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz"; + name = "fstream-0.1.25.tgz"; sha1 = "deef2db7c7898357c2b37202212a9e5b36abc732"; }) ]; @@ -4785,6 +5040,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + name = "fstream-ignore-0.0.7.tgz"; sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; }) ]; @@ -4808,6 +5064,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz"; + name = "fstream-npm-0.1.6.tgz"; sha1 = "1369323075d9bd85cfcc9409f33f0d6fe5be104d"; }) ]; @@ -4828,6 +5085,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.7.1.tgz"; + name = "generator-angular-0.7.1.tgz"; sha1 = "51f9faed8d7c0e9d972004101cc1c16ecd1ebf65"; }) ]; @@ -4852,6 +5110,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.6.0.tgz"; + name = "generator-karma-0.6.0.tgz"; sha1 = "e89b6195c186771e8bdddde37441abb6ce07e1a0"; }) ]; @@ -4872,6 +5131,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/generator-mocha/-/generator-mocha-0.1.3.tgz"; + name = "generator-mocha-0.1.3.tgz"; sha1 = "d54977bc0839b30c9b15fdd900e0ecd42afe14c8"; }) ]; @@ -4892,6 +5152,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.6.tgz"; + name = "generator-webapp-0.4.6.tgz"; sha1 = "6f51516b615aaf807e221a8ac713845fd680648f"; }) ]; @@ -4915,6 +5176,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz"; + name = "getmac-1.0.6.tgz"; sha1 = "f222c8178be9de24899df5a04e77557fbaf4e522"; }) ]; @@ -4934,6 +5196,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"; + name = "getobject-0.1.0.tgz"; sha1 = "047a449789fa160d018f5486ed91320b6ec7885c"; }) ]; @@ -4952,6 +5215,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; + name = "github-url-from-git-1.1.1.tgz"; sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; }) ]; @@ -4972,6 +5236,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; + name = "github-url-from-username-repo-0.0.2.tgz"; sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; }) ]; @@ -4990,6 +5255,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.7.tgz"; + name = "glob-3.2.7.tgz"; sha1 = "275f39a0eee805694790924f36eac38e1db6d802"; }) ]; @@ -5010,6 +5276,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + name = "glob-3.2.3.tgz"; sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; }) ]; @@ -5035,6 +5302,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; + name = "glob-3.1.21.tgz"; sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; }) ]; @@ -5064,6 +5332,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; + name = "graceful-fs-2.0.1.tgz"; sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; }) ]; @@ -5082,6 +5351,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + name = "graceful-fs-1.2.3.tgz"; sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; }) ]; @@ -5100,6 +5370,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.1.14.tgz"; + name = "graceful-fs-1.1.14.tgz"; sha1 = "07078db5f6377f6321fceaaedf497de124dc9465"; }) ]; @@ -5128,6 +5399,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz"; + name = "gridfs-stream-0.4.0.tgz"; sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a"; }) ]; @@ -5147,6 +5419,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz"; + name = "growl-1.7.0.tgz"; sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da"; }) ]; @@ -5165,6 +5438,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt/-/grunt-0.4.2.tgz"; + name = "grunt-0.4.2.tgz"; sha1 = "895b4f28a6102bffd41d365a65e8be2d6a293d93"; }) ]; @@ -5207,6 +5481,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-bower-task/-/grunt-bower-task-0.3.4.tgz"; + name = "grunt-bower-task-0.3.4.tgz"; sha1 = "6f713725ae96bb22ed60b1173cf4c522bbb8583b"; }) ]; @@ -5232,6 +5507,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.11.tgz"; + name = "grunt-cli-0.1.11.tgz"; sha1 = "a0d785b7f8633983ecb5e6af8397feb6e39dd0a8"; }) ]; @@ -5256,6 +5532,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.7.0.tgz"; + name = "grunt-contrib-cssmin-0.7.0.tgz"; sha1 = "a5735e9f1d263149e49fe035294e429d8c670bab"; }) ]; @@ -5272,26 +5549,27 @@ }; "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.7.0"; by-spec."grunt-contrib-jshint"."*" = - self.by-version."grunt-contrib-jshint"."0.7.2"; - by-version."grunt-contrib-jshint"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-jshint-0.7.2"; + self.by-version."grunt-contrib-jshint"."0.8.0"; + by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-jshint-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.7.2.tgz"; - sha1 = "29859ddcf42e7f6c54c43fe75da3c4bd90384a8e"; + url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.8.0.tgz"; + name = "grunt-contrib-jshint-0.8.0.tgz"; + sha1 = "6bd52325dcce1d995dbbf648030c59e1a606acda"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.by-version."jshint"."2.3.0" + self.by-version."jshint"."2.4.0" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-jshint" ]; }; - "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.7.2"; + "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-spec."grunt-contrib-less"."*" = self.by-version."grunt-contrib-less"."0.8.3"; by-version."grunt-contrib-less"."0.8.3" = lib.makeOverridable self.buildNodePackage { @@ -5299,6 +5577,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.3.tgz"; + name = "grunt-contrib-less-0.8.3.tgz"; sha1 = "8a0e9183577339ad08729f57a9a4adeff6c41410"; }) ]; @@ -5321,6 +5600,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.1.tgz"; + name = "grunt-contrib-requirejs-0.4.1.tgz"; sha1 = "862ba167141b8a8f36af5444feab3272bb8cf4bd"; }) ]; @@ -5342,6 +5622,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.7.tgz"; + name = "grunt-contrib-uglify-0.2.7.tgz"; sha1 = "e6bda51e0c40a1459f6cead423c65efd725a1bf7"; }) ]; @@ -5364,6 +5645,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.2.tgz"; + name = "grunt-karma-0.7.2.tgz"; sha1 = "1d041d9833671c2bca671cd66bd874c96b2a631e"; }) ]; @@ -5386,6 +5668,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz"; + name = "grunt-lib-contrib-0.6.1.tgz"; sha1 = "3f56adb7da06e814795ee2415b0ebe5fb8903ebb"; }) ]; @@ -5407,6 +5690,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz"; + name = "grunt-sed-0.1.1.tgz"; sha1 = "2613d486909319b3f8f4bd75dafb46a642ec3f82"; }) ]; @@ -5428,6 +5712,7 @@ src = [ (fetchurl { url = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854"; + name = "guifi-earth-0.2.1.tgz"; sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }) ]; @@ -5452,6 +5737,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz"; + name = "gzippo-0.2.0.tgz"; sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733"; }) ]; @@ -5472,6 +5758,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.12.tgz"; + name = "handlebars-1.0.12.tgz"; sha1 = "18c6d3440c35e91b19b3ff582b9151ab4985d4fc"; }) ]; @@ -5494,6 +5781,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/has-color/-/has-color-0.1.1.tgz"; + name = "has-color-0.1.1.tgz"; sha1 = "28cc90127bc5448f99e76096dc97470a94a66720"; }) ]; @@ -5512,6 +5800,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; + name = "hasher-1.2.0.tgz"; sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }) ]; @@ -5531,6 +5820,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz"; + name = "hashring-1.0.1.tgz"; sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c"; }) ]; @@ -5551,6 +5841,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; + name = "hat-0.0.3.tgz"; sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; }) ]; @@ -5569,6 +5860,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; + name = "hawk-0.10.2.tgz"; sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; }) ]; @@ -5593,6 +5885,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz"; + name = "hawk-0.13.1.tgz"; sha1 = "3617958821f58311e4d7f6de291fca662b412ef4"; }) ]; @@ -5615,6 +5908,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + name = "hawk-1.0.0.tgz"; sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; }) ]; @@ -5637,6 +5931,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz"; + name = "he-0.3.6.tgz"; sha1 = "9d7bc446e77963933301dd602d5731cb861135e0"; }) ]; @@ -5655,6 +5950,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/hipache/-/hipache-0.2.4.tgz"; + name = "hipache-0.2.4.tgz"; sha1 = "1d6a06bf88cac084b5fcd01959392c8b4889ec65"; }) ]; @@ -5679,6 +5975,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz"; + name = "hiredis-0.1.16.tgz"; sha1 = "f6cee1add2589b8b71cef3c4d3936a9fcd638640"; }) ]; @@ -5698,6 +5995,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; + name = "hoek-0.7.6.tgz"; sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; }) ]; @@ -5716,6 +6014,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz"; + name = "hoek-0.8.5.tgz"; sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f"; }) ]; @@ -5734,6 +6033,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; }) ]; @@ -5752,6 +6052,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"; + name = "hooker-0.2.3.tgz"; sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959"; }) ]; @@ -5770,6 +6071,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; + name = "hooks-0.2.1.tgz"; sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; }) ]; @@ -5788,6 +6090,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.1.4.tgz"; + name = "htmlparser2-3.1.4.tgz"; sha1 = "72cbe7d5d56c01acf61fcf7b933331f4e45b36f0"; }) ]; @@ -5803,6 +6106,29 @@ ]; passthru.names = [ "htmlparser2" ]; }; + by-spec."htmlparser2"."3.3.x" = + self.by-version."htmlparser2"."3.3.0"; + by-version."htmlparser2"."3.3.0" = lib.makeOverridable self.buildNodePackage { + name = "htmlparser2-3.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz"; + name = "htmlparser2-3.3.0.tgz"; + sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe"; + }) + ]; + buildInputs = + (self.nativeDeps."htmlparser2" or []); + deps = [ + self.by-version."domhandler"."2.1.0" + self.by-version."domutils"."1.1.6" + self.by-version."domelementtype"."1.1.1" + self.by-version."readable-stream"."1.0.17" + ]; + peerDependencies = [ + ]; + passthru.names = [ "htmlparser2" ]; + }; by-spec."http-auth"."2.0.7" = self.by-version."http-auth"."2.0.7"; by-version."http-auth"."2.0.7" = lib.makeOverridable self.buildNodePackage { @@ -5810,6 +6136,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; + name = "http-auth-2.0.7.tgz"; sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3"; }) ]; @@ -5855,6 +6182,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz"; + name = "http-signature-0.9.11.tgz"; sha1 = "9e882714572315e6790a5d0a7955efff1f19e653"; }) ]; @@ -5876,6 +6204,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; + name = "http-signature-0.10.0.tgz"; sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; }) ]; @@ -5899,6 +6228,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz"; + name = "i-0.3.2.tgz"; sha1 = "b2e2d6ef47900bd924e281231ff4c5cc798d9ea8"; }) ]; @@ -5917,6 +6247,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/i18next/-/i18next-1.7.1.tgz"; + name = "i18next-1.7.1.tgz"; sha1 = "39616a1fe88258edbdd0da918b9ee49a1bd1e124"; }) ]; @@ -5937,6 +6268,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/ibrik/-/ibrik-1.0.1.tgz"; + name = "ibrik-1.0.1.tgz"; sha1 = "ba9c0cf9302c51a812dc4a92038b3de579c0aefb"; }) ]; @@ -5962,6 +6294,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"; + name = "iconv-lite-0.2.11.tgz"; sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8"; }) ]; @@ -5982,6 +6315,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + name = "indexof-0.0.1.tgz"; sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }) ]; @@ -6000,6 +6334,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; + name = "inherits-1.0.0.tgz"; sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; }) ]; @@ -6020,6 +6355,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; }) ]; @@ -6044,6 +6380,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + name = "ini-1.1.0.tgz"; sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; }) ]; @@ -6066,6 +6403,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz"; + name = "init-package-json-0.0.14.tgz"; sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7"; }) ]; @@ -6089,6 +6427,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz"; + name = "inquirer-0.2.5.tgz"; sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6"; }) ]; @@ -6111,6 +6450,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.5.tgz"; + name = "inquirer-0.3.5.tgz"; sha1 = "a78be064ac9abf168147c02169a931d9a483a9f6"; }) ]; @@ -6135,6 +6475,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/insight/-/insight-0.3.0.tgz"; + name = "insight-0.3.0.tgz"; sha1 = "9d922133f560f7633abfc8f91451bda5e2cf2f71"; }) ]; @@ -6159,6 +6500,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz"; + name = "intersect-0.0.3.tgz"; sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920"; }) ]; @@ -6177,6 +6519,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.9.tgz"; + name = "ironhorse-0.0.9.tgz"; sha1 = "9cfaf75e464a0bf394d511a05c0a8b8de080a1d9"; }) ]; @@ -6212,6 +6555,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/is/-/is-0.2.6.tgz"; + name = "is-0.2.6.tgz"; sha1 = "36681b7c4328a75a6dd4b6d8f7131e4f81de55c0"; }) ]; @@ -6230,6 +6574,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz"; + name = "is-object-0.1.2.tgz"; sha1 = "00efbc08816c33cfc4ac8251d132e10dc65098d7"; }) ]; @@ -6248,6 +6593,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz"; + name = "is-promise-1.0.0.tgz"; sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f"; }) ]; @@ -6266,6 +6612,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"; + name = "isbinaryfile-0.1.9.tgz"; sha1 = "15eece35c4ab708d8924da99fb874f2b5cc0b6c4"; }) ]; @@ -6286,6 +6633,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.0.tgz"; + name = "isbinaryfile-2.0.0.tgz"; sha1 = "309c09010811d04ebed7c8d026df443d565e9f26"; }) ]; @@ -6304,6 +6652,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.1.tgz"; + name = "istanbul-0.2.1.tgz"; sha1 = "21755f7ff0d7627a0747e571ffcea7f2ee9627d8"; }) ]; @@ -6334,6 +6683,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.46.tgz"; + name = "istanbul-0.1.46.tgz"; sha1 = "cefeb1c787d125a6db23bd0f63b0eb9390b0b40d"; }) ]; @@ -6363,6 +6713,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jade/-/jade-1.0.0.tgz"; + name = "jade-1.0.0.tgz"; sha1 = "388fab59603843eb4836211a3684f5206cb93b66"; }) ]; @@ -6389,6 +6740,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + name = "jade-0.26.3.tgz"; sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; }) ]; @@ -6409,6 +6761,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; + name = "jade-0.27.0.tgz"; sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }) ]; @@ -6431,6 +6784,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.1.tgz"; + name = "jayschema-0.2.1.tgz"; sha1 = "b951c66c9cf48c510d5b920198c2755590f3b691"; }) ]; @@ -6451,6 +6805,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jedediah/-/jedediah-0.1.1.tgz"; + name = "jedediah-0.1.1.tgz"; sha1 = "51f33021ebec6847d844cb53bbc086ee38877f84"; }) ]; @@ -6469,6 +6824,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; + name = "js-yaml-3.0.1.tgz"; sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; }) ]; @@ -6490,6 +6846,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; + name = "js-yaml-0.3.7.tgz"; sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"; }) ]; @@ -6508,6 +6865,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; + name = "js-yaml-2.1.0.tgz"; sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; }) ]; @@ -6528,6 +6886,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz"; + name = "js-yaml-2.0.5.tgz"; sha1 = "a25ae6509999e97df278c6719da11bd0687743a8"; }) ]; @@ -6548,6 +6907,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; + name = "js-yaml-2.1.3.tgz"; sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; }) ]; @@ -6568,6 +6928,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz"; + name = "jsesc-0.4.3.tgz"; sha1 = "a9c7f90afd5a1bf2ee64df6c416dab61672d2ae9"; }) ]; @@ -6582,13 +6943,14 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.3.0"; - by-version."jshint"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.3.0"; + self.by-version."jshint"."2.4.0"; + by-version."jshint"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.3.0.tgz"; - sha1 = "19504455a2c20c46ee183361eb87f3a1c0b7dc47"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.4.0.tgz"; + name = "jshint-2.4.0.tgz"; + sha1 = "31717646cee2137cdd7f1b773c3fce58f4d99fc5"; }) ]; buildInputs = @@ -6598,15 +6960,16 @@ self.by-version."underscore"."1.4.4" self.by-version."cli"."0.4.5" self.by-version."minimatch"."0.2.14" + self.by-version."htmlparser2"."3.3.0" self.by-version."console-browserify"."0.1.6" ]; peerDependencies = [ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.3.0"; - by-spec."jshint"."~2.3.0" = - self.by-version."jshint"."2.3.0"; + "jshint" = self.by-version."jshint"."2.4.0"; + by-spec."jshint"."~2.4.0" = + self.by-version."jshint"."2.4.0"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -6614,6 +6977,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + name = "json-schema-0.2.2.tgz"; sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; }) ]; @@ -6632,6 +6996,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; + name = "json-stringify-safe-3.0.0.tgz"; sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; }) ]; @@ -6650,6 +7015,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz"; + name = "json-stringify-safe-4.0.0.tgz"; sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54"; }) ]; @@ -6668,6 +7034,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; }) ]; @@ -6686,6 +7053,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; + name = "jsonfile-1.0.1.tgz"; sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; }) ]; @@ -6704,6 +7072,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.1.tgz"; + name = "jsontool-7.0.1.tgz"; sha1 = "d5a705e46e305d7377ede769707c072e6d957977"; }) ]; @@ -6723,6 +7092,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; + name = "jsprim-0.3.0.tgz"; sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; }) ]; @@ -6744,6 +7114,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/junk/-/junk-0.2.2.tgz"; + name = "junk-0.2.2.tgz"; sha1 = "d595eb199b37930cecd1f2c52820847e80e48ae7"; }) ]; @@ -6762,6 +7133,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma/-/karma-0.11.11.tgz"; + name = "karma-0.11.11.tgz"; sha1 = "c5e0fa2220dfee7bb08a3bb085895b40e82197a8"; }) ]; @@ -6806,6 +7178,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.2.tgz"; + name = "karma-chrome-launcher-0.1.2.tgz"; sha1 = "f7154d03be01f4c246368d56d43d7232e14ccce6"; }) ]; @@ -6826,6 +7199,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.4.tgz"; + name = "karma-coverage-0.1.4.tgz"; sha1 = "53766bad4dc2aa26dcc1be95ded7809be8032d8e"; }) ]; @@ -6849,6 +7223,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.1.tgz"; + name = "karma-junit-reporter-0.2.1.tgz"; sha1 = "ae125962683a0d1286dc7768fbf66a8f02e448fc"; }) ]; @@ -6870,6 +7245,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.1.tgz"; + name = "karma-mocha-0.1.1.tgz"; sha1 = "5edddb3e2d2c6fd47e9ad26f0af1595fe852c756"; }) ]; @@ -6891,6 +7267,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz"; + name = "karma-requirejs-0.2.1.tgz"; sha1 = "7f3ac5df67bccd9d832a928ec658d733ec983c5d"; }) ]; @@ -6912,6 +7289,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.0.tgz"; + name = "karma-sauce-launcher-0.2.0.tgz"; sha1 = "0994da49a1774be876ff1b107fd47e8768e3ead0"; }) ]; @@ -6936,6 +7314,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.3.tgz"; + name = "keen.io-0.0.3.tgz"; sha1 = "2d6ae2baa6d24b618f378b2a44413e1283fbcb63"; }) ]; @@ -6956,6 +7335,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; + name = "keep-alive-agent-0.0.1.tgz"; sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; }) ]; @@ -6974,6 +7354,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz"; + name = "kerberos-0.0.3.tgz"; sha1 = "4285d92a0748db2784062f5adcec9f5956cb818a"; }) ]; @@ -6992,6 +7373,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; + name = "kew-0.1.7.tgz"; sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }) ]; @@ -7010,6 +7392,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + name = "keypress-0.1.0.tgz"; sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }) ]; @@ -7028,6 +7411,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz"; + name = "knox-0.8.8.tgz"; sha1 = "aeeadd22b0a4b1e4d858a15174af2da060ab6774"; }) ]; @@ -7051,6 +7435,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/kue/-/kue-0.6.2.tgz"; + name = "kue-0.6.2.tgz"; sha1 = "9a6a95081842cf4ee3da5c61770bc23616a943f2"; }) ]; @@ -7076,6 +7461,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; + name = "lazy-1.0.11.tgz"; sha1 = "daa068206282542c088288e975c297c1ae77b690"; }) ]; @@ -7094,6 +7480,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.4.tgz"; + name = "lcov-parse-0.0.4.tgz"; sha1 = "3853a4f132f04581db0e74c180542d90f0d1c66b"; }) ]; @@ -7112,6 +7499,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-0.0.2.tgz"; + name = "lcov-result-merger-0.0.2.tgz"; sha1 = "72a538c09f76e5c79b511bcd1053948d4aa98f10"; }) ]; @@ -7132,6 +7520,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/less/-/less-1.5.1.tgz"; + name = "less-1.5.1.tgz"; sha1 = "633313130efd12a3b78c56aa799dab3eeffffff4"; }) ]; @@ -7155,6 +7544,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.8.1.tgz"; + name = "libxmljs-0.8.1.tgz"; sha1 = "b8b1d3962a92dbc5be9dc798bac028e09db8d630"; }) ]; @@ -7174,6 +7564,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.2.tgz"; + name = "libyaml-0.2.2.tgz"; sha1 = "a22d5f699911b6b622d6dc323fb62320c877c9c8"; }) ]; @@ -7193,6 +7584,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz"; + name = "lockfile-0.4.2.tgz"; sha1 = "ab91f5d3745bc005ae4fa34d078910d1f2b9612d"; }) ]; @@ -7211,6 +7603,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-0.10.0.tgz"; + name = "lodash-0.10.0.tgz"; sha1 = "5254bbc2c46c827f535a27d631fd4f2bff374ce7"; }) ]; @@ -7229,6 +7622,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"; + name = "lodash-0.9.2.tgz"; sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c"; }) ]; @@ -7247,6 +7641,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"; + name = "lodash-1.0.1.tgz"; sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc"; }) ]; @@ -7265,6 +7660,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.1.1.tgz"; + name = "lodash-1.1.1.tgz"; sha1 = "41a2b2e9a00e64d6d1999f143ff6b0755f6bbb24"; }) ]; @@ -7283,6 +7679,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.2.1.tgz"; + name = "lodash-1.2.1.tgz"; sha1 = "ed47b16e46f06b2b40309b68e9163c17e93ea304"; }) ]; @@ -7301,6 +7698,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; + name = "lodash-1.3.1.tgz"; sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770"; }) ]; @@ -7321,6 +7719,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"; + name = "lodash-2.1.0.tgz"; sha1 = "0637eaaa36a8a1cfc865c3adfb942189bfb0998d"; }) ]; @@ -7339,6 +7738,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz"; + name = "lodash-2.2.1.tgz"; sha1 = "ca935fd14ab3c0c872abacf198b9cda501440867"; }) ]; @@ -7357,6 +7757,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.3.0.tgz"; + name = "lodash-2.3.0.tgz"; sha1 = "dfbdac99cf87a59a022c474730570d8716c267dd"; }) ]; @@ -7375,6 +7776,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"; + name = "lodash-2.4.1.tgz"; sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420"; }) ]; @@ -7393,6 +7795,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.1.tgz"; + name = "log-driver-1.2.1.tgz"; sha1 = "ada8202a133e99764306652e195e28268b0bea5b"; }) ]; @@ -7411,6 +7814,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/log4js/-/log4js-0.6.9.tgz"; + name = "log4js-0.6.9.tgz"; sha1 = "2e327189c1c0dec17448ec5255f58cd0fddf4596"; }) ]; @@ -7432,6 +7836,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz"; + name = "long-1.1.2.tgz"; sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53"; }) ]; @@ -7450,6 +7855,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; + name = "lru-cache-2.5.0.tgz"; sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; }) ]; @@ -7468,6 +7874,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; + name = "lru-cache-2.2.0.tgz"; sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }) ]; @@ -7486,6 +7893,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; + name = "lru-cache-2.2.4.tgz"; sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; }) ]; @@ -7504,6 +7912,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz"; + name = "lru-cache-2.3.0.tgz"; sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a"; }) ]; @@ -7522,6 +7931,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz"; + name = "lru-cache-1.0.6.tgz"; sha1 = "aa50f97047422ac72543bda177a9c9d018d98452"; }) ]; @@ -7540,6 +7950,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + name = "lru-cache-2.3.1.tgz"; sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; }) ]; @@ -7560,6 +7971,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.6.tgz"; + name = "mailcomposer-0.2.6.tgz"; sha1 = "fa785ae7505daeb7a11f7cecf2b374d7801d1b87"; }) ]; @@ -7583,6 +7995,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/meat/-/meat-0.2.5.tgz"; + name = "meat-0.2.5.tgz"; sha1 = "8f277ec68f51794365e271166c7b7bba8d046869"; }) ]; @@ -7608,6 +8021,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/memoizee/-/memoizee-0.2.6.tgz"; + name = "memoizee-0.2.6.tgz"; sha1 = "bb45a7ad02530082f1612671dab35219cd2e0741"; }) ]; @@ -7629,6 +8043,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.1.tgz"; + name = "merge-descriptors-0.0.1.tgz"; sha1 = "2ff0980c924cf81d0b5d1fb601177cb8bb56c0d0"; }) ]; @@ -7647,6 +8062,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + name = "methods-0.0.1.tgz"; sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; }) ]; @@ -7665,6 +8081,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + name = "methods-0.1.0.tgz"; sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; }) ]; @@ -7683,6 +8100,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; }) ]; @@ -7701,6 +8119,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + name = "mime-1.2.4.tgz"; sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; }) ]; @@ -7719,6 +8138,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; + name = "mime-1.2.5.tgz"; sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13"; }) ]; @@ -7737,6 +8157,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; + name = "mime-1.2.6.tgz"; sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }) ]; @@ -7755,6 +8176,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + name = "mime-1.2.9.tgz"; sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; }) ]; @@ -7787,6 +8209,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; + name = "mimelib-0.2.14.tgz"; sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; }) ]; @@ -7807,6 +8230,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; }) ]; @@ -7827,6 +8251,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; + name = "minimatch-0.0.5.tgz"; sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de"; }) ]; @@ -7866,6 +8291,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz"; + name = "minimist-0.0.5.tgz"; sha1 = "d7aa327bcecf518f9106ac6b8f003fa3bcea8566"; }) ]; @@ -7884,6 +8310,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz"; + name = "ministyle-0.1.3.tgz"; sha1 = "d7a639f29e9450b9d5ebf2255d1fa8d1d9d89900"; }) ]; @@ -7902,6 +8329,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz"; + name = "miniwrite-0.1.3.tgz"; sha1 = "9e893efb435f853454ca0321b86a44378e8c50c6"; }) ]; @@ -7921,6 +8349,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }) ]; @@ -7944,6 +8373,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + name = "mkdirp-0.3.0.tgz"; sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; }) ]; @@ -7974,6 +8404,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; + name = "mkpath-0.1.0.tgz"; sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; }) ]; @@ -7992,6 +8423,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mocha/-/mocha-1.16.2.tgz"; + name = "mocha-1.16.2.tgz"; sha1 = "57766843f016a1308fe9fddb22f74676d6721ace"; }) ]; @@ -8018,6 +8450,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz"; + name = "mocha-unfunk-reporter-0.4.0.tgz"; sha1 = "59eda97aec6ae6e26d7af4173490a65b7b082d20"; }) ]; @@ -8041,6 +8474,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + name = "moment-2.1.0.tgz"; sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; }) ]; @@ -8059,6 +8493,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz"; + name = "moment-2.4.0.tgz"; sha1 = "06dd8dfbbfdb53a03510080ac788163c9490e75d"; }) ]; @@ -8077,6 +8512,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc3.tgz"; + name = "mongodb-1.4.0-rc3.tgz"; sha1 = "e605a2c85a337f85d766e2ed221a4caa201c0b4f"; }) ]; @@ -8098,6 +8534,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; + name = "mongodb-1.2.14.tgz"; sha1 = "269665552066437308d0942036646e6795c3a9a3"; }) ]; @@ -8117,6 +8554,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; + name = "mongodb-1.3.19.tgz"; sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4"; }) ]; @@ -8137,6 +8575,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz"; + name = "mongodb-1.3.23.tgz"; sha1 = "874a5212162b16188aeeaee5e06067766c8e9e86"; }) ]; @@ -8157,6 +8596,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.3.tgz"; + name = "mongoose-3.8.3.tgz"; sha1 = "74425eb9ee9ca4a34c87b4624dc055131e0c7d0c"; }) ]; @@ -8184,6 +8624,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; + name = "mongoose-3.6.7.tgz"; sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc"; }) ]; @@ -8209,6 +8650,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz"; + name = "mongoose-3.6.20.tgz"; sha1 = "47263843e6b812ea207eec104c40a36c8d215f53"; }) ]; @@ -8236,6 +8678,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz"; + name = "mongoose-lifecycle-1.0.0.tgz"; sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }) ]; @@ -8254,6 +8697,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz"; + name = "mongoose-schema-extend-0.1.7.tgz"; sha1 = "50dc366ba63227d00c4cd3db9bb8bf95e9629910"; }) ]; @@ -8274,6 +8718,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz"; + name = "monocle-1.1.50.tgz"; sha1 = "e21b059d99726d958371f36240c106b8a067fa7d"; }) ]; @@ -8293,6 +8738,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mout/-/mout-0.6.0.tgz"; + name = "mout-0.6.0.tgz"; sha1 = "ce7abad8130d796b09d7fb509bcc73b09be024a6"; }) ]; @@ -8311,6 +8757,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mout/-/mout-0.7.1.tgz"; + name = "mout-0.7.1.tgz"; sha1 = "218de2b0880b220d99f4fbaee3fc0c3a5310bda8"; }) ]; @@ -8329,6 +8776,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; + name = "mpath-0.1.1.tgz"; sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; }) ]; @@ -8347,6 +8795,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; + name = "mpromise-0.2.1.tgz"; sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; }) ]; @@ -8366,6 +8815,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mpromise/-/mpromise-0.3.0.tgz"; + name = "mpromise-0.3.0.tgz"; sha1 = "cb864c2f642eb2192765087e3692e1dc152afe4b"; }) ]; @@ -8385,6 +8835,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mquery/-/mquery-0.3.2.tgz"; + name = "mquery-0.3.2.tgz"; sha1 = "074cb82c51ec1b15897d8afb80a7b3567a2f8eca"; }) ]; @@ -8406,6 +8857,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; + name = "ms-0.1.0.tgz"; sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; }) ]; @@ -8424,6 +8876,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.1.tgz"; + name = "msgpack-0.2.1.tgz"; sha1 = "5da246daa2138b4163640e486c00c4f3961e92ac"; }) ]; @@ -8442,6 +8895,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; + name = "multiparty-2.2.0.tgz"; sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; }) ]; @@ -8462,6 +8916,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; + name = "muri-0.3.1.tgz"; sha1 = "861889c5c857f1a43700bee85d50731f61727c9a"; }) ]; @@ -8480,6 +8935,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz"; + name = "mute-stream-0.0.3.tgz"; sha1 = "f09c090d333b3063f615cbbcca71b349893f0152"; }) ]; @@ -8498,6 +8954,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; + name = "mute-stream-0.0.4.tgz"; sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; }) ]; @@ -8516,6 +8973,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz"; + name = "mv-0.0.5.tgz"; sha1 = "15eac759479884df1131d6de56bce20b654f5391"; }) ]; @@ -8534,6 +8992,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; + name = "nan-0.3.2.tgz"; sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }) ]; @@ -8552,6 +9011,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.4.4.tgz"; + name = "nan-0.4.4.tgz"; sha1 = "9db58eae63cee119807a0d01afd0655d956bea75"; }) ]; @@ -8570,6 +9030,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz"; + name = "nan-0.6.0.tgz"; sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa"; }) ]; @@ -8588,6 +9049,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/natural/-/natural-0.0.69.tgz"; + name = "natural-0.0.69.tgz"; sha1 = "60d9ce23797a54ec211600eb721cc66779b954d3"; }) ]; @@ -8609,6 +9071,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; + name = "nconf-0.6.9.tgz"; sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; }) ]; @@ -8635,6 +9098,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz"; + name = "ncp-0.2.7.tgz"; sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1"; }) ]; @@ -8653,6 +9117,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + name = "ncp-0.4.2.tgz"; sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }) ]; @@ -8675,6 +9140,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz"; + name = "negotiator-0.2.5.tgz"; sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec"; }) ]; @@ -8693,6 +9159,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; + name = "negotiator-0.3.0.tgz"; sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; }) ]; @@ -8711,6 +9178,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz"; + name = "net-ping-1.1.7.tgz"; sha1 = "49f5bca55a30a3726d69253557f231135a637075"; }) ]; @@ -8730,6 +9198,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/next-tick/-/next-tick-0.1.0.tgz"; + name = "next-tick-0.1.0.tgz"; sha1 = "1912cce8eb9b697d640fbba94f8f00dec3b94259"; }) ]; @@ -8748,6 +9217,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz"; + name = "nib-0.5.0.tgz"; sha1 = "ad0a7dfa2bca8680c8cb8adaa6ab68c80e5221e5"; }) ]; @@ -8766,6 +9236,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nijs/-/nijs-0.0.12.tgz"; + name = "nijs-0.0.12.tgz"; sha1 = "23bb40746b409e8556f9a4fe97ca314410a685df"; }) ]; @@ -8786,6 +9257,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz"; + name = "node-expat-2.1.4.tgz"; sha1 = "e55a82249b71afbce09ffa880705ec37553c5121"; }) ]; @@ -8806,6 +9278,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; + name = "node-gyp-0.12.2.tgz"; sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; }) ]; @@ -8834,13 +9307,14 @@ by-spec."node-gyp"."~0.12.0" = self.by-version."node-gyp"."0.12.2"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.6.2"; - by-version."node-inspector"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.6.2"; + self.by-version."node-inspector"."0.7.0-1"; + by-version."node-inspector"."0.7.0-1" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.0-1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.2.tgz"; - sha1 = "0471a3f4ef5c53e4e567466f93b179d77d1ba5c6"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-1.tgz"; + name = "node-inspector-0.7.0-1.tgz"; + sha1 = "13964415403ee7642fd7554f87c2c7a51af64090"; }) ]; buildInputs = @@ -8858,7 +9332,7 @@ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.6.2"; + "node-inspector" = self.by-version."node-inspector"."0.7.0-1"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.0.9"; by-version."node-protobuf"."1.0.9" = lib.makeOverridable self.buildNodePackage { @@ -8866,6 +9340,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.9.tgz"; + name = "node-protobuf-1.0.9.tgz"; sha1 = "6b2e7682bb65e01a10e19179f8e162ac9a66a6e6"; }) ]; @@ -8885,6 +9360,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; + name = "node-swt-0.1.1.tgz"; sha1 = "af0903825784be553b93dbae57d99d59060585dd"; }) ]; @@ -8903,6 +9379,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz"; + name = "node-syslog-1.1.7.tgz"; sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb"; }) ]; @@ -8921,6 +9398,7 @@ src = [ (fetchurl { url = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7"; + name = "node-uptime-3.2.0.tgz"; sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746"; }) ]; @@ -8954,6 +9432,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; }) ]; @@ -8973,6 +9452,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; + name = "node-uuid-1.3.3.tgz"; sha1 = "d3db4d7b56810d9e4032342766282af07391729b"; }) ]; @@ -8991,6 +9471,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"; + name = "node-uuid-1.4.0.tgz"; sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65"; }) ]; @@ -9013,6 +9494,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; + name = "node-wsfederation-0.1.1.tgz"; sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; }) ]; @@ -9032,6 +9514,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; + name = "node.extend-1.0.0.tgz"; sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; }) ]; @@ -9050,6 +9533,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; + name = "nodemailer-0.3.35.tgz"; sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19"; }) ]; @@ -9071,6 +9555,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.17.tgz"; + name = "nodemon-0.9.17.tgz"; sha1 = "31fbc65cbda162ebff4d9ff5f774fdd3006bb50b"; }) ]; @@ -9091,6 +9576,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; + name = "nomnom-1.6.2.tgz"; sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971"; }) ]; @@ -9111,6 +9597,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; + name = "nopt-2.1.2.tgz"; sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; }) ]; @@ -9130,6 +9617,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; + name = "nopt-2.0.0.tgz"; sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; }) ]; @@ -9151,6 +9639,7 @@ src = [ (fetchurl { url = "https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress"; + name = "nopt-1.0.10.tgz"; sha256 = "94daa53a0ab7668be12931b7b551c924c913d1efef7f2a05e60704c9b90a7bad"; }) ]; @@ -9176,6 +9665,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.8.tgz"; + name = "normalize-package-data-0.2.8.tgz"; sha1 = "95dc1bcb54c8d46b3be345c05afbab27e48e2f69"; }) ]; @@ -9191,13 +9681,14 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.3.21"; - by-version."npm"."1.3.21" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.21"; + self.by-version."npm"."1.3.22"; + by-version."npm"."1.3.22" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.22"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.21.tgz"; - sha1 = "fb2bd7fdbc3b511c9dfb8de5559d305391421ec1"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.22.tgz"; + name = "npm-1.3.22.tgz"; + sha1 = "6ebc09f97f83ed3fd524b85faea5e30574e08c99"; }) ]; buildInputs = @@ -9254,9 +9745,9 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.3.21"; + "npm" = self.by-version."npm"."1.3.22"; by-spec."npm"."~1.3.14" = - self.by-version."npm"."1.3.21"; + self.by-version."npm"."1.3.22"; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { @@ -9264,6 +9755,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; + name = "npm-registry-client-0.2.27.tgz"; sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }) ]; @@ -9292,6 +9784,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.3.tgz"; + name = "npm-registry-client-0.3.3.tgz"; sha1 = "da08bb681fb24aa5c988ca71f8c10f27f09daf4a"; }) ]; @@ -9320,6 +9813,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"; + name = "npm-user-validate-0.0.3.tgz"; sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e"; }) ]; @@ -9332,13 +9826,14 @@ passthru.names = [ "npm-user-validate" ]; }; by-spec."npm2nix"."*" = - self.by-version."npm2nix"."5.4.1"; - by-version."npm2nix"."5.4.1" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.4.1"; + self.by-version."npm2nix"."5.4.2"; + by-version."npm2nix"."5.4.2" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.1.tgz"; - sha1 = "98a0eb1012aacee3baa53eeb8a0084a006153086"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.2.tgz"; + name = "npm2nix-5.4.2.tgz"; + sha1 = "03184775d310c75117c82303eecb50f6b26f93d0"; }) ]; buildInputs = @@ -9357,7 +9852,7 @@ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.by-version."npm2nix"."5.4.1"; + "npm2nix" = self.by-version."npm2nix"."5.4.2"; by-spec."npmconf"."0.0.24" = self.by-version."npmconf"."0.0.24"; by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { @@ -9365,6 +9860,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz"; + name = "npmconf-0.0.24.tgz"; sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; }) ]; @@ -9391,6 +9887,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; + name = "npmconf-0.1.1.tgz"; sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1"; }) ]; @@ -9417,6 +9914,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.9.tgz"; + name = "npmconf-0.1.9.tgz"; sha1 = "a6b256fdd23e347ef2465a2e6d57a9be4deb898f"; }) ]; @@ -9445,6 +9943,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz"; + name = "npmlog-0.0.6.tgz"; sha1 = "685043fe71aa1665d6e3b2acef180640caf40873"; }) ]; @@ -9468,6 +9967,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz"; + name = "nssocket-0.5.1.tgz"; sha1 = "11f0428335ad8d89ff9cf96ab2852a23b1b33b71"; }) ]; @@ -9488,6 +9988,7 @@ src = [ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; + name = "oauth-0.9.10.tgz"; sha256 = "c0c59efccbd34819ed51e912bc74b872e812a0157784dc8604434378a14cf64a"; }) ]; @@ -9506,6 +10007,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; + name = "oauth-sign-0.2.0.tgz"; sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; }) ]; @@ -9524,6 +10026,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }) ]; @@ -9542,6 +10045,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz"; + name = "object-additions-0.5.1.tgz"; sha1 = "ac624e0995e696c94cc69b41f316462b16a3bda4"; }) ]; @@ -9560,6 +10064,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz"; + name = "object-keys-0.2.0.tgz"; sha1 = "cddec02998b091be42bf1035ae32e49f1cb6ea67"; }) ]; @@ -9581,6 +10086,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; + name = "once-1.1.1.tgz"; sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; }) ]; @@ -9601,6 +10107,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz"; + name = "once-1.3.0.tgz"; sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; }) ]; @@ -9619,6 +10126,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz"; + name = "open-0.0.2.tgz"; sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc"; }) ]; @@ -9637,6 +10145,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz"; + name = "open-0.0.4.tgz"; sha1 = "5de46a0858b9f49f9f211aa8f26628550657f262"; }) ]; @@ -9657,6 +10166,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz"; + name = "opener-1.3.0.tgz"; sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2"; }) ]; @@ -9675,6 +10185,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/openid/-/openid-0.5.5.tgz"; + name = "openid-0.5.5.tgz"; sha1 = "a4ce534ca82d68f81ccf45109fc92b4547b2cdd1"; }) ]; @@ -9693,6 +10204,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + name = "optimist-0.6.0.tgz"; sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; }) ]; @@ -9714,6 +10226,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; + name = "optimist-0.2.8.tgz"; sha1 = "e981ab7e268b457948593b55674c099a815cac31"; }) ]; @@ -9733,6 +10246,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + name = "optimist-0.3.7.tgz"; sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }) ]; @@ -9762,6 +10276,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; + name = "options-0.0.5.tgz"; sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; }) ]; @@ -9780,6 +10295,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz"; + name = "optjs-3.2.1-boom.tgz"; sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758"; }) ]; @@ -9798,6 +10314,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + name = "optparse-1.0.5.tgz"; sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }) ]; @@ -9819,6 +10336,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + name = "osenv-0.0.3.tgz"; sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }) ]; @@ -9839,6 +10357,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz"; + name = "owl-deepcopy-0.0.2.tgz"; sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88"; }) ]; @@ -9860,6 +10379,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.0.1.tgz"; + name = "p-throttler-0.0.1.tgz"; sha1 = "c341e3589ec843852a035e6f88e6c1e96150029b"; }) ]; @@ -9879,6 +10399,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; + name = "passport-0.1.17.tgz"; sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; }) ]; @@ -9906,6 +10427,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz"; + name = "passport-http-0.2.2.tgz"; sha1 = "2501314c0ff4a831e8a51ccfdb1b68f5c7cbc9f6"; }) ]; @@ -9927,6 +10449,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz"; + name = "passport-local-0.1.6.tgz"; sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db"; }) ]; @@ -9950,6 +10473,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.0.tgz"; + name = "path-is-inside-1.0.0.tgz"; sha1 = "8ec1c42a4c1a039e3e75f6e9e6029bd0c699016e"; }) ]; @@ -9968,6 +10492,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + name = "pause-0.0.1.tgz"; sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; }) ]; @@ -9986,6 +10511,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-6.tgz"; + name = "phantomjs-1.9.2-6.tgz"; sha1 = "71db87e5275489570560a744dbaa649c2f9da0a0"; }) ]; @@ -10011,6 +10537,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; + name = "pkginfo-0.2.3.tgz"; sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; }) ]; @@ -10029,6 +10556,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + name = "pkginfo-0.3.0.tgz"; sha1 = "726411401039fe9b009eea86614295d5f3a54276"; }) ]; @@ -10051,6 +10579,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.2.tgz"; + name = "plist-native-0.2.2.tgz"; sha1 = "6abde856b07a52f0d6bc027f7750f4d97ff93858"; }) ]; @@ -10071,6 +10600,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; + name = "policyfile-0.0.4.tgz"; sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; }) ]; @@ -10089,6 +10619,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/posix/-/posix-1.0.3.tgz"; + name = "posix-1.0.3.tgz"; sha1 = "f0efae90d59c56c4509c8f0ed222b421caa8188a"; }) ]; @@ -10108,6 +10639,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz"; + name = "posix-getopt-1.0.0.tgz"; sha1 = "42a90eca6119014c78bc4b9b70463d294db1aa87"; }) ]; @@ -10126,6 +10658,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; + name = "promise-2.0.0.tgz"; sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; }) ]; @@ -10145,6 +10678,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz"; + name = "prompt-0.2.11.tgz"; sha1 = "26d455af4b7fac15291dfcdddf2400328c1fa446"; }) ]; @@ -10168,6 +10702,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz"; + name = "promptly-0.2.0.tgz"; sha1 = "73ef200fa8329d5d3a8df41798950b8646ca46d9"; }) ]; @@ -10187,6 +10722,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/promzard/-/promzard-0.2.0.tgz"; + name = "promzard-0.2.0.tgz"; sha1 = "766f33807faadeeecacf8057024fe5f753cfa3c1"; }) ]; @@ -10206,6 +10742,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz"; + name = "proto-list-1.2.2.tgz"; sha1 = "48b88798261ec2c4a785720cdfec6200d57d3326"; }) ]; @@ -10224,6 +10761,7 @@ src = [ (self.patchSource fetchurl { url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.1.tgz"; + name = "protobufjs-2.0.1.tgz"; sha1 = "636e8c4a9e0488fbc9c8898c044d844884f8fd96"; }) ]; @@ -10244,6 +10782,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; + name = "ps-tree-0.0.3.tgz"; sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; }) ]; @@ -10263,6 +10802,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz"; + name = "punycode-1.2.3.tgz"; sha1 = "b4e304471082d783c73b3bafabf2fd9b6a486266"; }) ]; @@ -10283,6 +10823,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + name = "q-0.9.7.tgz"; sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; @@ -10309,6 +10850,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + name = "qs-0.4.2.tgz"; sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; }) ]; @@ -10329,6 +10871,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; + name = "qs-0.5.1.tgz"; sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; }) ]; @@ -10347,6 +10890,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.2.tgz"; + name = "qs-0.5.2.tgz"; sha1 = "e5734acb7009fb918e800fd5c60c2f5b94a7ff43"; }) ]; @@ -10365,6 +10909,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz"; + name = "qs-0.5.5.tgz"; sha1 = "b07f0d7ffe3efc6fc2fcde6c66a20775641423f3"; }) ]; @@ -10383,6 +10928,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + name = "qs-0.6.5.tgz"; sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; }) ]; @@ -10401,6 +10947,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; }) ]; @@ -10421,6 +10968,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + name = "qs-0.5.6.tgz"; sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }) ]; @@ -10443,6 +10991,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz"; + name = "rai-0.1.9.tgz"; sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc"; }) ]; @@ -10461,6 +11010,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; + name = "range-parser-0.0.4.tgz"; sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; }) ]; @@ -10479,6 +11029,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raven/-/raven-0.6.0.tgz"; + name = "raven-0.6.0.tgz"; sha1 = "440aa58143e95760cb7b73b7b23b3429ca9b5576"; }) ]; @@ -10499,6 +11050,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; + name = "raw-body-0.0.3.tgz"; sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; }) ]; @@ -10517,6 +11069,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz"; + name = "raw-body-1.1.2.tgz"; sha1 = "c74b3004dea5defd1696171106ac740ec31d62be"; }) ]; @@ -10536,6 +11089,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz"; + name = "raw-socket-1.2.2.tgz"; sha1 = "c9be873878a1ef70497a27e40b6e55b563d8f886"; }) ]; @@ -10554,6 +11108,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/raw-stacktrace/-/raw-stacktrace-1.0.0.tgz"; + name = "raw-stacktrace-1.0.0.tgz"; sha1 = "f308881f17667785a9acd7c8fbd442e1b2acf1db"; }) ]; @@ -10574,6 +11129,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rbytes/-/rbytes-1.0.0.tgz"; + name = "rbytes-1.0.0.tgz"; sha1 = "4eeb85c457f710d8147329d5eed5cd02c798fa4d"; }) ]; @@ -10593,6 +11149,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rc/-/rc-0.3.2.tgz"; + name = "rc-0.3.2.tgz"; sha1 = "cd8f895690f764621ccec110516b225286e8f69f"; }) ]; @@ -10616,6 +11173,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; + name = "read-1.0.5.tgz"; sha1 = "007a3d169478aa710a491727e453effb92e76203"; }) ]; @@ -10641,6 +11199,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz"; + name = "read-installed-0.2.2.tgz"; sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab"; }) ]; @@ -10663,6 +11222,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz"; + name = "read-installed-0.2.5.tgz"; sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86"; }) ]; @@ -10685,6 +11245,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.4.tgz"; + name = "read-package-json-1.1.4.tgz"; sha1 = "c4effa9fac527deaee1cd84659c419693aa5294a"; }) ]; @@ -10709,6 +11270,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.17.tgz"; + name = "readable-stream-1.0.17.tgz"; sha1 = "cbc295fdf394dfa1225d225d02e6b6d0f409fd4b"; }) ]; @@ -10729,6 +11291,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.9.tgz"; + name = "readable-stream-1.1.9.tgz"; sha1 = "d87130fbf8f9ee9c3b4058b3c58a3e30db2fcfdd"; }) ]; @@ -10751,6 +11314,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz"; + name = "readdirp-0.2.5.tgz"; sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb"; }) ]; @@ -10770,6 +11334,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz"; + name = "redeyed-0.4.2.tgz"; sha1 = "f0133b990cb972bdbcf2d2dce0aec36595f419bc"; }) ]; @@ -10789,6 +11354,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.10.0.tgz"; + name = "redis-0.10.0.tgz"; sha1 = "76864475f71a745cbc3bbb27d794a6d01a96505c"; }) ]; @@ -10808,6 +11374,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz"; + name = "redis-0.7.2.tgz"; sha1 = "fa557fef4985ab3e3384fdc5be6e2541a0bb49af"; }) ]; @@ -10827,6 +11394,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; + name = "redis-0.7.3.tgz"; sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; }) ]; @@ -10845,6 +11413,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz"; + name = "redis-0.8.6.tgz"; sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8"; }) ]; @@ -10865,6 +11434,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/reds/-/reds-0.1.4.tgz"; + name = "reds-0.1.4.tgz"; sha1 = "a97819180c30f6ecd01cad03cecb574eaabb4bee"; }) ]; @@ -10885,6 +11455,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + name = "reduce-component-1.0.1.tgz"; sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }) ]; @@ -10903,6 +11474,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz"; + name = "regexp-clone-0.0.1.tgz"; sha1 = "a7c2e09891fdbf38fbb10d376fb73003e68ac589"; }) ]; @@ -10921,6 +11493,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/replace/-/replace-0.2.7.tgz"; + name = "replace-0.2.7.tgz"; sha1 = "e22d08a9e2e6764337bb530166a4dd89c2558fda"; }) ]; @@ -10942,6 +11515,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; + name = "request-2.30.0.tgz"; sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; }) ]; @@ -10976,6 +11550,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.16.2.tgz"; + name = "request-2.16.2.tgz"; sha1 = "83a028be61be4a05163e7e2e7a4b40e35df1bcb9"; }) ]; @@ -11005,6 +11580,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; + name = "request-2.16.6.tgz"; sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; }) ]; @@ -11034,6 +11610,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; + name = "request-2.9.203.tgz"; sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }) ]; @@ -11056,6 +11633,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.21.0.tgz"; + name = "request-2.21.0.tgz"; sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7"; }) ]; @@ -11086,6 +11664,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; + name = "request-2.25.0.tgz"; sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; }) ]; @@ -11116,6 +11695,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; + name = "request-2.27.0.tgz"; sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; }) ]; @@ -11146,6 +11726,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz"; + name = "request-2.29.0.tgz"; sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3"; }) ]; @@ -11178,6 +11759,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; + name = "request-progress-0.3.1.tgz"; sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; }) ]; @@ -11197,6 +11779,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz"; + name = "request-replay-0.2.0.tgz"; sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60"; }) ]; @@ -11216,6 +11799,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.9.tgz"; + name = "requirejs-2.1.9.tgz"; sha1 = "624e10d22863e8db9aebfb8f21809ca59da42344"; }) ]; @@ -11236,6 +11820,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.5.1.tgz"; + name = "resolve-0.5.1.tgz"; sha1 = "15e4a222c4236bcd4cf85454412c2d0fb6524576"; }) ]; @@ -11254,6 +11839,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz"; + name = "resolve-0.3.1.tgz"; sha1 = "34c63447c664c70598d1c9b126fc43b2a24310a4"; }) ]; @@ -11272,6 +11858,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz"; + name = "restify-2.4.1.tgz"; sha1 = "35790a052bd0927e7f6a06cc3d079e56fabc9371"; }) ]; @@ -11307,6 +11894,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.11.0-1.tgz"; + name = "rethinkdb-1.11.0-1.tgz"; sha1 = "beab3376b9efa9ecf7f2fbf39c58ce80c8bd5dfd"; }) ]; @@ -11327,6 +11915,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + name = "retry-0.6.0.tgz"; sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; }) ]; @@ -11347,6 +11936,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.6.tgz"; + name = "revalidator-0.1.6.tgz"; sha1 = "0af2bab68d7d0e766fc4249660ebc2be28b594ba"; }) ]; @@ -11365,6 +11955,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz"; + name = "rimraf-1.0.9.tgz"; sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1"; }) ]; @@ -11383,6 +11974,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.5.tgz"; + name = "rimraf-2.2.5.tgz"; sha1 = "4e5c4f667b121afa806d0c5b58920996f9478aa0"; }) ]; @@ -11405,6 +11997,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.0.3.tgz"; + name = "rimraf-2.0.3.tgz"; sha1 = "f50a2965e7144e9afd998982f15df706730f56a9"; }) ]; @@ -11426,6 +12019,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + name = "rimraf-2.1.4.tgz"; sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; }) ]; @@ -11453,6 +12047,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/s3http/-/s3http-0.0.3.tgz"; + name = "s3http-0.0.3.tgz"; sha1 = "4d8965ae1c62c7fc2bbdc3fb6b95067429aac87a"; }) ]; @@ -11480,6 +12075,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.2.2.tgz"; + name = "sauce-connect-launcher-0.2.2.tgz"; sha1 = "cfd951c8b488af38d384aef14920261482e2e05a"; }) ]; @@ -11501,6 +12097,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"; + name = "saucelabs-0.1.1.tgz"; sha1 = "5e0ea1cf3d735d6ea15fde94b5bda6bc15d2c06d"; }) ]; @@ -11519,6 +12116,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + name = "sax-0.5.8.tgz"; sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }) ]; @@ -11539,6 +12137,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.39.0.tgz"; + name = "selenium-webdriver-2.39.0.tgz"; sha1 = "546225f2f4f53f1f490a3077e5f14092fad3d205"; }) ]; @@ -11558,6 +12157,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; }) ]; @@ -11577,6 +12177,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; + name = "semver-1.1.0.tgz"; sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; }) ]; @@ -11595,6 +12196,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; + name = "semver-1.1.4.tgz"; sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; }) ]; @@ -11625,6 +12227,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + name = "semver-2.0.11.tgz"; sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; }) ]; @@ -11643,6 +12246,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; + name = "semver-2.1.0.tgz"; sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; }) ]; @@ -11663,6 +12267,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz"; + name = "send-0.1.4.tgz"; sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; }) ]; @@ -11685,6 +12290,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz"; + name = "send-0.0.3.tgz"; sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184"; }) ]; @@ -11707,6 +12313,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz"; + name = "send-0.1.0.tgz"; sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }) ]; @@ -11731,6 +12338,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + name = "sequence-2.2.1.tgz"; sha1 = "7f5617895d44351c0a047e764467690490a16b03"; }) ]; @@ -11751,6 +12359,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz"; + name = "sha-1.2.3.tgz"; sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329"; }) ]; @@ -11771,6 +12380,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"; + name = "shelljs-0.1.4.tgz"; sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e"; }) ]; @@ -11791,6 +12401,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"; + name = "shelljs-0.2.6.tgz"; sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378"; }) ]; @@ -11809,6 +12420,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/should/-/should-2.1.1.tgz"; + name = "should-2.1.1.tgz"; sha1 = "c648b13a8b464465c2f838ea0c93f12e4ae06c6b"; }) ]; @@ -11828,6 +12440,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; + name = "sigmund-1.0.0.tgz"; sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; }) ]; @@ -11846,6 +12459,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + name = "signals-1.0.0.tgz"; sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; }) ]; @@ -11868,6 +12482,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz"; + name = "simple-lru-cache-0.0.1.tgz"; sha1 = "0334171e40ed4a4861ac29250eb1db23300be4f0"; }) ]; @@ -11886,6 +12501,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.16.tgz"; + name = "simplesmtp-0.3.16.tgz"; sha1 = "c82ab64b957a5f979b10b96787094e3612877814"; }) ]; @@ -11906,6 +12522,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; + name = "sliced-0.0.3.tgz"; sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50"; }) ]; @@ -11924,6 +12541,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; + name = "sliced-0.0.4.tgz"; sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; }) ]; @@ -11942,6 +12560,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz"; + name = "sliced-0.0.5.tgz"; sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f"; }) ]; @@ -11960,6 +12579,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz"; + name = "slide-1.1.5.tgz"; sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d"; }) ]; @@ -11980,6 +12600,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.2.tgz"; + name = "smartdc-7.1.2.tgz"; sha1 = "11228af972ed5014d3798202ecc370e02f007872"; }) ]; @@ -12006,6 +12627,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz"; + name = "smartdc-auth-1.0.1.tgz"; sha1 = "520bbf918313bdf2da372927d33756d46356b87b"; }) ]; @@ -12029,6 +12651,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; + name = "sntp-0.1.4.tgz"; sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; }) ]; @@ -12048,6 +12671,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }) ]; @@ -12067,6 +12691,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; + name = "socket.io-0.9.14.tgz"; sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667"; }) ]; @@ -12089,6 +12714,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; + name = "socket.io-0.9.16.tgz"; sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76"; }) ]; @@ -12115,6 +12741,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz"; + name = "socket.io-client-0.9.11.tgz"; sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7"; }) ]; @@ -12137,6 +12764,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; + name = "socket.io-client-0.9.16.tgz"; sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6"; }) ]; @@ -12159,6 +12787,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz"; + name = "sockjs-0.3.8.tgz"; sha1 = "c083cb0505db1ea1a949d3bd12d8a1ea385a456c"; }) ]; @@ -12180,6 +12809,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; + name = "source-map-0.1.31.tgz"; sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; }) ]; @@ -12208,6 +12838,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz"; + name = "spdy-1.7.1.tgz"; sha1 = "4fde77e602b20c4ecc39ee8619373dd9bf669152"; }) ]; @@ -12226,6 +12857,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz"; + name = "ssh-agent-0.2.1.tgz"; sha1 = "3044e9eaeca88a9e6971dd7deb19bdcc20012929"; }) ]; @@ -12246,6 +12878,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.14.tgz"; + name = "ssh2-0.2.14.tgz"; sha1 = "6f93df62f1475cbe5b45924da568643b9ac7388a"; }) ]; @@ -12266,6 +12899,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz"; + name = "stack-trace-0.0.7.tgz"; sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff"; }) ]; @@ -12284,6 +12918,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/statsd/-/statsd-0.7.0.tgz"; + name = "statsd-0.7.0.tgz"; sha1 = "13354345392c50a30221d3ab524bffcdda90272e"; }) ]; @@ -12306,6 +12941,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + name = "stream-combiner-0.0.4.tgz"; sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; }) ]; @@ -12325,6 +12961,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz"; + name = "stream-counter-0.1.0.tgz"; sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b"; }) ]; @@ -12344,6 +12981,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + name = "stream-counter-0.2.0.tgz"; sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; }) ]; @@ -12363,6 +13001,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz"; + name = "stream-splitter-transform-0.0.4.tgz"; sha1 = "0de54e94680633a8d703b252b20fa809ed99331c"; }) ]; @@ -12383,6 +13022,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + name = "streamsearch-0.1.2.tgz"; sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }) ]; @@ -12401,6 +13041,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz"; + name = "string-1.6.1.tgz"; sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; }) ]; @@ -12419,6 +13060,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.7.tgz"; + name = "stringify-object-0.1.7.tgz"; sha1 = "bb54d1ceed118b428c1256742b40a53f03599581"; }) ]; @@ -12437,6 +13079,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; + name = "strip-ansi-0.1.1.tgz"; sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; }) ]; @@ -12455,6 +13098,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.0.tgz"; + name = "strong-data-uri-0.1.0.tgz"; sha1 = "a41235806b8c3bf0f6f324dc57dfe85bbab681a0"; }) ]; @@ -12474,6 +13118,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stylus/-/stylus-0.41.3.tgz"; + name = "stylus-0.41.3.tgz"; sha1 = "0a49c3f2f4f6b6719e7cca823052b9df87acaeb7"; }) ]; @@ -12497,6 +13142,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz"; + name = "stylus-0.27.2.tgz"; sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117"; }) ]; @@ -12518,6 +13164,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.2.1.tgz"; + name = "sudo-block-0.2.1.tgz"; sha1 = "b394820741b66c0fe06f97b334f0674036837ba5"; }) ]; @@ -12537,6 +13184,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.3.0.tgz"; + name = "sudo-block-0.3.0.tgz"; sha1 = "aec27fbde8763ee32e3e47b8ba3c70584da7eb9c"; }) ]; @@ -12556,6 +13204,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/superagent/-/superagent-0.15.7.tgz"; + name = "superagent-0.15.7.tgz"; sha1 = "095c70b8afffbc072f1458f39684d4854d6333a3"; }) ]; @@ -12582,6 +13231,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/superagent/-/superagent-0.13.0.tgz"; + name = "superagent-0.13.0.tgz"; sha1 = "ddfbfa5c26f16790f9c5bce42815ccbde2ca36f2"; }) ]; @@ -12608,6 +13258,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/supertest/-/supertest-0.8.2.tgz"; + name = "supertest-0.8.2.tgz"; sha1 = "2da3519f7c9dcfa8759e2de9c794f1d4acc0333b"; }) ]; @@ -12629,6 +13280,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz"; + name = "swig-0.14.0.tgz"; sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; }) ]; @@ -12649,6 +13301,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; + name = "sylvester-0.0.21.tgz"; sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7"; }) ]; @@ -12669,6 +13322,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz"; + name = "tar-0.1.19.tgz"; sha1 = "fe45941799e660ce1ea52d875d37481b4bf13eac"; }) ]; @@ -12693,6 +13347,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + name = "tar-0.1.17.tgz"; sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; }) ]; @@ -12720,6 +13375,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; + name = "temp-0.6.0.tgz"; sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; }) ]; @@ -12745,6 +13401,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/text-table/-/text-table-0.1.1.tgz"; + name = "text-table-0.1.1.tgz"; sha1 = "9aa4347a39b6950cd24190264576f62db6e52d93"; }) ]; @@ -12763,6 +13420,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + name = "text-table-0.2.0.tgz"; sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }) ]; @@ -12781,6 +13439,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; + name = "throttleit-0.0.2.tgz"; sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"; }) ]; @@ -12799,6 +13458,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/through2/-/through2-0.1.0.tgz"; + name = "through2-0.1.0.tgz"; sha1 = "54e756cc6a543c72bb5adf55e8a248686b84c9cc"; }) ]; @@ -12819,6 +13479,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; + name = "timespan-2.3.0.tgz"; sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; }) ]; @@ -12837,6 +13498,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz"; + name = "timezone-0.0.23.tgz"; sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac"; }) ]; @@ -12856,6 +13518,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + name = "tinycolor-0.0.1.tgz"; sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }) ]; @@ -12874,6 +13537,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz"; + name = "tmp-0.0.23.tgz"; sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74"; }) ]; @@ -12892,6 +13556,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz"; + name = "touch-0.0.2.tgz"; sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4"; }) ]; @@ -12911,6 +13576,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; + name = "tough-cookie-0.9.15.tgz"; sha1 = "75617ac347e3659052b0350131885829677399f6"; }) ]; @@ -12930,6 +13596,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/traceback/-/traceback-0.3.0.tgz"; + name = "traceback-0.3.0.tgz"; sha1 = "4e147f07cd332fbd0330ba510b942a5c9256a0ab"; }) ]; @@ -12948,6 +13615,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; + name = "transformers-2.1.0.tgz"; sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }) ]; @@ -12969,6 +13637,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; + name = "traverse-0.3.9.tgz"; sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; }) ]; @@ -12987,6 +13656,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/truncate/-/truncate-1.0.2.tgz"; + name = "truncate-1.0.2.tgz"; sha1 = "3221c41f6e747f83e8613f5466c8bfb596226a66"; }) ]; @@ -13005,6 +13675,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; + name = "tunnel-agent-0.2.0.tgz"; sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; }) ]; @@ -13023,6 +13694,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + name = "tunnel-agent-0.3.0.tgz"; sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; }) ]; @@ -13041,6 +13713,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; + name = "type-detect-0.1.1.tgz"; sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; }) ]; @@ -13059,6 +13732,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz"; + name = "typechecker-2.0.8.tgz"; sha1 = "e83da84bb64c584ccb345838576c40b0337db82e"; }) ]; @@ -13077,6 +13751,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; + name = "uglify-js-1.2.5.tgz"; sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; }) ]; @@ -13095,6 +13770,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz"; + name = "uglify-js-2.4.0.tgz"; sha1 = "a5f2b6b1b817fb34c16a04234328c89ba1e77137"; }) ]; @@ -13117,6 +13793,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; + name = "uglify-js-2.2.5.tgz"; sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; }) ]; @@ -13137,6 +13814,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + name = "uglify-js-2.3.6.tgz"; sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; }) ]; @@ -13158,6 +13836,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.8.tgz"; + name = "uglify-js-2.4.8.tgz"; sha1 = "70e33bd9bce9a27b896fd4fead4c7da434fcca09"; }) ]; @@ -13180,6 +13859,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.1.tgz"; + name = "uglify-to-browserify-1.0.1.tgz"; sha1 = "0e9ada5d4ca358a59a00bb33c8061e2f40ef97d2"; }) ]; @@ -13198,6 +13878,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; + name = "uid-number-0.0.3.tgz"; sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; }) ]; @@ -13216,6 +13897,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uid2/-/uid2-0.0.2.tgz"; + name = "uid2-0.0.2.tgz"; sha1 = "107fb155c82c1136620797ed4c88cf2b08f6aab8"; }) ]; @@ -13234,6 +13916,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; + name = "uid2-0.0.3.tgz"; sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }) ]; @@ -13252,6 +13935,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + name = "underscore-1.5.2.tgz"; sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }) ]; @@ -13271,6 +13955,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + name = "underscore-1.4.4.tgz"; sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }) ]; @@ -13303,6 +13988,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"; + name = "underscore.string-2.2.1.tgz"; sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19"; }) ]; @@ -13321,6 +14007,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + name = "underscore.string-2.3.3.tgz"; sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; }) ]; @@ -13341,6 +14028,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.1.tgz"; + name = "unfunk-diff-0.0.1.tgz"; sha1 = "fd01490b7e53bc268f069f222fda10704c8f1265"; }) ]; @@ -13362,6 +14050,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ungit/-/ungit-0.6.0.tgz"; + name = "ungit-0.6.0.tgz"; sha1 = "fffc26cafc5d138bc6b3585fef3f15744f5f3d31"; }) ]; @@ -13381,7 +14070,7 @@ self.by-version."winston"."0.7.2" self.by-version."passport"."0.1.17" self.by-version."passport-local"."0.1.6" - self.by-version."npm"."1.3.21" + self.by-version."npm"."1.3.22" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" @@ -13408,6 +14097,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.7.tgz"; + name = "update-notifier-0.1.7.tgz"; sha1 = "b37fb55004835240fd2e7e360c52ccffde5219c9"; }) ]; @@ -13432,6 +14122,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz"; + name = "useragent-2.0.7.tgz"; sha1 = "a44c07d157a15e13d73d4af4ece6aab70f298224"; }) ]; @@ -13451,6 +14142,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/util/-/util-0.10.2.tgz"; + name = "util-0.10.2.tgz"; sha1 = "8180519cf690fb88bc56480fe55087531f446304"; }) ]; @@ -13470,6 +14162,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz"; + name = "util-0.4.9.tgz"; sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3"; }) ]; @@ -13489,6 +14182,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; + name = "utile-0.1.7.tgz"; sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; }) ]; @@ -13513,6 +14207,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; + name = "utile-0.2.1.tgz"; sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; }) ]; @@ -13543,6 +14238,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/uuid/-/uuid-1.4.1.tgz"; + name = "uuid-1.4.1.tgz"; sha1 = "a337828580d426e375b8ee11bd2bf901a596e0b8"; }) ]; @@ -13561,6 +14257,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; + name = "validator-0.4.28.tgz"; sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4"; }) ]; @@ -13579,6 +14276,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"; + name = "vargs-0.1.0.tgz"; sha1 = "6b6184da6520cc3204ce1b407cac26d92609ebff"; }) ]; @@ -13597,6 +14295,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz"; + name = "vasync-1.3.3.tgz"; sha1 = "84917680717020b67e043902e63bc143174c8728"; }) ]; @@ -13617,6 +14316,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz"; + name = "verror-1.1.0.tgz"; sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0"; }) ]; @@ -13636,6 +14336,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz"; + name = "verror-1.3.3.tgz"; sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; }) ]; @@ -13655,6 +14356,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + name = "verror-1.3.6.tgz"; sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; }) ]; @@ -13674,6 +14376,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.3.tgz"; + name = "view-helpers-0.1.3.tgz"; sha1 = "97b061548a753eff5b432e6c1598cb10417bff02"; }) ]; @@ -13693,6 +14396,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; + name = "vows-0.7.0.tgz"; sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; }) ]; @@ -13713,6 +14417,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz"; + name = "walk-2.2.1.tgz"; sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016"; }) ]; @@ -13735,6 +14440,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz"; + name = "watch-0.5.1.tgz"; sha1 = "50ea3a056358c98073e0bca59956de4afd20b213"; }) ]; @@ -13753,6 +14459,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/watch/-/watch-0.8.0.tgz"; + name = "watch-0.8.0.tgz"; sha1 = "1bb0eea53defe6e621e9c8c63c0358007ecbdbcc"; }) ]; @@ -13771,6 +14478,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/wd/-/wd-0.2.8.tgz"; + name = "wd-0.2.8.tgz"; sha1 = "397ccb8058e72af3ae6e7c485f4368f4fb514631"; }) ]; @@ -13796,6 +14504,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.38.0-0.tgz"; + name = "webdrvr-2.38.0-0.tgz"; sha1 = "b5388a672ac512e09df24d00f80b3d619dc15e5c"; }) ]; @@ -13822,6 +14531,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.1.tgz"; + name = "websocket-driver-0.3.1.tgz"; sha1 = "25f86b4e7ca9d8f8136cd225ffcee71a3d2869cf"; }) ]; @@ -13842,6 +14552,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/when/-/when-2.2.1.tgz"; + name = "when-2.2.1.tgz"; sha1 = "b1def994017350b8087f6e9a7596ab2833bdc712"; }) ]; @@ -13860,6 +14571,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz"; + name = "which-1.0.5.tgz"; sha1 = "5630d6819dda692f1464462e7956cb42c0842739"; }) ]; @@ -13884,6 +14596,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/winser/-/winser-0.0.11.tgz"; + name = "winser-0.0.11.tgz"; sha1 = "38474086a89ac72f90f9c6762e23375d12046c7c"; }) ]; @@ -13904,6 +14617,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; + name = "winston-0.7.2.tgz"; sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb"; }) ]; @@ -13930,6 +14644,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; + name = "winston-0.6.2.tgz"; sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; }) ]; @@ -13961,6 +14676,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/wiredep/-/wiredep-0.4.2.tgz"; + name = "wiredep-0.4.2.tgz"; sha1 = "42d4cf07422576f26e3a04045edc163da101a66f"; }) ]; @@ -13981,6 +14697,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz"; + name = "with-2.0.0.tgz"; sha1 = "ec01ff021db9df05639047147ede012f5e6d0afd"; }) ]; @@ -14000,6 +14717,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + name = "wordwrap-0.0.2.tgz"; sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; }) ]; @@ -14022,6 +14740,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/wrench/-/wrench-1.4.4.tgz"; + name = "wrench-1.4.4.tgz"; sha1 = "7f523efdb71b0100e77dce834c06523cbe3d54e0"; }) ]; @@ -14040,6 +14759,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; + name = "ws-0.4.31.tgz"; sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; }) ]; @@ -14062,6 +14782,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/wu/-/wu-0.1.8.tgz"; + name = "wu-0.1.8.tgz"; sha1 = "619bcdf64974a487894a25755ae095c5208b4a22"; }) ]; @@ -14081,6 +14802,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/x509/-/x509-0.0.6.tgz"; + name = "x509-0.0.6.tgz"; sha1 = "b58747854ff33df7ff8f1653756bff6a32a8c838"; }) ]; @@ -14100,6 +14822,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz"; + name = "xml2js-0.2.4.tgz"; sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d"; }) ]; @@ -14119,6 +14842,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; + name = "xml2js-0.2.8.tgz"; sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; }) ]; @@ -14138,6 +14862,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.0.tgz"; + name = "xml2js-0.4.0.tgz"; sha1 = "124fc4114b4129c810800ecb2ac86cf25462cb9a"; }) ]; @@ -14160,6 +14885,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; + name = "xmlbuilder-0.4.2.tgz"; sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; }) ]; @@ -14178,6 +14904,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.0.1.tgz"; + name = "xmlbuilder-2.0.1.tgz"; sha1 = "b0f9b16bd2a260e734f5f8e30d9bf1db217fe79b"; }) ]; @@ -14197,6 +14924,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; + name = "xmlhttprequest-1.4.2.tgz"; sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500"; }) ]; @@ -14215,6 +14943,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; + name = "xoauth2-0.1.8.tgz"; sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; }) ]; @@ -14233,6 +14962,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz"; + name = "xtend-2.0.6.tgz"; sha1 = "5ea657a6dba447069c2e59c58a1138cb0c5e6cee"; }) ]; @@ -14253,6 +14983,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/yaml/-/yaml-0.2.3.tgz"; + name = "yaml-0.2.3.tgz"; sha1 = "b5450e92e76ef36b5dd24e3660091ebaeef3e5c7"; }) ]; @@ -14271,6 +15002,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; + name = "yeoman-generator-0.13.4.tgz"; sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34"; }) ]; @@ -14309,6 +15041,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.14.2.tgz"; + name = "yeoman-generator-0.14.2.tgz"; sha1 = "6d3e306d1118c83c25ac12a9d3dcb7870aa53397"; }) ]; @@ -14342,13 +15075,14 @@ passthru.names = [ "yeoman-generator" ]; }; by-spec."yeoman-generator"."~0.15.0" = - self.by-version."yeoman-generator"."0.15.0-pre.2"; - by-version."yeoman-generator"."0.15.0-pre.2" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.15.0-pre.2"; + self.by-version."yeoman-generator"."0.15.0-pre.3"; + by-version."yeoman-generator"."0.15.0-pre.3" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.15.0-pre.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.15.0-pre.2.tgz"; - sha1 = "d6a2f2994209e891517f7f6823b03fffe3c18878"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.15.0-pre.3.tgz"; + name = "yeoman-generator-0.15.0-pre.3.tgz"; + sha1 = "49ded1ed00a2f27fe101ec11f2bf797c6ba9d81f"; }) ]; buildInputs = @@ -14387,13 +15121,14 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/yo/-/yo-1.0.7-pre.2.tgz"; + name = "yo-1.0.7-pre.2.tgz"; sha1 = "0301500c8b92e81409a7a68459501e8dece0609f"; }) ]; buildInputs = (self.nativeDeps."yo" or []); deps = [ - self.by-version."yeoman-generator"."0.15.0-pre.2" + self.by-version."yeoman-generator"."0.15.0-pre.3" self.by-version."nopt"."2.1.2" self.by-version."lodash"."2.4.1" self.by-version."update-notifier"."0.1.7" @@ -14422,6 +15157,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; + name = "zeparser-0.0.5.tgz"; sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }) ]; @@ -14440,6 +15176,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.1.tgz"; + name = "zlib-browserify-0.0.1.tgz"; sha1 = "4fa6a45d00dbc15f318a4afa1d9afc0258e176cc"; }) ]; -- cgit 1.4.1 From f6a8fe34b29f67a602470236c1b7a982712c0091 Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Thu, 26 Dec 2013 16:50:13 +0100 Subject: speedtest-cli: dev -> 0.2.4 --- pkgs/tools/networking/speedtest-cli/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 15ca99f47e9..26b4b680a6e 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -1,21 +1,14 @@ -{ stdenv, fetchgit, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: -stdenv.mkDerivation rec { - name = "speedtest-cli-dev"; +pythonPackages.buildPythonPackage rec { + name = "speedtest-cli-${version}"; + version = "0.2.4"; - src = fetchgit { - url = "https://github.com/sivel/speedtest-cli.git"; - rev = "fe0940c5744ebe74ca31ad44e6b181d82a89edab"; - sha256 = "0iywcmgqi58bhldcf8qn1nr7mihypi5fp9s13d4vqc7797xvb28k"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; + sha256 = "1mz9lx0sdgjz5w3w2lrfh4g7mdyas0ywqfvwh7hwmmpg0fvqiq5q"; }; - buildInputs = [ pythonPackages.python ]; - - installPhase = '' - mkdir -p $out/bin - cp speedtest-cli $out/bin/ - ''; - meta = with stdenv.lib; { homepage = https://github.com/sivel/speedtest-cli; description = "Command line interface for testing internet bandwidth using speedtest.net"; -- cgit 1.4.1 From 55a49a3f9339d140c0b50700d0df95ed63a1d0a9 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Fri, 27 Dec 2013 00:16:57 +0800 Subject: midori: fix file chooser dialog (Ctrl+o) vcunat: change to double-prefix of the variable, instead of clearing it. --- pkgs/applications/networking/browsers/midori/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 791725272a9..033ee44fbf8 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper -, webkitgtk, librsvg, libnotify +, gtk3, webkitgtk, librsvg, libnotify , glib_networking, gsettings_desktop_schemas }: @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/midori \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share" + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gsettings_desktop_schemas}/share" ''; } -- cgit 1.4.1 From 9b273eb971bde277363798128e49469102a6d82b Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Thu, 26 Dec 2013 20:16:09 +0800 Subject: midori: build with webkit2 to support GTK+2 plugins (close #1412) --- pkgs/applications/networking/browsers/midori/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 033ee44fbf8..b2ca7c42e76 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = '' - -DUSE_GTK3=1 + -DHALF_BRO_INCOM_WEBKIT2=ON -DUSE_ZEITGEIST=OFF ''; -- cgit 1.4.1 From 88b9e1f191c1c48a285fdb17dc2f5a85860e80c0 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 15 Dec 2013 23:47:25 +0800 Subject: retroarch: update to 0.9.9.7 --- pkgs/misc/emulators/retroarch/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index a98e6db2db4..8bc53da8f0c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, which +{ stdenv, fetchgit, pkgconfig, which , SDL, mesa, alsaLib +, libXxf86vm, libXinerama, libXv }: stdenv.mkDerivation rec { - name = "retroarch-0.9.9"; + name = "retroarch-0.9.9.7"; - src = fetchurl { - url = "http://themaister.net/retroarch-dl/${name}.tar.gz"; - sha256 = "08xlndpl14c4ccgp752ixx3a7ajf3xp93nawhinwxq0cw801prda"; + src = fetchgit { + url = "https://github.com/libretro/RetroArch.git"; + rev = "ea0c4880556e0f9d1fe8253ddc713bc743b00e1b"; + sha256 = "1jhyh7f8ijy67fxslxqsp8pjl2lwayjljp06hp4n5cn33yajpbd7"; }; buildInputs = [ pkgconfig which SDL mesa alsaLib + libXxf86vm libXinerama libXv ]; preConfigure = '' configureFlags="--global-config-dir=$out/etc" ''; - + meta = { - description = "A cross-platform multi-system emulator"; - homepage = "http://themaister.net/retroarch.html"; + description = "Modular multi-system game/emulator system"; + homepage = "http://www.libretro.com/"; license = stdenv.lib.licenses.gpl3Plus; - platform = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; } -- cgit 1.4.1 From 44c97e02f69add2691ce06424bd62c90b595297d Mon Sep 17 00:00:00 2001 From: Shea Levy 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 --- 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') 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 < $out/nix-support/setup-hook < $out/nix-support/setup-hook < $out/nix-support/setup-hook < 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') 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 9020582feadaae2e17ed18d98253f3498fd44ef6 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 27 Dec 2013 08:48:39 +0100 Subject: xfce4-terminal: bugfix update 0.6.2 -> .3 --- pkgs/desktops/xfce/applications/terminal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index 1c795a5a5fa..d891ad98fdc 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-terminal"; ver_maj = "0.6"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0d9vbkvbxxhv022mwyihrabmj8y9097bp57n1a412qyji0i454ix"; + sha256 = "023y0lkfijifh05yz8grimxadqpi98mrivr00sl18nirq8b4fbwi"; }; name = "${p_name}-${ver_maj}.${ver_min}"; -- cgit 1.4.1 From 5331088ba14231d09f2f0dacf32213684d79d953 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 28 Dec 2013 00:57:17 +0000 Subject: ledger3: Update to latest git (8d38060968) --- pkgs/applications/office/ledger/3.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index 8a29d9356df..ecc9f389502 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -1,15 +1,15 @@ { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }: let - rev = "0e5867bc5c"; + rev = "8d38060968"; in stdenv.mkDerivation { - name = "ledger3-2013.11.${rev}"; + name = "ledger3-2013.12.${rev}"; src = fetchgit { url = "https://github.com/ledger/ledger.git"; inherit rev; - sha256 = "16aa63z24rp5vin7al8b6nzdi4kqpawbzvh148wfr2wj60vdb1n5"; + sha256 = "e100f28d18e1804fc8aa8b0141cc33d6d95bbe329e803ba887622ac5f8d3d972"; }; buildInputs = [ cmake boost gmp mpfr libedit python texinfo ]; -- cgit 1.4.1 From 5890215501972ae6805f3adba46f003dd48ce647 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 12 Dec 2013 22:33:51 +0100 Subject: windowManager.xmonad: Make it configurable and extensible. PR #1366 The previous windowManager.xmonad option only starts xmonad and doesn't make ghc available. This assumes that the user has GHC with access to the xmonad package in his PATH when using xmonad. Xmonad in Nix is now patched to accept the XMONAD_{GHC,XMESSAGE} environment variables which define the path to either ghc or xmessage. These are set automatically when using xmonad through windowManager.xmonad. My (or specific: @aristidb and my) changes make it possible to use Xmonad without adding GHC to any profile. This is useful if you want to add a different GHC to your profile. This commit introduces some options: - xmonad.haskellPackages: Controls which Haskell package set & GHC set is used to (re)build Xmonad - xmonad.extraPackages: Function returning a list of additional packages to make available to GHC when rebuilding Xmonad - xmonad.enableContribExtras: Boolean option to build xmonadContrib and xmonadExtras. Signed-off-by: Moritz Ulrich --- .../services/x11/window-managers/xmonad.nix | 55 ++++++++++++++++++---- .../window-managers/xmonad/default.nix | 6 +++ .../xmonad/xmonad_ghc_var_0.11.patch | 44 +++++++++++++++++ 3 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/window-managers/xmonad/xmonad_ghc_var_0.11.patch (limited to 'pkgs') diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 2cbb5002d6c..87eff38a028 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -1,10 +1,14 @@ {pkgs, config, ...}: let - inherit (pkgs.lib) mkOption mkIf; + inherit (pkgs.lib) mkOption mkIf optionals literalExample; cfg = config.services.xserver.windowManager.xmonad; + xmonadEnv = cfg.haskellPackages.ghcWithPackages(self: [ + self.xmonad + ] ++ optionals cfg.enableContribAndExtras [ self.xmonadContrib self.xmonadExtras] + ++ optionals (cfg.extraPackages != null) (cfg.extraPackages self)); + xmessage = pkgs.xlibs.xmessage; in - { options = { services.xserver.windowManager.xmonad = { @@ -13,18 +17,53 @@ in example = true; description = "Enable the xmonad window manager."; }; + + haskellPackages = mkOption { + default = pkgs.haskellPackages; + defaultText = "pkgs.haskellPackages"; + example = literalExample "pkgs.haskellPackages_ghc701"; + description = '' + haskellPackages used to build Xmonad and other packages. + This can be used to change the GHC version used to build + Xmonad and the packages listed in + extraPackages. + ''; + }; + + extraPackages = mkOption { + default = null; + example = literalExample '' + haskellPackages: [ + haskellPackages.xmonadContrib + haskellPackages.monadLogger + ] + ''; + description = '' + Extra packages available to ghc when rebuilding Xmonad. The + value must be a function which receives the attrset defined + in haskellpackages as the sole argument. + ''; + }; + + enableContribAndExtras = mkOption { + default = false; + example = true; + type = pkgs.lib.types.bool; + description = "Enable xmonad-{contrib,extras} in Xmonad."; + }; }; }; - - config = { + config = mkIf cfg.enable { services.xserver.windowManager = { - session = mkIf cfg.enable [{ + session = [{ name = "xmonad"; - start = " - ${pkgs.haskellPackages.xmonad}/bin/xmonad & + start = '' + XMONAD_GHC=${xmonadEnv}/bin/ghc XMONAD_XMESSAGE=${xmessage}/bin/xmessage xmonad & waitPID=$! - "; + ''; }]; }; + + environment.systemPackages = [ cfg.haskellPackages.xmonad ]; }; } diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index 0b8b71db7e9..54ef0b274aa 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -13,6 +13,12 @@ cabal.mkDerivation (self: { mkdir -p $out/share/man/man1 mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/ ''; + + patches = [ + # Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available). + ./xmonad_ghc_var_0.11.patch + ]; + meta = { homepage = "http://xmonad.org"; description = "A tiling window manager"; diff --git a/pkgs/applications/window-managers/xmonad/xmonad_ghc_var_0.11.patch b/pkgs/applications/window-managers/xmonad/xmonad_ghc_var_0.11.patch new file mode 100644 index 00000000000..f0785773cc1 --- /dev/null +++ b/pkgs/applications/window-managers/xmonad/xmonad_ghc_var_0.11.patch @@ -0,0 +1,44 @@ +--- xmonad-0.11/XMonad/Core.hs 2013-01-01 01:31:47.000000000 +0000 ++++ new-xmonad/XMonad/Core.hs 2013-12-23 17:36:40.862146910 +0000 +@@ -47,6 +47,7 @@ + import System.Process + import System.Directory + import System.Exit ++import System.Environment (lookupEnv) + import Graphics.X11.Xlib + import Graphics.X11.Xlib.Extras (Event) + import Data.Typeable +@@ -452,6 +453,7 @@ + err = base ++ ".errors" + src = base ++ ".hs" + lib = dir "lib" ++ ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "XMONAD_GHC") + libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib + srcT <- getModTime src + binT <- getModTime bin +@@ -460,7 +462,7 @@ + -- temporarily disable SIGCHLD ignoring: + uninstallSignalHandlers + status <- bracket (openFile err WriteMode) hClose $ \h -> +- waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir) ++ waitForProcess =<< runProcess ghc ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir) + Nothing Nothing Nothing (Just h) + + -- re-enable SIGCHLD: +@@ -469,6 +471,7 @@ + -- now, if it fails, run xmessage to let the user know: + when (status /= ExitSuccess) $ do + ghcErr <- readFile err ++ xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE") + let msg = unlines $ + ["Error detected while loading xmonad configuration file: " ++ src] + ++ lines (if null ghcErr then show status else ghcErr) +@@ -476,7 +479,7 @@ + -- nb, the ordering of printing, then forking, is crucial due to + -- lazy evaluation + hPutStrLn stderr msg +- forkProcess $ executeFile "xmessage" True ["-default", "okay", msg] Nothing ++ forkProcess $ executeFile xmessage True ["-default", "okay", msg] Nothing + return () + return (status == ExitSuccess) + else return True -- cgit 1.4.1 From 9bcacfb1429b2232ecffa40c86f13c0ede1d32ce Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 28 Dec 2013 15:08:47 +0100 Subject: hicolor_icon_theme: minor update 0.12 -> 0.13 --- pkgs/data/icons/hicolor-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 553665396ec..1cf29db9dbc 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.12"; + name = "hicolor-icon-theme-0.13"; src = fetchurl { url = "http://icon-theme.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0wzc7g4ldb2l8zc0x2785ck808c03i857jji942ikakyc68adp4y"; + sha256 = "01ilkizzal3wq2naaj84rqmd850aari1ahiw9vfis3a82n4h72x3"; }; meta = { -- cgit 1.4.1 From a126ce011af5292f44c60f0a55423cec3917570c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát 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') 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 From 9f735bdf5784ef1d93122036d5add9ad35c19a35 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 28 Dec 2013 15:49:19 +0100 Subject: gnumeric: add platforms, maintainer --- pkgs/applications/office/gnumeric/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 10b486a438f..0108f934693 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome_icon_theme}/share" ''; - meta = { + meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; license = "GPLv2+"; homepage = http://projects.gnome.org/gnumeric/; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; }; } -- cgit 1.4.1