From 06c780077ff37a5e57751eacb904931c203ef265 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 3 Dec 2013 11:41:49 +0000 Subject: [PATCH 001/449] Removes the ruby18 dependency to klinkstatus --- pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix index 33a4d8c6083c..86a8b7c0a193 100644 --- a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix @@ -1,8 +1,8 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost, ruby18 }: +{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: kde { - buildInputs = [ kdelibs kdepimlibs ruby18 htmlTidy boost ]; + buildInputs = [ kdelibs kdepimlibs htmlTidy boost ]; meta = { description = "A KDE link checker"; From fc2580ad877c94aa603e78f640be3e0229fd0e60 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 2 Jan 2014 11:53:25 +0100 Subject: [PATCH 002/449] Removed confnotify-6.0.patch. I don't think it is a good idea to hardcode this patch in nixpkgs as it is likely that a patch provided by a user will conflict with this patch. This is for instance the case with the patch "single_tagset" (http://dwm.suckless.org/patches/single_tagset). --- .../window-managers/dwm/confnotify-6.0.patch | 36 ------------------- .../window-managers/dwm/default.nix | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/applications/window-managers/dwm/confnotify-6.0.patch diff --git a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch deleted file mode 100644 index 5b5e2ebb68a7..000000000000 --- a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix SDL fullscreen problems when the resolution changes: -https://groups.google.com/d/msg/wmii/nJBrSjrnnq8/ZEYWOWE5pj4J - -diff -r ec4baab78314 dwm.c ---- a/dwm.c Mon Dec 19 15:38:30 2011 +0100 -+++ b/dwm.c Sat Jan 14 12:35:50 2012 +0100 -@@ -397,9 +397,10 @@ - showhide(m->stack); - else for(m = mons; m; m = m->next) - showhide(m->stack); -- if(m) -+ if(m) { - arrangemon(m); -- else for(m = mons; m; m = m->next) -+ restack(m); -+ } else for(m = mons; m; m = m->next) - arrangemon(m); - } - -@@ -408,7 +409,6 @@ - strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol); - if(m->lt[m->sellt]->arrange) - m->lt[m->sellt]->arrange(m); -- restack(m); - } - - void -@@ -1827,6 +1827,8 @@ - .event_mask = ButtonPressMask|ExposureMask - }; - for(m = mons; m; m = m->next) { -+ if (m->barwin) -+ continue; - m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), - CopyFromParent, DefaultVisual(dpy, screen), - CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 82eb9e56935f..b69dd9d8a492 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; # Allow users set their own list of patches - patches = [ ./confnotify-6.0.patch ] ++ patches; + inherit patches; buildPhase = " make "; From 99ba14ee7a94d5f809d024e6fa4bfffba7984040 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner Date: Tue, 4 Feb 2014 20:02:46 +0100 Subject: [PATCH 003/449] Add packages for libzdb, libsearpc, ccnet, seafile-shared, and seafile-client --- .../networking/seafile-client/default.nix | 38 ++++++ .../libraries/libsearpc/default.nix | 31 +++++ .../libraries/libsearpc/libsearpc.pc.patch | 10 ++ pkgs/development/libraries/libzdb/default.nix | 23 ++++ ...Add-autoconfiguration-for-libjansson.patch | 121 ++++++++++++++++++ pkgs/misc/seafile-shared/default.nix | 42 ++++++ ...Add-autoconfiguration-for-libjansson.patch | 72 +++++++++++ pkgs/tools/networking/ccnet/default.nix | 36 ++++++ pkgs/tools/networking/ccnet/libccnet.pc.patch | 10 ++ pkgs/top-level/all-packages.nix | 10 ++ 10 files changed, 393 insertions(+) create mode 100644 pkgs/applications/networking/seafile-client/default.nix create mode 100644 pkgs/development/libraries/libsearpc/default.nix create mode 100644 pkgs/development/libraries/libsearpc/libsearpc.pc.patch create mode 100644 pkgs/development/libraries/libzdb/default.nix create mode 100644 pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch create mode 100644 pkgs/misc/seafile-shared/default.nix create mode 100644 pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch create mode 100644 pkgs/tools/networking/ccnet/default.nix create mode 100644 pkgs/tools/networking/ccnet/libccnet.pc.patch diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix new file mode 100644 index 000000000000..8640389f9d3b --- /dev/null +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafileShared, ccnet, makeWrapper}: + +stdenv.mkDerivation rec +{ + version = "2.1.1"; + name = "seafile-client-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; + sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0"; + }; + + buildInputs = [ pkgconfig cmake qt4 seafileShared makeWrapper ]; + + builder = writeScript "${name}-builder.sh" '' + source $stdenv/setup + + tar xvfz $src + cd seafile-client-* + + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" . + make -j1 + + make install + + wrapProgram $out/bin/seafile-applet \ + --suffix PATH : ${ccnet}/bin:${seafileShared}/bin + ''; + + meta = + { + homepage = "https://github.com/haiwen/seafile-clients"; + description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix new file mode 100644 index 000000000000..b27519fa66c6 --- /dev/null +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, automake, autoconf, pkgconfig, libtool, python, pythonPackages, glib, jansson}: + +stdenv.mkDerivation rec +{ + version = "1.2.1"; + seafileVersion = "2.1.1"; + name = "libsearpc-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz"; + sha256 = "c0e7cc812c642ebb1339c3701570e78ff5b8c8aa2a521e5a505e28d9666e89ec"; + }; + + patches = [ ./libsearpc.pc.patch ]; + + buildInputs = [ automake autoconf pkgconfig libtool python pythonPackages.simplejson ]; + propagatedBuildInputs = [ glib jansson ]; + + preConfigure = "./autogen.sh"; + + buildPhase = "make -j1"; + + meta = + { + homepage = "https://github.com/haiwen/libsearpc"; + description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System."; + license = stdenv.lib.licenses.lgpl3; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch new file mode 100644 index 000000000000..6f30932ba6db --- /dev/null +++ b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch @@ -0,0 +1,10 @@ +From: Aaron Lindsay + +--- a/libsearpc.pc.in 2013-01-10 01:35:24.000000000 -0500 ++++ b/libsearpc.pc.in 2013-01-19 11:31:50.479301798 -0500 +@@ -1,4 +1,4 @@ +-prefix=(DESTDIR)@prefix@ ++prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix new file mode 100644 index 000000000000..25eef6c7a990 --- /dev/null +++ b/pkgs/development/libraries/libzdb/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, sqlite}: + +stdenv.mkDerivation rec +{ + version = "3.0"; + name = "libzdb-${version}"; + + src = fetchurl + { + url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; + sha256 = "e334bcb9ca1410e863634a164e3b1b5784018eb6e90b6c2b527780fc29a123c8"; + }; + + buildInputs = [ sqlite ]; + + meta = + { + homepage = "http://www.tildeslash.com/libzdb/"; + description = "A small, easy to use Open Source Database Connection Pool Library."; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} \ No newline at end of file diff --git a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch new file mode 100644 index 000000000000..7966d1e683b9 --- /dev/null +++ b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch @@ -0,0 +1,121 @@ +diff -r -u a/app/Makefile.am b/app/Makefile.am +--- a/app/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/app/Makefile.am 2014-01-16 14:22:24.584094619 +0100 +@@ -21,7 +21,7 @@ + seafile_LDADD = @CCNET_LIBS@ \ + $(top_builddir)/lib/libseafile.la \ + $(top_builddir)/lib/libseafile_common.la \ +- @SEARPC_LIBS@ \ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 + + seafile_LDFALGS = @STATIC_COMPILE@ @CONSOLE@ +@@ -29,7 +29,7 @@ + if COMPILE_SERVER + seafserv_tool_SOURCES = seafserv-tool.c + seafserv_tool_LDADD = @CCNET_LIBS@ \ +- $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ \ ++ $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ @JANSSON_LIBS@ \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 + + seafserv_tool_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ +diff -r -u a/configure.ac b/configure.ac +--- a/configure.ac 2014-01-10 11:38:46.000000000 +0100 ++++ b/configure.ac 2014-01-16 14:22:24.584094619 +0100 +@@ -233,6 +233,7 @@ + GLIB_REQUIRED=2.16.0 + CCNET_REQUIRED=0.9.3 + SEARPC_REQUIRED=1.0 ++JANSSON_REQUIRED=2.2.1 + ZDB_REQUIRED=2.10 + #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 + CURL_REQUIRED=7.17 +@@ -254,6 +255,11 @@ + AC_SUBST(SEARPC_CFLAGS) + AC_SUBST(SEARPC_LIBS) + ++PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) ++AC_SUBST(JANSSON_CFLAGS) ++AC_SUBST(JANSSON_LIBS) ++ ++ + PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED]) + AC_SUBST(LIBEVENT_CFLAGS) + AC_SUBST(LIBEVENT_LIBS) +diff -r -u a/daemon/Makefile.am b/daemon/Makefile.am +--- a/daemon/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/daemon/Makefile.am 2014-01-16 14:22:24.587427993 +0100 +@@ -139,7 +139,7 @@ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ + $(top_builddir)/common/cdc/libcdc.la \ + $(top_builddir)/common/index/libindex.la ${LIB_WS32} \ +- @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ ++ @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ + + seaf_daemon_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ + +diff -r -u a/server/gc/Makefile.am b/server/gc/Makefile.am +--- a/server/gc/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/server/gc/Makefile.am 2014-01-16 14:23:20.991449822 +0100 +@@ -50,7 +50,7 @@ + $(top_builddir)/common/cdc/libcdc.la \ + $(top_builddir)/lib/libseafile_common.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} + + seafserv_gc_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ + +@@ -63,6 +63,6 @@ + $(top_builddir)/common/cdc/libcdc.la \ + $(top_builddir)/lib/libseafile_common.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} + + seaf_fsck_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ +diff -r -u a/server/Makefile.am b/server/Makefile.am +--- a/server/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/server/Makefile.am 2014-01-16 14:23:40.498354610 +0100 +@@ -99,6 +99,6 @@ + $(top_builddir)/common/index/libindex.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ + $(top_builddir)/common/cdc/libcdc.la \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} + + seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ +diff -r -u a/httpserver/Makefile.am b/httpserver/Makefile.am +--- a/httpserver/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/httpserver/Makefile.am 2014-01-16 14:26:48.673985279 +0100 +@@ -50,7 +50,7 @@ + @CCNET_LIBS@ \ + $(top_builddir)/lib/libseafile.la \ + $(top_builddir)/common/cdc/libcdc.la \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ + @LIBARCHIVE_LIBS@ ${LIB_WS32} + + httpserver_LDFLAGS = @STATIC_COMPILE@ +diff -r -u a/controller/Makefile.am b/controller/Makefile.am +--- a/controller/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/controller/Makefile.am 2014-01-16 14:29:42.076102675 +0100 +@@ -18,6 +18,6 @@ + seafile_controller_LDADD = @CCNET_LIBS@ \ + $(top_builddir)/lib/libseafile_common.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -levent \ +- @SEARPC_LIBS@ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ + + seafile_controller_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ +diff -r -u a/fuse/Makefile.am b/fuse/Makefile.am +--- a/fuse/Makefile.am 2014-01-10 11:38:46.000000000 +0100 ++++ b/fuse/Makefile.am 2014-01-16 14:31:44.764267711 +0100 +@@ -43,6 +43,6 @@ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ \ + -lsqlite3 -levent \ + $(top_builddir)/common/cdc/libcdc.la \ +- @SEARPC_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ ++ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ + + seaf_fuse_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix new file mode 100644 index 000000000000..f392e9ece7ae --- /dev/null +++ b/pkgs/misc/seafile-shared/default.nix @@ -0,0 +1,42 @@ +{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, intltool, fuse, ccnet}: + +stdenv.mkDerivation rec +{ + version = "2.1.1"; + name = "seafile-shared-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; + sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6"; + }; + + patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ]; + + buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; + propagatedBuildInputs = [ ccnet ]; + + preConfigure = '' + sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + ./autogen.sh + ''; + + configureFlags = "--disable-server --disable-console"; + + buildPhase = "make -j1"; + + postInstall = '' + # Remove seafile binary + rm -rf "$out/bin/seafile" + # Remove cli client binary + rm -rf "$out/bin/seaf-cli" + ''; + + meta = + { + homepage = "https://github.com/haiwen/seafile"; + description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch new file mode 100644 index 000000000000..83cdbad7bbac --- /dev/null +++ b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch @@ -0,0 +1,72 @@ +From f730ba82d641029dd262d05e8533fc7643f4c4b9 Mon Sep 17 00:00:00 2001 +From: Aaron Lindsay +Date: Wed, 15 Jan 2014 13:49:40 -0500 +Subject: [PATCH] Add autoconfiguration for libjansson + +--- + configure.ac | 5 +++++ + net/daemon/Makefile.am | 4 ++-- + net/server/Makefile.am | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 64e74b5..0911671 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,6 +248,7 @@ SEARPC_REQUIRED=1.0 + ZDB_REQUIRED=2.10 + LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 + SEARPC_REQUIRED=1.0 ++JANSSON_REQUIRED=2.2.1 + CURL_REQUIRED=7.17 + + PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED]) +@@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED]) + AC_SUBST(SEARPC_CFLAGS) + AC_SUBST(SEARPC_LIBS) + ++PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) ++AC_SUBST(JANSSON_CFLAGS) ++AC_SUBST(JANSSON_LIBS) ++ + if test x${compile_python} = xyes; then + AM_PATH_PYTHON([2.6]) + +diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am +index 35d1a3c..0e28c6a 100644 +--- a/net/daemon/Makefile.am ++++ b/net/daemon/Makefile.am +@@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \ + + ccnet_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ +- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ ++ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ + + + ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined +@@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs) + + ccnet_test_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ +- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ ++ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ + + ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@ + +diff --git a/net/server/Makefile.am b/net/server/Makefile.am +index d587f48..b048936 100644 +--- a/net/server/Makefile.am ++++ b/net/server/Makefile.am +@@ -103,7 +103,7 @@ ccnet_server_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ + @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ + -lpthread \ + @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \ +- @LDAP_LIBS@ ++ @LDAP_LIBS@ @JANSSON_LIBS@ + + + ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined +-- +1.8.5.2 + diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix new file mode 100644 index 000000000000..95479b8598e9 --- /dev/null +++ b/pkgs/tools/networking/ccnet/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: + +stdenv.mkDerivation rec +{ + version = "1.4.0"; + seafileVersion = "2.1.1"; + name = "ccnet-${version}"; + + src = fetchurl + { + url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz"; + sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0"; + }; + + patches = [ ./libccnet.pc.patch ./0001-Add-autoconfiguration-for-libjansson.patch ]; + + buildInputs = [ which automake autoconf pkgconfig libtool vala python ]; + propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; + + preConfigure = '' + sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh + ./autogen.sh + ''; + + configureFlags = "--enable-server"; + + buildPhase = "make -j1"; + + meta = + { + homepage = "https://github.com/haiwen/ccnet"; + description = "A framework for writing networked applications in C."; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/tools/networking/ccnet/libccnet.pc.patch b/pkgs/tools/networking/ccnet/libccnet.pc.patch new file mode 100644 index 000000000000..0d9fea552bcd --- /dev/null +++ b/pkgs/tools/networking/ccnet/libccnet.pc.patch @@ -0,0 +1,10 @@ +From: Aaron Lindsay + +--- a/libccnet.pc.in 2013-01-10 01:35:24.000000000 -0500 ++++ b/libccnet.pc.in 2013-01-19 11:31:50.479301798 -0500 +@@ -1,4 +1,4 @@ +-prefix=(DESTDIR)@prefix@ ++prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbae9a7946e7..19261ef2fe18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -562,6 +562,8 @@ let catdoc = callPackage ../tools/text/catdoc { }; + ccnet = callPackage ../tools/networking/ccnet { }; + ditaa = callPackage ../tools/graphics/ditaa { }; direnv = callPackage ../tools/misc/direnv { }; @@ -4943,6 +4945,8 @@ let librsync = callPackage ../development/libraries/librsync { }; + libsearpc = callPackage ../development/libraries/libsearpc { }; + libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; @@ -5101,6 +5105,8 @@ let libzip = callPackage ../development/libraries/libzip { }; + libzdb = callPackage ../development/libraries/libzdb { }; + libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix { ccrtp = ccrtp_1_8; @@ -8706,6 +8712,8 @@ let inherit (gnome) libart_lgpl; }; + seafileClient = callPackage ../applications/networking/seafile-client { }; + seeks = callPackage ../tools/networking/p2p/seeks { opencv = opencv_2_1; }; @@ -10227,6 +10235,8 @@ let saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { }; + seafileShared = callPackage ../misc/seafile-shared { }; + slock = callPackage ../misc/screensavers/slock { }; sourceAndTags = import ../misc/source-and-tags { From 3d7010b5b70cf9008da986874a76231a37708ffb Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner Date: Wed, 5 Feb 2014 18:25:43 +0100 Subject: [PATCH 004/449] Dashify seafileShared and seafileClient --- pkgs/applications/networking/seafile-client/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 8640389f9d3b..82e5d08da413 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafileShared, ccnet, makeWrapper}: +{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafile-shared, ccnet, makeWrapper}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0"; }; - buildInputs = [ pkgconfig cmake qt4 seafileShared makeWrapper ]; + buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; builder = writeScript "${name}-builder.sh" '' source $stdenv/setup @@ -25,7 +25,7 @@ stdenv.mkDerivation rec make install wrapProgram $out/bin/seafile-applet \ - --suffix PATH : ${ccnet}/bin:${seafileShared}/bin + --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin ''; meta = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19261ef2fe18..7425338225f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8712,7 +8712,7 @@ let inherit (gnome) libart_lgpl; }; - seafileClient = callPackage ../applications/networking/seafile-client { }; + seafile-client = callPackage ../applications/networking/seafile-client { }; seeks = callPackage ../tools/networking/p2p/seeks { opencv = opencv_2_1; @@ -10235,7 +10235,7 @@ let saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { }; - seafileShared = callPackage ../misc/seafile-shared { }; + seafile-shared = callPackage ../misc/seafile-shared { }; slock = callPackage ../misc/screensavers/slock { }; From aec17bfbd380da05eb43b423041adc2b19a42914 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sat, 8 Feb 2014 10:52:59 +0800 Subject: [PATCH 005/449] add guile-xcb 1.3 --- .../guile-modules/guile-xcb/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/guile-modules/guile-xcb/default.nix diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix new file mode 100644 index 000000000000..a192025df697 --- /dev/null +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, guile, texinfo }: + +stdenv.mkDerivation { + name = "guile-xcb-1.3"; + + meta = with stdenv.lib; { + description = "XCB bindings for Guile"; + homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + name = "guile-xcb-1.3.tar.gz"; + sha256 = "1gna9h3536s880p4bd9n2jyh2a8igwya6x7v3vfx19f4rppmai60"; + + urls = [ + "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz" + "https://github.com/mwitmer/guile-xcb/archive/1.3.tar.gz" + ]; + }; + + buildInputs = [ pkgconfig guile texinfo ]; + + preConfigure = '' + configureFlags=" + --with-guile-site-dir=$out/share/guile/site + --with-guile-site-ccache-dir=$out/share/guile/site + "; + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3478b409d10d..2c68e9bc193b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3367,6 +3367,8 @@ let guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; + srecord = callPackage ../development/tools/misc/srecord { }; windowssdk = ( From 4696dc40339cb7d8840e2f1aad985d4fe755063e Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Tue, 11 Feb 2014 15:56:37 +0800 Subject: [PATCH 006/449] portaudio: update to v19_20140130 --- pkgs/development/libraries/portaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 34d5bac6adb3..f405e30433fb 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, pkgconfig }: stdenv.mkDerivation rec { - name = "portaudio-19-20111121"; + name = "portaudio-19-20140130"; src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz; - sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw"; + url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; + sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; }; buildInputs = [ pkgconfig ] From 561378ad030ef911b1aadf63678a21444a127e9a Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Mon, 17 Feb 2014 09:48:34 +0800 Subject: [PATCH 007/449] guile-xcb: fix hash --- pkgs/development/guile-modules/guile-xcb/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index a192025df697..fc02ab305a38 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -12,13 +12,8 @@ stdenv.mkDerivation { }; src = fetchurl { - name = "guile-xcb-1.3.tar.gz"; - sha256 = "1gna9h3536s880p4bd9n2jyh2a8igwya6x7v3vfx19f4rppmai60"; - - urls = [ - "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz" - "https://github.com/mwitmer/guile-xcb/archive/1.3.tar.gz" - ]; + url = "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz"; + sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; }; buildInputs = [ pkgconfig guile texinfo ]; From 4247a34463f18febfa146e344ae4e355954e146f Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Tue, 18 Feb 2014 15:23:16 +0100 Subject: [PATCH 008/449] Updated vagrant to 1.4.3 --- pkgs/development/tools/vagrant/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 80fc093822fd..d0870e82b723 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,18 +4,18 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "vagrant-1.4.0"; + name = "vagrant-1.4.3"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_x86_64.deb; - sha256 = "0hggajqdwk1qlkhf5sgdlmyxhan33q3pdgks9n5i2cw6f2ckw3rh"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb; + sha256 = "dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b"; } else fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_i686.deb; - sha256 = "03jcmsdl4na5n08phyvx65dnfv1gq9vgn07kcyqc2f8nq7vmcmkm"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_i686.deb; + sha256 = "66e613fc1c9e31ecaf8e5f1d07d2ae4fca3d4fc2e43593543962664258d9af9b"; }; meta = with stdenv.lib; { From cea9a1a242af60adb99e98a4eae50950dfd1ff92 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 19 Feb 2014 16:56:25 +0100 Subject: [PATCH 009/449] nixos-generate-config: Don't generate /var/lib/nfs/rpc_pipefs filesystem It's automatically mounted if the system has support for NFS. --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index b6bc04584770..67ba79560227 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -256,7 +256,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { $mountPoint = "/" if $mountPoint eq ""; # Skip special filesystems. - next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run"); + next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs"; # Skip the optional fields. my $n = 6; $n++ while $fields[$n] ne "-"; $n++; From a146fdab808ddacc2ea0b950d753807d75eae2db Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 19 Feb 2014 17:13:21 +0100 Subject: [PATCH 010/449] nixos-generate-config: Don't generate filesystem options We don't want to hardcode configuration options that the current kernel chose for us when mounting the filesystem, since the defaults can change in the future. --- nixos/modules/installer/tools/nixos-generate-config.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 67ba79560227..bf7cdcd37119 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -305,7 +305,15 @@ EOF fileSystems.\"$mountPoint\" = { device = \"$device\"; fsType = \"$fsType\"; - options = \"${\join ",", uniq(@extraOptions, @superOptions, @mountOptions)}\"; +EOF + + if (scalar @extraOptions > 0) { + $fileSystems .= < Date: Wed, 19 Feb 2014 13:07:20 +0100 Subject: [PATCH 011/449] - Add openobex's unusual pkgconfig to pkgconfig path - Prepend dbus_libs pkgconfig to pkgconfig path, as otherwise the dbus-daemon pkgconfig wins, as it has the same name (dbus-1.pc), which doesn't provide all the dbus headers that are needed - Apply the included patch to obex-data-server which lets it build against current openobex --- .../bluetooth/obex-data-server/default.nix | 11 +++- ...obex-data-server-0.4.6-build-fixes-1.patch | 56 +++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 790b57f4a76d..53e854c34ebc 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex }: +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex, dbus_libs }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -8,7 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; - buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex ]; + buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex dbus_libs ]; + + patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; + + preConfigure = '' + addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig + export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH" + ''; meta = { homepage = http://wiki.muiline.com/obex-data-server; diff --git a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch new file mode 100644 index 000000000000..b5fde8db589c --- /dev/null +++ b/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch @@ -0,0 +1,56 @@ +Submitted By: Armin K. +Date: 2012-07-06 +Initial Package Version: 0.4.6 +Upstream Status: Unknown +Origin: Self +Description: Some build fixes. + +--- obex-data-server.orig/src/ods-obex.c 2011-02-10 10:14:42.000000000 +0100 ++++ obex-data-server/src/ods-obex.c 2012-07-06 20:10:09.208712553 +0200 +@@ -412,7 +412,7 @@ + goto err; + } + +- interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf); ++ interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle); + if (intf_num >= interfaces_num) { + g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number"); + goto err; +@@ -1928,7 +1928,7 @@ + gchar *uname; + gsize uname_len; + +- if (action != OBEX_ACTION_SETPERM) ++ if (action != 0x03) + g_assert (src && dst); + + object = OBEX_ObjectNew (obex_context->obex_handle, OBEX_CMD_ACTION); +@@ -1974,7 +1974,7 @@ + OBEX_HDR_ACTION_ID, hv, 1, 0); + + /* permissions header */ +- if (action == OBEX_ACTION_SETPERM) { ++ if (action == 0x03) { + hv.bq4 = perms; + ret = OBEX_ObjectAddHeader (obex_context->obex_handle, object, + OBEX_HDR_PERMISSIONS, hv, 4, 0); +--- obex-data-server.orig/src/ods-session.c 2011-02-10 09:57:31.000000000 +0100 ++++ obex-data-server/src/ods-session.c 2012-07-06 20:10:09.208712553 +0200 +@@ -1761,7 +1761,7 @@ + DBusGMethodInvocation *context) + { + return ods_session_remote_action (session, remote_source, +- remote_destination, OBEX_ACTION_COPY, ++ remote_destination, 0x00, + context); + } + +@@ -1772,7 +1772,7 @@ + DBusGMethodInvocation *context) + { + return ods_session_remote_action (session, remote_source, +- remote_destination, OBEX_ACTION_MOVE, ++ remote_destination, 0x01, + context); + } + From e43130d3797c9b48faff2431a94478b66f4a6f02 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 19 Feb 2014 15:04:59 -0600 Subject: [PATCH 012/449] reptyr: version 0.5 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/reptyr/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 573f1a578c72..e5e579081f67 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchgit}: +{ stdenv, fetchurl }: + stdenv.mkDerivation rec { - version = "0.4"; + version = "0.5"; name = "reptyr-${version}"; - src = fetchgit { - url = "https://github.com/nelhage/reptyr.git"; - rev = "refs/tags/${name}"; - sha256 = "2d2814c210e4bde6f9bcf3aa20477287d7e4a5aa7ee09110b37d2eaaf7e5ecae"; + src = fetchurl { + url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz"; + sha256 = "077cvjjf534nxh7qqisw27a0wa61mdgyik43k50f8v090rggz2xm"; }; makeFlags = ["PREFIX=$(out)"]; meta = { From 6cbc1d554f7a724fcb8b8e98c6c8e41f86a640c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 3 Jan 2014 18:05:35 +0100 Subject: [PATCH 013/449] remove unused setuptools/site.nix --- .../python-modules/setuptools/site.nix | 16 ---------------- pkgs/top-level/python-packages.nix | 5 ----- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/python-modules/setuptools/site.nix diff --git a/pkgs/development/python-modules/setuptools/site.nix b/pkgs/development/python-modules/setuptools/site.nix deleted file mode 100644 index 34e7b478595e..000000000000 --- a/pkgs/development/python-modules/setuptools/site.nix +++ /dev/null @@ -1,16 +0,0 @@ -# Propagated by buildPythonPackge to process pth files - -{ stdenv, python, setuptools }: - -stdenv.mkDerivation { - name = "python-setuptools-site-${setuptools.version}"; - - buildInputs = [ python setuptools ]; - - unpackPhase = "true"; - installPhase = '' - dst="$out/lib/${python.libPrefix}/site-packages" - ensureDir $dst - ln -s ${setuptools}/lib/${python.libPrefix}/site-packages/site.* $dst/ - ''; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2958120f9078..fe80ab70e360 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -48,11 +48,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python wrapPython; }; - setuptoolsSite = import ../development/python-modules/setuptools/site.nix { - inherit (pkgs) stdenv; - inherit python setuptools; - }; - # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; From 29b7f2e1824ad42e8a71df6f45d82290df463b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 3 Jan 2014 18:06:04 +0100 Subject: [PATCH 014/449] setuptools: remove obsolete patch --- ...kip-sdist_with_utf8_encoded_filename.patch | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch diff --git a/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch deleted file mode 100644 index 96a4f81ee581..000000000000 --- a/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -r f5ac515f062a setuptools/tests/test_sdist.py ---- a/setuptools/tests/test_sdist.py Fri Jul 26 09:52:26 2013 +0200 -+++ b/setuptools/tests/test_sdist.py Sat Jul 27 20:22:17 2013 +0200 -@@ -3,12 +3,14 @@ - - - import os -+import locale - import shutil - import sys - import tempfile - import unittest - import unicodedata - -+from setuptools.tests.py26compat import skipIf - from setuptools.compat import StringIO, unicode - from setuptools.command.sdist import sdist - from setuptools.command.egg_info import manifest_maker -@@ -318,6 +320,9 @@ - filename = filename.decode('latin-1') - self.assertFalse(filename in cmd.filelist.files) - -+ -+ @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8', -+ 'Unittest fails if locale is not utf-8 but the manifests is recorded correctly') - def test_sdist_with_utf8_encoded_filename(self): - # Test for #303. - dist = Distribution(SETUP_ATTRS) From e9923c649955dfdadeb016482049a8747e5fc454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 6 Jan 2014 22:21:15 +0000 Subject: [PATCH 015/449] pythonPackages: update a bunch of them --- pkgs/top-level/python-packages.nix | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe80ab70e360..3aff56277323 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1236,11 +1236,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; pytest = buildPythonPackage rec { - name = "pytest-2.3.5"; + name = "pytest-2.5.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz"; - md5 = "18f150e7be96b5fe3c388b0e817b8087"; + md5 = "4e155a0134e6757b37cc6698c20f3e9f"; }; propagatedBuildInputs = [ pythonPackages.py ] @@ -1250,7 +1250,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = with stdenv.lib; { maintainers = with maintainers; [ iElectric lovek323 ]; - platforms = platforms.unix; + platforms = platforms.unix; }; }; @@ -2471,11 +2471,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { dulwich = buildPythonPackage rec { - name = "dulwich-0.8.1"; + name = "dulwich-0.8.7"; src = fetchurl { url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz"; - sha256 = "1a1619e9c7e63fe9bdc93356ee893be1016b7ea12ad953f4e1f1f5c0c5056ee8"; + sha256 = "041qp5v2x8fbwkmws6hwwiny74lavkz723dj8gwbm40b2383d8vv"; }; buildPhase = "make build"; @@ -4613,11 +4613,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; pip = buildPythonPackage rec { - version = "1.4.1"; + version = "1.5"; name = "pip-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz"; - sha256 = "0knhj3c1nqqzxgqin8l0gzy6nzsbcxinyr0cbp1j99hi8xahcyjf"; + sha256 = "0j700f70mj0brdlvs2cz4a7h4jwmzgymgp8qk1qb3lsm1qd1vy15"; }; buildInputs = [ mock scripttest virtualenv nose ]; # ValueError: Working directory tests not found, or not a directory @@ -4639,11 +4639,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pillow = buildPythonPackage rec { - name = "Pillow-2.2.1"; + name = "Pillow-2.3.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; - md5 = "d1d20d3db5d1ab312da0951ff061e6bf"; + md5 = "56b6614499aacb7d6b5983c4914daea7"; }; buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ]; @@ -5748,11 +5748,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.09"; + name = "PyYAML-3.10"; src = fetchurl { - url = "http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip"; - sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040"; + url = "http://pyyaml.org/download/pyyaml/${name}.zip"; + sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa"; }; buildInputs = [ pkgs.unzip pkgs.pyrex ]; @@ -6195,15 +6195,15 @@ pythonPackages = modules // import ./python-packages-generated.nix { scripttest = buildPythonPackage rec { - version = "1.1.1"; + version = "1.3"; name = "scripttest-${version}"; src = fetchurl { - url = "http://pypi.python.org/packages/source/S/ScriptTest/ScriptTest-${version}.tar.gz"; - md5 = "592ce890764c3f546d35b4d7c40c32ef"; + url = "http://pypi.python.org/packages/source/s/scripttest/scripttest-${version}.tar.gz"; + md5 = "1d1c5117ccfc7b5961cae6c1020c0848"; }; - buildInputs = [ nose ]; + buildInputs = [ nose pytest ]; meta = { description = "A library for testing interactive command-line applications"; @@ -6317,7 +6317,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "93c93725674c0702583a638f5a09c9e4"; }; - propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh ]; + propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh pytest ]; meta = with stdenv.lib; { description = "Yet another simple static gallery generator"; @@ -7201,10 +7201,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.10"; + name = "virtualenv-1.11"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "9745c28256c70c76d36adb3767a00212"; + md5 = "d1a7cf95b539a861a8215827f387c4eb"; }; inherit recursivePthLoader; From bf5d6fb9b1c12a919853f15571b5a012f87fd928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 6 Jan 2014 22:24:05 +0000 Subject: [PATCH 016/449] Refactor buildPythonPackage to modularize building process. Before we used `easy_install` command to handle installation in one shot, now this is split into two phases: - buildPhase: python setup.py build - installPhase: python setup.py install Each of those commands have the ability to pass extra parameters through buildPythonPackage parameters as `setupPyInstallFlags` and `setupPyBuildFlags`. Phases now correctly execute post/pre hooks. In configurePhase we inject setuptools dependency before distutils is imported to apply monkeypatching by setuptools that is needed for special features to apply. We don't have to reorder default phases anymore, as test phase comes after build and that works. I rewrote offineDistutils into distutils-cfg with a bit cleaner syntax and ability to specify extraCfg to the config file. Plone packages are failing and garbas said he will adopt them to the new functions. The rest of the packages I fixed and these commits shouldn't break any package (according to my testings) and they introduce 16 new jobs and fix 38 that were broken before. --- .../python-modules/distutils-cfg/default.nix | 31 +++++ .../python-modules/generic/default.nix | 121 ++++++++++-------- .../offline-distutils/default.nix | 21 --- pkgs/top-level/python-packages.nix | 13 +- 4 files changed, 106 insertions(+), 80 deletions(-) create mode 100644 pkgs/development/python-modules/distutils-cfg/default.nix delete mode 100644 pkgs/development/python-modules/offline-distutils/default.nix diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix new file mode 100644 index 000000000000..7b0f36286980 --- /dev/null +++ b/pkgs/development/python-modules/distutils-cfg/default.nix @@ -0,0 +1,31 @@ +# global distutils configuration, see http://docs.python.org/2/install/index.html#distutils-configuration-files + +{ stdenv, python, writeText, extraCfg ? "" }: + + +let + distutilsCfg = writeText "distutils.cfg" '' + [easy_install] + + # don't allow network connections during build to ensure purity + allow-hosts = None + + # make sure we always unzip installed packages otherwise setup hooks won't work + zip_ok = 0 + + ${extraCfg} + ''; +in stdenv.mkDerivation { + name = "distutils.cfg-python${python.version}"; + + buildInputs = [ python ]; + + unpackPhase = "true"; + + installPhase = '' + dest="$out/lib/${python.libPrefix}/site-packages/distutils" + mkdir -p $dest + ln -s ${python}/lib/${python.libPrefix}/distutils/* $dest + ln -s ${distutilsCfg} $dest/distutils.cfg + ''; +} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6a7d5e5f3d5e..51af437265d5 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -1,84 +1,95 @@ /* This function provides a generic Python package builder. It is - intended to work with packages that use `setuptools' + intended to work with packages that use `distutils/setuptools' (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }: +{ python, setuptools, wrapPython, lib, recursivePthLoader, distutils-cfg }: -{ name, namePrefix ? python.libPrefix + "-" +{ name + +# by default prefix name with python version name, e.g. "python3.3-" +, namePrefix ? python.libPrefix + "-" , buildInputs ? [] +# TODO: document +, distutilsExtraCfg ? "" + +# TODO: say what it does , propagatedBuildInputs ? [] -, # List of packages that should be added to the PYTHONPATH - # environment variable in programs built by this function. Packages - # in the standard `propagatedBuildInputs' variable are also added. - # The difference is that `pythonPath' is not propagated to the user - # environment. This is preferrable for programs because it doesn't - # pollute the user environment. - pythonPath ? [] +# passed to "python setup.py install" +, setupPyInstallFlags ? [] -, installCommand ? - '' - easy_install --always-unzip --prefix="$out" . - '' - -, preConfigure ? "true" - -, buildPhase ? "true" +# passed to "python setup.py build" +, setupPyBuildFlags ? [] +# enable tests by default , doCheck ? true -, checkPhase ? - '' - runHook preCheck - ${python}/bin/${python.executable} setup.py test - runHook postCheck - '' +# List of packages that should be added to the PYTHONPATH +# environment variable in programs built by this function. Packages +# in the standard `propagatedBuildInputs' variable are also added. +# The difference is that `pythonPath' is not propagated to the user +# environment. This is preferrable for programs because it doesn't +# pollute the user environment. +, pythonPath ? [] -, preInstall ? "" -, postInstall ? "" - -, meta ? {} +, meta ? {} , ... } @ attrs: -# Keep extra attributes from ATTR, e.g., `patchPhase', etc. +# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. python.stdenv.mkDerivation (attrs // { - inherit doCheck buildPhase checkPhase; + inherit doCheck; name = namePrefix + name; - # default to python's platforms and add maintainer(s) to every - # package - meta = { - platforms = python.meta.platforms; - } // meta // { - maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ]; - }; - - # checkPhase after installPhase to run tests on installed packages - phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; - - buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + buildInputs = [ python wrapPython setuptools (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) ] ++ buildInputs ++ pythonPath; propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; pythonPath = [ setuptools ] ++ pythonPath; - preConfigure = '' + configurePhase = attrs.configurePhase or '' + runHook preConfigure + + # TODO: document export DETERMINISTIC_BUILD=1 - PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${preConfigure} + + # we need to prepend following line to monkeypatch distutils commands + sed -i '0,/import distutils/s//import setuptools;import distutils/' setup.py + sed -i '0,/from distutils/s//import setuptools;from distutils/' setup.py + + + runHook postConfigure ''; - installPhase = preInstall + '' + checkPhase = attrs.checkPhase or '' + runHook preCheck + + ${python}/bin/${python.executable} setup.py test -q + + runHook postCheck + ''; + + buildPhase = attrs.buildPhase or '' + runHook preBuild + + ${python}/bin/${python.executable} setup.py build ${lib.concatStringsSep " " setupPyBuildFlags} + + runHook postBuild + ''; + + installPhase = attrs.installPhase or '' + runHook preInstall + mkdir -p "$out/lib/${python.libPrefix}/site-packages" - echo "installing \`${name}' with \`easy_install'..." export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${installCommand} + + ${python}/bin/${python.executable} setup.py install --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} # A pth file might have been generated to load the package from # within its own site-packages, rename this package not to @@ -94,17 +105,18 @@ python.stdenv.mkDerivation (attrs // { # corresponding site.py needs to be included in the PYTHONPATH. rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* - ${postInstall} + runHook postInstall ''; postFixup = '' wrapPythonPrograms - # If a user installs a Python package, she probably also wants its + # If a user installs a Python package, they probably also wants its # dependencies in the user environment (since Python modules don't # have something like an RPATH, so the only way to find the # dependencies is to have them in the PYTHONPATH variable). + # TODO: better docs if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi @@ -116,4 +128,13 @@ python.stdenv.mkDerivation (attrs // { fi done ''; + + meta = { + # default to python's platforms + platforms = python.meta.platforms; + } // meta // { + # add extra maintainer(s) to every package + maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ]; + }; + }) diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix deleted file mode 100644 index 269f67bf5cd0..000000000000 --- a/pkgs/development/python-modules/offline-distutils/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Used during module installation to prevent easy_install and python -# setup.py install/test from downloading - -{ stdenv, python }: - -stdenv.mkDerivation { - name = "python-offline-distutils-${python.version}"; - - buildInputs = [ python ]; - - unpackPhase = "true"; - installPhase = '' - dst="$out/lib/${python.libPrefix}/site-packages" - ensureDir $dst/distutils - ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/ - cat < $dst/distutils/distutils.cfg -[easy_install] -allow-hosts = None -EOF - ''; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3aff56277323..0ccd5d5da26c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20,10 +20,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { callPackage = pkgs.lib.callPackageWith (pkgs // pythonPackages); - buildPythonPackage = import ../development/python-modules/generic { - inherit (pkgs) lib; - inherit python wrapPython setuptools recursivePthLoader offlineDistutils; - }; + # global distutils config used by buildPythonPackage + distutils-cfg = callPackage ../development/python-modules/distutils-cfg { }; + + buildPythonPackage = callPackage ../development/python-modules/generic { }; wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; @@ -33,11 +33,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { # specials - offlineDistutils = import ../development/python-modules/offline-distutils { - inherit (pkgs) stdenv; - inherit python; - }; - recursivePthLoader = import ../development/python-modules/recursive-pth-loader { inherit (pkgs) stdenv; inherit python; From 6adfd13dd4b28546e4ea0dfa4e28727b94c891e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 6 Jan 2014 22:34:01 +0000 Subject: [PATCH 017/449] adopt setuptools to new python infrastructure (also make sure we unzip setuptools while building) --- .../python-modules/setuptools/default.nix | 9 ++++-- .../setuptools/fix_python3_egg_fetcher.patch | 28 +++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index e0c3e7837b4c..f585d758c2d5 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wrapPython }: +{ stdenv, fetchurl, python, wrapPython, distutils-cfg }: stdenv.mkDerivation rec { shortName = "setuptools-${version}"; @@ -11,9 +11,12 @@ stdenv.mkDerivation rec { sha256 = "09nv5x45y8fgc0kjmmw4gig3hr0is9xlc5rq053vnbmkxr5q5xmi"; }; - buildInputs = [ python wrapPython ]; + # see https://bitbucket.org/pypa/setuptools/commits/976b839801a3a181f2e14f305ddbe0b410fa8fc0.patch + patches = [ ./fix_python3_egg_fetcher.patch ]; - buildPhase = "${python}/bin/${python.executable} setup.py build --build-base $out"; + buildInputs = [ python wrapPython distutils-cfg ]; + + buildPhase = "${python}/bin/${python.executable} setup.py build"; installPhase = '' diff --git a/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch b/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch new file mode 100644 index 000000000000..17ab473a5022 --- /dev/null +++ b/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch @@ -0,0 +1,28 @@ +diff --git a/CHANGES.txt b/CHANGES.txt +--- a/CHANGES.txt ++++ b/CHANGES.txt +@@ -3,6 +3,12 @@ + ======= + + ----- ++2.0.3 ++----- ++ ++* Issue #131: Fix RuntimeError when constructing an egg fetcher. ++ ++----- + 2.0.2 + ----- + +diff --git a/setuptools/dist.py b/setuptools/dist.py +--- a/setuptools/dist.py ++++ b/setuptools/dist.py +@@ -295,7 +295,7 @@ + 'find_links', 'site_dirs', 'index_url', 'optimize', + 'site_dirs', 'allow_hosts' + ) +- for key in opts.keys(): ++ for key in list(opts): + if key not in keep: + del opts[key] # don't use any other settings + if self.dependency_links: From fae6079a01b604cdaaab2ecb9bf48368be31255e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 6 Jan 2014 22:35:39 +0000 Subject: [PATCH 018/449] adopt rest of the packages that were failing with the buildPythonPackage changes --- pkgs/applications/audio/lastwatch/default.nix | 2 - pkgs/applications/audio/quodlibet/default.nix | 4 +- pkgs/applications/video/miro/default.nix | 12 +- .../python-modules/pycrypto/default.nix | 12 +- .../python-modules/pygtk/default.nix | 7 +- pkgs/tools/X11/winswitch/default.nix | 10 +- pkgs/tools/X11/xpra/default.nix | 14 +- pkgs/tools/admin/gtk-vnc/default.nix | 69 +++------ pkgs/tools/networking/getmail/default.nix | 2 - pkgs/tools/security/fail2ban/default.nix | 4 - pkgs/top-level/python-packages.nix | 144 +++++++++--------- 11 files changed, 129 insertions(+), 151 deletions(-) diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index 324a0b0bebcb..c09d397eefa3 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -19,8 +19,6 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = pythonPath; - installCommand = "python setup.py install --prefix=$out"; - meta = { homepage = "https://github.com/aszlig/LastWatch"; description = "An inotify-based last.fm audio scrobbler"; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index c865314cb175..3ab7688cde3e 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject +{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject, intltool , pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: @@ -42,7 +42,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ - mutagen pygtk pygobject pythonDBus gst_python + mutagen pygtk pygobject pythonDBus gst_python intltool ]; postInstall = stdenv.lib.optionalString withGstPlugins '' diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 5ca6c80dc7c1..516f12f20511 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -40,10 +40,6 @@ buildPythonPackage rec { plat/resources.py ''; - installCommand = '' - python setup.py install --prefix= --root="$out" - ''; - # Disabled for now, because it requires networking and even if we skip those # tests, the whole test run takes around 10-20 minutes. doCheck = false; @@ -51,8 +47,14 @@ buildPythonPackage rec { HOME="$TEMPDIR" LANG=en_US.UTF-8 python miro.real --unittest ''; + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + ${python}/bin/${python.executable} setup.py install_data --root=$out + sed -i '/data_files=data_files/d' setup.py + ''; + postInstall = '' - mv "$out/bin/miro.real" "$out/bin/miro" + mv $out/bin/miro.real $out/bin/miro ''; buildInputs = [ diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index ec741ba247e5..5da727a08db1 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -9,17 +9,7 @@ buildPythonPackage rec { sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"; }; - buildInputs = [ python gmp ]; - - buildPhase = - '' - python ./setup.py build_ext --library-dirs=${gmp}/lib - ''; - -# installPhase = -# '' -# python ./setup.py install --prefix=$out -# ''; + buildInputs = [ gmp ]; meta = { homepage = "http://www.pycrypto.org/"; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index e291544911cc..dfe805ec9e40 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -14,7 +14,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ gtk pygobject pycairo ]; - installCommand = "make install"; + configurePhase = "configurePhase"; + + buildPhase = "buildPhase"; + + installPhase = "installPhase"; + checkPhase = stdenv.lib.optionalString (libglade == null) '' sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index bd160940b573..2db0d1721735 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -29,12 +29,10 @@ let }' winswitch/util/distro_packaging_util.py ''; - buildPhase = '' - python setup.py build - ''; - - installCommand = '' - PREFIX="$out" python ./setup.py install --prefix="$out" + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + python setup.py install_data --install-dir=$out --root=$out + sed -i '/data_files = data_files/d' setup.py ''; doCheck = false; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 35370ae21280..f96fa5773230 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ - python cython pkgconfig + cython pkgconfig xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto @@ -33,9 +33,15 @@ buildPythonPackage rec { # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177 doCheck = false; - buildPhase = '' - 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 + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" + ''; + setupPyBuildFlags = ["--enable-Xdummy"]; + + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out + sed -i '/ = data_files/d' setup.py ''; meta = { diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 44a421e2ba3d..d4c45b7ba964 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,62 +1,41 @@ -x@{builderDefsPackage - , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 - , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs - , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefoxPkgs"]; +{ stdenv, fetchurl +, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio +, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt }: - buildInputs = (map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames))) - ++ [perlPackages.TextCSV firefoxPkgs.xulrunner ]; - sourceInfo = rec { - baseName="gtk-vnc"; - majorVersion="0.4"; - minorVersion="2"; - version="${majorVersion}.${minorVersion}"; - name="${baseName}-${version}"; - url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.gz"; - hash="1fkhzwpw50rnwp51lsbny16p2ckzx5rkcaiaqvkd90vwnm2cccls"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + +stdenv.mkDerivation rec { + name = "gtk-vnc-${version}"; + version = "0.5.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gtk-vnc/0.5/${name}.tar.xz"; + sha256 = "1bww2ihxb3zzvifdrcsy1lifr664pvikq17hmr1hsm8fyk4ad46l"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ + python gtk pygtk gnutls cairo libtool pkgconfig glib libffi libgcrypt + intltool cyrus_sasl pulseaudio pygobject perl perlPackages.TextCSV + ]; + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ "--with-python" "--with-examples" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixMakefiles" "doConfigure" "doMakeInstall"]; + makeFlags = "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; - fixMakefiles = a.fullDepEntry '' - find . -name 'Makefile*' -exec sed -i '{}' -e 's@=codegendir pygtk-2.0@=codegendir pygobject-2.0@' ';' - '' ["minInit" "doUnpack"]; - - meta = { + meta = with stdenv.lib; { description = "A GTK VNC widget"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.lgpl21; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; + passthru = { updateInfo = { downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc"; }; }; -}) x - +} diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 80d29835da53..6d9666506b88 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -11,8 +11,6 @@ buildPythonPackage rec { doCheck = false; - installCommand = "python setup.py install --prefix=\"\$prefix\""; - meta = { description = "A program for retrieving mail"; maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ]; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index aa387eff3e72..b28c761ec2cf 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -39,10 +39,6 @@ pythonPackages.buildPythonPackage { doCheck = false; - installCommand = '' - python setup.py install --prefix=$out - ''; - meta = with stdenv.lib; { homepage = http://www.fail2ban.org/; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ccd5d5da26c..c65eea991234 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -40,7 +40,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; - inherit python wrapPython; + inherit python wrapPython distutils-cfg; }; # packages defined elsewhere @@ -287,10 +287,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { ]; postInstall = '' - ln -s ${pyramid}/bin/pserve $out/bin ln -s ${pkgs.bacula}/bin/bconsole $out/bin - wrapProgram "$out/bin/pserve" \ - --suffix PYTHONPATH : "$out/lib/python2.7/site-packages" ''; meta = { @@ -544,7 +541,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; # tests depend on $HOME setting - configurePhase = "export HOME=$TMPDIR"; + preConfigure = "export HOME=$TMPDIR"; propagatedBuildInputs = [ pythonPackages.pyyaml @@ -1238,7 +1235,22 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "4e155a0134e6757b37cc6698c20f3e9f"; }; - propagatedBuildInputs = [ pythonPackages.py ] + preCheck = '' + # broken on python3, fixed in master, remove in next release + rm doc/en/plugins_index/test_plugins_index.py + + # see https://bitbucket.org/hpk42/pytest/issue/418/test-failures-with-python-275-and-pytest + sed -i "/test_unicode/i\ @pytest.mark.xfail" testing/test_assertion.py + + # don't test bash builtins + rm testing/test_argcomplete.py + + # yaml test are failing + rm doc/en/example/nonpython/test_simple.yml + + ''; + + propagatedBuildInputs = [ py ] ++ stdenv.lib.optional pkgs.config.pythonPackages.pytest.selenium or false pythonPackages.selenium; @@ -1687,14 +1699,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; gtimelog = buildPythonPackage rec { - name = "gtimelog-0.8.1"; + name = "gtimelog-${version}"; + version = "0.8.1"; + src = fetchurl { - url = https://launchpad.net/gtimelog/devel/0.8.1/+download/gtimelog-0.8.1.tar.gz; - sha256 = "010sbw4rmslf5ifg9bgicn0f6mgsy76v8218xi0jndi9z6pva7y6"; + url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; + sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0"; }; + propagatedBuildInputs = [ pygtk ]; + + checkPhase = '' + patchShebangs ./runtests + ./runtests + ''; + meta = with stdenv.lib; { - description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible."; + description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; homepage = http://mg.pov.lt/gtimelog/; license = licenses.gpl2Plus; maintainers = [ maintainers.ocharles ]; @@ -2185,6 +2206,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6"; }; + preConfigure = '' + sed -i "/use_setuptools/d" setup.py + ''; + buildInputs = [ pkgs.alsaLib pkgs.jackaudio ]; meta = with stdenv.lib; { @@ -2474,9 +2499,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; buildPhase = "make build"; - installCommand = '' - ${python}/bin/${python.executable} setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed - ''; # For some reason "python setup.py test" doesn't work with Python 2.6. # pretty sure that is about import behaviour. @@ -3438,9 +3460,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ ]; doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; meta = { description = "Pythonic binding for the libxml2 and libxslt libraries"; @@ -3492,21 +3511,15 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; - magic = pkgs.stdenv.mkDerivation rec { - name = "python-${pkgs.file.name}"; + magic = buildPythonPackage rec { + name = "${pkgs.file.name}"; src = pkgs.file.src; patches = [ ../tools/misc/file/python.patch ]; buildInputs = [ python pkgs.file ]; - configurePhase = "cd python"; - - buildPhase = "${python}/bin/${python.executable} setup.py build"; - - installPhase = '' - ${python}/bin/${python.executable} setup.py install --prefix=$out - ''; + preConfigure = "cd python"; meta = { description = "A Python wrapper around libmagic"; @@ -3526,7 +3539,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [ pkgs.swig pkgs.openssl ]; - buildPhase = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}"; + preBuild = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}"; doCheck = false; # another test that depends on the network. @@ -4200,19 +4213,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); - notmuch = pkgs.stdenv.mkDerivation rec { + notmuch = buildPythonPackage rec { name = "python-${pkgs.notmuch.name}"; src = pkgs.notmuch.src; + sourceRoot = "${pkgs.notmuch.name}/bindings/python"; + buildInputs = [ python pkgs.notmuch ]; - #propagatedBuildInputs = [ python pkgs.notmuch ]; - - configurePhase = "cd bindings/python"; - - buildPhase = "python setup.py build"; - - installPhase = "python setup.py install --prefix=$out"; meta = { description = "A Python wrapper around notmuch"; @@ -4233,13 +4241,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { sed -i 's/-faltivec//' numpy/distutils/system_info.py ''; - # TODO: add ATLAS=${pkgs.atlas} - installCommand = '' + preBuild = '' export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} - ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95" - ${python}/bin/${python.executable} setup.py install --prefix=$out ''; + setupPyBuildFlags = ["--fcompiler='gnu95'"]; + # error: invalid command 'test' doCheck = false; @@ -4614,10 +4621,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz"; sha256 = "0j700f70mj0brdlvs2cz4a7h4jwmzgymgp8qk1qb3lsm1qd1vy15"; }; - buildInputs = [ mock scripttest virtualenv nose ]; - # ValueError: Working directory tests not found, or not a directory - # see https://github.com/pypa/pip/issues/92 - doCheck = false; + buildInputs = [ mock scripttest virtualenv pytest ]; }; @@ -4644,7 +4648,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - configurePhase = '' + preConfigure = '' sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; @@ -4653,7 +4657,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' ''; - doCheck = true; + meta = { homepage = http://python-imaging.github.com/Pillow; @@ -4764,10 +4768,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; - buildPhase = '' - python setup.py build - ''; - propagatedBuildInputs = [pkgs.protobuf]; sourceRoot = "${name}/python"; @@ -4838,7 +4838,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { src = fetchurl { url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz"; - md5 = "3857dc8309d5f284669b81184253c2bb"; + md5 = "d2e24b4363d834bf9192247f143435bc"; }; }; @@ -5189,6 +5189,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ urlgrabber ]; checkPhase = '' + export PYTHONPATH="$PYTHONPATH:." ${python}/bin/${python.executable} tests/baseclass.py -vv ''; @@ -5267,7 +5268,8 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ pkgs.parted ]; checkPhase = '' - ${python}/bin/${python.executable} -m unittest discover -v + patchShebangs Makefile + make test PYTHON=${python.executable} ''; meta = { @@ -5621,7 +5623,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { # There seems to be no way to pass that path to configure. NIX_CFLAGS_COMPILE="-I${pkgs.aprutil}/include/apr-1"; - configurePhase = '' + preConfigure = '' cd Source python setup.py backport python setup.py configure \ @@ -6172,16 +6174,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [pkgs.gfortran]; propagatedBuildInputs = [ numpy ]; + # TODO: add ATLAS=${pkgs.atlas} + preConfigure = '' + export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} + ''; + + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + # error: invalid command 'test' doCheck = false; - # TODO: add ATLAS=${pkgs.atlas} - installCommand = '' - export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} - ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95" - ${python}/bin/${python.executable} setup.py install --prefix=$out - ''; - meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; homepage = http://www.scipy.org/; @@ -6573,7 +6575,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; buildInputs = [ mock ]; - propagatedBuildInputs = [ meld3 ]; + propagatedBuildInputs = [ meld3 ]; + + # failing tests when building under chroot as root user doesn't exist + doCheck = false; meta = { description = "A system for controlling process state under UNIX"; @@ -6713,10 +6718,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "051dd9de0757714d33c3ecd5ab37b97d"; }; - buildInputs = [ pytest webob pkgs.imagemagick ]; + buildInputs = [ pytest webob pkgs.imagemagick nose ]; propagatedBuildInputs = [ sqlalchemy8 wand ]; - checkPhase = "cd tests && LD_LIBRARY_PATH=${pkgs.imagemagick}/lib py.test"; + checkPhase = '' + cd tests + export LD_LIBRARY_PATH=${pkgs.imagemagick}/lib + export PYTHONPATH=$PYTHONPATH:../ + py.test + cd .. + ''; meta = { homepage = https://github.com/crosspop/sqlalchemy-imageattach; @@ -7816,8 +7827,8 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ zope_proxy ]; # ignore circular dependency on zope_schema - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . + preBuild = '' + sed -i '/zope.schema/d' setup.py ''; doCheck = false; @@ -7870,12 +7881,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "e7e581af8193551831560a736a53cf58"; }; - propagatedBuildInputs = [ zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; - - # ignore circular dependency on zope_location - installCommand = '' - easy_install --no-deps --prefix="$out" . - ''; + propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; From 7cdab2c02470d9a410298495a678aff9bd3afd85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 10 Jan 2014 21:50:03 +0100 Subject: [PATCH 019/449] pythonPackages.setuptools: 2.0.2 -> 2.1 --- .../python-modules/setuptools/default.nix | 7 ++--- .../setuptools/fix_python3_egg_fetcher.patch | 28 ------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index f585d758c2d5..35630be22553 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -4,16 +4,13 @@ stdenv.mkDerivation rec { shortName = "setuptools-${version}"; name = "${python.executable}-${shortName}"; - version = "2.0.2"; + version = "2.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; - sha256 = "09nv5x45y8fgc0kjmmw4gig3hr0is9xlc5rq053vnbmkxr5q5xmi"; + sha256 = "1m8qjvj5bfbphdags5s6pgmvk3xnw509lgdlq9whkq5a9mgxf8m7"; }; - # see https://bitbucket.org/pypa/setuptools/commits/976b839801a3a181f2e14f305ddbe0b410fa8fc0.patch - patches = [ ./fix_python3_egg_fetcher.patch ]; - buildInputs = [ python wrapPython distutils-cfg ]; buildPhase = "${python}/bin/${python.executable} setup.py build"; diff --git a/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch b/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch deleted file mode 100644 index 17ab473a5022..000000000000 --- a/pkgs/development/python-modules/setuptools/fix_python3_egg_fetcher.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CHANGES.txt b/CHANGES.txt ---- a/CHANGES.txt -+++ b/CHANGES.txt -@@ -3,6 +3,12 @@ - ======= - - ----- -+2.0.3 -+----- -+ -+* Issue #131: Fix RuntimeError when constructing an egg fetcher. -+ -+----- - 2.0.2 - ----- - -diff --git a/setuptools/dist.py b/setuptools/dist.py ---- a/setuptools/dist.py -+++ b/setuptools/dist.py -@@ -295,7 +295,7 @@ - 'find_links', 'site_dirs', 'index_url', 'optimize', - 'site_dirs', 'allow_hosts' - ) -- for key in opts.keys(): -+ for key in list(opts): - if key not in keep: - del opts[key] # don't use any other settings - if self.dependency_links: From ab6865c3a486ebd5ec4e6d95572268aae4303e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 10 Jan 2014 21:54:07 +0100 Subject: [PATCH 020/449] distutils.cfg: name as others coding conventions for python packages --- pkgs/development/python-modules/distutils-cfg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix index 7b0f36286980..190c663b471a 100644 --- a/pkgs/development/python-modules/distutils-cfg/default.nix +++ b/pkgs/development/python-modules/distutils-cfg/default.nix @@ -16,7 +16,7 @@ let ${extraCfg} ''; in stdenv.mkDerivation { - name = "distutils.cfg-python${python.version}"; + name = "${python.libPrefix}-distutils.cfg"; buildInputs = [ python ]; From 21ada5b105aa863a01388275d7aaf226253f9d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 10 Jan 2014 21:57:28 +0100 Subject: [PATCH 021/449] garden --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 51af437265d5..fc91fcd3d8a8 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -35,7 +35,7 @@ # pollute the user environment. , pythonPath ? [] -, meta ? {} +, meta ? {} , ... } @ attrs: From c80feaf542d437d0bc6d4461ba49643dd9eac1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 10 Jan 2014 22:04:05 +0100 Subject: [PATCH 022/449] document setuptools monkeypatching and DETERMINISTIC_BUILD=1 --- pkgs/development/python-modules/generic/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index fc91fcd3d8a8..c2a389a78be1 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -54,14 +54,17 @@ python.stdenv.mkDerivation (attrs // { configurePhase = attrs.configurePhase or '' runHook preConfigure - # TODO: document + # patch python interpreter to write null timestamps when compiling python files + # with following var we tell python to activate the patch so that python doesn't + # try to update them when we freeze timestamps in nix store export DETERMINISTIC_BUILD=1 - # we need to prepend following line to monkeypatch distutils commands + # prepend following line to import setuptools before distutils + # this way we make sure setuptools monkeypatches distutils commands + # this way setuptools provides extra helpers such as "python setup.py test" sed -i '0,/import distutils/s//import setuptools;import distutils/' setup.py sed -i '0,/from distutils/s//import setuptools;from distutils/' setup.py - runHook postConfigure ''; From b1ffb9ede468fec2845960e2b37b6dfeb922d3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 11 Jan 2014 11:44:24 +0100 Subject: [PATCH 023/449] buildPythonPackage: Add --old-and-unmanageable flag to install command and add more docs. For explanation see inline comments. --- .../python-modules/generic/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index c2a389a78be1..5253c52df42a 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -7,15 +7,16 @@ { name -# by default prefix name with python version name, e.g. "python3.3-" +# by default prefix `name` e.g. "python3.3-${name}" , namePrefix ? python.libPrefix + "-" , buildInputs ? [] -# TODO: document +# pass extra information to the distutils global configuration (think as global setup.cfg) , distutilsExtraCfg ? "" -# TODO: say what it does +# propagate build dependencies so in case we have A -> B -> C, +# C can import propagated packages by A , propagatedBuildInputs ? [] # passed to "python setup.py install" @@ -71,6 +72,7 @@ python.stdenv.mkDerivation (attrs // { checkPhase = attrs.checkPhase or '' runHook preCheck + # reduce output to only dots, if a test fails error output will include verbose info ${python}/bin/${python.executable} setup.py test -q runHook postCheck @@ -91,8 +93,17 @@ python.stdenv.mkDerivation (attrs // { export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} + ${python}/bin/${python.executable} setup.py install \ + # sometimes packages specify where files should be installed outside the usual + # python lib prefix, we override that back so all infrastructure (setup hooks) + # work as expected + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + # instruct setuptools not to use eggs but fallback to plan package install + # this also reduces one .pth file in the chain, but the main reason is to + # force install process to install only scripts for the package we are + # installing (otherwise it will install scripts also for dependencies) + --old-and-unmanageable \ + --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} # A pth file might have been generated to load the package from # within its own site-packages, rename this package not to @@ -116,14 +127,14 @@ python.stdenv.mkDerivation (attrs // { wrapPythonPrograms # If a user installs a Python package, they probably also wants its - # dependencies in the user environment (since Python modules don't - # have something like an RPATH, so the only way to find the + # dependencies in the user environment profile (only way to find the # dependencies is to have them in the PYTHONPATH variable). - # TODO: better docs + # Allows you to do: $ PYTHONPATH=~/.nix-profile/lib/python2.7/site-packages python if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi + # TODO: document createBuildInputsPth build-inputs "$buildInputStrings" for inputsfile in propagated-build-inputs propagated-native-build-inputs; do if test -e $out/nix-support/$inputsfile; then @@ -135,9 +146,9 @@ python.stdenv.mkDerivation (attrs // { meta = { # default to python's platforms platforms = python.meta.platforms; - } // meta // { + } // meta // with lib.maintainers; { # add extra maintainer(s) to every package - maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ]; + maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; }; }) From dfa8ac64ad35cb8525d441f7ae92911b4b367074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 11 Jan 2014 20:14:58 +0100 Subject: [PATCH 024/449] miro: keep quotes --- pkgs/applications/video/miro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 516f12f20511..14aeca62a710 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ''; postInstall = '' - mv $out/bin/miro.real $out/bin/miro + mv "$out/bin/miro.real" "$out/bin/miro" ''; buildInputs = [ From fa98edf2b13a568735e7098a0f1156e8975eaad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 22 Jan 2014 10:15:26 +0100 Subject: [PATCH 025/449] fix eval --- pkgs/development/python-modules/generic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 5253c52df42a..f95278b5e997 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -143,10 +143,10 @@ python.stdenv.mkDerivation (attrs // { done ''; - meta = { + meta = with lib.maintainers; { # default to python's platforms platforms = python.meta.platforms; - } // meta // with lib.maintainers; { + } // meta // { # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; }; From c72d59881fa79be33f8bc2c20c5fc0dfd81c6f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 22 Jan 2014 10:15:43 +0100 Subject: [PATCH 026/449] remove unneeded pytest test skip --- pkgs/top-level/python-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c65eea991234..b05c670aab6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1239,15 +1239,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { # broken on python3, fixed in master, remove in next release rm doc/en/plugins_index/test_plugins_index.py - # see https://bitbucket.org/hpk42/pytest/issue/418/test-failures-with-python-275-and-pytest - sed -i "/test_unicode/i\ @pytest.mark.xfail" testing/test_assertion.py - # don't test bash builtins rm testing/test_argcomplete.py # yaml test are failing rm doc/en/example/nonpython/test_simple.yml - ''; propagatedBuildInputs = [ py ] From 567e67f05fb7ddcaa8d788661b81de5a678644ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 22 Jan 2014 10:17:34 +0100 Subject: [PATCH 027/449] bash doesn't allow comments between multiline statements --- .../python-modules/generic/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index f95278b5e997..2b901db7643a 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -94,17 +94,21 @@ python.stdenv.mkDerivation (attrs // { export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" ${python}/bin/${python.executable} setup.py install \ - # sometimes packages specify where files should be installed outside the usual - # python lib prefix, we override that back so all infrastructure (setup hooks) - # work as expected --install-lib=$out/lib/${python.libPrefix}/site-packages \ - # instruct setuptools not to use eggs but fallback to plan package install - # this also reduces one .pth file in the chain, but the main reason is to - # force install process to install only scripts for the package we are - # installing (otherwise it will install scripts also for dependencies) --old-and-unmanageable \ --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} + # --install-lib: + # sometimes packages specify where files should be installed outside the usual + # python lib prefix, we override that back so all infrastructure (setup hooks) + # work as expected + + # --old-and-unmanagable: + # instruct setuptools not to use eggs but fallback to plan package install + # this also reduces one .pth file in the chain, but the main reason is to + # force install process to install only scripts for the package we are + # installing (otherwise it will install scripts also for dependencies) + # A pth file might have been generated to load the package from # within its own site-packages, rename this package not to # collide with others. From f6ba040bdce29da6072d1a0a86387ebe5d79869d Mon Sep 17 00:00:00 2001 From: Tom Hinton Date: Wed, 19 Feb 2014 15:38:44 +0000 Subject: [PATCH 028/449] Add me to maintainers list Add a derivation for davmail Add a derivation for lxappearance Add both new derivations to all-packages --- lib/maintainers.nix | 1 + .../misc/lxappearance/default.nix | 18 +++++++++++++ .../networking/davmail/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 4 files changed, 48 insertions(+) create mode 100644 pkgs/applications/misc/lxappearance/default.nix create mode 100644 pkgs/applications/networking/davmail/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ee3830e6d352..fe9c2d62a01b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -28,6 +28,7 @@ garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; + hinton = "Tom Hinton "; ianwookim = "Ian-Woo Kim "; iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix new file mode 100644 index 000000000000..032c664b9266 --- /dev/null +++ b/pkgs/applications/misc/lxappearance/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }: + +stdenv.mkDerivation rec { + name = "lxappearance-0.5.5"; + src = fetchurl{ + url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz"; + sha256 = "8cae82e6425ba8a0267774e4d10096df2d91b0597520058331684a5ece068b4c"; + }; + buildInputs = [ intltool libX11 pkgconfig gtk ]; + meta = { + description = "A lightweight program for configuring the theme and fonts of gtk applications"; + maintainers = [ stdenv.lib.maintainers.hinton ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl2; + homepage = "http://lxappearance.sourceforce.net/"; + }; +} + diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix new file mode 100644 index 000000000000..7dc54a9c871d --- /dev/null +++ b/pkgs/applications/networking/davmail/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: + +stdenv.mkDerivation rec { + name = "davmail-4.4.1"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/davmail/davmail/4.4.1/davmail-linux-x86_64-4.4.1-2225.tgz"; + sha256 = "66c7ae23c0242860cca1576e5fc29343431789a821f7623e420b91ba91e480a9"; + }; + + buildInputs = [ makeWrapper ]; + + meta = { + description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; + maintainers = [ stdenv.lib.maintainers.hinton ]; + platforms = stdenv.lib.platforms.all; + homepage = "http://davmail.sourceforce.net/"; + license = stdenv.lib.licenses.gpl2; + }; + + installPhase = '' + mkdir -p $out/bin + cp ./* $out/bin/ -R + wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed811f549ce0..0e2d9945fd74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3136,6 +3136,10 @@ let jmeter = callPackage ../applications/networking/jmeter {}; + davmail = callPackage ../applications/networking/davmail {}; + + lxappearance = callPackage ../applications/misc/lxappearance {}; + kona = callPackage ../development/interpreters/kona {}; love = callPackage ../development/interpreters/love {lua=lua5;}; From 2537b7c679abd5d45d820869f47694521df6451f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 29 Aug 2013 21:27:48 +0000 Subject: [PATCH 029/449] vim: add config option to generate vimrc --- pkgs/applications/editors/vim/default.nix | 8 +++--- pkgs/applications/editors/vim/wrapper.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/editors/vim/wrapper.nix diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 7dd4a0519ce4..673174904129 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchhg, ncurses, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "vim-7.4.131"; - + name = "vim-${version}"; + + version = "7.4.131"; + src = fetchhg { url = "https://vim.googlecode.com/hg/"; tag = "v7-4-131"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - + buildInputs = [ ncurses pkgconfig ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/editors/vim/wrapper.nix b/pkgs/applications/editors/vim/wrapper.nix new file mode 100644 index 000000000000..709753ff8eb5 --- /dev/null +++ b/pkgs/applications/editors/vim/wrapper.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper, writeText, vim, vimrc }: + +let + + vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc); + +in stdenv.mkDerivation rec { + name = "vimwrapper-${vim.version}"; + + buildInputs = [ makeWrapper vim vimrcfile ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out + cp -r ${vim}/* $out/ + + chmod u+w $out/bin + chmod u+w $out/share/vim + + ln -s ${vimrcfile} $out/share/vim/vimrc + wrapProgram $out/bin/vim --set VIM "$out/share/vim" + ''; + + meta = with stdenv.lib; { + description = "The most popular clone of the VI editor"; + homepage = http://www.vim.org; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e8a3d89f39a..ded6a364512b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9009,6 +9009,11 @@ let else stdenv; }; + vimwrapper = callPackage ../applications/editors/vim/wrapper.nix { + inherit vim; + vimrc = config.vim.vimrc or null; + }; + vimHugeX = vim_configurable; vim_configurable = callPackage ../applications/editors/vim/configurable.nix { From c5e1cc5f377c165d8cee75bad4d1c8f7f0be5c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 20 Feb 2014 23:12:54 +0100 Subject: [PATCH 030/449] Minor whitespace cleanup --- pkgs/applications/misc/lxappearance/default.nix | 1 - pkgs/applications/networking/davmail/default.nix | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix index 032c664b9266..9295eaabf322 100644 --- a/pkgs/applications/misc/lxappearance/default.nix +++ b/pkgs/applications/misc/lxappearance/default.nix @@ -15,4 +15,3 @@ stdenv.mkDerivation rec { homepage = "http://lxappearance.sourceforce.net/"; }; } - diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 7dc54a9c871d..b95d29031542 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "davmail-4.4.1"; src = fetchurl { url = "http://downloads.sourceforge.net/project/davmail/davmail/4.4.1/davmail-linux-x86_64-4.4.1-2225.tgz"; - sha256 = "66c7ae23c0242860cca1576e5fc29343431789a821f7623e420b91ba91e480a9"; + sha256 = "66c7ae23c0242860cca1576e5fc29343431789a821f7623e420b91ba91e480a9"; }; buildInputs = [ makeWrapper ]; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { meta = { description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; maintainers = [ stdenv.lib.maintainers.hinton ]; - platforms = stdenv.lib.platforms.all; - homepage = "http://davmail.sourceforce.net/"; - license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + homepage = "http://davmail.sourceforce.net/"; + license = stdenv.lib.licenses.gpl2; }; installPhase = '' From cc2b86d13357c1ba9d544eed10717529c8159439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 21 Feb 2014 00:10:40 +0100 Subject: [PATCH 031/449] google_talk_plugin: 4.2.1.0 -> 5.1.4.0 --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 4f7d3feb8ad6..d9cd8f9be539 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -47,18 +47,18 @@ stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; # Use the following to determine the current upstream version: # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p' - version = "4.2.1.0"; + version = "5.1.4.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "1g7kpz2lzzz1gri5rd3isp7cfyls6gzwcw2kc8jgrgrixq9iixfd"; + sha256 = "19x1ss6kx7w8833f40pg1mwqr6sygz4ij4a7r7h3flmk67zywj4c"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "1z0zbblzlky9nyifxmnl49v4zafpqp3l08b9v1486sinm35rf58r"; + sha256 = "1jxcridpqx46sdy4bw381rvffn1z93s280vhihwbgmiwjq5h4g41"; } else throw "Google Talk does not support your platform."; From 864c75b7fdb4e6716ae765d8e0aec9171dac6c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 20 Feb 2014 23:33:37 +0100 Subject: [PATCH 032/449] guitarix: update from 0.25.2 to 0.28.3 Add new required inputs: lv2 and avahi, tidy up --- pkgs/applications/audio/guitarix/default.nix | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 17d53a621ca6..868fbc2cbc4b 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile -, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }: +{ stdenv, fetchurl, avahi, boost fftw, gettext, glib, glibmm, gtk +, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile lv2 +, pkgconfig, python +}: stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.25.2"; + version = "0.28.3"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga"; + sha256 = "0ks5avylyicqfj9l1wf4gj62i8m6is2jmp0h11h5l2wbg3xiwxjd"; }; - buildInputs = - [ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm - gtkmm fftw librdf ladspaH boost - ]; + buildInputs = [ + avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio + ladspaH librdf libsndfile lv2 pkgconfig python + ]; configurePhase = "python waf configure --prefix=$out"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = "python waf install"; - meta = { + meta = with stdenv.lib; { description = "A virtual guitar amplifier for Linux running with JACK"; longDescription = '' guitarix is a virtual guitar amplifier for Linux running with @@ -46,8 +48,8 @@ stdenv.mkDerivation rec { crazy sounds never heard before. ''; homepage = http://guitarix.sourceforge.net/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ astsmtl goibhniu ]; + platforms = platforms.linux; }; } From a1dc5ea7072158fb2371108210ccad5eda5c8f41 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Feb 2014 19:53:34 -0600 Subject: [PATCH 033/449] kernel: stable updates - 3.13 stable: 3.13.3 -> 3.13.4 - 3.12 stable: 3.12.11 -> 3.12.12 - 3.10 longterm: 3.10.30 -> 3.10.31 - 3.4 longterm: 3.4.80 -> 3.4.81 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.13.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index a5c096491c37..748611ab1b5f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.30"; + version = "3.10.31"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0a9x27g026gvy64w2xkpkdf3kzjfzzgy0kgikdyk604zdz4ha2hm"; + sha256 = "1nz8203avjjin3sivx6h6ddsramk37vp02g9lw2ix3hxji0lsz1m"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 352b3cc483dd..84c865b6542b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.11"; + version = "3.12.12"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1zqwfzb0hmx69caw54np6if2nybmin4mhxj9milfflc6z40fn06r"; + sha256 = "0wndjj5bdjfl4i9s5mj9wylhspygsvnl3pnwps6d65q2jm813lrv"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix index 24f10ecb478f..827910ca28b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.13.3"; + version = "3.13.4"; extraMeta.branch = "3.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0x277h0ccdjivi16w20aj59ncazr7zs07zprazm0ph4qyffv0r4g"; + sha256 = "0hzxr8gsafnyc96x5p2clgi827ahidk1hma0yd48gdx9dhynrq2r"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 6e94cb5807e6..a7bfee210ad8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.80"; + version = "3.4.81"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1vma3bxydryhcg7iimndq4rbpzbpjvnq7qa5md6wm6iill011pil"; + sha256 = "17m8b9wcsz8ryakhk8v85iknylkjlbsx69wkj1rbvqi2f1sjihx5"; }; features.iwlwifi = true; From 18f65f3640e49c119d984444223a436ac9d91fad Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Feb 2014 19:55:45 -0600 Subject: [PATCH 034/449] grsecurity: stable/testing updates - stable: 3.0-3.2.55-201402192249 -> 3.0-3.2.55-201402201903 - testing: 3.0-3.13.3-201402192252 -> 3.0-3.13.4-201402201908 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d14a124dd050..49d0d37586cc 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -81,19 +81,19 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402192249.patch; - sha256 = "16q531j9gphqgqw6v0g45l9hzpz6gnsmh72b9435xs3pjwz1wp44"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402201903.patch; + sha256 = "01kvs5z4ia5d5s4z8kfqyvh06qlw4v14hfll9n9qav6z8s5wyx10"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54 features.apparmor = true; }; - grsecurity_3_0_3_13_3 = - { name = "grsecurity-3.0-3.13.3"; + grsecurity_3_0_3_13_4 = + { name = "grsecurity-3.0-3.13.4"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402192252.patch; - sha256 = "09f2ym9hyfff83yvaflj7zzk78c2xw4xvn70bj1x3ybawv3sw83k"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402201908.patch; + sha256 = "140rp57hzbjljhcgvdcczfhw0ghyw1x1ga2xv5ma2pk3dml158lh"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f19613bd88b5..53326d6e6fc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6695,7 +6695,7 @@ let })) (args: grsecurityOverrider args)); linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_3 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_4 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; }; From b1a2c840a7ca8dfd462ac90c5f6d74a8d0cc41a8 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 19 Feb 2014 23:20:33 +0100 Subject: [PATCH 035/449] cogl: Compile with gstreamer --- pkgs/development/libraries/cogl/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 1fc1021156d5..0f1c1dd82e2d 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland }: +, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +, gstreamerSupport ? true, gst_all_1 }: let ver_maj = "1.16"; @@ -22,13 +23,15 @@ stdenv.mkDerivation rec { "--enable-kms-egl-platform" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" - ]; + ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland ] - ++ libintlOrEmpty; + ++ libintlOrEmpty + ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer + gst_all_1.gst-plugins-base ]; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; From 9f5beec66f9c417f61b29f772d1826b4f0be36a9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 19 Feb 2014 23:21:19 +0100 Subject: [PATCH 036/449] clutter-gst: new package --- .../libraries/clutter-gst/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/clutter-gst/default.nix diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix new file mode 100644 index 000000000000..8297dc9d5da3 --- /dev/null +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -0,0 +1,26 @@ +{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }: + +stdenv.mkDerivation rec { + name = "clutter-gst-2.0.10"; + + src = fetchurl { + url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz"; + sha256 = "f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00"; + }; + + propagatedBuildInputs = [ clutter gtk3 glib cogl ]; + nativeBuildInputs = [ pkgconfig ]; + + postBuild = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "Clutter-GST"; + + homepage = http://www.clutter-project.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ lethalman ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e8a3d89f39a..e91329c866b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3970,6 +3970,8 @@ let clutter = callPackage ../development/libraries/clutter { }; + clutter-gst = callPackage ../development/libraries/clutter-gst { }; + clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { }; From 668a0bbfc762e61a2b501e86253585a4102ed69d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 20 Feb 2014 10:27:10 +0100 Subject: [PATCH 037/449] telepathy-glib: Generate vala bindings --- pkgs/development/libraries/telepathy/glib/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 615641a8309c..516ebc5f2736 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt -, gobjectIntrospection }: +, gobjectIntrospection, valaSupport ? true, vala }: stdenv.mkDerivation rec { name = "telepathy-glib-0.22.0"; @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232"; }; + configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; + propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection]; - buildInputs = [pkgconfig libxslt]; + buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala; meta = { homepage = http://telepathy.freedesktop.org; From 4232f21de37da8c7cbc4fd4af869ac496a45dc97 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 19 Feb 2014 23:55:48 +0100 Subject: [PATCH 038/449] evolution-data-server: Generate vala bindings --- .../gnome-3/core/evolution-data-server/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index d0c15bd96ffa..0ded30b11abb 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret -, p11_kit, db, nspr, nss, libical, gperf }: +, p11_kit, db, nspr, nss, libical, gperf, valaSupport ? true, vala }: stdenv.mkDerivation rec { @@ -12,10 +12,12 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret - gcr p11_kit db nspr nss libgweather libical libgdata gperf ]; + gcr p11_kit db nspr nss libgweather libical libgdata gperf ] + ++ stdenv.lib.optional valaSupport vala; # uoa irrelevant for now - configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss"; + configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"] + ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; meta = with stdenv.lib; { platforms = platforms.linux; From 226be5a247deeabcb079b66b148dfb19a567f19c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 20 Feb 2014 14:43:18 +0100 Subject: [PATCH 039/449] evolution-data-server: install gschemas in share/evolution-data-server --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 0ded30b11abb..30805c1c5975 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"] ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; + installFlags = "gsettingsschemadir=\${out}/share/evolution-data-server/glib-2.0/schemas/"; + meta = with stdenv.lib; { platforms = platforms.linux; }; From 9f2187478190cf30193b45cf769519315fac704d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 20 Feb 2014 02:27:49 +0100 Subject: [PATCH 040/449] telepathy-logger: install gschemas in share/telepathy-logger --- .../networking/instant-messengers/telepathy/logger/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 173dfe9c929f..bd8cffd40e4b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { configureFlags = "--enable-call"; + installFlags = "gsettingsschemadir=\${out}/share/telepathy/logger/glib-2.0/schemas/"; + meta = { description = "Logger service for Telepathy framework"; homepage = http://telepathy.freedesktop.org/wiki/Logger ; From aa292356219bce8a583d8e53e517d0a7cc415105 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 20 Feb 2014 02:28:28 +0100 Subject: [PATCH 041/449] clutter-gtk: update to 1.4.4 --- pkgs/development/libraries/clutter-gtk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 587324461117..040123d42766 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, clutter, gtk3 }: stdenv.mkDerivation rec { - name = "clutter-gtk-1.0.4"; + name = "clutter-gtk-1.4.4"; src = fetchurl { - url = mirror://gnome/sources/clutter-gtk/1.0/clutter-gtk-1.0.4.tar.xz; - sha256 = "0kj6vsvaqxx6vqqk9acc8b0p40klrpwlf2wsjkams1kxxcpzsh87"; + url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz"; + sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"; }; propagatedBuildInputs = [ clutter gtk3 ]; From dfa357c3e46ce87557feeca74ea3dbd5bc9de22d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 20 Feb 2014 14:44:00 +0100 Subject: [PATCH 042/449] yelp: save loaders.cache in yelp-specific directory --- pkgs/desktops/gnome-3/core/yelp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index e6779abcffa4..ee98f96bc270 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; postInstall = '' - cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/loaders.cache + mkdir -p $out/lib/yelp/gdk-pixbuf-2.0/2.10.0 + cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache wrapProgram "$out/bin/yelp" \ - --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/loaders.cache` \ + --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache` \ --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" ''; From d50909f56bd8c0f1eed8c3e941f442e63e123778 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 20 Feb 2014 00:36:16 +0100 Subject: [PATCH 043/449] folks: new package --- pkgs/desktops/gnome-3/core/folks/default.nix | 42 ++++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/folks/default.nix diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix new file mode 100644 index 000000000000..9b0f403b079f --- /dev/null +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -0,0 +1,42 @@ +{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool +, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs +, telepathy_glib, evolution_data_server, libsecret, db }: + +# TODO: enable more folks backends + +stdenv.mkDerivation rec { + name = "folks-0.9.6"; + + src = fetchurl { + url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz"; + sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f"; + }; + + propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; + # dbus_daemon needed for tests + buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs + vala libsecret libxml2 libsoup nspr nss intltool db ]; + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = "--disable-fatal-warnings"; + + NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" + "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; + + enableParallelBuilding = true; + + postBuild = "rm -rf $out/share/gtk-doc"; + + installFlags = "gsettingsschemadir=\${out}/share/folks/glib-2.0/schemas/"; + + meta = { + description = "Folks"; + + homepage = https://wiki.gnome.org/Projects/Folks; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ lethalman ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 1c26c6949ca2..7ab56f088143 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -50,6 +50,8 @@ rec { libgnome_keyring = callPackage ./core/libgnome-keyring { }; + folks = callPackage ./core/folks { }; + gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; gnome_session = callPackage ./core/gnome-session { }; From 3991f590f4b1df383997ef51b959a1b270f36e37 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 20 Feb 2014 22:38:26 +0100 Subject: [PATCH 044/449] empathy: new package Messaging program which supports text, voice, video chat, and file transfers over many different protocols https://wiki.gnome.org/Apps/Empathy --- .../desktops/gnome-3/core/empathy/default.nix | 59 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 63 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/empathy/default.nix diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix new file mode 100644 index 000000000000..cfa774599e1d --- /dev/null +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -0,0 +1,59 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf +, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream +, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts +, gcr, libsecret, folks, pulseaudio, telepathy_mission_control +, telepathy_logger, libnotify, clutter, libsoup, gnutls +, evolution_data_server +, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info +, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: + +# TODO: enable more features + +stdenv.mkDerivation rec { + name = "empathy-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/empathy/3.10/${name}.tar.xz"; + sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196"; + }; + + propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard + gnome3.gnome_icon_theme hicolor_icon_theme + gnome_online_accounts shared_mime_info + gnome3.gnome_icon_theme_symbolic ]; + propagatedBuildInputs = [ folks telepathy_logger evolution_data_server + telepathy_mission_control ]; + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool + libxml2 libxslt icu file makeWrapper + telepathy_glib clutter_gtk clutter-gst cogl + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gcr libsecret pulseaudio gnome3.yelp_xsl + libnotify clutter libsoup gnutls libgee p11_kit + libcanberra_gtk3 telepathy_farstream farstream + gnome3.gsettings_desktop_schemas file libtool ]; + + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" + "-I${dbus_libs}/include/dbus-1.0" + "-I${dbus_libs}/lib/dbus-1.0/include" ]; + + enableParallelBuilding = true; + + installFlags = "gsettingsschemadir=\${out}/share/empathy/glib-2.0/schemas/"; + + postInstall = '' + mkdir -p $out/lib/empathy/gdk-pixbuf-2.0/2.10.0 + cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache + wrapProgram "$out/bin/empathy" \ + --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache` \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Empathy; + description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; + maintainers = with maintainers; [ lethalman ]; + license = [ licenses.gpl2 licenses.lgpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 7ab56f088143..15544eff9220 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -20,6 +20,8 @@ rec { dconf = callPackage ./core/dconf { }; + empathy = callPackage ./core/empathy { }; + epiphany = callPackage ./core/epiphany { }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e91329c866b7..b790057b8605 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7816,6 +7816,8 @@ let emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages; emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); + inherit (gnome3) empathy; + epdfview = callPackage ../applications/misc/epdfview { }; inherit (gnome3) epiphany; From 68a5b5e5fbaf0c379bc2185b03eda4673bb3d448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 21 Feb 2014 13:18:56 +0100 Subject: [PATCH 045/449] add xarchiver: GTK+2 only frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only) --- pkgs/tools/archivers/xarchiver/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/archivers/xarchiver/default.nix diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix new file mode 100644 index 000000000000..fc5b984bd905 --- /dev/null +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gtk2, pkgconfig, intltool }: + +stdenv.mkDerivation rec { + version = "0.5.3"; + name = "xarchiver-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/xarchiver/${name}.tar.bz2"; + sha256 = "10bdq406xkl2q6rl6qvvipdr3ini5lnh1sjykgw66fp8jns9r2f5"; + }; + + buildInputs = [ gtk2 pkgconfig intltool ]; + + meta = { + description = "GTK+2 only frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; + homepage = http://sourceforge.net/projects/xarchiver/; + mainatainers = [ stdenv.lib.maintainers.iElectric ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 229a5c8ac3b0..f7eb13f00d8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2121,6 +2121,8 @@ let xarchive = callPackage ../tools/archivers/xarchive { }; + xarchiver = callPackage ../tools/archivers/xarchiver { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; From fc4e653167708666bbb917ccb4478fa4f22657d6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 21 Feb 2014 16:20:27 +0100 Subject: [PATCH 046/449] titaniumsdk: Fix issue with APK with spaces in them --- pkgs/development/mobile/titaniumenv/build-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 8a0a8f460dec..1e32cce9c722 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation { ${if target == "android" && release then "" else if target == "android" then - ''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out'' + ''cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out'' else if target == "iphone" && release then '' cp -av build/iphone/build/* $out From f1db57f1fe3ac9f33a7c212981293f5d864ecf69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 21 Feb 2014 14:29:32 +0100 Subject: [PATCH 047/449] buildPythonPackage: fix more borken packages --- pkgs/applications/audio/quodlibet/default.nix | 5 +++++ .../python-modules/generic/default.nix | 3 +-- pkgs/development/python-modules/pil/default.nix | 5 ++--- pkgs/os-specific/linux/iotop/default.nix | 6 ------ pkgs/top-level/python-packages.nix | 17 ++++++++++------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 3ab7688cde3e..fa63c9f654ad 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -29,6 +29,11 @@ buildPythonPackage { }) ]; + preConfigure = '' + # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc + sed -i /distclass/d setup.py + ''; + sourceRoot = "quodlibet-${version}"; postUnpack = '' # the patch searches for plugins in directory ../plugins diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 2b901db7643a..067a1cdf2e27 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -72,8 +72,7 @@ python.stdenv.mkDerivation (attrs // { checkPhase = attrs.checkPhase or '' runHook preCheck - # reduce output to only dots, if a test fails error output will include verbose info - ${python}/bin/${python.executable} setup.py test -q + ${python}/bin/${python.executable} setup.py test runHook postCheck ''; diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix index 1dfdfee08fb6..0b462cb4e521 100644 --- a/pkgs/development/python-modules/pil/default.nix +++ b/pkgs/development/python-modules/pil/default.nix @@ -14,16 +14,15 @@ buildPythonPackage { doCheck = true; - configurePhase = '' + preConfigure = '' sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' ''; - buildPhase = "python setup.py build_ext -i"; checkPhase = "python selftest.py"; - #installPhase = "python setup.py install --prefix=$out"; + buildPhase = "python setup.py build_ext -i"; meta = { homepage = http://www.pythonware.com/products/pil/; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index 8e181d3d5cf5..7481edeee7b0 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -11,12 +11,6 @@ buildPythonPackage rec { pythonPath = [ pythonPackages.curses ]; - postInstall = - '' - # Put the man page in the right place. - mv $out/lib/python*/site-packages/iotop-*/share $out - ''; - doCheck = false; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b05c670aab6a..73919c330ba2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1719,6 +1719,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + # TODO: this shouldn't use a buildPythonPackage koji = buildPythonPackage (rec { name = "koji-1.8"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; @@ -1728,8 +1729,9 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; }; + configurePhase = ":"; buildPhase = ":"; - installCommand = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix"; + installPhase = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix"; doCheck = false; propagatedBuildInputs = [ pythonPackages.pycurl ]; @@ -1748,12 +1750,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { paver = buildPythonPackage rec { - version = "1.2.1"; + version = "1.2.2"; name = "Paver-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/P/Paver/Paver-${version}.tar.gz"; - sha256 = "1b1023jks1gi1rwphdy3y2zx7dh4bvwk2050kclp95j7xym1ya0y"; + sha256 = "0lix9d33ndb3yk56sm1zlj80fbmxp0w60yk0d9pr2xqxiwi88sqy"; }; buildInputs = [ cogapp mock virtualenv ]; @@ -4235,6 +4237,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; preBuild = '' @@ -5307,14 +5310,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); python_fedora = buildPythonPackage (rec { - name = "python-fedora-0.3.32.3"; + name = "python-fedora-0.3.33"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; src = fetchurl { - url = "https://fedorahosted.org/releases/p/y/python-fedora/python-fedora-0.3.32.3.tar.gz"; - sha256 = "0qwmbid4pkdj6z9gwa43fzs97fr6ci2h2vj1hyk0gp0vqim4kv4l"; + url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz"; + sha256 = "1g05bh7d5d0gzrlnhpnca7jpqbgs2rgnlzzbvzzxmdbmlkqi3mws"; }; - propagatedBuildInputs = [ kitchen requests bunch ]; + propagatedBuildInputs = [ kitchen requests bunch paver ]; doCheck = false; }); From e65eb02a35c5e70f8411f2be4e3008b32f018107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 21 Feb 2014 18:38:02 +0100 Subject: [PATCH 048/449] fix eval --- pkgs/applications/audio/guitarix/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 868fbc2cbc4b..44b0e9ef0d79 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchurl, avahi, boost fftw, gettext, glib, glibmm, gtk -, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile lv2 -, pkgconfig, python -}: +{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk +, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2 +, pkgconfig, python }: stdenv.mkDerivation rec { name = "guitarix-${version}"; From 96c481b8a0ef211967f6f6c078771d05830456b6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 21 Feb 2014 18:35:56 +0100 Subject: [PATCH 049/449] flashplayer: Update from 11.2.202.336 -> 11.2.202.341 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index ecd51f7c1109..8317f94e0796 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.336"; + version = "11.2.202.341"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "1wri6y5vllgs452dfklv23k7bp5daajnaqblkn5cb2gl28l5xcni"; + sha256 = "0d1ic70awdig0v699svmq8mmnil8xmmwsap30sgi0r94saxmq49j"; } else if stdenv.system == "i686-linux" then if debug then { @@ -58,7 +58,7 @@ let } else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0mjxjbj75r74gqpmqzqa6vlrk2wv7r358wcqbmg132bhv8kaph85"; + sha256 = "0bfz1id4035jnkwy4xm0dj8l9lygrrzqdbf8dgc9pcy8c63d1hac"; } else throw "Flash Player is not supported on this platform"; From 239112930747530e4043b8761cfba70be3575de9 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 21 Feb 2014 18:31:20 +0000 Subject: [PATCH 050/449] chromium: Update stable and beta channels stable: 33.0.1750.115 -> 33.0.1750.117 beta: 33.0.1750.115 -> 33.0.1750.117 --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 64866243261b..0a8adfee40aa 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,13 +6,13 @@ sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg"; }; beta = { - version = "33.0.1750.115"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz"; - sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp"; + version = "33.0.1750.117"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz"; + sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f"; }; stable = { - version = "33.0.1750.115"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz"; - sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp"; + version = "33.0.1750.117"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz"; + sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f"; }; } From f1459cd4b0225c07a2a818eb1cf0aad2fe5d16ed Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 17 Feb 2014 08:23:31 -0600 Subject: [PATCH 051/449] grsecurity: add gradm-3.0-201401291757 This also ensures the appropriate udev rules are installed. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/gradm/default.nix | 51 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/os-specific/linux/gradm/default.nix diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix new file mode 100644 index 000000000000..7272b5a22fab --- /dev/null +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -0,0 +1,51 @@ +{ fetchurl, stdenv, bison, flex, pam, + gcc, coreutils, findutils, binutils, bash }: + +stdenv.mkDerivation rec { + name = "gradm-${version}"; + version = "3.0-201401291757"; + + src = fetchurl { + url = "http://grsecurity.net/stable/${name}-${version}.tar.gz"; + sha256 = "19p7kaqbvf41scc63n69b5v5xzpw3mbf5zy691rply8hdm7736cw"; + }; + + buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ]; + preBuild = '' + substituteInPlace ./Makefile --replace "/usr/include/security/pam_" "${pam}/include/security/pam_" + substituteInPlace ./gradm_defs.h --replace "/sbin/grlearn" "$out/sbin/grlearn" + substituteInPlace ./gradm_defs.h --replace "/sbin/gradm" "$out/sbin/gradm" + substituteInPlace ./gradm_defs.h --replace "/sbin/gradm_pam" "$out/sbin/gradm_pam" + ''; + + postInstall = '' + mkdir -p $out/lib/udev/rules.d + cat > $out/lib/udev/rules.d/80-grsec.rules < Date: Mon, 17 Feb 2014 08:24:20 -0600 Subject: [PATCH 052/449] grsecurity: add paxctl-0.7 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/paxctl/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/paxctl/default.nix diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix new file mode 100644 index 000000000000..253c0dd5ed27 --- /dev/null +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "paxctl-${version}"; + version = "0.7"; + + src = fetchurl { + url = "https://pax.grsecurity.net/${name}-${version}.tar.bz2"; + sha256 = "1j6dg6wd1v7na5i4xj8zmbff0mdqdnw6cvqy0rsbz5anra27f1zp"; + }; + + preBuild = '' + sed "s|--owner 0 --group 0||g" -i Makefile + ''; + + makeFlags = [ + "DESTDIR=$(out)" + "MANDIR=share/man/man1" + ]; + + meta = { + description = "A tool for controlling PaX flags on a per binary basis"; + homepage = "https://pax.grsecurity.net"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18ebecb2bec0..6012c39bc854 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6986,6 +6986,8 @@ let pam_usb = callPackage ../os-specific/linux/pam_usb { }; + paxctl = callPackage ../os-specific/linux/paxctl { }; + pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { firmware = config.pcmciaUtils.firmware or []; config = config.pcmciaUtils.config or null; From 4631a65c4383a2f544154912e7fac878d4f8f7ca Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 17 Feb 2014 08:24:43 -0600 Subject: [PATCH 053/449] grsecurity: add pax-utils-0.7 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/pax-utils/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/pax-utils/default.nix diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix new file mode 100644 index 000000000000..9ab3183e92a7 --- /dev/null +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "pax-utils-${version}"; + version = "0.7"; + + src = fetchurl { + url = "http://dev.gentoo.org/~vapier/dist/${name}-${version}.tar.xz"; + sha256 = "111vmwn0ikrmy3s0w3rzpbzwrphawljrmcjya0isg5yam7lwxi0s"; + }; + + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=$(out)" + ]; + + meta = { + description = "A suite of tools for PaX/grsecurity"; + homepage = "http://dev.gentoo.org/~vapier/dist/"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6012c39bc854..bbe1b4ce51a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6988,6 +6988,8 @@ let paxctl = callPackage ../os-specific/linux/paxctl { }; + pax-utils = callPackage ../os-specific/linux/pax-utils { }; + pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { firmware = config.pcmciaUtils.firmware or []; config = config.pcmciaUtils.config or null; From 2a462ff6ae48465d744755441ddfa2c532a2886c Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 21 Feb 2014 19:56:35 +0000 Subject: [PATCH 054/449] firefox: Update from 27.0 -> 27.0.1 --- pkgs/applications/networking/browsers/firefox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index c0cfb60420b7..e7aedc6c009d 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "27.0"; + firefoxVersion = "27.0.1"; - xulVersion = "27.0"; # this attribute is used by other packages + xulVersion = "27.0.1"; # this attribute is used by other packages src = fetchurl { @@ -29,7 +29,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "ec2031385237e30be829817ac79caa8e80cc2a14"; + sha256 = "197icqnk3mpizb8c2iz86gfw3kh7x4x3szzd6s3f43x9hmyyafvh"; }; commonConfigureFlags = From 92794f775a6e7ab7639d6548a6234ab8401648ae Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 21 Feb 2014 20:21:10 +0000 Subject: [PATCH 055/449] firefox: Fix hash --- pkgs/applications/networking/browsers/firefox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index e7aedc6c009d..db89903c3ad6 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -29,7 +29,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha256 = "197icqnk3mpizb8c2iz86gfw3kh7x4x3szzd6s3f43x9hmyyafvh"; + sha256 = "13qd53yf8dn9m03p4x5ml9h3mys60nba5nz82lcvaq7ycp1pl1bn"; }; commonConfigureFlags = From 40b8b3206e329ebe6725e25b7d057af75fc666bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 21 Feb 2014 23:26:56 +0100 Subject: [PATCH 056/449] fix remaining broken python packages due to refactoring --- pkgs/applications/graphics/mirage/default.nix | 4 ---- pkgs/top-level/python-packages.nix | 9 ++++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index cd5388c1b88f..67b91fd68570 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -9,10 +9,6 @@ buildPythonPackage rec { sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c"; }; - postInstall = '' - mv $out/lib/${python.libPrefix}/site-packages/*.egg/share $out - ''; - doCheck = false; buildInputs = [ stdenv libX11 gettext ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73919c330ba2..7f5f176ebc35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1594,7 +1594,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildInputs = [ fudge nose ]; }; - fedora_cert = buildPythonPackage (rec { + fedora_cert = stdenv.mkDerivation (rec { name = "fedora-cert-0.5.9.2"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; @@ -1602,10 +1602,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9"; }; - installCommand = "make install"; - propagatedBuildInputs = [ python_fedora ]; + + propagatedBuildInputs = [ python python_fedora wrapPython ]; postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg"; doCheck = false; + + postFixup = "wrapPythonPrograms"; }); fedpkg = buildPythonPackage (rec { @@ -6176,6 +6178,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { # TODO: add ATLAS=${pkgs.atlas} preConfigure = '' export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; From 5306d974ce8aa96b6a95702b9d1565075b77654d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 16:29:01 +0100 Subject: [PATCH 057/449] haskell-aeson-0.7.x: fix build with older versions of ByteString Closes . Closes . --- pkgs/development/libraries/haskell/aeson/0.7.0.1.nix | 11 ++++++----- pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix index 551f62d07561..dd58c12473de 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix @@ -1,6 +1,7 @@ -{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl -, QuickCheck, scientific, syb, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time, unorderedContainers, vector +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit +, mtl, QuickCheck, scientific, syb, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -8,8 +9,8 @@ cabal.mkDerivation (self: { version = "0.7.0.1"; sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3"; buildDepends = [ - attoparsec deepseq dlist hashable mtl scientific syb text time - unorderedContainers vector + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb + text time unorderedContainers vector ]; testDepends = [ attoparsec HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dd996a0d5760..ba3f60d72462 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -527,7 +527,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; - aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {}; + aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix { + blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null; + }; aeson = self.aeson_0_6_2_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; From 2e079fd608e733d692ccbb73f3623c18b3a1ce42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 16:29:32 +0100 Subject: [PATCH 058/449] haskell-aeson-0.7.x: enable test suite --- pkgs/development/libraries/haskell/aeson/0.7.0.1.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix index dd58c12473de..4b5c137d89b0 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix @@ -16,7 +16,6 @@ cabal.mkDerivation (self: { attoparsec HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 text time unorderedContainers vector ]; - doCheck = false; meta = { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; From 269955a521a1855005a394a3b16d1d6d21ff7deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 21 Feb 2014 23:46:45 +0100 Subject: [PATCH 059/449] pythonPackages.psycopg2: 2.5.1 -> 2.5.2 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f5f176ebc35..5772d7a7ed52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4798,14 +4798,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.5.1"; + name = "psycopg2-2.5.2"; # error: invalid command 'test' doCheck = false; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz"; - sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5"; + url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz"; + sha256 = "0bmxlmi9k995n6pz16awjaap0y02y1v2d31jbxhkqv510f3jsf2h"; }; propagatedBuildInputs = [ pkgs.postgresql ]; From 9ad8ce91a336b718f779cf9ff21514b8207785a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 22 Feb 2014 00:55:26 +0100 Subject: [PATCH 060/449] New expression: ghc-events-analyze --- .../haskell/ghc-events-analyze/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/tools/haskell/ghc-events-analyze/default.nix diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix new file mode 100644 index 000000000000..7744a3071cce --- /dev/null +++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix @@ -0,0 +1,20 @@ +{ cabal, diagramsLib, diagramsSvg, filepath, ghcEvents, lens, mtl +, optparseApplicative, parsec, SVGFonts, thLift, transformers +}: + +cabal.mkDerivation (self: { + pname = "ghc-events-analyze"; + version = "0.2.0"; + sha256 = "04px1p0pnx54414m7sdpmdhj2dpsi1z8bjm8jq2yzh66854xiyh4"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + diagramsLib diagramsSvg filepath ghcEvents lens mtl + optparseApplicative parsec SVGFonts thLift transformers + ]; + meta = { + description = "Analyze and visualize event logs"; + 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 dd996a0d5760..b89865c5fc20 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1134,6 +1134,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; + ghcEventsAnalyze = callPackage ../development/tools/haskell/ghc-events-analyze {}; + ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view { cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled }; From 864db9c0881a4be91e3bd04bb152c46f16a28492 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:22 +0100 Subject: [PATCH 061/449] haskell-HTTP: update to version 4000.2.11 --- .../libraries/haskell/HTTP/{4000.2.10.nix => 4000.2.11.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/HTTP/{4000.2.10.nix => 4000.2.11.nix} (88%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.11.nix similarity index 88% rename from pkgs/development/libraries/haskell/HTTP/4000.2.10.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.11.nix index c893d2f1e750..f48642462c60 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.11.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.10"; - sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg"; + version = "4000.2.11"; + sha256 = "17jlmh3v6k0mhd9nh1y5pf2br17lkx4wp9sa7q81wvprw998nw97"; buildDepends = [ mtl network parsec ]; testDepends = [ caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ba3f60d72462..02e93b3360ed 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_10; + HTTP = self.HTTP_4000_2_11; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; network = self.network_2_4_2_2; @@ -1305,8 +1305,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_10 = callPackage ../development/libraries/haskell/HTTP/4000.2.10.nix {}; - HTTP = self.HTTP_4000_2_10; + HTTP_4000_2_11 = callPackage ../development/libraries/haskell/HTTP/4000.2.11.nix {}; + HTTP = self.HTTP_4000_2_11; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; From 007611cf4bdf2cea29f6b6db379ba543feb945e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:28 +0100 Subject: [PATCH 062/449] haskell-git-annex: update to version 5.20140221 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fb00474e5673..3019785a40c0 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 @@ -15,8 +15,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140210"; - sha256 = "0l5fny743v27yv7spppms64qca0mizh776b6wv8wca0wmcbc6j88"; + version = "5.20140221"; + sha256 = "0z6awqbk6kagssx26ddixbrl381c1kmsmlgaqmx087g4rwp43wqb"; isLibrary = false; isExecutable = true; buildDepends = [ From 1cfc55518b97d33243baf02ed95aadfb69a46d59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:29 +0100 Subject: [PATCH 063/449] haskell-HList: update to version 0.3.4.0 --- pkgs/development/libraries/haskell/HList/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index aafa2fae8250..fda43c09baf1 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -1,12 +1,12 @@ { cabal, cmdargs, diffutils, doctest, filepath, hspec, lens, mtl -, syb +, syb, tagged }: cabal.mkDerivation (self: { pname = "HList"; - version = "0.3.2.0"; - sha256 = "1cv27y8jg38yvfca83zn3fzq7mkzhqw7j1y7kg5fkfh4wd8ixs1f"; - buildDepends = [ mtl ]; + version = "0.3.4.0"; + sha256 = "0jx0bfsc17c6bx621n7k0wfa5s59kcpi45p6wr8g4gyw846hjw9q"; + buildDepends = [ mtl tagged ]; testDepends = [ cmdargs doctest filepath hspec lens mtl syb ]; buildTools = [ diffutils ]; doCheck = false; From 358f4de889ea12367d1104a9ae2fee469630f050 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:30 +0100 Subject: [PATCH 064/449] haskell-amqp: update to version 0.8.1 --- .../development/libraries/haskell/amqp/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 432d353a0af6..200a736f3312 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -1,18 +1,20 @@ -{ cabal, binary, clock, dataBinaryIeee754, hspec, hspecExpectations -, network, split, text, xml +{ cabal, binary, clock, connection, dataBinaryIeee754, hspec +, hspecExpectations, monadControl, network, split, text, xml }: cabal.mkDerivation (self: { pname = "amqp"; - version = "0.7.0"; - sha256 = "09zazmbdw8nphbjkmixn2dpwdgkjqjfbn6jv522ykvrcnsn35kc4"; + version = "0.8.1"; + sha256 = "10infzs2siw9vv8jgsndv7c82bsh22cs2drrb73nxpwf73hy3rzm"; isLibrary = true; isExecutable = true; buildDepends = [ - binary clock dataBinaryIeee754 network split text xml + binary clock connection dataBinaryIeee754 monadControl network + split text xml ]; testDepends = [ - binary dataBinaryIeee754 hspec hspecExpectations network split text + binary clock connection dataBinaryIeee754 hspec hspecExpectations + network split text ]; meta = { homepage = "https://github.com/hreinhardt/amqp"; From ca3491f514f02b4c1a22e6024f52b7adfcf05816 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:31 +0100 Subject: [PATCH 065/449] haskell-classy-prelude: update to version 0.8.0.1 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index f5429fb024dd..abc0841c58e2 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.8.0"; - sha256 = "02zf6v7a6bjf9z391bravx10mw0w4m4p5b78zap08z2i6fk5h91g"; + version = "0.8.0.1"; + sha256 = "0mj6zz53w6irs16w1pk65imhvnhp1rq3vq8s1n1xkf9gr13v3y9r"; buildDepends = [ basicPrelude chunkedData enclosedExceptions hashable liftedBase monoTraversable semigroups systemFilepath text time transformers From b4cc157cb590a3fd03d8296abb4ca364e5d949f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:33 +0100 Subject: [PATCH 066/449] haskell-dns: update to version 1.2.0 --- pkgs/development/libraries/haskell/dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 5434db270875..5b2d99fb90e5 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "dns"; - version = "1.1.1"; - sha256 = "1vyi0rqddaqpnh87gjracp0j3f7ai18qzr6zl6rjkszw3zfngww9"; + version = "1.2.0"; + sha256 = "1pzwvb1qycjw6qw34xhd4ap9jl0cc79d3i09b23bg0vqcz80vmpr"; buildDepends = [ attoparsec attoparsecConduit binary blazeBuilder conduit iproute mtl network networkConduit random From f7ad96cbb5c4831317ff03b289dc1ba1ed3eebfc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:34 +0100 Subject: [PATCH 067/449] haskell-hamlet: update to version 1.1.9 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index b393aed07d5f..f7456f1fdafc 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.8"; - sha256 = "093igcaycg2d29ncj9l8qbzi21drynjk8kvqfl70zqvgsm8nai7x"; + version = "1.1.9"; + sha256 = "194a4qnmpgralhvrv6813qfjjy80919famh824lyl9iryqwsbfkc"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare systemFileio systemFilepath text time From 36bc104279452ecb18cc5c1e4918db037930cbdb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:35 +0100 Subject: [PATCH 068/449] haskell-haskell-names: update to version 0.3.2.5 --- pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index 4d5e8388ea23..db9e92fc8ce6 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.4"; - sha256 = "1m3p64kkm8zv2diwila0zdincykavf2fvxpqzpsmfndwb24f5b3p"; + version = "0.3.2.5"; + sha256 = "1jp3109b742gr6ii7syacl167i1i91xsyw0200ghaad3ymrqkcvq"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass From d55f488a6134264d0718b7d79df9cc9e81970e9c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:36 +0100 Subject: [PATCH 069/449] haskell-haskell-packages: update to version 0.2.3.4 --- .../libraries/haskell/haskell-packages/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 537ff52e3ffc..4081e246a34c 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -1,13 +1,13 @@ -{ cabal, aeson, Cabal, deepseq, EitherT, filepath, haskellSrcExts +{ cabal, aeson, Cabal, deepseq, either, filepath, haskellSrcExts , hseCpp, mtl, optparseApplicative, tagged }: cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.3.3"; - sha256 = "1i3x392dwryhw6k02bd2r9wn9iwwmcqzjhk7gx5lx1vhyb470qr2"; + version = "0.2.3.4"; + sha256 = "0qj5n1yc481n5c8gi5dgk22pxj58gf7z30621spr7gwlv001sk1y"; buildDepends = [ - aeson Cabal deepseq EitherT filepath haskellSrcExts hseCpp mtl + aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl optparseApplicative tagged ]; meta = { From 2d8aa999c33dbbc6f6750e24750b984b22694b59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:37 +0100 Subject: [PATCH 070/449] haskell-http-conduit: update to version 2.0.0.7 --- .../haskell/http-conduit/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 8719028bf3d1..3f938332c02b 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,30 +1,23 @@ -{ cabal, asn1Data, base64Bytestring, blazeBuilder -, blazeBuilderConduit, caseInsensitive, certificate, conduit -, connection, cookie, cprngAes, dataDefaultClass, deepseq, failure -, filepath, hspec, httpClient, httpClientConduit +{ cabal, blazeBuilder, caseInsensitive, conduit, connection, cookie +, dataDefaultClass, hspec, httpClient, httpClientConduit , httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase -, mimeTypes, monadControl, mtl, network, networkConduit -, publicsuffixlist, random, regexCompat, resourcet, socks, text -, time, transformers, transformersBase, utf8String, void, wai, warp -, warpTls, zlibConduit +, network, networkConduit, resourcet, text, time, transformers +, utf8String, wai, warp, warpTls }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.6"; - sha256 = "0jgv17cxf8javcy4vcaayw9ajbr7dj43pba23xr6416hs6cv21hl"; + version = "2.0.0.7"; + sha256 = "0rizmshpypllfbmipbrad7hkrs2asx0ijfhr53w3pj58w6h80m0i"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers ]; testDepends = [ - asn1Data base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive certificate conduit connection cookie cprngAes - dataDefaultClass deepseq failure filepath hspec httpClient - httpClientMultipart httpTypes HUnit liftedBase mimeTypes - monadControl mtl network networkConduit publicsuffixlist random - regexCompat resourcet socks text time transformers transformersBase - utf8String void wai warp warpTls zlibConduit + blazeBuilder caseInsensitive conduit connection cookie + dataDefaultClass hspec httpClient httpClientMultipart httpTypes + HUnit liftedBase network networkConduit text time transformers + utf8String wai warp warpTls ]; doCheck = false; meta = { From aa654a5857d0f7037d46ba145913af42738ef69d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:33:38 +0100 Subject: [PATCH 071/449] haskell-mono-traversable: update to version 0.3.0.2 --- .../libraries/haskell/mono-traversable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 03eb64da753f..9c6e2c70cdf0 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.3.0.1"; - sha256 = "14vh6qhl6v46r857pfwkyhn8g8dh7q7vbm6z64zq1lhdw91ywn4f"; + version = "0.3.0.2"; + sha256 = "1aa6dm75ff822fazdnjfgggy3y2zxa8vy4dn2vvx0y8i9pgh0m0l"; buildDepends = [ comonad hashable semigroupoids semigroups text transformers unorderedContainers vector vectorInstances From 6522d4254f63a4c7ed3435134e3f7e631d62f883 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Feb 2014 23:35:28 +0100 Subject: [PATCH 072/449] haskell-primitive: update to version 0.5.2.1 --- .../libraries/haskell/primitive/0.5.2.1.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/primitive/0.5.2.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix new file mode 100644 index 000000000000..8f1090c09b1e --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.5.2.1"; + sha256 = "1vn3y5gh4lwvgvklhn8k1z7gxjy27ik621f4gpa9cb7gqa0nnl8f"; + meta = { + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + 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 02e93b3360ed..0a81703b0359 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -177,7 +177,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x alex = self.alex_3_1_3; haddock = self.haddock_2_13_2_1; happy = self.happy_1_19_3; - primitive = self.primitive_0_5_1_0; # semi-official, but specified + primitive = self.primitive_0_5_2_1; # semi-official, but specified }; haskellPlatformArgs_2013_2_0_0 = self : { @@ -1958,8 +1958,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x punycode = callPackage ../development/libraries/haskell/punycode {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; - primitive_0_5_1_0 = callPackage ../development/libraries/haskell/primitive/0.5.1.0.nix {}; - primitive = self.primitive_0_5_1_0; + primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {}; + primitive = self.primitive_0_5_0_1; profunctors = callPackage ../development/libraries/haskell/profunctors {}; From a35d4a9d4e2d4435e53fdfd1698f2118828c773f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 22 Feb 2014 10:38:13 +0100 Subject: [PATCH 073/449] unstable job: don't depend on glib-tested yet (fails) --- pkgs/top-level/release.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 84ae44ec449c..cb22983e6c37 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -35,8 +35,10 @@ let # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux + /* not ready yet jobs.glib-tested.x86_64-linux # standard glib doesn't do checks jobs.glib-tested.i686-linux + */ ]; }; From f21abed131198355b7623613472dd30330155d28 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Fri, 21 Feb 2014 12:40:05 +0100 Subject: [PATCH 074/449] nixos: Assign uid/gid to dictd's service user. --- nixos/modules/misc/ids.nix | 2 ++ nixos/modules/services/misc/dictd.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7e4c9b9b948a..95b7683ba2f1 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -113,6 +113,7 @@ munin = 102; logcheck = 103; nix-ssh = 104; + dictd = 105; # When adding a uid, make sure it doesn't match an existing gid. @@ -204,6 +205,7 @@ connman = 94; munin = 95; keys = 96; + dictd = 105; # When adding a gid, make sure it doesn't match an existing uid. diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index b84fbb3e1281..fd68f8470102 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -43,10 +43,12 @@ with pkgs.lib; group = "dictd"; description = "DICT.org dictd server"; home = "${dictdb}/share/dictd"; + uid = config.ids.uids.dictd; }; users.extraGroups = singleton { name = "dictd"; + gid = config.ids.gids.dictd; }; jobs.dictd = From afaee01ed395f254c2a64d00dbc32d4dba808145 Mon Sep 17 00:00:00 2001 From: Linquize Date: Fri, 14 Feb 2014 23:32:12 +0800 Subject: [PATCH 075/449] pycairo: Update to 1.10.0 and support both python 2 and python 3 Close #1802. --- .../python-modules/pycairo/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 1e8ceed6878f..54a50a2b71f1 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,11 +1,24 @@ { stdenv, fetchurl, python, pkgconfig, cairo, x11 }: -stdenv.mkDerivation { - name = "pycairo-1.8.8"; - src = fetchurl { - url = http://cairographics.org/releases/pycairo-1.8.8.tar.gz; - sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig"; - }; +stdenv.mkDerivation rec { + version = "1.10.0"; + name = "pycairo-${version}"; + src = if python.is_py3k or false + then fetchurl { + url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; + sha256 = "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s"; + } + else fetchurl { + url = "http://cairographics.org/releases/py2cairo-${version}.tar.bz2"; + sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k"; + }; buildInputs = [ python pkgconfig cairo x11 ]; + preConfigure = '' + sed -e 's@#!/usr/bin/env python@#!${python.executable}@' -i waf + head waf + ''; + configurePhase = "${python.executable} waf configure --prefix=$out"; + buildPhase = "${python.executable} waf"; + installPhase = "${python.executable} waf install"; } From fb1028813c948bd017e9bcaba06654b30924fc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 22 Feb 2014 17:04:34 +0100 Subject: [PATCH 076/449] subversion: minor bump to fix CVE-2014-0032 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 7a27611496b9..e699b82f2b0a 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation rec { - version = "1.8.5"; + version = "1.8.8"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha256 = "0r3mxrrlr1l9s2nh829bf0qmrfaafkq3di6ndr10j76sxkqjnlpx"; + sha256 = "1cqxwydjidyf59y4lgkxl7bra1sy28abqm2mi5971qjsv0f96s8m"; }; buildInputs = [ zlib apr aprutil sqlite ] From 0f4942ecbc7d7dcd4fbfaed31dc67936e4ccce2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 22 Feb 2014 17:13:40 +0100 Subject: [PATCH 077/449] gnome3.libgee: downgrade to latest stable, add meta Tests started to fail, and stable is preferred anyway. Cf. #1770 discussion. --- pkgs/desktops/gnome-3/core/libgee/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index 039227786522..c7ed541082d5 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: - +let + ver_maj = "0.12"; + ver_min = "0"; +in stdenv.mkDerivation rec { - name = "libgee-0.13.90"; + name = "libgee-${ver_maj}.${ver_min}"; src = fetchurl { - url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz"; - sha256 = "9496f8fb249f7850db32b50e8675998db8b5276d4568cbf043faa7e745d7b7d6"; + url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni"; }; doCheck = true; @@ -15,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } From 5a8a3195a0d7dcdb53cb21fef367aac07968380a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 22 Feb 2014 17:40:01 +0100 Subject: [PATCH 078/449] xorg.xcb-util-wm: minor update 0.4.0 -> .1 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/extra.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a0cc0c7b148d..be08477a1d20 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1180,11 +1180,11 @@ let })) // {inherit gperf m4 libxcb xproto ;}; xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) { - name = "xcb-util-wm-0.4.0"; + name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2; - sha256 = "07zmlaaqkasihmkfwcac4wclb8zws915inz57y3kr3frywc7ryb6"; + url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; + sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 90c8e489e1e3..867e050bce05 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -5,5 +5,5 @@ http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2 From c541462cb4fc901578a531f326eb8c5b55eb09a5 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 22 Feb 2014 11:31:10 +0000 Subject: [PATCH 079/449] haskellPackages.fb: New expression --- .../libraries/haskell/fb/default.nix | 32 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/haskell/fb/default.nix diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix new file mode 100644 index 000000000000..122c23296687 --- /dev/null +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -0,0 +1,32 @@ +{ cabal, aeson, attoparsec, attoparsecConduit, base16Bytestring +, base64Bytestring, cereal, conduit, cryptoApi, cryptohash +, cryptohashCryptoapi, dataDefault, hspec, httpConduit, httpTypes +, HUnit, liftedBase, monadControl, monadLogger, QuickCheck +, resourcet, text, time, transformers, transformersBase +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "fb"; + version = "0.15.2"; + sha256 = "1nkgw4978kwhqs7h6rlsspx2f9dbmsywjn57v2fg1c1lg271rz1d"; + buildDepends = [ + aeson attoparsec attoparsecConduit base16Bytestring + base64Bytestring cereal conduit cryptoApi cryptohash + cryptohashCryptoapi dataDefault httpConduit httpTypes liftedBase + monadControl monadLogger resourcet text time transformers + transformersBase unorderedContainers + ]; + testDepends = [ + aeson conduit dataDefault hspec httpConduit HUnit liftedBase + monadControl QuickCheck text time transformers + ]; + meta = { + homepage = "https://github.com/meteficha/fb"; + description = "Bindings to Facebook's API"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + # The tests require Facebook API keys + doCheck = false; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0a81703b0359..21f608b8b74d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1083,6 +1083,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fastLogger = callPackage ../development/libraries/haskell/fast-logger {}; + fb = callPackage ../development/libraries/haskell/fb {}; + fclabels = callPackage ../development/libraries/haskell/fclabels {}; FerryCore = callPackage ../development/libraries/haskell/FerryCore {}; From e310dd17745eebe8978f5c20c6a600642d7e3a7c Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 22 Feb 2014 16:49:40 +0100 Subject: [PATCH 080/449] searx: new package --- pkgs/top-level/python-packages.nix | 71 +++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5772d7a7ed52..e9c7668c151d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4915,11 +4915,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { Babel = buildPythonPackage (rec { - name = "Babel-0.9.6"; + name = "Babel-1.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz"; - sha256 = "4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f"; + sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz"; }; buildInputs = [ pytz ]; @@ -8526,6 +8526,73 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + searx = buildPythonPackage rec { + name = "searx-${version}"; + version = "0.2.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/searx/${name}.tar.gz"; + sha256 = "19hxjg3vhq7fygcvfhsr3i40c8kbi7i76ym9cv2s03b3zijd38w0"; + }; + + propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz ]; + + meta = { + homepage = https://github.com/asciimoo/searx; + description = "A privacy-respecting, hackable metasearch engine."; + license = stdenv.lib.licenses.agpl3Plus; + }; + }; + + grequests = buildPythonPackage rec { + name = "grequests-0.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grequests/${name}.tar.gz"; + sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c"; + }; + + buildInputs = [ requests gevent ]; + + meta = { + description = "GRequests allows you to use Requests with Gevent to make asyncronous HTTP Requests easily."; + homepage = https://github.com/kennethreitz/grequests; + license = "bsd"; + }; + }; + + flaskbabel = buildPythonPackage rec { + name = "Flask-Babel-0.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/F/Flask-Babel/${name}.tar.gz"; + sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa"; + }; + + buildInputs = [ flask jinja2 speaklater Babel pytz ]; + + meta = { + description = "Adds i18n/l10n support to Flask applications"; + homepage = https://github.com/mitsuhiko/flask-babel; + license = "bsd"; + }; + }; + + speaklater = buildPythonPackage rec { + name = "speaklater-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/speaklater/${name}.tar.gz"; + sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr"; + }; + + meta = { + description = "implements a lazy string for python useful for use with gettext"; + homepage = https://github.com/mitsuhiko/speaklater; + license = "bsd"; + }; + }; + # python2.7 specific eggs } // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { From e07c7d233ba6415475f8e52ca59470ef2db611d1 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 22 Feb 2014 18:03:28 +0100 Subject: [PATCH 081/449] add matejc as maintainer --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9c7668c151d..b599279d8846 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8541,6 +8541,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine."; license = stdenv.lib.licenses.agpl3Plus; + maintainers = [ stdenv.lib.maintainers.matejc ]; }; }; @@ -8558,6 +8559,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { description = "GRequests allows you to use Requests with Gevent to make asyncronous HTTP Requests easily."; homepage = https://github.com/kennethreitz/grequests; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.matejc ]; }; }; @@ -8575,6 +8577,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { description = "Adds i18n/l10n support to Flask applications"; homepage = https://github.com/mitsuhiko/flask-babel; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.matejc ]; }; }; @@ -8590,6 +8593,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { description = "implements a lazy string for python useful for use with gettext"; homepage = https://github.com/mitsuhiko/speaklater; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.matejc ]; }; }; From a188cfd37da21481a6e799593f713d2f1b4fce0b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 22 Feb 2014 11:37:10 +0000 Subject: [PATCH 082/449] postgresql: Update to latest releases --- pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.3.x.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index b027d0093e88..6f2fd4fa2dc0 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.19"; in +let version = "8.4.20"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "f744d04a5d9feeea516fa57fea92be5568527bab03a84cf660a06ce90f90dcea"; + sha256 = "e84e46083a6accd2bf37f0bd7253415649afcafc49f2564bc8481c10ed90d7c1"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 40878fc6e783..f27fdfb9c5eb 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.15"; in +let version = "9.0.16"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "a45acd27d546e425911ecd371247066be5dafd96304e50e0708c84b918c28f9d"; + sha256 = "900f6ab00fc36c94b17430e7cb22499708025da1e34d7a70aefaf9a875f0fabf"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 9eefe708798f..4d1bdbf17abc 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.11"; in +let version = "9.1.12"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "ccbc35aae1490ee5878b97a6aea48dad7465cdad296b380542e4303b68cc6f74"; + sha256 = "0b267ebab5feb39ad6ef945b9588787886e7f7e5284467921d18cc7b76bcb383"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 8f78dffb4ba3..3414424e8cae 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.6"; in +let version = "9.2.7"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886"; + sha256 = "83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index cb33c6f2921c..711bdade813c 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.3.2"; in +let version = "9.3.3"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7"; + sha256 = "e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879"; }; buildInputs = [ zlib readline ]; From 72fb60117edd01e8fda94ae57eee7b042fe2564c Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 4 Jan 2014 01:28:24 +0100 Subject: [PATCH 083/449] twmn: new package --- pkgs/applications/misc/twmn/default.nix | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/twmn/default.nix diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix new file mode 100644 index 000000000000..1c0a44da7eb6 --- /dev/null +++ b/pkgs/applications/misc/twmn/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv, fetchgit, qt4, pkgconfig, boost, dbus }: + +stdenv.mkDerivation rec { + rev = "9f52882688ba03d7aaab2e3fd83cb05cfbf1a374"; + name = "twmn-${rev}"; + + src = fetchgit { + inherit rev; + url = "https://github.com/sboli/twmn.git"; + sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3"; + }; + + buildInputs = [ qt4 pkgconfig boost ]; + propagatedBuildInputs = [ dbus ]; + + configurePhase = "qmake"; + + installPhase = '' + mkdir -p "$out/bin" + cp bin/* "$out/bin" + ''; + + meta = { + description = "A notification system for tiling window managers."; + homepage = "https://github.com/sboli/twmn"; + platforms = with stdenv.lib.platforms; linux; + }; +} From 9f06f92fd2b97bbead5e39a9d4ed7fa29f3189fc Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 22 Feb 2014 17:59:22 +0100 Subject: [PATCH 084/449] remove a dot; add matejc as maintainer --- pkgs/applications/misc/twmn/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 1c0a44da7eb6..65c2ccb5ff0b 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A notification system for tiling window managers."; + description = "A notification system for tiling window managers"; homepage = "https://github.com/sboli/twmn"; platforms = with stdenv.lib.platforms; linux; + maintainers = [ stdenv.lib.maintainers.matejc ]; }; } From 0df7152c8f7c685f6b3701bcb2900689851ebe68 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 22 Feb 2014 18:13:26 +0100 Subject: [PATCH 085/449] twmn: add twmn to all-packages.nix --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0c4155d606c..a46424836482 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8973,6 +8973,8 @@ let tribler = callPackage ../applications/networking/p2p/tribler { }; + twmn = callPackage ../applications/misc/twmn { }; + twinkle = callPackage ../applications/networking/instant-messengers/twinkle { ccrtp = ccrtp_1_8; libzrtpcpp = libzrtpcpp_1_6; From fc9022bea1cf99085df4c1f023a69b08dcfcfa99 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 19 Feb 2014 05:19:19 -0600 Subject: [PATCH 086/449] firewall: add support for TCP/UDP port ranges This is useful for packages like mosh, which use a wide UDP port range by default for incoming connections. Signed-off-by: Austin Seipp --- .../modules/services/networking/firewall.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 3c0c51e6ec8a..babde3e942b3 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -128,6 +128,17 @@ in ''; }; + networking.firewall.allowedTCPPortRanges = mkOption { + default = []; + example = [ { from = 8999; to = 9003; } ]; + type = types.listOf (types.attrsOf types.int); + description = + '' + A range of TCP ports on which incoming connections are + accepted. + ''; + }; + networking.firewall.allowedUDPPorts = mkOption { default = []; example = [ 53 ]; @@ -138,6 +149,16 @@ in ''; }; + networking.firewall.allowedUDPPortRanges = mkOption { + default = []; + example = [ { from = 60000; to = 61000; } ]; + type = types.listOf (types.attrsOf types.int); + description = + '' + Range of open UDP ports. + ''; + }; + networking.firewall.allowPing = mkOption { default = false; type = types.bool; @@ -322,6 +343,15 @@ in ) cfg.allowedTCPPorts } + # Accept connections to the allowed TCP port ranges. + ${concatMapStrings (rangeAttr: + let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in + '' + ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept + '' + ) cfg.allowedTCPPortRanges + } + # Accept packets on the allowed UDP ports. ${concatMapStrings (port: '' @@ -330,6 +360,15 @@ in ) cfg.allowedUDPPorts } + # Accept packets on the allowed UDP port ranges. + ${concatMapStrings (rangeAttr: + let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in + '' + ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept + '' + ) cfg.allowedUDPPortRanges + } + # Accept IPv4 multicast. Not a big security risk since # probably nobody is listening anyway. #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept From c895bb910d40c84062c311a18cffb1aea1caae6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 22 Feb 2014 18:20:08 +0100 Subject: [PATCH 087/449] xfce4-power-manager: update patch hash (no idea what's changed) --- pkgs/desktops/xfce/core/xfce4-power-manager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 5f38308f6d42..91ec6b40e23e 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { brightness_patch = fetchurl { url = "http://git.xfce.org/xfce/xfce4-power-manager/patch/?id=05d12e12596512f7a31d3cdb4845a69dc2d4c611"; - sha256 = "0rbldvjwpj93hx59xrmvbdql1pgkbqzjh4vp6gkavn4z6sv535v8"; + sha256 = "1y8520s0s4d7x1abdwsm5qig4vgm3np7hhagfbdwd5ymiz5nn9mw"; }; name = "${p_name}-${ver_maj}.${ver_min}"; From 72d3ce1431ec80a69388cd9ea573a91d6f9a3e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 22 Feb 2014 18:29:04 +0100 Subject: [PATCH 088/449] pythonPackages.eggdeps: disable tests, they've been failing for ages and author is not responding --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b599279d8846..b58e84f9efa3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7057,6 +7057,9 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; }; + # tests fail, see http://hydra.nixos.org/build/4316603/log/raw + doCheck = false; + propagatedBuildInputs = [ zope_interface zope_testing ]; meta = { description = "A tool which computes a dependency graph between active Python eggs"; From 88d490588d336d41b851f15bac8865f4b7bc3a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 22 Feb 2014 18:35:52 +0100 Subject: [PATCH 089/449] xorg: add some modules I was testing whether 10.1 mesa might solve the LLVM RTTI problems, and it seems mesa will need these (and the problems aren't solved). --- pkgs/servers/x11/xorg/default.nix | 30 +++++++++++++++++++++++++ pkgs/servers/x11/xorg/tarballs-7.7.list | 3 +++ 2 files changed, 33 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index be08477a1d20..beca7414c363 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -79,6 +79,16 @@ let buildInputs = [pkgconfig ]; })) // {inherit ;}; + dri3proto = (stdenv.mkDerivation ((if overrides ? dri3proto then overrides.dri3proto else x: x) { + name = "dri3proto-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; + sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; + }; + buildInputs = [pkgconfig ]; + })) // {inherit ;}; + encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) { name = "encodings-1.0.4"; builder = ./builder.sh; @@ -909,6 +919,16 @@ let buildInputs = [pkgconfig kbproto libX11 ]; })) // {inherit kbproto libX11 ;}; + libxshmfence = (stdenv.mkDerivation ((if overrides ? libxshmfence then overrides.libxshmfence else x: x) { + name = "libxshmfence-1.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2; + sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv"; + }; + buildInputs = [pkgconfig xproto ]; + })) // {inherit xproto ;}; + lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) { name = "lndir-1.0.3"; builder = ./builder.sh; @@ -959,6 +979,16 @@ let buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; + presentproto = (stdenv.mkDerivation ((if overrides ? presentproto then overrides.presentproto else x: x) { + name = "presentproto-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/proto/presentproto-1.0.tar.bz2; + sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41"; + }; + buildInputs = [pkgconfig ]; + })) // {inherit ;}; + printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { name = "printproto-1.0.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 2eb08b1831de..24279ac70f9b 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -5,6 +5,8 @@ mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2 +mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2 +mirror://xorg/individual/proto/presentproto-1.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 @@ -50,6 +52,7 @@ mirror://xorg/individual/proto/inputproto-2.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 From 5b223d457e523da555cf7bc293b808f5bab4560f Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Thu, 20 Feb 2014 13:31:16 +0400 Subject: [PATCH 090/449] zathura: set default window-icon --- pkgs/applications/misc/zathura/core/default.nix | 9 +++++++-- pkgs/applications/misc/zathura/default.nix | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index b86107890d86..933882c940bb 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }: stdenv.mkDerivation rec { version = "0.2.7"; @@ -21,7 +21,12 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; postInstall = '' - wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin" + wrapProgram "$out/bin/zathura" \ + --prefix PATH ":" "${file}/bin" \ + --prefix XDG_CONFIG_DIRS ":" "$out/etc" + + mkdir -pv $out/etc + echo "set window-icon ${zathura_icon}" > $out/etc/zathurarc ''; meta = { diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 2ee32f77c1ed..f943bff7bf0c 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -3,8 +3,11 @@ rec { inherit (pkgs) stdenv; + icon = ./icon.xpm; + zathura_core = callPackage ./core { gtk = pkgs.gtk3; + zathura_icon = icon; }; zathura_pdf_poppler = callPackage ./pdf-poppler { }; @@ -19,7 +22,7 @@ rec { zathuraWrapper = stdenv.mkDerivation { - inherit zathura_core; + inherit zathura_core icon; name = "zathura-${zathura_core.version}"; @@ -29,8 +32,6 @@ rec { zathura_ps ]; - icon = ./icon.xpm; - builder = ./builder.sh; preferLocalBuild = true; From 83c5d12d4c2b895941fe4e41b8dce7f50cb07b4b Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Sat, 22 Feb 2014 19:08:54 +0100 Subject: [PATCH 091/449] Add opam 1.1.1 --- pkgs/development/tools/ocaml/opam/1.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix index c5093db107d0..2c71f8ba49f5 100644 --- a/pkgs/development/tools/ocaml/opam/1.1.nix +++ b/pkgs/development/tools/ocaml/opam/1.1.nix @@ -30,13 +30,13 @@ let sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.1.0.zip"; - sha256 = "38a5edc1428f9e8e0d13e7017c97e1614dd651b75b4c234c80ff22f103d38bf7"; + url = "https://github.com/ocaml/opam/archive/1.1.1.zip"; + sha256 = "9c69eeb448af5a38950b2664446401ce240b9f028e0b4d26b6ac1a96938a5f03"; }; }; in stdenv.mkDerivation rec { - name = "opam-1.1.0"; + name = "opam-1.1.1"; buildInputs = [unzip curl ncurses ocaml]; From 1b60ee5f67f81cc7c89e838700ffa3f2b4cf0975 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 22 Feb 2014 19:15:46 +0100 Subject: [PATCH 092/449] paxctl: Fix URL --- pkgs/os-specific/linux/paxctl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 253c0dd5ed27..36afde6a736d 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7"; src = fetchurl { - url = "https://pax.grsecurity.net/${name}-${version}.tar.bz2"; + url = "https://pax.grsecurity.net/${name}.tar.bz2"; sha256 = "1j6dg6wd1v7na5i4xj8zmbff0mdqdnw6cvqy0rsbz5anra27f1zp"; }; From bf02ae28d666fb37f76641b108b8c1d342e1fe58 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 22 Feb 2014 19:23:27 +0100 Subject: [PATCH 093/449] gradm: Fix URL --- pkgs/os-specific/linux/gradm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 7272b5a22fab..9bce50f464f7 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.0-201401291757"; src = fetchurl { - url = "http://grsecurity.net/stable/${name}-${version}.tar.gz"; + url = "http://grsecurity.net/stable/${name}.tar.gz"; sha256 = "19p7kaqbvf41scc63n69b5v5xzpw3mbf5zy691rply8hdm7736cw"; }; From 4ee12df331602bcb1017aa269606607a63308472 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 22 Feb 2014 19:24:31 +0100 Subject: [PATCH 094/449] pax-utils: Fix URL --- pkgs/os-specific/linux/pax-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 9ab3183e92a7..46f0ecf457eb 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7"; src = fetchurl { - url = "http://dev.gentoo.org/~vapier/dist/${name}-${version}.tar.xz"; + url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; sha256 = "111vmwn0ikrmy3s0w3rzpbzwrphawljrmcjya0isg5yam7lwxi0s"; }; From 6554a490f68a64287429188ee1d222989b2919e7 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 22 Feb 2014 20:11:33 +0100 Subject: [PATCH 095/449] gradm, pax-utils, paxctl: Add myself as a maintainer --- lib/maintainers.nix | 1 + pkgs/os-specific/linux/gradm/default.nix | 8 ++++---- pkgs/os-specific/linux/pax-utils/default.nix | 8 ++++---- pkgs/os-specific/linux/paxctl/default.nix | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index fe9c2d62a01b..195e77b58204 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -74,6 +74,7 @@ vizanto = "Danny Wilson "; vlstill = "Vladimír Štill "; winden = "Antonio Vargas Gonzalez "; + wizeman = "Ricardo M. Correia "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; zimbatm = "zimbatm "; diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 9bce50f464f7..680547be57cf 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "grsecurity RBAC administration and policy analysis utility"; homepage = "https://grsecurity.net"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice wizeman ]; }; } diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 46f0ecf457eb..8d58873d5c12 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "A suite of tools for PaX/grsecurity"; homepage = "http://dev.gentoo.org/~vapier/dist/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice wizeman ]; }; } diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 36afde6a736d..d664f119c340 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { "MANDIR=share/man/man1" ]; - meta = { + meta = with stdenv.lib; { description = "A tool for controlling PaX flags on a per binary basis"; homepage = "https://pax.grsecurity.net"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice wizeman ]; }; } From 7f4b97d495db22940b7e7dc2f85eedf93b5707ce Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 22 Feb 2014 12:30:24 -0600 Subject: [PATCH 096/449] grsecurity: stable/testing updates - stable: 3.0-3.2.55-201402201903 -> 3.0-3.2.55-201402221305 - testing: 3.0-3.13.4-201402201908 -> 3.0-3.13.4-201402221308 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 49d0d37586cc..49fa176d7835 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -81,8 +81,8 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402201903.patch; - sha256 = "01kvs5z4ia5d5s4z8kfqyvh06qlw4v14hfll9n9qav6z8s5wyx10"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402221305.patch; + sha256 = "0g6mqbmjmqz4xh18cq5mn3d0zlzjlk76x0lmpwbrcapdcg5apcp5"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54 @@ -92,8 +92,8 @@ rec { grsecurity_3_0_3_13_4 = { name = "grsecurity-3.0-3.13.4"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402201908.patch; - sha256 = "140rp57hzbjljhcgvdcczfhw0ghyw1x1ga2xv5ma2pk3dml158lh"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402221308.patch; + sha256 = "0783an79485wwbsvcf8ggsmc2bwsbj1i7q6r8g22b19i9hzqmr64"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2 From 1efb6e65d24c7139d8036c8ea67c93b72ce49c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 23 Feb 2014 08:00:59 +0100 Subject: [PATCH 097/449] doc: document current conventions on package naming Mostly: encourage using dashes instead of underscores. --- doc/coding-conventions.xml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index e55f86ae3d31..61d373738f90 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -235,12 +235,7 @@ Most of the time, these are the same. For instance, the package bound to the variable name e2fsprogs in all-packages.nix, and the Nix expression is in pkgs/os-specific/linux/e2fsprogs/default.nix. -However, identifiers in the Nix language don’t allow certain -characters (e.g. dashes), so sometimes a different variable name -should be used. For instance, the -module-init-tools package is bound to the -module_init_tools variable in -all-packages.nix. + There are a few naming guidelines: @@ -261,17 +256,20 @@ should be used. For instance, the a package named hello-svn by nix-env. - Dashes in the package name should be changed to - underscores in variable names, rather than to camel case — e.g., - module_init_tools instead of - moduleInitTools. + Dashes in the package name should be preserved + in new variable names, rather than converted to underscores + (which was convention up to around 2013 and most names + still have underscores instead of dashes) — e.g., + http-parser instead of + http_parser. If there are multiple versions of a package, this should be reflected in the variable names in all-packages.nix, - e.g. hello_0_3 and hello_0_4. + e.g. json-c-0-9 and json-c-0-11. If there is an obvious “default” version, make an attribute like - hello = hello_0_4;. + json-c = json-c-0-9;. + See also @@ -288,7 +286,7 @@ dashes between words — not in camel case. For instance, it should be allPackages.nix or AllPackages.nix. -
Hierachy +
Hierarchy Each package should be stored in its own directory somewhere in the pkgs/ tree, i.e. in @@ -567,7 +565,7 @@ splitting up an existing category.
-
Versioning +
Versioning Because every version of a package in Nixpkgs creates a potential maintenance burden, old versions of a package should not be From 3f95f39baba418b04bc56f979edb263005942ba6 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 13 Feb 2014 18:49:30 +0000 Subject: [PATCH 098/449] postgresql: Build all versions on Hydra (Linux) Additionally, add @ocharles to the list of maintainers. I am only building these on Linux environments in Hydra for now, as that's the only environment I can be a maintainer for. --- pkgs/servers/sql/postgresql/8.4.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.0.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.1.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.2.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.3.x.nix | 2 ++ 5 files changed, 10 insertions(+) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 6f2fd4fa2dc0..f91f78c4d574 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index f27fdfb9c5eb..c50c6a4aba20 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -23,5 +23,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 4d1bdbf17abc..9bc971b9dfd6 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -31,5 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 3414424e8cae..3d1e0d6ec334 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -31,5 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 711bdade813c..2230c3703355 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -31,5 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; }; } From 9f08c21c2b7106ded1e6212abcf631098a0f125d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 23 Feb 2014 12:21:19 +0100 Subject: [PATCH 099/449] gnucash: enable aqbanking support for online banking This requires recent versions of aqbanking and gwenhywfar: https://devel.aqbanking.de/trac/aqbanking/ticket/197 It seems as if the developers have changed their version numbering scheme in 2012 and have only released versions with the "beta" suffix since then. --- pkgs/applications/office/gnucash/default.nix | 6 +++--- .../libraries/aqbanking/default.nix | 20 +++++++++++-------- .../libraries/gwenhywfar/default.nix | 17 +++++++++++----- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index c8ebe6e2b12c..ee0475d45ec0 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl, perlPackages +, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar }: /* If you experience GConf errors when running GnuCash on NixOS, see @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl - perlPackages.DateManip perlPackages.FinanceQuote + perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx"; + configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; postInstall = '' # Auto-updaters don't make sense in Nix. diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 7dfc6a60a99f..e162d870052a 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, gwenhywfar, pkgconfig, gmp, zlib }: +{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt +, pkgconfig, xmlsec, zlib +}: stdenv.mkDerivation rec { - name = "aqbanking-5.0.21"; + name = "aqbanking-5.4.0beta"; src = fetchurl { - url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=91&file=01&dummy=aqbanking-5.0.21.tar.gz"; + url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=112&file=01&dummy=aqbanking-5.4.0beta.tar.gz"; name = "${name}.tar.gz"; - sha256 = "1xvzg640fswkrjrkrqzj0j9lnij7kcpnyvzd7nsg1by40wxwgp52"; + sha256 = "0yd588sw9grc2c0bfyx8h39mr30pa1zxrcbv31p6pz6szilk2agh"; }; - buildInputs = [ gwenhywfar gmp zlib ]; + buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--with-gwen-dir=${gwenhywfar}"; - meta = { - maintainers = [ stdenv.lib.maintainers.urkud ]; - # Tries to install gwenhywfar plugin, thus `make install` fails + meta = with stdenv.lib; { + description = "An interface to banking tasks, file formats and country information"; + homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; hydraPlatforms = []; + maintainers = with maintainers; [ goibhniu urkud ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix index 724524e2b263..41e784bac3c6 100644 --- a/pkgs/development/libraries/gwenhywfar/default.nix +++ b/pkgs/development/libraries/gwenhywfar/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, qt4, gtk, pkgconfig, gnutls, libgcrypt }: +{ stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, qt4 }: stdenv.mkDerivation rec { - name = "gwenhywfar-4.3.1"; + name = "gwenhywfar-4.10.0beta"; src = fetchurl { - url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-4.3.1.tar.gz"; + url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-4.10.0beta.tar.gz"; name = "${name}.tar.gz"; - sha256 = "1r8ayi1nwcdcs4mncd7zigl8pk707j7whb85klsyir4nif52fxrs"; + sha256 = "1ihg2s263g540hl42y6g9wqcc4am70kv01yivsqfrpa9fnhbxm7f"; }; propagatedBuildInputs = [ gnutls libgcrypt ]; - buildInputs = [ qt4 gtk ]; + buildInputs = [ gtk qt4 ]; nativeBuildInputs = [ pkgconfig ]; QTDIR = qt4; + + meta = with stdenv.lib; { + description = "OS abstraction functions used by aqbanking and related tools"; + homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; + maintainers = with maintainers; [ goibhniu ]; + platforms = platforms.linux; + }; } From 169b452e0c62581edd488ad7df060b8312b497c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 23 Feb 2014 12:44:18 +0100 Subject: [PATCH 100/449] aqbanking, gwenhywfar: add license info --- pkgs/development/libraries/aqbanking/default.nix | 1 + pkgs/development/libraries/gwenhywfar/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index e162d870052a..226f792c45a4 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { description = "An interface to banking tasks, file formats and country information"; homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; hydraPlatforms = []; + license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu urkud ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix index 41e784bac3c6..b8ad34427291 100644 --- a/pkgs/development/libraries/gwenhywfar/default.nix +++ b/pkgs/development/libraries/gwenhywfar/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OS abstraction functions used by aqbanking and related tools"; homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; + license = licenses.lgpl21; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; }; From a131bf9be71110d6cd9934dd9169328b4701f0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 23 Feb 2014 16:57:37 +0100 Subject: [PATCH 101/449] i3minator: 0.0.3 -> 0.0.4 --- pkgs/tools/misc/i3minator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index cb12cb33c76d..08e012128c24 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -15,11 +15,11 @@ let }; in buildPythonPackage rec { name = "i3minator-${version}"; - version = "0.0.3"; + version = "0.0.4"; src = fetchurl { - url = "https://github.com/carlesso/i3minator/archive/v${version}.tar.gz"; - sha256 = "0ksb0frrhq10k5rjzk72kj5rjzak1irr9q4x4f22w2vylxq19xxa"; + url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz"; + sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw"; }; propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ]; From f6aba32af3f6d060181f1915c38f4c3d13820445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 23 Feb 2014 19:14:27 +0100 Subject: [PATCH 102/449] ardour3: update 3.5.308 -> 3.5.357 --- pkgs/applications/audio/ardour/ardour3.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 4d725b43aae6..4315a5a7547e 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -6,18 +6,16 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - # Ardour 3.5.308 tag - rev = "40d8c5ae"; + tag = "3.5.357"; in stdenv.mkDerivation rec { - name = "ardour-${version}"; - version = "3.5.308"; + name = "ardour-${tag}"; src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; - inherit rev; - sha256 = "7473c19c2aeb68bd93d512c2d4e976b23dd36d2453c877c859ad37a76f50dc8a"; + rev = "refs/tags/${tag}"; + sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42"; }; buildInputs = @@ -29,10 +27,10 @@ stdenv.mkDerivation rec { ]; patchPhase = '' - # The funny revision number is from `git describe ${rev} - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${version}-g40d8c5a\"; }\n' > libs/ardour/revision.cc + # The funny revision number is from `git describe rev` + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc # Note the different version number - sed -i '33i rev = \"3.5-308-g40d8c5a\"' wscript + sed -i '33i rev = \"3.5-357-gce4d125\"' wscript sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a46424836482..64f2bb688c4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7425,7 +7425,6 @@ let ardour3 = lowPrio (callPackage ../applications/audio/ardour/ardour3.nix { inherit (gnome) libgnomecanvas libgnomecanvasmm; - boost = boost149; }); arora = callPackage ../applications/networking/browsers/arora { }; From 4670b503b18521770c3405fcaf2455808dfbac5a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 24 Feb 2014 00:01:43 -0300 Subject: [PATCH 103/449] New package: 8086tiny, a tiny 8086 emulator --- .../virtualization/8086tiny/builder.sh | 45 +++++++++++++++++++ .../virtualization/8086tiny/default.nix | 37 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 84 insertions(+) create mode 100644 pkgs/applications/virtualization/8086tiny/builder.sh create mode 100644 pkgs/applications/virtualization/8086tiny/default.nix diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh new file mode 100644 index 000000000000..0f321e067544 --- /dev/null +++ b/pkgs/applications/virtualization/8086tiny/builder.sh @@ -0,0 +1,45 @@ + +source $stdenv/setup + +mkdir -p ./$name $out/bin $out/share/$name $out/share/doc/$name/images + +cd $name +tar xf $src +make 8086tiny + +install 8086tiny $out/bin +install bios $out/share/$name/8086tiny-bios +install fd.img $out/share/$name/8086tiny-floppy.img +install bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asmn +install docs/8086tiny.css $out/share/doc/$name +install docs/doc.html $out/share/doc/$name +for i in docs/images/*.gif +do + install $i $out/share/doc/$name/images +done + +# Refactoring "runme" script + +cat << 'EOF' >> run-8086tiny +#!/bin/sh + +# Setting vars: $1 = bios file, $2 = floppy image, $3= harddisk image +if [ $# -ne 2 -a $# -ne 3 ]; then + echo "Usage: $0 [harddisk image]" + exit 1 +fi + +bios="$1" +floppy="$2" +hdimage="$3" + +clear +stty cbreak raw -echo min 0 +8086tiny $bios $floppy $hdimage +stty cooked echo + +EOF + +patchShebangs run-8086tiny +install run-8086tiny $out/bin + diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix new file mode 100644 index 000000000000..0b4ff90e4095 --- /dev/null +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl +, localBios ? false, nasm ? null +, sdlSupport ? true, SDL ? null +}: + + +assert sdlSupport -> (SDL != null); + + +stdenv.mkDerivation rec { + + name = "8086tiny-${version}"; + version = "1.20"; + + src = fetchurl { + url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; + sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw"; + }; + + buildInputs = with stdenv.lib; + optionals localBios [ nasm ] + ++ optionals sdlSupport [ SDL ]; + + builder = ./builder.sh; + + meta = { + description = "An open-source 8086 emulator"; + longDescription = '' + 8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine. + + 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) + ''; + homepage = http://www.megalith.co.uk/8086tiny/index.html; + license = "MIT"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2592799d1b8..da606148b344 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1970,6 +1970,8 @@ let tinc = callPackage ../tools/networking/tinc { }; + tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tmpwatch = callPackage ../tools/misc/tmpwatch { }; tmux = callPackage ../tools/misc/tmux { }; From ad6bdfaf56b4b6a74850c39adde0e6a7d2a3ad20 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 24 Feb 2014 00:12:00 -0300 Subject: [PATCH 104/449] Deleting the "runme" stuff - it is not needed at all, and the run method is fully documented --- .../virtualization/8086tiny/builder.sh | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh index 0f321e067544..36c381bececc 100644 --- a/pkgs/applications/virtualization/8086tiny/builder.sh +++ b/pkgs/applications/virtualization/8086tiny/builder.sh @@ -17,29 +17,3 @@ for i in docs/images/*.gif do install $i $out/share/doc/$name/images done - -# Refactoring "runme" script - -cat << 'EOF' >> run-8086tiny -#!/bin/sh - -# Setting vars: $1 = bios file, $2 = floppy image, $3= harddisk image -if [ $# -ne 2 -a $# -ne 3 ]; then - echo "Usage: $0 [harddisk image]" - exit 1 -fi - -bios="$1" -floppy="$2" -hdimage="$3" - -clear -stty cbreak raw -echo min 0 -8086tiny $bios $floppy $hdimage -stty cooked echo - -EOF - -patchShebangs run-8086tiny -install run-8086tiny $out/bin - From 55ac3b0a93d66e1a7f80cfcfbbe615b788d8816f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Feb 2014 05:54:04 -0600 Subject: [PATCH 105/449] spark: version 0.9.0 Signed-off-by: Austin Seipp --- .../networking/cluster/spark/default.nix | 127 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 129 insertions(+) create mode 100644 pkgs/applications/networking/cluster/spark/default.nix diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix new file mode 100644 index 000000000000..18aae784cbc7 --- /dev/null +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -0,0 +1,127 @@ +{ stdenv, fetchurl, jre, bash, simpleBuildTool, python27Packages }: + +stdenv.mkDerivation rec { + name = "spark-${version}"; + version = "0.9.0"; + + src = fetchurl { + url = "http://d3kbcqa49mib13.cloudfront.net/${name}-incubating-bin-cdh4.tgz"; + sha256 = "0dgirq2ws25accijijanqij6d1mwxkrcqkmq1xsslfpz26svs1w1"; + }; + + unpackPhase = ''tar zxf $src''; + + untarDir = "spark-${version}-incubating-bin-cdh4"; + installPhase = '' + set -x + mkdir -p $out/lib $out/bin + mv ${untarDir} $out/lib + + cat > $out/bin/spark-class < []" >&2 + exit 1 + fi + + export SPARK_MEM=\''${SPARK_MEM:-1024m} + + JAVA_OPTS="" + JAVA_OPTS="\$JAVA_OPTS -Djava.library.path=\"\$SPARK_LIBRARY_PATH\"" + JAVA_OPTS="\$JAVA_OPTS -Xms\$SPARK_MEM -Xmx\$SPARK_MEM" + export JAVA_OPTS + + CLASSPATH=\`$out/lib/${untarDir}/bin/compute-classpath.sh\` + export CLASSPATH + + exec ${jre}/bin/java -cp "\$CLASSPATH" \$JAVA_OPTS "\$@" + EOF + chmod +x $out/bin/spark-class + + cat > $out/bin/spark-shell </dev/null) + if [[ ! \$? ]]; then + saved_stty="" + fi + + $out/bin/spark-class \$OPTIONS org.apache.spark.repl.Main "\$@" + + exit_status=\$? + onExit + EOF + chmod +x $out/bin/spark-shell + + cat > $out/bin/pyspark < $out/bin/spark-upload-scala < $out/bin/spark-upload-python < Date: Wed, 19 Feb 2014 05:00:45 -0600 Subject: [PATCH 106/449] ktap: add v0.5-dev from git Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/ktap/default.nix | 29 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/ktap/default.nix diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix new file mode 100644 index 000000000000..21996e26131b --- /dev/null +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, kernel }: + +stdenv.mkDerivation rec { + name = "ktap-${version}"; + version = "0.5-7ee59b19"; + src = fetchgit { + url = "https://github.com/ktap/ktap.git"; + rev = "7ee59b19d536fd3d3164ff0a0623faff827e5d97"; + sha256 = "0a46836469d0afb088e72fd6310406a86c487d17bac40e390cec8bc869e7379c"; + }; + + buildPhase = '' + make FFI=1 KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build + ''; + + installPhase = '' + mkdir -p $out/sbin + cp ktap $out/sbin + make modules_install KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out + ''; + + meta = { + description = "A lightweight script-based dynamic tracing tool for Linux."; + homepage = "http://www.ktap.org"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64f2bb688c4a..0d3eb10b9fac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6823,6 +6823,8 @@ let frandom = callPackage ../os-specific/linux/frandom { }; + ktap = callPackage ../os-specific/linux/ktap { }; + lttngModules = callPackage ../os-specific/linux/lttng-modules { }; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; From 3db6fc36f67ea713e5a78c6356d8a0ed75e41132 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Mon, 24 Feb 2014 17:30:40 +0800 Subject: [PATCH 107/449] gradle: update to 1.11 --- pkgs/development/tools/build-managers/gradle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 97b50d0019fa..f8466e5aafda 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: stdenv.mkDerivation rec { - name = "gradle-1.8"; + name = "gradle-1.11"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "00spxad9b5vddshp02cic0ds8icgb1clknl7494f467x2pxbnhm3"; + sha256 = "14a0qdzjiar97l9a0i3ds2y48p1lrqkj7skkkvhz0r29hbgkbqh7"; }; installPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-1.8.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $out/lib/gradle-launcher-1.11.jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; From aa23a9943679dc3977e7d18f486d96646d24931f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 24 Feb 2014 12:02:21 +0100 Subject: [PATCH 108/449] Add stackdriver-statsd-backend/statsd-librato-backend node packages and update existing node packages. --- pkgs/top-level/node-packages-generated.nix | 546 +++++++++++++-------- pkgs/top-level/node-packages.json | 2 + 2 files changed, 334 insertions(+), 214 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index f2b7328f35a1..d3220d30e5c6 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -412,7 +412,7 @@ buildInputs = (self.nativeDeps."archiver" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" self.by-version."zip-stream"."0.1.4" self.by-version."lazystream"."0.1.0" self.by-version."file-utils"."0.1.5" @@ -757,14 +757,14 @@ passthru.names = [ "aws-sign2" ]; }; by-spec."backbone"."*" = - self.by-version."backbone"."1.1.1"; - by-version."backbone"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-backbone-1.1.1"; + self.by-version."backbone"."1.1.2"; + by-version."backbone"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-backbone-1.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/backbone/-/backbone-1.1.1.tgz"; - name = "backbone-1.1.1.tgz"; - sha1 = "8091197fef3a58fdeae24de70d96e23ce432f399"; + url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz"; + name = "backbone-1.1.2.tgz"; + sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d"; }) ]; buildInputs = @@ -776,7 +776,7 @@ ]; passthru.names = [ "backbone" ]; }; - "backbone" = self.by-version."backbone"."1.1.1"; + "backbone" = self.by-version."backbone"."1.1.2"; by-spec."backoff"."2.1.0" = self.by-version."backoff"."2.1.0"; by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -1303,7 +1303,7 @@ deps = [ self.by-version."hat"."0.0.3" self.by-version."connect"."2.13.0" - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" ]; peerDependencies = [ ]; @@ -1937,14 +1937,14 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.1.0" = - self.by-version."clean-css"."2.1.0"; - by-version."clean-css"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.1.0"; + self.by-version."clean-css"."2.1.1"; + by-version."clean-css"."2.1.1" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.0.tgz"; - name = "clean-css-2.1.0.tgz"; - sha1 = "2884698408337a94c33cc028acd13ea4a532132e"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.1.tgz"; + name = "clean-css-2.1.1.tgz"; + sha1 = "eb0a46987629bee4550e2a1b8e6b6d6259d1e677"; }) ]; buildInputs = @@ -3162,7 +3162,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = [ - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" ]; peerDependencies = [ ]; @@ -3593,7 +3593,7 @@ self.by-version."mkpath"."0.1.0" self.by-version."binary"."0.3.0" self.by-version."touch"."0.0.2" - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.1.11" self.by-version."nopt"."2.1.2" ]; peerDependencies = [ @@ -4495,7 +4495,7 @@ ]; passthru.names = [ "execSync" ]; }; - by-spec."exit"."~0.1.1" = + by-spec."exit"."0.1.x" = self.by-version."exit"."0.1.2"; by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "node-exit-0.1.2"; @@ -4514,6 +4514,8 @@ ]; passthru.names = [ "exit" ]; }; + by-spec."exit"."~0.1.1" = + self.by-version."exit"."0.1.2"; by-spec."express"."*" = self.by-version."express"."3.4.8"; by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { @@ -5358,14 +5360,14 @@ passthru.names = [ "fresh" ]; }; by-spec."fresh"."~0.2.1" = - self.by-version."fresh"."0.2.1"; - by-version."fresh"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-fresh-0.2.1"; + self.by-version."fresh"."0.2.2"; + by-version."fresh"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-fresh-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fresh/-/fresh-0.2.1.tgz"; - name = "fresh-0.2.1.tgz"; - sha1 = "13cc0b1f53fe0e6fa6a70c18d52ce3c5c56be066"; + url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; + name = "fresh-0.2.2.tgz"; + sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77"; }) ]; buildInputs = @@ -6081,7 +6083,7 @@ (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ self.by-version."chalk"."0.4.0" - self.by-version."clean-css"."2.1.0" + self.by-version."clean-css"."2.1.1" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -6104,7 +6106,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.by-version."jshint"."2.4.3" + self.by-version."jshint"."2.4.4" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" @@ -6267,7 +6269,7 @@ self.by-version."jade"."1.1.5" self.by-version."q"."1.0.0" self.by-version."xml2js"."0.4.1" - self.by-version."msgpack"."0.2.1" + self.by-version."msgpack"."0.2.2" ]; peerDependencies = [ ]; @@ -6644,7 +6646,7 @@ self.by-version."domhandler"."2.0.3" self.by-version."domutils"."1.1.6" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -6667,7 +6669,7 @@ 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.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -6690,7 +6692,7 @@ self.by-version."domhandler"."2.2.0" self.by-version."domutils"."1.3.0" self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.1.11" ]; peerDependencies = [ ]; @@ -7034,14 +7036,14 @@ by-spec."inquirer"."~0.3.4" = self.by-version."inquirer"."0.3.5"; by-spec."inquirer"."~0.4.0" = - self.by-version."inquirer"."0.4.0"; - by-version."inquirer"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-inquirer-0.4.0"; + self.by-version."inquirer"."0.4.1"; + by-version."inquirer"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inquirer-0.4.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.0.tgz"; - name = "inquirer-0.4.0.tgz"; - sha1 = "62782d60c8a71d6328d8b4e9a5a71933cfda8f33"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.4.1.tgz"; + name = "inquirer-0.4.1.tgz"; + sha1 = "6cf74eb1a347f97a1a207bea8ad1c987d0ff4b81"; }) ]; buildInputs = @@ -7052,6 +7054,7 @@ self.by-version."cli-color"."0.2.3" self.by-version."mute-stream"."0.0.4" self.by-version."through"."2.3.4" + self.by-version."readline2"."0.1.0" ]; peerDependencies = [ ]; @@ -7075,7 +7078,7 @@ self.by-version."request"."2.27.0" self.by-version."configstore"."0.2.2" self.by-version."async"."0.2.10" - self.by-version."inquirer"."0.4.0" + self.by-version."inquirer"."0.4.1" self.by-version."object-assign"."0.1.2" self.by-version."lodash.debounce"."2.4.1" ]; @@ -7126,7 +7129,7 @@ self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" self.by-version."js-yaml"."3.0.1" - self.by-version."mongoose"."3.8.7" + self.by-version."mongoose"."3.8.8" self.by-version."gridfs-stream"."0.4.1" self.by-version."temp"."0.6.0" self.by-version."kue"."0.7.5" @@ -7359,26 +7362,26 @@ passthru.names = [ "jade" ]; }; by-spec."jayschema"."*" = - self.by-version."jayschema"."0.2.3"; - by-version."jayschema"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "jayschema-0.2.3"; + self.by-version."jayschema"."0.2.4"; + by-version."jayschema"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "jayschema-0.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.3.tgz"; - name = "jayschema-0.2.3.tgz"; - sha1 = "8f2e99d7f9dabda8d171eef2093ce9054671790d"; + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.4.tgz"; + name = "jayschema-0.2.4.tgz"; + sha1 = "de51c61702a472c579cf50adf70652b7e23977ae"; }) ]; buildInputs = (self.nativeDeps."jayschema" or []); deps = [ - self.by-version."when"."2.2.1" + self.by-version."when"."2.8.0" ]; peerDependencies = [ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.by-version."jayschema"."0.2.3"; + "jayschema" = self.by-version."jayschema"."0.2.4"; by-spec."jedediah"."~0.1.0" = self.by-version."jedediah"."0.1.1"; by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -7530,14 +7533,14 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.4.3"; - by-version."jshint"."2.4.3" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.4.3"; + self.by-version."jshint"."2.4.4"; + by-version."jshint"."2.4.4" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.4.3.tgz"; - name = "jshint-2.4.3.tgz"; - sha1 = "1beb074b4d9f817773bb5aa16882fd67164c216a"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.4.4.tgz"; + name = "jshint-2.4.4.tgz"; + sha1 = "4162238314c649f987752651e8e064e30a68706e"; }) ]; buildInputs = @@ -7549,14 +7552,15 @@ self.by-version."minimatch"."0.2.14" self.by-version."htmlparser2"."3.3.0" self.by-version."console-browserify"."0.1.6" + self.by-version."exit"."0.1.2" ]; peerDependencies = [ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.4.3"; + "jshint" = self.by-version."jshint"."2.4.4"; by-spec."jshint"."~2.4.0" = - self.by-version."jshint"."2.4.3"; + self.by-version."jshint"."2.4.4"; 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 { @@ -8096,7 +8100,7 @@ buildInputs = (self.nativeDeps."lazystream" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -8157,7 +8161,7 @@ (self.nativeDeps."less" or []); deps = [ self.by-version."mime"."1.2.11" - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."mkdirp"."0.3.5" self.by-version."clean-css"."2.0.8" self.by-version."source-map"."0.1.32" @@ -8596,7 +8600,7 @@ deps = [ self.by-version."async"."0.1.15" self.by-version."semver"."1.1.4" - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -9095,14 +9099,14 @@ by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.14"; by-spec."minimist"."~0.0.1" = - self.by-version."minimist"."0.0.7"; - by-version."minimist"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.7"; + self.by-version."minimist"."0.0.8"; + by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.7.tgz"; - name = "minimist-0.0.7.tgz"; - sha1 = "dc4c620253c542eda0d2eb91c3c6a971a11e63e7"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + name = "minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }) ]; buildInputs = @@ -9113,6 +9117,8 @@ ]; passthru.names = [ "minimist" ]; }; + by-spec."minimist"."~0.0.7" = + self.by-version."minimist"."0.0.8"; by-spec."ministyle"."~0.1.3" = self.by-version."ministyle"."0.1.3"; by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -9421,14 +9427,14 @@ by-spec."mongodb"."1.3.x" = self.by-version."mongodb"."1.3.23"; by-spec."mongoose"."*" = - self.by-version."mongoose"."3.8.7"; - by-version."mongoose"."3.8.7" = lib.makeOverridable self.buildNodePackage { - name = "node-mongoose-3.8.7"; + self.by-version."mongoose"."3.8.8"; + by-version."mongoose"."3.8.8" = lib.makeOverridable self.buildNodePackage { + name = "node-mongoose-3.8.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.7.tgz"; - name = "mongoose-3.8.7.tgz"; - sha1 = "0ce98a491097944c25b9d0d1bfe2899198284a00"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.8.tgz"; + name = "mongoose-3.8.8.tgz"; + sha1 = "ab046f1fa17b0bdf090a04b6d034d87d240a47c2"; }) ]; buildInputs = @@ -9442,7 +9448,7 @@ self.by-version."mpromise"."0.4.3" self.by-version."mpath"."0.1.1" self.by-version."regexp-clone"."0.0.1" - self.by-version."mquery"."0.5.2" + self.by-version."mquery"."0.5.3" ]; peerDependencies = [ ]; @@ -9678,15 +9684,15 @@ ]; passthru.names = [ "mpromise" ]; }; - by-spec."mquery"."0.5.2" = - self.by-version."mquery"."0.5.2"; - by-version."mquery"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-mquery-0.5.2"; + by-spec."mquery"."0.5.3" = + self.by-version."mquery"."0.5.3"; + by-version."mquery"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "node-mquery-0.5.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mquery/-/mquery-0.5.2.tgz"; - name = "mquery-0.5.2.tgz"; - sha1 = "3b844d772af24e370c52e6eca1ddbb87af8b5a71"; + url = "http://registry.npmjs.org/mquery/-/mquery-0.5.3.tgz"; + name = "mquery-0.5.3.tgz"; + sha1 = "b8a04d096ecf90bf17a81cc39b80dd4e5abcecec"; }) ]; buildInputs = @@ -9720,14 +9726,14 @@ passthru.names = [ "ms" ]; }; by-spec."msgpack".">= 0.0.1" = - self.by-version."msgpack"."0.2.1"; - by-version."msgpack"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "msgpack-0.2.1"; + self.by-version."msgpack"."0.2.2"; + by-version."msgpack"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "msgpack-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.1.tgz"; - name = "msgpack-0.2.1.tgz"; - sha1 = "5da246daa2138b4163640e486c00c4f3961e92ac"; + url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.2.tgz"; + name = "msgpack-0.2.2.tgz"; + sha1 = "e7aec9bea24d9b07940dee6cfa536c469cd1776c"; }) ]; buildInputs = @@ -9752,7 +9758,7 @@ buildInputs = (self.nativeDeps."multiparty" or []); deps = [ - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.1.11" self.by-version."stream-counter"."0.2.0" ]; peerDependencies = [ @@ -10179,7 +10185,7 @@ self.by-version."nopt"."2.2.0" self.by-version."npmlog"."0.0.6" self.by-version."osenv"."0.0.3" - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."rimraf"."2.2.6" self.by-version."semver"."2.2.1" self.by-version."tar"."0.1.19" @@ -10193,32 +10199,35 @@ by-spec."node-gyp"."~0.12.2" = self.by-version."node-gyp"."0.12.2"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.0-2"; - by-version."node-inspector"."0.7.0-2" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.0-2"; + self.by-version."node-inspector"."0.7.0"; + by-version."node-inspector"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0-2.tgz"; - name = "node-inspector-0.7.0-2.tgz"; - sha1 = "e26d3c5ee74fe99fc5c8b2adb5634dac0ca86e81"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.0.tgz"; + name = "node-inspector-0.7.0.tgz"; + sha1 = "b035e94e4bca3279ebabbb4df871ad8931919d9c"; }) ]; buildInputs = (self.nativeDeps."node-inspector" or []); deps = [ - self.by-version."socket.io"."0.9.16" self.by-version."express"."3.4.8" self.by-version."async"."0.2.10" self.by-version."glob"."3.2.8" - self.by-version."rc"."0.3.3" + self.by-version."rc"."0.3.4" self.by-version."strong-data-uri"."0.1.1" self.by-version."debug"."0.7.4" + self.by-version."ws"."0.4.31" + self.by-version."opener"."1.3.0" + self.by-version."yargs"."1.1.3" + self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.0-2"; + "node-inspector" = self.by-version."node-inspector"."0.7.0"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.0.10"; by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage { @@ -10437,14 +10446,14 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.0.14"; - by-version."nodemon"."1.0.14" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.0.14"; + self.by-version."nodemon"."1.0.15"; + by-version."nodemon"."1.0.15" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.0.15"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.14.tgz"; - name = "nodemon-1.0.14.tgz"; - sha1 = "415499efd9262b6a76cbf37385876c3343f4f0c6"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.15.tgz"; + name = "nodemon-1.0.15.tgz"; + sha1 = "32efa6b8134d579dca8894cd9e8a27d381387f11"; }) ]; buildInputs = @@ -10457,7 +10466,7 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.0.14"; + "nodemon" = self.by-version."nodemon"."1.0.15"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -10568,14 +10577,14 @@ by-spec."nopt"."~2.1.2" = self.by-version."nopt"."2.1.2"; by-spec."normalize-package-data"."~0.2.9" = - self.by-version."normalize-package-data"."0.2.9"; - by-version."normalize-package-data"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "node-normalize-package-data-0.2.9"; + self.by-version."normalize-package-data"."0.2.12"; + by-version."normalize-package-data"."0.2.12" = lib.makeOverridable self.buildNodePackage { + name = "node-normalize-package-data-0.2.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.9.tgz"; - name = "normalize-package-data-0.2.9.tgz"; - sha1 = "8be8a1c0a0b55a7df07bee2b488c67c1d8862a4b"; + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.12.tgz"; + name = "normalize-package-data-0.2.12.tgz"; + sha1 = "c8284cf0cb0466ea60ee64276b9070722c1da768"; }) ]; buildInputs = @@ -10590,14 +10599,14 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.4.3"; - by-version."npm"."1.4.3" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.4.3"; + self.by-version."npm"."1.4.4"; + by-version."npm"."1.4.4" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.4.3.tgz"; - name = "npm-1.4.3.tgz"; - sha1 = "c0b18a662731d93cfdac37df5c2b3a0cda39613c"; + url = "http://registry.npmjs.org/npm/-/npm-1.4.4.tgz"; + name = "npm-1.4.4.tgz"; + sha1 = "076616f7af95bcd08a4c5ad5cce18c5f370e0935"; }) ]; buildInputs = @@ -10621,7 +10630,7 @@ 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.4" + self.by-version."uid-number"."0.0.5" self.by-version."archy"."0.0.2" self.by-version."chownr"."0.0.1" self.by-version."npmlog"."0.0.6" @@ -10635,7 +10644,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.12" + self.by-version."npmconf"."0.1.13" self.by-version."opener"."1.3.0" self.by-version."chmodr"."0.1.0" self.by-version."cmd-shim"."1.1.1" @@ -10656,7 +10665,7 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.4.3"; + "npm" = self.by-version."npm"."1.4.4"; by-spec."npm-install-checks"."~1.0.0" = self.by-version."npm-install-checks"."1.0.0"; by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -10692,7 +10701,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."graceful-fs"."2.0.2" self.by-version."semver"."2.0.11" self.by-version."slide"."1.1.5" @@ -10721,7 +10730,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."graceful-fs"."2.0.2" self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" @@ -10749,7 +10758,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ - self.by-version."request"."2.33.0" + self.by-version."request"."2.34.0" self.by-version."graceful-fs"."2.0.2" self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" @@ -10865,14 +10874,14 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.12" = - self.by-version."npmconf"."0.1.12"; - by-version."npmconf"."0.1.12" = lib.makeOverridable self.buildNodePackage { - name = "node-npmconf-0.1.12"; + self.by-version."npmconf"."0.1.13"; + by-version."npmconf"."0.1.13" = lib.makeOverridable self.buildNodePackage { + name = "node-npmconf-0.1.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.12.tgz"; - name = "npmconf-0.1.12.tgz"; - sha1 = "7b89bbbb93fbbc449d7fac109e8164b47d105e90"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.13.tgz"; + name = "npmconf-0.1.13.tgz"; + sha1 = "d47241b5b074f554ced90cd888d0dc96e4b1a4da"; }) ]; buildInputs = @@ -10892,7 +10901,7 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.12"; + self.by-version."npmconf"."0.1.13"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -11209,7 +11218,7 @@ (self.nativeDeps."optimist" or []); deps = [ self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.7" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; @@ -11271,7 +11280,7 @@ (self.nativeDeps."optimist" or []); deps = [ self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.7" + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; @@ -11281,8 +11290,6 @@ self.by-version."optimist"."0.6.1"; by-spec."optimist"."~0.3" = self.by-version."optimist"."0.3.7"; - by-spec."optimist"."~0.3.4" = - self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.3.5" = self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.6.0" = @@ -11629,14 +11636,14 @@ by-spec."pkginfo"."0.x.x" = self.by-version."pkginfo"."0.3.0"; by-spec."plist-native"."*" = - self.by-version."plist-native"."0.2.2"; - by-version."plist-native"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-plist-native-0.2.2"; + self.by-version."plist-native"."0.2.3"; + by-version."plist-native"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-plist-native-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.2.tgz"; - name = "plist-native-0.2.2.tgz"; - sha1 = "6abde856b07a52f0d6bc027f7750f4d97ff93858"; + url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.3.tgz"; + name = "plist-native-0.2.3.tgz"; + sha1 = "76843a2da80d587b75dcbcc1634c6f3968a2af17"; }) ]; buildInputs = @@ -11648,7 +11655,7 @@ ]; passthru.names = [ "plist-native" ]; }; - "plist-native" = self.by-version."plist-native"."0.2.2"; + "plist-native" = self.by-version."plist-native"."0.2.3"; by-spec."policyfile"."0.0.4" = self.by-version."policyfile"."0.0.4"; by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -12216,20 +12223,20 @@ }; "rbytes" = self.by-version."rbytes"."1.0.0"; by-spec."rc"."~0.3.0" = - self.by-version."rc"."0.3.3"; - by-version."rc"."0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.3.3"; + self.by-version."rc"."0.3.4"; + by-version."rc"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "rc-0.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.3.3.tgz"; - name = "rc-0.3.3.tgz"; - sha1 = "2eac52d221dfdf5ba512def3ea27500a68dc3c07"; + url = "http://registry.npmjs.org/rc/-/rc-0.3.4.tgz"; + name = "rc-0.3.4.tgz"; + sha1 = "01101660fb38363c22afbddfad46ecdb92b42df9"; }) ]; buildInputs = (self.nativeDeps."rc" or []); deps = [ - self.by-version."optimist"."0.3.7" + self.by-version."minimist"."0.0.8" self.by-version."deep-extend"."0.2.8" self.by-version."ini"."1.1.0" ]; @@ -12238,7 +12245,7 @@ passthru.names = [ "rc" ]; }; by-spec."rc"."~0.3.2" = - self.by-version."rc"."0.3.3"; + self.by-version."rc"."0.3.4"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -12327,7 +12334,7 @@ deps = [ self.by-version."glob"."3.2.8" self.by-version."lru-cache"."2.5.0" - self.by-version."normalize-package-data"."0.2.9" + self.by-version."normalize-package-data"."0.2.12" self.by-version."graceful-fs"."2.0.2" ]; peerDependencies = [ @@ -12337,14 +12344,14 @@ by-spec."read-package-json"."~1.1.7" = self.by-version."read-package-json"."1.1.7"; by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.25"; - by-version."readable-stream"."1.0.25" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.0.25"; + self.by-version."readable-stream"."1.0.26"; + by-version."readable-stream"."1.0.26" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.0.26"; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.25.tgz"; - name = "readable-stream-1.0.25.tgz"; - sha1 = "df19f64e6f74fd37ecf9d3ab8dbf1e2d11c9a045"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.26.tgz"; + name = "readable-stream-1.0.26.tgz"; + sha1 = "12a9c4415f6a85374abe18b7831ba52d43105766"; }) ]; buildInputs = @@ -12357,14 +12364,14 @@ passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."1.1" = - self.by-version."readable-stream"."1.1.10"; - by-version."readable-stream"."1.1.10" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.1.10"; + self.by-version."readable-stream"."1.1.11"; + by-version."readable-stream"."1.1.11" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.1.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.10.tgz"; - name = "readable-stream-1.1.10.tgz"; - sha1 = "d4dc2e5319e9c90d1e71c69390ef62cd90827f65"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.11.tgz"; + name = "readable-stream-1.1.11.tgz"; + sha1 = "76ae0d88df2ac36c59e7c205e0cafc81c57bc07d"; }) ]; buildInputs = @@ -12379,15 +12386,15 @@ passthru.names = [ "readable-stream" ]; }; by-spec."readable-stream"."~1.0.17" = - self.by-version."readable-stream"."1.0.25"; + self.by-version."readable-stream"."1.0.26"; by-spec."readable-stream"."~1.0.2" = - self.by-version."readable-stream"."1.0.25"; + self.by-version."readable-stream"."1.0.26"; by-spec."readable-stream"."~1.0.24" = - self.by-version."readable-stream"."1.0.25"; + self.by-version."readable-stream"."1.0.26"; by-spec."readable-stream"."~1.1.8" = - self.by-version."readable-stream"."1.1.10"; + self.by-version."readable-stream"."1.1.11"; by-spec."readable-stream"."~1.1.9" = - self.by-version."readable-stream"."1.1.10"; + self.by-version."readable-stream"."1.1.11"; by-spec."readdirp"."~0.2.3" = self.by-version."readdirp"."0.2.5"; by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -12408,6 +12415,28 @@ ]; passthru.names = [ "readdirp" ]; }; + by-spec."readline2"."~0.1.0" = + self.by-version."readline2"."0.1.0"; + by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-readline2-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readline2/-/readline2-0.1.0.tgz"; + name = "readline2-0.1.0.tgz"; + sha1 = "6a272ef89731225b448e4c6799b6e50d5be12b98"; + }) + ]; + buildInputs = + (self.nativeDeps."readline2" or []); + deps = [ + self.by-version."mute-stream"."0.0.4" + self.by-version."lodash"."2.4.1" + self.by-version."chalk"."0.4.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "readline2" ]; + }; by-spec."redeyed"."~0.4.0" = self.by-version."redeyed"."0.4.2"; by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -12590,14 +12619,14 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.33.0"; - by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.33.0"; + self.by-version."request"."2.34.0"; + by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.34.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; - name = "request-2.33.0.tgz"; - sha1 = "5167878131726070ec633752ea230a2379dc65ff"; + url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; + name = "request-2.34.0.tgz"; + sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; }) ]; buildInputs = @@ -12621,9 +12650,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.33.0"; + self.by-version."request"."2.34.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.33.0"; + self.by-version."request"."2.34.0"; by-spec."request"."2.16.2" = self.by-version."request"."2.16.2"; by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { @@ -12704,9 +12733,9 @@ passthru.names = [ "request" ]; }; by-spec."request".">=2.12.0" = - self.by-version."request"."2.33.0"; + self.by-version."request"."2.34.0"; by-spec."request"."~2" = - self.by-version."request"."2.33.0"; + self.by-version."request"."2.34.0"; by-spec."request"."~2.25.0" = self.by-version."request"."2.25.0"; by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage { @@ -12833,6 +12862,35 @@ }; by-spec."request"."~2.33.0" = self.by-version."request"."2.33.0"; + by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.33.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; + name = "request-2.33.0.tgz"; + sha1 = "5167878131726070ec633752ea230a2379dc65ff"; + }) + ]; + 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.2" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.12.1" + 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-progress"."~0.3.0" = self.by-version."request-progress"."0.3.1"; by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -13246,14 +13304,14 @@ passthru.names = [ "sax" ]; }; by-spec."selenium-webdriver"."*" = - self.by-version."selenium-webdriver"."2.39.0"; - by-version."selenium-webdriver"."2.39.0" = lib.makeOverridable self.buildNodePackage { - name = "node-selenium-webdriver-2.39.0"; + self.by-version."selenium-webdriver"."2.40.0"; + by-version."selenium-webdriver"."2.40.0" = lib.makeOverridable self.buildNodePackage { + name = "node-selenium-webdriver-2.40.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.39.0.tgz"; - name = "selenium-webdriver-2.39.0.tgz"; - sha1 = "546225f2f4f53f1f490a3077e5f14092fad3d205"; + url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.40.0.tgz"; + name = "selenium-webdriver-2.40.0.tgz"; + sha1 = "ca4603c08311ec3688d67e1c8e8263cb9c1c1450"; }) ]; buildInputs = @@ -13264,7 +13322,7 @@ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.by-version."selenium-webdriver"."2.39.0"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.40.0"; by-spec."semver"."*" = self.by-version."semver"."2.2.1"; by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -13393,7 +13451,7 @@ deps = [ self.by-version."debug"."0.7.4" self.by-version."mime"."1.2.11" - self.by-version."fresh"."0.2.1" + self.by-version."fresh"."0.2.2" self.by-version."range-parser"."1.0.0" ]; peerDependencies = [ @@ -13505,7 +13563,7 @@ (self.nativeDeps."sha" or []); deps = [ self.by-version."graceful-fs"."2.0.2" - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -13870,8 +13928,6 @@ }; by-spec."socket.io"."~0.9.13" = self.by-version."socket.io"."0.9.16"; - by-spec."socket.io"."~0.9.14" = - self.by-version."socket.io"."0.9.16"; by-spec."socket.io-client"."0.9.11" = self.by-version."socket.io-client"."0.9.11"; by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage { @@ -14073,14 +14129,14 @@ passthru.names = [ "stack-trace" ]; }; by-spec."stack-trace"."0.0.x" = - self.by-version."stack-trace"."0.0.8"; - by-version."stack-trace"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-stack-trace-0.0.8"; + self.by-version."stack-trace"."0.0.9"; + by-version."stack-trace"."0.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-stack-trace-0.0.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.8.tgz"; - name = "stack-trace-0.0.8.tgz"; - sha1 = "8a9c30543ed9697f77739c67b053d8b030d86f3e"; + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + name = "stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }) ]; buildInputs = @@ -14091,6 +14147,26 @@ ]; passthru.names = [ "stack-trace" ]; }; + by-spec."stackdriver-statsd-backend"."*" = + self.by-version."stackdriver-statsd-backend"."0.1.5"; + by-version."stackdriver-statsd-backend"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "node-stackdriver-statsd-backend-0.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.1.5.tgz"; + name = "stackdriver-statsd-backend-0.1.5.tgz"; + sha1 = "6f0cda0903fd149c6f69d0e50a9e8b4efd85141b"; + }) + ]; + buildInputs = + (self.nativeDeps."stackdriver-statsd-backend" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "stackdriver-statsd-backend" ]; + }; + "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.1.5"; by-spec."statsd"."*" = self.by-version."statsd"."0.7.1"; by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage { @@ -14114,6 +14190,26 @@ passthru.names = [ "statsd" ]; }; "statsd" = self.by-version."statsd"."0.7.1"; + by-spec."statsd-librato-backend"."*" = + self.by-version."statsd-librato-backend"."0.1.2"; + by-version."statsd-librato-backend"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-statsd-librato-backend-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.2.tgz"; + name = "statsd-librato-backend-0.1.2.tgz"; + sha1 = "228718018361ef352109bb69e2e6b3af9ab7d12d"; + }) + ]; + buildInputs = + (self.nativeDeps."statsd-librato-backend" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "statsd-librato-backend" ]; + }; + "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2"; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -14148,7 +14244,7 @@ buildInputs = (self.nativeDeps."stream-counter" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" ]; peerDependencies = [ ]; @@ -14168,7 +14264,7 @@ buildInputs = (self.nativeDeps."stream-counter" or []); deps = [ - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.1.11" ]; peerDependencies = [ ]; @@ -14704,7 +14800,7 @@ buildInputs = (self.nativeDeps."through2" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" self.by-version."xtend"."2.1.2" ]; peerDependencies = [ @@ -15167,15 +15263,15 @@ ]; passthru.names = [ "uglify-to-browserify" ]; }; - by-spec."uid-number"."0" = - self.by-version."uid-number"."0.0.4"; - by-version."uid-number"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-uid-number-0.0.4"; + by-spec."uid-number"."0.0.5" = + self.by-version."uid-number"."0.0.5"; + by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-uid-number-0.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.4.tgz"; - name = "uid-number-0.0.4.tgz"; - sha1 = "5ea1d068b8c0dd1866c13aa0b76fa6e4f240cbdf"; + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"; + name = "uid-number-0.0.5.tgz"; + sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"; }) ]; buildInputs = @@ -15363,7 +15459,7 @@ self.by-version."moment"."2.5.1" self.by-version."async"."0.2.9" self.by-version."ssh2"."0.2.17" - self.by-version."rc"."0.3.3" + self.by-version."rc"."0.3.4" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" self.by-version."passport"."0.1.18" @@ -15383,7 +15479,7 @@ self.by-version."raven"."0.6.2" self.by-version."knockout"."3.0.0" self.by-version."npm-registry-client"."0.3.6" - self.by-version."npmconf"."0.1.12" + self.by-version."npmconf"."0.1.13" self.by-version."mkdirp"."0.3.5" ]; peerDependencies = [ @@ -15856,7 +15952,7 @@ self.by-version."adm-zip"."0.4.4" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.12" + self.by-version."npmconf"."0.1.13" self.by-version."phantomjs"."1.9.7-1" self.by-version."tmp"."0.0.23" self.by-version."follow-redirects"."0.0.3" @@ -15887,15 +15983,15 @@ }; by-spec."websocket-driver".">=0.3.1" = self.by-version."websocket-driver"."0.3.2"; - by-spec."when"."~2.2.1" = - self.by-version."when"."2.2.1"; - by-version."when"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-when-2.2.1"; + by-spec."when"."~2.8.0" = + self.by-version."when"."2.8.0"; + by-version."when"."2.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-when-2.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/when/-/when-2.2.1.tgz"; - name = "when-2.2.1.tgz"; - sha1 = "b1def994017350b8087f6e9a7596ab2833bdc712"; + url = "http://registry.npmjs.org/when/-/when-2.8.0.tgz"; + name = "when-2.8.0.tgz"; + sha1 = "a15eda8b6998ce74c6f4e220dbda18ce2ab3b026"; }) ]; buildInputs = @@ -15972,7 +16068,7 @@ 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.8" + self.by-version."stack-trace"."0.0.9" ]; peerDependencies = [ ]; @@ -15999,7 +16095,7 @@ self.by-version."eyes"."0.1.8" self.by-version."pkginfo"."0.2.3" self.by-version."request"."2.9.203" - self.by-version."stack-trace"."0.0.8" + self.by-version."stack-trace"."0.0.9" ]; peerDependencies = [ ]; @@ -16158,6 +16254,8 @@ ]; passthru.names = [ "ws" ]; }; + by-spec."ws"."~0.4.31" = + self.by-version."ws"."0.4.31"; by-spec."wu"."*" = self.by-version."wu"."0.1.8"; by-version."wu"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -16377,6 +16475,26 @@ ]; passthru.names = [ "xtend" ]; }; + by-spec."yargs"."~1.1.2" = + self.by-version."yargs"."1.1.3"; + by-version."yargs"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-yargs-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yargs/-/yargs-1.1.3.tgz"; + name = "yargs-1.1.3.tgz"; + sha1 = "c44ed2bb9c86d55b557f2179fea7c7013fe4c42a"; + }) + ]; + buildInputs = + (self.nativeDeps."yargs" or []); + deps = [ + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yargs" ]; + }; 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 { @@ -16482,7 +16600,7 @@ self.by-version."isbinaryfile"."2.0.1" self.by-version."dargs"."0.1.0" self.by-version."async"."0.2.10" - self.by-version."inquirer"."0.4.0" + self.by-version."inquirer"."0.4.1" self.by-version."iconv-lite"."0.2.11" self.by-version."shelljs"."0.2.6" self.by-version."findup-sync"."0.1.2" @@ -16567,7 +16685,7 @@ buildInputs = (self.nativeDeps."zip-stream" or []); deps = [ - self.by-version."readable-stream"."1.0.25" + self.by-version."readable-stream"."1.0.26" self.by-version."lodash.defaults"."2.4.1" ]; peerDependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index c7660c7a0a2f..6539fc3e6dda 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -73,6 +73,8 @@ , "generator-webapp" , "generator-angular" , "statsd" +, "statsd-librato-backend" +, "stackdriver-statsd-backend" , "ungit" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } From 51c9dbc9f3ad4cf3142d0e50b040f4ba14b84ad2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 12:41:12 +0100 Subject: [PATCH 109/449] python-wrapper: add 'ignoreCollisions' parameter (which default to 'false') --- pkgs/development/interpreters/python/wrapper.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 34af23740d5d..ccfbcfcdd42f 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" -, stdLibs ? stdenv.lib.attrValues python.modules +, stdLibs ? stdenv.lib.attrValues python.modules, ignoreCollisions ? false }: # Create a python executable that knows about additional packages. @@ -7,7 +7,8 @@ (buildEnv { name = "python-${python.version}-wrapper"; paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ]; - ignoreCollisions = false; + + inherit ignoreCollisions; postBuild = '' . "${makeWrapper}/nix-support/setup-hook" From d5211b0e0e45c840d415733b56d9be93224f1616 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 24 Feb 2014 18:05:26 +0100 Subject: [PATCH 110/449] Make initialRootPassword overrideable in all virtualisation modules, not just virtualbox. --- nixos/modules/virtualisation/amazon-image.nix | 2 +- nixos/modules/virtualisation/containers.nix | 4 ++-- nixos/modules/virtualisation/google-compute-image.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index abd2a1084bd9..99d6f927ef0b 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -164,5 +164,5 @@ with pkgs.lib; # Prevent logging in as root without a password. This doesn't really matter, # since the only PAM services that allow logging in with a null # password are local ones that are inaccessible on EC2 machines. - security.initialRootPassword = "!"; + security.initialRootPassword = mkDefault "!"; } diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index bcbfaacd703f..d87284de4fc1 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -55,7 +55,7 @@ with pkgs.lib; modules = let extraConfig = { boot.isContainer = true; - security.initialRootPassword = "!"; + security.initialRootPassword = mkDefault "!"; networking.hostName = mkDefault name; }; in [ extraConfig config.config ]; @@ -134,4 +134,4 @@ with pkgs.lib; }) config.systemd.containers; }; -} \ No newline at end of file +} diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 098c9ede8533..634932ff0077 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -114,7 +114,7 @@ with pkgs.lib; # Prevent logging in as root without a password. This doesn't really matter, # since the only PAM services that allow logging in with a null # password are local ones that are inaccessible on Google Compute machines. - security.initialRootPassword = "!"; + security.initialRootPassword = mkDefault "!"; # Configure default metadata hostnames networking.extraHosts = '' From 9c36f01edd6b339f16938fcf66b191e363edd504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 24 Feb 2014 19:17:46 +0100 Subject: [PATCH 111/449] Updating toxic and toxcore to newer code. --- .../networking/instant-messengers/toxic/default.nix | 6 +++--- pkgs/development/libraries/libtoxcore/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 23b09cf8fa11..ded2bbf92500 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -2,8 +2,8 @@ , libtoxcore, pkgconfig }: let - version = "da99d776df"; - date = "20140203"; + version = "b308e19e6b"; + date = "20140224"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0d97crkslyk7sgcsawnnwyzp31azp80yprpd6xqjcraxd442dfyj"; + sha256 = "0fgkvnpy3dl2h378h796z9md0zg05b3174fgx17b919av6j9x4ma"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 91f9e4f2f2b2..81336aed8aad 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libconfig, pkgconfig }: let - version = "dbe256cc82"; - date = "20140203"; + version = "388b1229b"; + date = "20140220"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0mqbwwqbm15p16ya8nlij23fgbafjdmnc44nm2vh47m8pyb119lc"; + sha256 = "12vggiv0gyv8a2rd5qrv04b7yhfhxb7r0yh75gg5n4jdpcbhvgsd"; }; preConfigure = '' From abca8f64f224a9ffc27c861367a0e9c9c455b08a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:16:58 +0100 Subject: [PATCH 112/449] lxc: update from 1.0.0.beta4 to 1.0.0 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 825c241e53ae..e6895bb517ff 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "lxc-1.0.0.beta4"; + name = "lxc-1.0.0"; src = fetchurl { url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; - sha256 = "174grvh5086pmbaladp5ivy2azlm7q9v5xwgc5yww2mggx99w41j"; + sha256 = "1dv78xd7mdb50x8dgjvnv2v6sdj2xv2vvar7y402ll2wh8ixmi91"; }; buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; From df4919f07027519e3f4774ded920a700a0287d96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:17:09 +0100 Subject: [PATCH 113/449] duplicity: update from 0.6.22 to 0.6.23 --- pkgs/tools/backup/duplicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 48f2757db867..ec4c00880d4d 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }: let - version = "0.6.22"; + version = "0.6.23"; in stdenv.mkDerivation { name = "duplicity-${version}"; src = fetchurl { url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz"; - sha256 = "04jskh1j85s35vfzm9gylpl7ysn5njbl0gcg92bhc7v88l29nj3g"; + sha256 = "0q0ckkmyq9z7xfbb1jajflmbzjwxpcjkkiab43rxrplm0ghz25vs"; }; installPhase = '' From b05d3e77f185277b60f746c88e940f41fde86aeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:17:24 +0100 Subject: [PATCH 114/449] spamassassin: update from 3.3.2 to 3.4.0 --- pkgs/servers/mail/spamassassin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index dc316267e6cc..03e579bda209 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -13,11 +13,11 @@ # buildPerlPackage rec { - name = "SpamAssassin-3.3.2"; + name = "SpamAssassin-3.4.0"; src = fetchurl { url = "http://apache.imsam.info/spamassassin/source/Mail-${name}.tar.bz2"; - sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7"; + sha256 = "0527rv6m5qd41l756fqh9q7sm9m2xfhhy2jchlhbmd39x6x3jfsm"; }; buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM From a0a94308692495d1f4947ffb37444a80ab7f3730 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 24 Feb 2014 15:34:57 -0500 Subject: [PATCH 115/449] Add mariadb --- pkgs/servers/sql/mariadb/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/sql/mariadb/default.nix diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix new file mode 100644 index 000000000000..e09943d86c8d --- /dev/null +++ b/pkgs/servers/sql/mariadb/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }: + +stdenv.mkDerivation rec { + name = "mariadb-10.0.8"; + + src = fetchurl { + url = "http://tweedo.com/mirror/mariadb/${name}/kvm-tarbake-jaunty-x86/${name}.tar.gz"; + md5 = "2b925d0beae8101f1f3f98102da91bf7"; + }; + + buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ]; + + cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DWITHOUT_TOKUDB=1" "-DINSTALL_SCRIPTDIR=bin" ]; + + enableParallelBuilding = true; + + meta = { + description = "An enhanced, drop-in replacement for MySQL"; + homepage = https://mariadb.org/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64f2bb688c4a..44a23e828dfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6294,6 +6294,8 @@ let #monetdb = callPackage ../servers/sql/monetdb { }; + mariadb = callPackage ../servers/sql/mariadb {}; + mongodb = callPackage ../servers/nosql/mongodb { }; riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; From 01aaf816c937d90fefca4e68703ecb9fb5650926 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:30:27 +0100 Subject: [PATCH 116/449] acpid: update from 2.0.20 to 2.0.21 --- pkgs/os-specific/linux/acpid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index c1f92476b879..a0ae59a5a5bb 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "acpid-2.0.20"; + name = "acpid-2.0.21"; src = fetchurl { url = "mirror://sourceforge/acpid2/${name}.tar.xz"; - sha256 = "0l7pzjcpf1935bn44kzgc16h00clbx73cjm2dlyhzvvb5ksvl7ka"; + sha256 = "0vv3zz8p3wxhlp35aqgqvzn6lda595wzn7php3k47jwci1cpxrn4"; }; preBuild = '' From 4d7ee5246c4e5cb0d42b2fda971f528da4b15f3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:30:40 +0100 Subject: [PATCH 117/449] isocodes: update from 3.49 to 3.51 --- pkgs/development/libraries/iso-codes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 3c408e6bc786..987e1a25d35f 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.49"; + name = "iso-codes-3.51"; src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "1ryk5i467p7xxrbrqynb35ci046yj9k9b4d3hfxzass962lz9q04"; + sha256 = "0zyp99l4m8cd6301x8zi3xxhziam6v0ic1h8qxb1l0mcjafzf8jj"; }; patchPhase = '' for i in `find . -name \*.py` From 9f714fbafa05f3b5bc78726252224fc58f25f5ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:30:47 +0100 Subject: [PATCH 118/449] iw: update from 3.11 to 3.14 --- pkgs/os-specific/linux/iw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 2609e1880b42..ab01231f3349 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-3.11"; + name = "iw-3.14"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "1zrh0pjcy0kg6n8wlr34cg3bmi3nj28rhqn5pad23a1170r2f0z9"; + sha256 = "16fr13cl02702d9yjqlgvnxvpv0w0mqn0acba39iwn2lln5b4747"; }; buildInputs = [ libnl pkgconfig ]; From 77f03b973d137857c62d9afd4329ba3b5d575ec6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:31:02 +0100 Subject: [PATCH 119/449] libmilter: update from 8.14.4 to 8.14.8 --- pkgs/development/libraries/libmilter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index c8fa978534d9..7f925cd9b2a7 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, m4}: stdenv.mkDerivation rec { - name = "libmilter-8.14.4"; + name = "libmilter-8.14.8"; src = fetchurl { - url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.4.tar.gz"; - sha256 = "1cbwz5ynl8snrdkl7ay1qhqknbyv0qsvdvcri7mb662hgi1hj0dw"; + url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.8.tar.gz"; + sha256 = "1zmhzkj3gzx8022hsrysr3nzlcmv1qisb5i4jbx91661bw96ksq2"; }; buildPhase = '' From 9a409ee3fd9d5eb9fe60a6853d19df7e60a406f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:31:19 +0100 Subject: [PATCH 120/449] libpcap: update from 1.4.0 to 1.5.3 --- pkgs/development/libraries/libpcap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 87e2a6416547..11eccb0a0e31 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.4.0"; + name = "libpcap-1.5.3"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "01klphfqxvkyjvic0hmc10qmiicqz6pv6kvb9s00kaz8f57jlskw"; + sha256 = "14wyjywrdi1ikaj6yc9c72m6m2r64z94lb0gm7k1a3q6q5cj3scs"; }; nativeBuildInputs = [ flex bison ]; From 2dc6bcbc40b2b20fbc306d9e7917b0cf20f9b534 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:31:30 +0100 Subject: [PATCH 121/449] libselinux: update from 2.2.1 to 2.2.2 --- pkgs/os-specific/linux/libselinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 2dd5bdfb24ce..e125ac3fe8e9 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libselinux-${version}"; - version = "2.2.1"; + version = "2.2.2"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; - sha256 = "17navgvljgq35bljzcdwjdj3khajc27s15binr51xkp0h29qgbcd"; + sha256 = "0gjs5cqwhqzmf0avnn0343ip69153k9z35vbp03sjvc02qs3darh"; }; buildInputs = [ pkgconfig libsepol pcre ] From 17f7c664f64e3c61affa15c652cba14e6038d487 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:31:42 +0100 Subject: [PATCH 122/449] libzip: update from 0.11.1 to 0.11.2 --- pkgs/development/libraries/libzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 914157c7a0cd..be50a58c54a0 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "libzip-0.11.1"; + name = "libzip-0.11.2"; src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; - sha256 = "15fwscng2lk0ypg45awk4y2grjqm987frnjcsnbxznfgpckrq7yy"; + sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3"; }; propagatedBuildInputs = [ zlib ]; From ce365835d7c16ff9b20513e42e1988ba31f3326e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:31:54 +0100 Subject: [PATCH 123/449] links2: update from 2.5 to 2.8 --- pkgs/applications/networking/browsers/links2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 7efdf7ed015e..9b9d9ab6db17 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.5"; + version = "2.8"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "1wlmj8s6bxgznh0pnawihyvhffzryciz3lkagcxhf7fp64zz5izm"; + sha256 = "15h07498z52jfdahzgvkphg1f7qvxnpbyfn2xmsls0d2dwwdll3r"; }; buildInputs = From 20a150a1dff8482c2a5324e2ca361b5d990bfc82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:32:04 +0100 Subject: [PATCH 124/449] memtest86: update from 4.1.0 to 4.3.3 --- pkgs/tools/misc/memtest86/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 978bb2729f84..ebf0a89a7075 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86-4.1.0"; + name = "memtest86-4.3.3"; src = fetchurl { - url = http://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz; - sha256 = "1kdvq16s8hvk7plprws33mfh7cnhmfl1m32sfgbmzygbhk5wqxxq"; + url = http://www.memtest86.com/downloads/memtest86-4.3.3-src.tar.gz; + sha256 = "1fzpk0s97lx8h1wbv2bgr6m8v4ag8i58kzr8fa25bvwyl8hks9sl"; }; preBuild = '' From 684e06c2e6089d0a4ea7297f0661dca2c32aa72a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:32:13 +0100 Subject: [PATCH 125/449] mtools: update from 4.0.17 to 4.0.18 --- pkgs/tools/filesystems/mtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index f5c07b031b80..0b666f389420 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.17"; + name = "mtools-4.0.18"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "1dpch2wsiwhyg7xhsdvmc1pws8biwqkmnqjc3mdj2bd76273bk0f"; + sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar"; }; doCheck = true; From 65aaf865a7339015a1980b927cbec9e1b4ccd345 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:32:23 +0100 Subject: [PATCH 126/449] nasm: update from 2.10 to 2.11.01 --- pkgs/development/compilers/nasm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index cbbb5608a461..76359de65753 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nasm-2.10"; + name = "nasm-2.11.01"; src = fetchurl { - url = "http://www.nasm.us/pub/nasm/releasebuilds/2.10/${name}.tar.bz2"; - sha256 = "1wcxm0il06b17wjarw8pbf9bagjhfcf7yayahmyip03qkfka2yk8"; + url = "http://www.nasm.us/pub/nasm/releasebuilds/2.11.01/${name}.tar.bz2"; + sha256 = "0p0rhq18in2hyv3gircgxj72n2b1mvr8bvjlqscpaz8m62cyvam7"; }; meta = { From dfff43fe5977b2c2ba741c22700bd6f93fb8f16a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:33:11 +0100 Subject: [PATCH 127/449] nspr: update from 4.10.2 to 4.10.3 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 2b6f952696cd..8aa8edfd3b91 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.2"; in +let version = "4.10.3"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "650e4aa35d58624bc1083ed585c81c4af09cf23c"; + sha256 = "1r81rc2v8rlvc9wfsmi98h7k4qwsqb37v5ww1c4v1nk5lsqpjmzj"; }; preConfigure = "cd nspr"; From 02a475bf75eca230725d777185d3076a66bed689 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:33:21 +0100 Subject: [PATCH 128/449] pylint: update from 0.26.0 to 0.28.0 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index d45d724ae589..df95e56377d7 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "pylint-0.26.0"; + name = "pylint-0.28.0"; namePrefix = ""; src = fetchurl { url = "http://download.logilab.org/pub/pylint/${name}.tar.gz"; - sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; + sha256 = "1077hs8zpl1q5yc6wcg645nfqc4pwbdk8vjcv0qrldbb87f3yv7a"; }; propagatedBuildInputs = [ pythonPackages.logilab_astng ]; From ddbeda014291661f4d71026020c40918c146e203 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:44:31 +0100 Subject: [PATCH 129/449] python-logilab-astng: update to version 0.24.3 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b58e84f9efa3..ff2d3be97eba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1740,11 +1740,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); logilab_astng = buildPythonPackage rec { - name = "logilab-astng-0.24.1"; + name = "logilab-astng-0.24.3"; src = fetchurl { url = "http://download.logilab.org/pub/astng/${name}.tar.gz"; - sha256 = "00qxaxsax80sknwv25xl1r49lc4gbhkxs1kjywji4ad8y1npax0s"; + sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn"; }; propagatedBuildInputs = [ logilab_common ]; From 199afbe062569cd751146c49e4acfabd3400d8f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:44:46 +0100 Subject: [PATCH 130/449] python-logilab-common: update to version 0.61.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff2d3be97eba..e6ae4b37c6e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3441,11 +3441,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; logilab_common = buildPythonPackage rec { - name = "logilab-common-0.58.2"; + name = "logilab-common-0.61.0"; src = fetchurl { url = "http://download.logilab.org/pub/common/${name}.tar.gz"; - sha256 = "0qfdyj2is0scpnkgpnqm12lh4yl27617l0irlilhk25cpgbbfbf9"; + sha256 = "09apsrcvjliawbxmfrmi1l8hlbaj87mb7n4lrlivy5maxs6yg4hd"; }; propagatedBuildInputs = [ unittest2 ]; From 2955a481073f223d039df8105906525acb0241fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:45:15 +0100 Subject: [PATCH 131/449] python-packages.nix: strip trailing whitespace --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6ae4b37c6e5..3340e3059f2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4658,7 +4658,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' ''; - + meta = { homepage = http://python-imaging.github.com/Pillow; From bac47e81686b1b56319d0fd717bc580e9842230d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 10:09:47 +0100 Subject: [PATCH 132/449] haskell-lens: update to version 4.0.4 --- .../libraries/haskell/lens/{4.0.3.nix => 4.0.4.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/development/libraries/haskell/lens/{4.0.3.nix => 4.0.4.nix} (94%) diff --git a/pkgs/development/libraries/haskell/lens/4.0.3.nix b/pkgs/development/libraries/haskell/lens/4.0.4.nix similarity index 94% rename from pkgs/development/libraries/haskell/lens/4.0.3.nix rename to pkgs/development/libraries/haskell/lens/4.0.4.nix index 9aca42a77df9..cd85c7a4e94b 100644 --- a/pkgs/development/libraries/haskell/lens/4.0.3.nix +++ b/pkgs/development/libraries/haskell/lens/4.0.4.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.0.3"; - sha256 = "01gf0hxpd136555r9ilzjrc6fyw0ng9bmr8bmkhfnkba127y7hgx"; + version = "4.0.4"; + sha256 = "14xa500afjpdfx3qqxr9dg5x8mxrna7c3b5xchqsrwck9d00cphd"; buildDepends = [ aeson bifunctors comonad constraints contravariant distributive exceptions filepath hashable mtl parallel primitive profunctors diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ed5417dfa6ea..7677173fb466 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -960,7 +960,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson { aeson = self.aeson_0_7_0_1; - lens = self.lens_4_0_3; + lens = self.lens_4_0_4; }; digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {}; @@ -1531,7 +1531,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x jsonAssertions = callPackage ../development/libraries/haskell/json-assertions { aeson = self.aeson_0_7_0_1; - lens = self.lens_4_0_3; + lens = self.lens_4_0_4; }; jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; @@ -1567,7 +1567,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {}; - lens_4_0_3 = callPackage ../development/libraries/haskell/lens/4.0.3.nix { + lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix { aeson = self.aeson_0_7_0_1; }; lens = self.lens_3_10_2; @@ -1593,7 +1593,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; linear = callPackage ../development/libraries/haskell/linear { - lens = self.lens_4_0_3; + lens = self.lens_4_0_4; }; List = callPackage ../development/libraries/haskell/List {}; @@ -2171,8 +2171,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x socks = callPackage ../development/libraries/haskell/socks {}; sparse = callPackage ../development/libraries/haskell/sparse { - lens = self.lens_4_0_3; - linear = self.linear.override { lens = self.lens_4_0_3; }; + lens = self.lens_4_0_4; + linear = self.linear.override { lens = self.lens_4_0_4; }; }; srcloc = callPackage ../development/libraries/haskell/srcloc {}; From c20be9610c04eaa5662e6292d3b82d24df043c52 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 10:10:12 +0100 Subject: [PATCH 133/449] haskell-fb: re-generate package with cabal2nix --- pkgs/development/libraries/haskell/fb/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 122c23296687..dbade4c9f84f 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -21,12 +21,11 @@ cabal.mkDerivation (self: { aeson conduit dataDefault hspec httpConduit HUnit liftedBase monadControl QuickCheck text time transformers ]; + doCheck = false; meta = { homepage = "https://github.com/meteficha/fb"; description = "Bindings to Facebook's API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - # The tests require Facebook API keys - doCheck = false; }) From eedfd782188402a58a50c2692b570f0203cc2d5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 10:11:55 +0100 Subject: [PATCH 134/449] haskell-asn1-encoding: update to version 0.8.1.3 --- pkgs/development/libraries/haskell/asn1-encoding/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix index c151da0c7dda..623657ee762b 100644 --- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix +++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-encoding"; - version = "0.8.1.2"; - sha256 = "01i7zga9nfvccgjixnxza9mi7jj4k6308g8asnljr44s1k8rikwm"; + version = "0.8.1.3"; + sha256 = "000rajx9gdxfyx521yg2mvp1z8h61sr96w1lzwawiw7n5ng6v8ni"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Types mtl text time ]; From 75a2d1b2f03bed1f1e2804101562c6baa65e8d6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 10:11:57 +0100 Subject: [PATCH 135/449] haskell-crypto-pubkey-types: update to version 0.4.2.1 --- .../libraries/haskell/crypto-pubkey-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index ba5007e789fa..7d6a5c1b6153 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.4.1"; - sha256 = "1zs0hhpqcfsdyfr3z96m8lwxrxr3mf27wvjrpvih9jlvh64vp1pr"; + version = "0.4.2.1"; + sha256 = "01jxvx4bjk4qj024ydwskp942gsgy15i9jfh3diq9la8yqnidwj2"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; From efcaa154440dd7a13dc0c2688be98b7688e72048 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 10:11:58 +0100 Subject: [PATCH 136/449] haskell-hoogle: update to version 4.2.29 --- .../libraries/haskell/hoogle/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 7744a705efc3..9f8c10f86fb2 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -1,19 +1,20 @@ { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes -, parsec, random, safe, shake, tagsoup, text, time, transformers -, uniplate, wai, warp +, parsec, QuickCheck, random, safe, shake, tagsoup, text, time +, transformers, uniplate, vector, vectorAlgorithms, wai, warp }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.28"; - sha256 = "0dd8qsspbcb76ld9v61x2jjsyxakrasww69gzzprb4dxzm58lsid"; + version = "4.2.29"; + sha256 = "0w4fgf0qvd5zsa7dk99vcbr2pnyyg1hl3k0zwvp5v26v1lfijzil"; isLibrary = true; isExecutable = true; buildDepends = [ aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit - deepseq filepath haskellSrcExts httpTypes parsec random safe shake - tagsoup text time transformers uniplate wai warp + deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random + safe shake tagsoup text time transformers uniplate vector + vectorAlgorithms wai warp ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; From 3912c15aa8a021260124e502f97e139a4540c019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 10:12:00 +0100 Subject: [PATCH 137/449] haskell-io-streams: update to version 1.1.4.2 --- pkgs/development/libraries/haskell/io-streams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index e582b0bce8ff..fcc39dfad573 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.1.4.0"; - sha256 = "0fkys15ih3ld4l5rqjlsmhdkf9w3xnhj6hbbahazx7pj0xsv1hyh"; + version = "1.1.4.2"; + sha256 = "0x6d0j41wnxl2h9xzbybmzqrrna3hc17786k65cpiby2x3nlp799"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings From 3b3afdce578e80019785b4386933aa7c89cb8549 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 10:12:04 +0100 Subject: [PATCH 138/449] haskell-shakespeare-text: update to version 1.0.2 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 95ae94a8f26a..fa5b91dd4693 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.1"; - sha256 = "1vxy1d8r9wd8qijmy2jm7c7y7wg77qnzsh1ga0rlh3nklj9w01ml"; + version = "1.0.2"; + sha256 = "0vhk5g5pm3gz8gzr7cbvkp920x4lmb9pkb9k6yhlj8wfb93bg93q"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { From 7fc5eea0f3a1c621f457c0ebb52afbf356629557 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 10:12:05 +0100 Subject: [PATCH 139/449] haskell-x509: update to version 1.4.9 --- pkgs/development/libraries/haskell/x509/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index 0aababd4715b..979f477e0858 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "x509"; - version = "1.4.7"; - sha256 = "0bm5sijahpih2c6scz3y32904wzvmllgslg9d547cksbgy7lyx1h"; + version = "1.4.9"; + sha256 = "0yrlkmrc0ygki61wlfvavvrm5aklircrj5w1nbvjlimrc4j8vq9g"; buildDepends = [ asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes filepath mtl pem time From e4f4e42896bc8d05eb62f95e7f3418b62bf3a115 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:22:58 +0100 Subject: [PATCH 140/449] haskell-multiarg: update to version 0.24.0.4 --- pkgs/development/libraries/haskell/multiarg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 737ddbda5d63..ba2249c717ad 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.24.0.2"; - sha256 = "0jqkqw0v9dzby6cm0ijj1ff5dpps8hbjnhrscf2qwja9x974686s"; + version = "0.24.0.4"; + sha256 = "1f572046hlv2yngqa4bcxc4kwi8sc5q7v2dw2aap6pv7jfm8m8ws"; buildDepends = [ utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; From 38d51bdf3b4b1f939f51fdd5761b189f8ba96cc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:22:59 +0100 Subject: [PATCH 141/449] haskell-multirec: update to version 0.7.4 --- pkgs/development/libraries/haskell/multirec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index 61de0cace5b5..85c2a671dbf3 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.7.3"; - sha256 = "0k1wbjsvkl08nwjikflc8yyalk654mf8bvi1rhm28i4na52myi5y"; + version = "0.7.4"; + sha256 = "01mligrin7fp3fnnwgv8nrww5938ryghgyw9xyw153a615ryj8i9"; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic programming for families of recursive datatypes"; From f49ce8adc7523bd585ee8a43f3f2ff69cdbc48de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:23:00 +0100 Subject: [PATCH 142/449] haskell-threepenny-gui: update to version 0.4.1.0 --- .../libraries/haskell/threepenny-gui/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index 70f96c8ac9d7..1855f4938120 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -1,17 +1,18 @@ -{ cabal, attoparsecEnumerator, dataDefault, deepseq, filepath -, hashable, json, MonadCatchIOTransformers, network, safe, snapCore -, snapServer, stm, text, time, transformers, unorderedContainers -, utf8String, vault, websockets, websocketsSnap +{ cabal, aeson, attoparsecEnumerator, dataDefault, deepseq +, filepath, hashable, MonadCatchIOTransformers, network, safe +, snapCore, snapServer, stm, text, time, transformers +, unorderedContainers, utf8String, vault, websockets +, websocketsSnap }: cabal.mkDerivation (self: { pname = "threepenny-gui"; - version = "0.4.0.2"; - sha256 = "0dx6jrpxvd6ypz314hmq8nngy0wjx3bwx3r9h1c6y70id31lr9pg"; + version = "0.4.1.0"; + sha256 = "0fafwnlbl96z9m5fr3wiyv090fga78cr9hrd4yd3vyiz44gfrpcw"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsecEnumerator dataDefault deepseq filepath hashable json + aeson attoparsecEnumerator dataDefault deepseq filepath hashable MonadCatchIOTransformers network safe snapCore snapServer stm text time transformers unorderedContainers utf8String vault websockets websocketsSnap From ec09c7d34e6edf9c503cde439252f0dd5d721a7e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Feb 2014 21:23:01 +0100 Subject: [PATCH 143/449] haskell-cpphs: update to version 1.18.2 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index fca4efc8661a..2f86e8ad0128 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.1"; - sha256 = "1fshsd1dzmrl3qbpwf7r2c30d08l77080j9cfchcgy1lijjr9vhm"; + version = "1.18.2"; + sha256 = "0b8hkb2sfacmpi3rwr62myn4kfpwbfdlv9k0vnhk3wvl1v4wf29l"; isLibrary = true; isExecutable = true; meta = { From 20567eba1f740350932ba5643c2613204488a396 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sun, 16 Feb 2014 23:58:51 -0800 Subject: [PATCH 144/449] correct tapButtons in synaptics config. Dont rely on the X11 input settings to take the last option. --- .../services/x11/hardware/synaptics.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 91e01f2e30b1..fe9dcd51a7a6 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -2,9 +2,23 @@ with pkgs.lib; -let cfg = config.services.xserver.synaptics; in - -{ +let cfg = config.services.xserver.synaptics; + tapConfig = if cfg.tapButtons then enabledTapConfig else disabledTapConfig; + enabledTapConfig = '' + Option "MaxTapTime" "180" + Option "MaxTapMove" "220" + Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}" + Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}" + Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}" + ''; + disabledTapConfig = '' + Option "MaxTapTime" "0" + Option "MaxTapMove" "0" + Option "TapButton1" "0" + Option "TapButton2" "0" + Option "TapButton3" "0" + ''; +in { options = { @@ -106,15 +120,10 @@ let cfg = config.services.xserver.synaptics; in MatchIsTouchpad "on" ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Driver "synaptics" - Option "MaxTapTime" "180" - Option "MaxTapMove" "220" Option "MinSpeed" "${cfg.minSpeed}" Option "MaxSpeed" "${cfg.maxSpeed}" Option "AccelFactor" "${cfg.accelFactor}" - ${if cfg.tapButtons then "" else ''Option "MaxTapTime" "0"''} - Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}" - Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}" - Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}" + ${optionalString cfg.tapButtons tapConfig} Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" From 0d4a9e3aa68da5f82fff724baee9168b50a485c8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Feb 2014 07:44:45 -0500 Subject: [PATCH 145/449] Allow httpd subservices to set the document root Only the main service OR one of the subservices can set the document root. This is used by mediawiki when it is hosted at the root of the vhost. --- .../services/web-servers/apache-httpd/default.nix | 9 +++++++-- .../services/web-servers/apache-httpd/mediawiki.nix | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index b96f5cf159b0..f239d4fd6c35 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -63,6 +63,7 @@ let enablePHP = false; phpOptions = ""; options = {}; + documentRoot = null; }; res = defaults // svcFunction { inherit config pkgs serverInfo php; }; in res; @@ -188,7 +189,11 @@ let subservices = callSubservices serverInfo cfg.extraSubservices; - documentRoot = if cfg.documentRoot != null then cfg.documentRoot else + maybeDocumentRoot = fold (svc: acc: + if acc == null then svc.documentRoot else assert svc.documentRoot == null; acc + ) null ([ cfg ] ++ subservices); + + documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else pkgs.runCommand "empty" {} "ensureDir $out"; documentRootConf = '' @@ -240,7 +245,7 @@ let ${robotsConf} - ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""} + ${if isMainServer || maybeDocumentRoot != null then documentRootConf else ""} ${if cfg.enableUserDir then '' diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index af2e2cae797f..7cb513f63020 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -126,7 +126,7 @@ in ''} - Alias ${config.urlPrefix} ${mediawikiRoot} + ${optionalString (config.urlPrefix != "") "Alias ${config.urlPrefix} ${mediawikiRoot}"} Order allow,deny @@ -139,6 +139,8 @@ in ''} ''; + documentRoot = if config.urlPrefix == "" then mediawikiRoot else null; + enablePHP = true; options = { From 793328e1eee25513c974fc491af5e32fc38f40d8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Feb 2014 09:13:40 -0500 Subject: [PATCH 146/449] Mediawiki: Add some needed rewrites --- .../services/web-servers/apache-httpd/mediawiki.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 7cb513f63020..9f4189e4d499 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -137,6 +137,13 @@ in ${optionalString (config.articleUrlPrefix != "") '' Alias ${config.articleUrlPrefix} ${mediawikiRoot}/index.php ''} + + RewriteEngine On + RewriteCond ${mediawikiRoot}/$0 !-f + RewriteCond ${mediawikiRoot}/$0 !-d + RewriteRule ^(.*)$ ${mediawikiRoot}/index.php [L] + + RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */ ''; documentRoot = if config.urlPrefix == "" then mediawikiRoot else null; From 1f42fa7cc0bfd89975ba3193414fb1caed36e76f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Feb 2014 10:49:15 -0500 Subject: [PATCH 147/449] Add hspec-expectations-lens haskell package --- .../haskell/hspec-expectations-lens/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix diff --git a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix new file mode 100644 index 000000000000..9ea5ff57efc7 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix @@ -0,0 +1,15 @@ +{ cabal, hspec, hspecExpectations, HUnit, lens, silently }: + +cabal.mkDerivation (self: { + pname = "hspec-expectations-lens"; + version = "0.3.0.0"; + sha256 = "1v6j4z3gv41jlhbi8ngx7h6d78l1fazvd3bw3c67zsnlgqrvl1x5"; + buildDepends = [ hspec hspecExpectations HUnit lens ]; + testDepends = [ hspec lens silently ]; + meta = { + homepage = "http://supki.github.io/hspec-expectations-lens/"; + description = "Hspec expectations for the lens stuff"; + 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 7677173fb466..4e98564e1325 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1430,6 +1430,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; + hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens { + lens = self.lens_4_0_4; + }; + hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; From 9ef06bd3871c9452badb6f1c71f1609c6787e84b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Feb 2014 11:09:26 -0500 Subject: [PATCH 148/449] Add libjenkins haskell package --- .../libraries/haskell/libjenkins/default.nix | 26 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/haskell/libjenkins/default.nix diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix new file mode 100644 index 000000000000..977ef112f09e --- /dev/null +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -0,0 +1,26 @@ +{ cabal, async, conduit, doctest, filepath, free, hspec +, hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens +, monadControl, network, text, transformers, xmlConduit +}: + +cabal.mkDerivation (self: { + pname = "libjenkins"; + version = "0.4.2.0"; + sha256 = "11013klk2gvcaf2d2gmi0bf3jg2m82li19szqlwb325kdjmdf546"; + buildDepends = [ + async conduit free httpClient httpConduit httpTypes lens + monadControl network text transformers xmlConduit + ]; + testDepends = [ + async conduit doctest filepath free hspec hspecExpectationsLens + httpClient httpConduit httpTypes lens monadControl network text + transformers xmlConduit + ]; + meta = { + description = "Jenkins API interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + # Test wants access to /etc/ssl + doCheck = false; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4e98564e1325..227e6be1eb27 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1586,6 +1586,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x libffi = pkgs.libffi; }; + libjenkins = callPackage ../development/libraries/haskell/libjenkins { + lens = self.lens_4_0_4; + }; + libmpd = callPackage ../development/libraries/haskell/libmpd {}; liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; From c11f32acdf736614b5df7a76b93c3b690038df25 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Feb 2014 11:14:07 -0500 Subject: [PATCH 149/449] scotty: jailbreak Needed when overriding aeson to the new version, which in turn is needed if using scotty on a project that also uses lens 4.0. --- pkgs/development/libraries/haskell/scotty/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index b3ca635ac213..5d354af308d3 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -17,4 +17,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; + jailbreak = true; }) From 276b72fb93d60ae0e59088ea0e0029da87e6f31c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 15 Feb 2014 03:47:57 +0100 Subject: [PATCH 150/449] vm: Introduce new Windows VM installer for Cygwin. After quite a lot of fighting against Windows and its various limitations, this new is the base architecture for installing and accessing the Windows VM and thus the Cygwin environment inside it: .------------. .---> | vde_switch | | `-[#]----[#]-' | | | ,' .' `---.___ ,' 192.168.0.1 `. | | 192.168.0.2 ,' _____[#]____ | ,' | | ______[#]______ | | Windows VM | | .--' | | |____________| | | | | | /|\ | .-| | | .---------. | | | | | | .-|-| manager |-' | | | | | | | `---------' | | | | | | | | | | | | | | .-------------. | | Samba | | | | BOOTSTRAP | | | | | | | | |-------------| | | | | .------| | `-| spawn VMs |-+--> | | `---| xchg | <-------. | |-------------| | | .---^------| | | | install |---. | `-| nixstore | <----. | | |-------------| | | `----------| | | |---| suspend VM | | | | | | | `------.------' | | Controller VM | | | | | | |_______________| | | | .--' | /|\ VirtIO | | __|__________:____________ | | | \|/ | | `. | | | | .------------. | | : | | | | | REAL BUILD | | | .-------^--------. | | | | |------------| | `-> | serial console | | | | `-| revive VM | | `----------------' | | | |------------| |------------. | | | | build |-->| /nix/store >>>-----------|-' | |------------| |------------| | | | collect |<--| xchg >>>-----------|----' `-----.------' |------------' | | | | \|/ | | | __ ___ | | | |--| | | (__ -|- | F I N I S H E D | | | |__| ___) | | |__________________________| This might look a bit overwhelming, but let me try to explain: We're starting at the base derivation ("BOOTSTRAP" above), where we actually install the Cygwin envirenment. Over there we basically fire up a vde_switch process and two virtual machines: One is the Windows machine, the other is a NixOS machine, which serves as some kind of proxy between the host and the Windows machine. The reason we're doing this, is because we don't have a lot of options for sharing files between a stock Windows machine and the host. In earlier experiments, I've tried to communicate with the Windows guest by using pipes and OpenSSH, but obviously this wasn't a big speed rush (or to say it bluntly: It was fucking slow). Using TCP/IP directly for accessing the guest would have been another option, but it could lead to possible errors when the port or a range of ports are in use at the Host system. Also, we would need to punch a hole into the sandbox of the Nix builder (as it doesn't allow networking), which in turn will possibly undermine deterministic builds/runs (well, at least as deterministic as it can be, we're running Windows, remember?). So, let's continue: The responsibility of the NixOS (controller) VM is to just wait until an SSH port becomes available on the Windows VM, whereas the Windows VM itself is installed using an unattended installation file provided via a virtual floppy image. With the installation of the basic Windows OS, we directly install Cygwin and start up an OpenSSH service. At this point the bootstrapping is almost finished and as soon as the port is available, the controller VM sets up Samba shares and makes it available as drive letters within Windows and as bind mounts (for example /nix/store) within Cygwin. Finally we're making a snapshot of the memory of the Windows VM in order to revive it within a few seconds when we want to build something. Now, the build process itself is fairly straightforward: Revive VM and build based on existing store derivations and collect the result _and_ the exit code from the xchg share/directory. Conclusion: This architecture may sound a bit complicated, but we're trying to achieve deterministic and reproducable builds and/or test runs. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/default.nix | 348 +++++++++++++++++++++ pkgs/build-support/vm/windows/mkclosure.py | 78 +++++ 2 files changed, 426 insertions(+) create mode 100644 pkgs/build-support/vm/windows/default.nix create mode 100644 pkgs/build-support/vm/windows/mkclosure.py diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix new file mode 100644 index 000000000000..03b66e9f5043 --- /dev/null +++ b/pkgs/build-support/vm/windows/default.nix @@ -0,0 +1,348 @@ +with import {}; + +with import { + inherit system; + minimal = false; +}; + +let + winISO = /path/to/iso/XXX; + + bootstrapAfterLogin = runCommand "bootstrap.sh" {} '' + cat > "$out" < ~/.ssh/authorized_keys < "$out" + ''); + gen = { url, md5 }: { + source = fetchurl { + url = "${cygwinMirror}/${url}"; + inherit md5; + }; + target = url; + }; + in map gen expr; + + cygiso = import { + inherit (pkgs) stdenv perl cdrkit pathsFromGraph; + contents = [ + { source = bootstrapAfterLogin; + target = "bootstrap.sh"; + } + { source = fetchurl { + url = "http://cygwin.com/setup-x86_64.exe"; + sha256 = "1bjmq9h1p6mmiqp6f1kvmg94jbsdi1pxfa07a5l497zzv9dsfivm"; + }; + target = "setup.exe"; + } + { source = cygPkgList; + target = "setup.ini"; + } + ] ++ makeCygwinClosure { + packages = cygPkgList; + packageList = [ "openssh" ]; + }; + }; + + maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64"; + + cygwinQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [ + "-monitor unix:$MONITOR_SOCKET,server,nowait" + "-nographic" + "-boot order=c,once=d" + "-drive file=${floppyImg},readonly,index=0,if=floppy" + "-drive file=winvm.img,index=0,media=disk" + "-drive file=${winISO},index=1,media=cdrom" + "-drive file=${cygiso}/iso/cd.iso,index=2,media=cdrom" + "-net nic,vlan=0,macaddr=52:54:00:12:01:01" + "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET" + "-rtc base=2010-01-01,clock=vm" + ]); + + modulesClosure = lib.overrideDerivation vmTools.modulesClosure (o: { + rootModules = o.rootModules ++ lib.singleton "virtio_net"; + }); + + snakeOilSSH = stdenv.mkDerivation { + name = "snakeoil-ssh-cygwin"; + buildCommand = '' + ensureDir "$out" + ${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N "" + ''; + }; + + controllerQemuArgs = cmd: let + preInitScript = writeScript "preinit.sh" '' + #!${vmTools.initrdUtils}/bin/ash -e + export PATH=${vmTools.initrdUtils}/bin + mount -t proc none /proc + mount -t sysfs none /sys + for arg in $(cat /proc/cmdline); do + if [ "x''${arg#command=}" != "x$arg" ]; then + command="''${arg#command=}" + fi + done + + for i in $(cat ${modulesClosure}/insmod-list); do + insmod $i + done + + mkdir -p /tmp /dev + mknod /dev/null c 1 3 + mknod /dev/zero c 1 5 + mknod /dev/random c 1 8 + mknod /dev/urandom c 1 9 + mknod /dev/tty c 5 0 + + ifconfig lo up + ifconfig eth0 up 192.168.0.2 + + mkdir -p /nix/store /etc /var/run /var/log + + cat > /etc/passwd < /etc/samba/smb.conf < '$out/state.gz'" + CMD + cp winvm.img "$out/disk.img" + ''; + }; + +in bootstrap diff --git a/pkgs/build-support/vm/windows/mkclosure.py b/pkgs/build-support/vm/windows/mkclosure.py new file mode 100644 index 000000000000..48d569a6bd3e --- /dev/null +++ b/pkgs/build-support/vm/windows/mkclosure.py @@ -0,0 +1,78 @@ +# Ugliest Python code I've ever written. -- aszlig +import sys + +def get_plist(path): + in_pack = False + in_str = False + current_key = None + buf = "" + packages = {} + package_name = None + package_attrs = {} + with open(path, 'r') as setup: + for line in setup: + if in_str and line.rstrip().endswith('"'): + package_attrs[current_key] = buf + line.rstrip()[:-1] + in_str = False + continue + elif in_str: + buf += line + continue + + if line.startswith('@'): + in_pack = True + package_name = line[1:].strip() + package_attrs = {} + elif in_pack and ':' in line: + key, value = line.split(':', 1) + if value.lstrip().startswith('"'): + if value.lstrip()[1:].rstrip().endswith('"'): + value = value.strip().strip('"') + else: + in_str = True + current_key = key.strip().lower() + buf = value.lstrip()[1:] + continue + package_attrs[key.strip().lower()] = value.strip() + elif in_pack: + in_pack = False + packages[package_name] = package_attrs + return packages + +def main(): + packages = get_plist(sys.argv[1]) + to_include = set() + + def traverse(package): + to_include.add(package) + attrs = packages.get(package, {}) + deps = attrs.get('requires', '').split() + for new_dep in set(deps) - to_include: + traverse(new_dep) + + map(traverse, sys.argv[2:]) + + sys.stdout.write('[\n') + for package, attrs in packages.iteritems(): + if package not in to_include: + cats = [c.lower() for c in attrs.get('category', '').split()] + if 'base' not in cats: + continue + + install_line = attrs.get('install') + if install_line is None: + continue + + url, size, md5 = install_line.split(' ', 2) + + pack = [ + ' {', + ' url = "{0}";'.format(url), + ' md5 = "{0}";'.format(md5), + ' }', + ]; + sys.stdout.write('\n'.join(pack) + '\n') + sys.stdout.write(']\n') + +if __name__ == '__main__': + main() From 4e21215d52025be5338e89020874b5ed7c903e19 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 15 Feb 2014 18:17:21 +0100 Subject: [PATCH 151/449] vm/windows: Move the installer into install/. At least the largest portion of the installer, because in the end we don't want the installer to *actually* save the state but only prepare the base image. Signed-off-by: aszlig --- .../vm/windows/cygwin-iso/default.nix | 43 ++++ .../vm/windows/{ => cygwin-iso}/mkclosure.py | 0 pkgs/build-support/vm/windows/default.nix | 191 +----------------- .../vm/windows/install/default.nix | 39 ++++ .../vm/windows/install/unattended-image.nix | 123 +++++++++++ 5 files changed, 211 insertions(+), 185 deletions(-) create mode 100644 pkgs/build-support/vm/windows/cygwin-iso/default.nix rename pkgs/build-support/vm/windows/{ => cygwin-iso}/mkclosure.py (100%) create mode 100644 pkgs/build-support/vm/windows/install/default.nix create mode 100644 pkgs/build-support/vm/windows/install/unattended-image.nix diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix new file mode 100644 index 000000000000..9df07bdb667f --- /dev/null +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -0,0 +1,43 @@ +{ packages ? [] +, mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin" +, extraContents ? [] +}: + +let + inherit (import {}) fetchurl runCommand python; + + cygPkgList = fetchurl { + url = "${mirror}/x86_64/setup.ini"; + sha256 = "0d54pli0gnm3010w9iq2bar3r2sc4syyblg62q75inc2cq341bi3"; + }; + + makeCygwinClosure = { packages, packageList }: let + expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } '' + python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out" + ''); + gen = { url, md5 }: { + source = fetchurl { + url = "${mirror}/${url}"; + inherit md5; + }; + target = url; + }; + in map gen expr; + +in import { + inherit (import {}) stdenv perl cdrkit pathsFromGraph; + contents = [ + { source = fetchurl { + url = "http://cygwin.com/setup-x86_64.exe"; + sha256 = "1bjmq9h1p6mmiqp6f1kvmg94jbsdi1pxfa07a5l497zzv9dsfivm"; + }; + target = "setup.exe"; + } + { source = cygPkgList; + target = "setup.ini"; + } + ] ++ makeCygwinClosure { + packages = cygPkgList; + packageList = packages; + } ++ extraContents; +} diff --git a/pkgs/build-support/vm/windows/mkclosure.py b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py similarity index 100% rename from pkgs/build-support/vm/windows/mkclosure.py rename to pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 03b66e9f5043..06bf6c9bb6d2 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -8,189 +8,10 @@ with import { let winISO = /path/to/iso/XXX; - bootstrapAfterLogin = runCommand "bootstrap.sh" {} '' - cat > "$out" < ~/.ssh/authorized_keys < "$out" - ''); - gen = { url, md5 }: { - source = fetchurl { - url = "${cygwinMirror}/${url}"; - inherit md5; - }; - target = url; - }; - in map gen expr; - - cygiso = import { - inherit (pkgs) stdenv perl cdrkit pathsFromGraph; - contents = [ - { source = bootstrapAfterLogin; - target = "bootstrap.sh"; - } - { source = fetchurl { - url = "http://cygwin.com/setup-x86_64.exe"; - sha256 = "1bjmq9h1p6mmiqp6f1kvmg94jbsdi1pxfa07a5l497zzv9dsfivm"; - }; - target = "setup.exe"; - } - { source = cygPkgList; - target = "setup.ini"; - } - ] ++ makeCygwinClosure { - packages = cygPkgList; - packageList = [ "openssh" ]; - }; + base = import ./install { + isoFile = winISO; + productKey = "XXX"; + sshPublicKey = "${snakeOilSSH}/key.pub"; }; maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64"; @@ -199,10 +20,10 @@ let "-monitor unix:$MONITOR_SOCKET,server,nowait" "-nographic" "-boot order=c,once=d" - "-drive file=${floppyImg},readonly,index=0,if=floppy" + "-drive file=${base.floppy},readonly,index=0,if=floppy" "-drive file=winvm.img,index=0,media=disk" "-drive file=${winISO},index=1,media=cdrom" - "-drive file=${cygiso}/iso/cd.iso,index=2,media=cdrom" + "-drive file=${base.iso}/iso/cd.iso,index=2,media=cdrom" "-net nic,vlan=0,macaddr=52:54:00:12:01:01" "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET" "-rtc base=2010-01-01,clock=vm" diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix new file mode 100644 index 000000000000..fec7dac0714e --- /dev/null +++ b/pkgs/build-support/vm/windows/install/default.nix @@ -0,0 +1,39 @@ +{ isoFile +, productKey +, sshPublicKey +}: + +let + inherit (import {}) lib runCommand; + + bootstrapAfterLogin = runCommand "bootstrap.sh" {} '' + cat > "$out" < ~/.ssh/authorized_keys < {}) lib stdenv writeText dosfstools mtools; + + afterSetup = [ + cygwinSetup + "-L -n -q" + "-l ${cygwinRepository}" + "-R ${cygwinRoot}" + "-C base" + ] ++ map (p: "-P ${p}") cygwinPackages; + + winXpUnattended = writeText "winnt.sif" '' + [Data] + AutoPartition = 1 + AutomaticUpdates = 0 + MsDosInitiated = 0 + UnattendedInstall = Yes + + [Unattended] + DUDisable = Yes + DriverSigningPolicy = Ignore + Hibernation = No + OemPreinstall = No + OemSkipEula = Yes + Repartition = Yes + TargetPath = \WINDOWS + UnattendMode = FullUnattended + UnattendSwitch = Yes + WaitForReboot = No + + [GuiUnattended] + AdminPassword = "nopasswd" + AutoLogon = Yes + AutoLogonCount = 1 + OEMSkipRegional = 1 + OemSkipWelcome = 1 + ServerWelcome = No + TimeZone = 85 + + [UserData] + ComputerName = "cygwin" + FullName = "cygwin" + OrgName = "" + ProductKey = "${productKey}" + + [Networking] + InstallDefaultComponents = Yes + + [Identification] + JoinWorkgroup = cygwin + + [NetAdapters] + PrimaryAdapter = params.PrimaryAdapter + + [params.PrimaryAdapter] + InfID = * + + [params.MS_MSClient] + + [NetProtocols] + MS_TCPIP = params.MS_TCPIP + + [params.MS_TCPIP] + AdapterSections=params.MS_TCPIP.PrimaryAdapter + + [params.MS_TCPIP.PrimaryAdapter] + DHCP = No + IPAddress = 192.168.0.1 + SpecificTo = PrimaryAdapter + SubnetMask = 255.255.255.0 + WINS = No + + ; Turn off all components + [Components] + ${lib.concatMapStrings (comp: "${comp} = Off\n") [ + "AccessOpt" "Appsrv_console" "Aspnet" "BitsServerExtensionsISAPI" + "BitsServerExtensionsManager" "Calc" "Certsrv" "Certsrv_client" + "Certsrv_server" "Charmap" "Chat" "Clipbook" "Cluster" "Complusnetwork" + "Deskpaper" "Dialer" "Dtcnetwork" "Fax" "Fp_extensions" "Fp_vdir_deploy" + "Freecell" "Hearts" "Hypertrm" "IEAccess" "IEHardenAdmin" "IEHardenUser" + "Iis_asp" "Iis_common" "Iis_ftp" "Iis_inetmgr" "Iis_internetdataconnector" + "Iis_nntp" "Iis_serversideincludes" "Iis_smtp" "Iis_webdav" "Iis_www" + "Indexsrv_system" "Inetprint" "Licenseserver" "Media_clips" "Media_utopia" + "Minesweeper" "Mousepoint" "Msmq_ADIntegrated" "Msmq_Core" + "Msmq_HTTPSupport" "Msmq_LocalStorage" "Msmq_MQDSService" + "Msmq_RoutingSupport" "Msmq_TriggersService" "Msnexplr" "Mswordpad" + "Netcis" "Netoc" "OEAccess" "Objectpkg" "Paint" "Pinball" "Pop3Admin" + "Pop3Service" "Pop3Srv" "Rec" "Reminst" "Rootautoupdate" "Rstorage" "SCW" + "Sakit_web" "Solitaire" "Spider" "TSWebClient" "Templates" + "TerminalServer" "UDDIAdmin" "UDDIDatabase" "UDDIWeb" "Vol" "WMAccess" + "WMPOCM" "WbemMSI" "Wms" "Wms_admin_asp" "Wms_admin_mmc" "Wms_isapi" + "Wms_server" "Zonegames" + ]} + + [WindowsFirewall] + Profiles = WindowsFirewall.TurnOffFirewall + + [WindowsFirewall.TurnOffFirewall] + Mode = 0 + + [SetupParams] + UserExecute = "${lib.concatStringsSep " " afterSetup}" + + [GuiRunOnce] + Command0 = "${cygwinRoot}\bin\bash -l ${shExecAfterwards}" + ''; + +in stdenv.mkDerivation { + name = "unattended-floppy.img"; + buildCommand = '' + dd if=/dev/zero of="$out" count=1440 bs=1024 + ${dosfstools}/sbin/mkfs.msdos "$out" + ${mtools}/bin/mcopy -i "$out" "${winXpUnattended}" ::winnt.sif + ''; +} From 9b1862ca1fad149275e4d3e9241579b9aec9b952 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 15 Feb 2014 18:23:43 +0100 Subject: [PATCH 152/449] vm/windows: Move creating SSH key into install/. This SSH key is specifically only for accessing the installed Cygwin within the Windows VM, so we only need to expose the private key. Yes, you heard right, the private key. It's not security-relevant because the machine is completely read-only, only exposed to the filesystem and networking is not available. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/default.nix | 11 +---------- pkgs/build-support/vm/windows/install/default.nix | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 06bf6c9bb6d2..470fac0437df 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -11,7 +11,6 @@ let base = import ./install { isoFile = winISO; productKey = "XXX"; - sshPublicKey = "${snakeOilSSH}/key.pub"; }; maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64"; @@ -33,14 +32,6 @@ let rootModules = o.rootModules ++ lib.singleton "virtio_net"; }); - snakeOilSSH = stdenv.mkDerivation { - name = "snakeoil-ssh-cygwin"; - buildCommand = '' - ensureDir "$out" - ${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N "" - ''; - }; - controllerQemuArgs = cmd: let preInitScript = writeScript "preinit.sh" '' #!${vmTools.initrdUtils}/bin/ash -e @@ -108,7 +99,7 @@ let ${samba}/sbin/nmbd -D ${samba}/sbin/smbd -D - ${coreutils}/bin/cp -L "${snakeOilSSH}/key" /ssh.key + ${coreutils}/bin/cp -L "${base.sshKey}" /ssh.key ${coreutils}/bin/chmod 600 /ssh.key echo -n "Waiting for Windows VM to become ready" diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix index fec7dac0714e..0021bae87bc8 100644 --- a/pkgs/build-support/vm/windows/install/default.nix +++ b/pkgs/build-support/vm/windows/install/default.nix @@ -1,16 +1,15 @@ { isoFile , productKey -, sshPublicKey }: let - inherit (import {}) lib runCommand; + inherit (import {}) lib stdenv runCommand openssh; bootstrapAfterLogin = runCommand "bootstrap.sh" {} '' cat > "$out" < ~/.ssh/authorized_keys < Date: Sat, 15 Feb 2014 19:46:01 +0100 Subject: [PATCH 153/449] vm/windows: Update sha256 of Cygwin's setup.ini. This is kinda stupid to do every little time the file is automatically regenerated upstream. But let's see how often that happens and whether it will become a major annoyance or not, and if yes, we might be forced to include it in our source tree. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/cygwin-iso/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index 9df07bdb667f..17e4cff855b7 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -8,7 +8,7 @@ let cygPkgList = fetchurl { url = "${mirror}/x86_64/setup.ini"; - sha256 = "0d54pli0gnm3010w9iq2bar3r2sc4syyblg62q75inc2cq341bi3"; + sha256 = "19vfm7zr8kcp1algmggk8vsilkccycx22mdf0ynfl6lcmp6dkfsz"; }; makeCygwinClosure = { packages, packageList }: let From c731467e2c83f3df0b59c44575616e6241a63c7d Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 15 Feb 2014 23:23:47 +0100 Subject: [PATCH 154/449] vm/windows: Split install into several stages. These stages are in particular: * Install of the bare Windows VM with Cygwin and shut down. * Boot up the same VM again without the installation media and dump the VMs memory to state.gz. * Resume from state.gz and build whatever we want to build. Every single stage involves a new "controller", which is more like an abstraction on the Nix side that constructs the madness described in 276b72fb93d60ae0e59088ea0e0029da87e6f31c. Signed-off-by: aszlig --- .../vm/windows/controller/default.nix | 173 +++++++++++++++++ pkgs/build-support/vm/windows/default.nix | 177 ++++-------------- .../vm/windows/install/default.nix | 43 ++++- 3 files changed, 239 insertions(+), 154 deletions(-) create mode 100644 pkgs/build-support/vm/windows/controller/default.nix diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix new file mode 100644 index 000000000000..49d6815a3dce --- /dev/null +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -0,0 +1,173 @@ +{ sshKey +, qemuArgs ? [] +, command ? "sync" +, suspendTo ? null +, resumeFrom ? null +, installMode ? false +}: + +let + inherit (import {}) lib stdenv writeScript vmTools makeInitrd; + inherit (import {}) samba vde2 busybox openssh; + inherit (import {}) socat netcat coreutils gzip; + + preInitScript = writeScript "preinit.sh" '' + #!${vmTools.initrdUtils}/bin/ash -e + export PATH=${vmTools.initrdUtils}/bin + mount -t proc none /proc + mount -t sysfs none /sys + for arg in $(cat /proc/cmdline); do + if [ "x''${arg#command=}" != "x$arg" ]; then + command="''${arg#command=}" + fi + done + + for i in $(cat ${modulesClosure}/insmod-list); do + insmod $i + done + + mkdir -p /tmp /dev + mknod /dev/null c 1 3 + mknod /dev/zero c 1 5 + mknod /dev/random c 1 8 + mknod /dev/urandom c 1 9 + mknod /dev/tty c 5 0 + + ifconfig lo up + ifconfig eth0 up 192.168.0.2 + + mkdir -p /nix/store /etc /var/run /var/log + + cat > /etc/passwd < /etc/samba/smb.conf < '${suspendTo}'" + quit + CMD + wait %% + ''; + +in writeScript "run-cygwin-vm.sh" '' + #!${stdenv.shell} -e + ${preVM} + ${vmExec} +'' diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 470fac0437df..2ecadbae7cfb 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -1,160 +1,49 @@ -with import {}; - -with import { - inherit system; - minimal = false; -}; - let + inherit (import {}) lib stdenv requireFile writeText qemu; + winISO = /path/to/iso/XXX; - base = import ./install { + installedVM = import ./install { isoFile = winISO; productKey = "XXX"; }; - maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64"; - - cygwinQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [ - "-monitor unix:$MONITOR_SOCKET,server,nowait" - "-nographic" - "-boot order=c,once=d" - "-drive file=${base.floppy},readonly,index=0,if=floppy" - "-drive file=winvm.img,index=0,media=disk" - "-drive file=${winISO},index=1,media=cdrom" - "-drive file=${base.iso}/iso/cd.iso,index=2,media=cdrom" - "-net nic,vlan=0,macaddr=52:54:00:12:01:01" - "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET" - "-rtc base=2010-01-01,clock=vm" - ]); - - modulesClosure = lib.overrideDerivation vmTools.modulesClosure (o: { - rootModules = o.rootModules ++ lib.singleton "virtio_net"; + runInVM = img: attrs: import ./controller (attrs // { + inherit (installedVM) sshKey; + qemuArgs = attrs.qemuArgs or [] ++ [ + "-boot order=c" + "-drive file=${img},index=0,media=disk" + ]; }); - controllerQemuArgs = cmd: let - preInitScript = writeScript "preinit.sh" '' - #!${vmTools.initrdUtils}/bin/ash -e - export PATH=${vmTools.initrdUtils}/bin - mount -t proc none /proc - mount -t sysfs none /sys - for arg in $(cat /proc/cmdline); do - if [ "x''${arg#command=}" != "x$arg" ]; then - command="''${arg#command=}" - fi - done - - for i in $(cat ${modulesClosure}/insmod-list); do - insmod $i - done - - mkdir -p /tmp /dev - mknod /dev/null c 1 3 - mknod /dev/zero c 1 5 - mknod /dev/random c 1 8 - mknod /dev/urandom c 1 9 - mknod /dev/tty c 5 0 - - ifconfig lo up - ifconfig eth0 up 192.168.0.2 - - mkdir -p /nix/store /etc /var/run /var/log - - cat > /etc/passwd < /etc/samba/smb.conf < '$out/state.gz'" - CMD cp winvm.img "$out/disk.img" + cp state.gz "$out/state.gz" ''; }; -in bootstrap + resumeAndRun = command: runInVM "${suspendedVM}/disk.img" { + resumeFrom = "${suspendedVM}/state.gz"; + qemuArgs = lib.singleton "-snapshot"; + inherit command; + }; + + runFromSuspended = command: stdenv.mkDerivation { + name = "cygwin-vm-run"; + buildCommand = '' + ${resumeAndRun command} + ''; + }; + +in runFromSuspended "uname -a" diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix index 0021bae87bc8..d766cbcf8e3a 100644 --- a/pkgs/build-support/vm/windows/install/default.nix +++ b/pkgs/build-support/vm/windows/install/default.nix @@ -3,7 +3,7 @@ }: let - inherit (import {}) lib stdenv runCommand openssh; + inherit (import {}) lib stdenv runCommand openssh qemu; bootstrapAfterLogin = runCommand "bootstrap.sh" {} '' cat > "$out" <> /etc/fstab + shutdown -s now EOF ''; @@ -28,10 +28,16 @@ let ''; }; - packages = [ "openssh" ]; + sshKey = "${cygwinSshKey}/key"; -in { - iso = import ../cygwin-iso { + packages = [ "openssh" "shutdown" ]; + + instfloppy = import ./unattended-image.nix { + cygwinPackages = packages; + inherit productKey; + }; + + cygiso = import ../cygwin-iso { inherit packages; extraContents = lib.singleton { source = bootstrapAfterLogin; @@ -39,10 +45,27 @@ in { }; }; - floppy = import ./unattended-image.nix { - cygwinPackages = packages; - inherit productKey; + installController = import ../controller { + inherit sshKey; + installMode = true; + qemuArgs = [ + "-boot order=c,once=d" + "-drive file=${instfloppy},readonly,index=0,if=floppy" + "-drive file=winvm.img,index=0,media=disk" + "-drive file=${isoFile},index=1,media=cdrom" + "-drive file=${cygiso}/iso/cd.iso,index=2,media=cdrom" + ]; }; - sshKey = "${cygwinSshKey}/key"; +in stdenv.mkDerivation { + name = "cygwin-base-vm"; + buildCommand = '' + ${qemu}/bin/qemu-img create -f qcow2 winvm.img 2G + ${installController} + ensureDir "$out" + cp winvm.img "$out/disk.img" + ''; + passthru = { + inherit sshKey; + }; } From 3e91192f079c2eac4bd15d564bb2fd4702506b36 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 00:27:43 +0100 Subject: [PATCH 155/449] vm/windows: Wait for VDE switch to startup. This could possibly cause flapping whenever qemu is too fast in starting up. As we are running with the shell's -e flag, the socat check also ensures that the VDE switch is properly started and causes the whole build to fail, should it not start up within 20 seconds. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/controller/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 49d6815a3dce..22451e0e3947 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -148,6 +148,8 @@ let QEMU_VDE_SOCKET="$(pwd)/vde.ctl" MONITOR_SOCKET="$(pwd)/monitor" ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" & + echo 'alive?' | ${socat}/bin/socat - \ + UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20 ''; vmExec = if installMode then '' From cfa859d79222d034a9fe493192150b80faae4ee8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 00:48:01 +0100 Subject: [PATCH 156/449] vm/windows: Don't init /nix/store on install. We're going to do this during the suspendedVM phase, so we're able to more easily change the shares without reinstalling the whole VM. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/install/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix index d766cbcf8e3a..64177ea17137 100644 --- a/pkgs/build-support/vm/windows/install/default.nix +++ b/pkgs/build-support/vm/windows/install/default.nix @@ -12,11 +12,8 @@ let $(cat "${cygwinSshKey}/key.pub") PUBKEY ssh-host-config -y -c 'binmode ntsec' -w dummy - - net use S: '\\192.168.0.2\nixstore' - mkdir -p /nix/store - echo "/cygdrives/s /nix/store none bind 0 0" >> /etc/fstab - shutdown -s now + cygrunsrv -S sshd + shutdown -s 5 EOF ''; From aa65a7057f3abba32726ed17853090bcb86992f9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 01:42:10 +0100 Subject: [PATCH 157/449] vm/windows: Properly escape shell command. Security-wise it's not a big issue because we're still sandboxed, but I really don't want to write something like \\\\\\\\192.168.0.2\\\\share in order to set up network shares. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/controller/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 22451e0e3947..6abf87f82c87 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -57,6 +57,8 @@ let }; }; + shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; + initScript = writeScript "init.sh" ('' #!${stdenv.shell} ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba @@ -104,7 +106,7 @@ let -o StrictHostKeyChecking=no \ -i /ssh.key \ -l Administrator \ - 192.168.0.1 -- "${command}" + 192.168.0.1 -- ${shellEscape command} ${busybox}/sbin/poweroff -f '')); From 0ce1fd07fe7e59115af60dd33a9e668cbb1ebd4c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 01:46:28 +0100 Subject: [PATCH 158/449] vm/windows: Reintroduce setting up /nix/store. Now we're doing this at the point where we're saving the VM state. Unfortunately it's not quite right, because the controller VM is shut down _before_ we're saving the state, so the share gets disconnected despite autodisconnect being deactivated during setup. We can get around this issue by finally introducing the xchg share, which is the last item to be implemented before we can merge to master. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 2ecadbae7cfb..b7c18f6d16c5 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -17,6 +17,13 @@ let }); runAndSuspend = runInVM "winvm.img" { + command = lib.concatStringsSep "; " [ + "set -e" + "net config server /autodisconnect:-1" + "net use S: '\\\\192.168.0.2\\nixstore' /persistent:yes" + "mkdir -p /nix/store" + "mount -o bind /cygdrive/s /nix/store" + ]; suspendTo = "state.gz"; }; From fedf13e6cfb94bad00df71aba66f0b6fea233e0f Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 03:19:40 +0100 Subject: [PATCH 159/449] vm/windows: Implement and use "xchg" share. This now finally introduces our xchg share and also uses it for exchanging state while suspending a VM. However, accessing the _real_ Nix store still isn't possible because we're shadowing the directory in the initrd. Signed-off-by: aszlig --- .../vm/windows/controller/default.nix | 30 +++++++++++++++---- pkgs/build-support/vm/windows/default.nix | 3 ++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 6abf87f82c87..da3be51c1026 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -36,13 +36,17 @@ let ifconfig lo up ifconfig eth0 up 192.168.0.2 - mkdir -p /nix/store /etc /var/run /var/log + mkdir -p /xchg /nix/store /etc /var/run /var/log cat > /etc/passwd < '${suspendTo}'" quit CMD - wait %% + wait %- ''; in writeScript "run-cygwin-vm.sh" '' diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index b7c18f6d16c5..89acb9a2d689 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -21,8 +21,11 @@ let "set -e" "net config server /autodisconnect:-1" "net use S: '\\\\192.168.0.2\\nixstore' /persistent:yes" + "net use X: '\\\\192.168.0.2\\xchg' /persistent:yes" "mkdir -p /nix/store" "mount -o bind /cygdrive/s /nix/store" + "mkdir -p /tmp/xchg" + "mount -o bind /cygdrive/x /tmp/xchg" ]; suspendTo = "state.gz"; }; From a1d7974acd1a6c7d527dd0adc9fe711983990074 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 16:47:23 +0100 Subject: [PATCH 160/449] vm/windows: Remove Samba from installMode. This should trim down possible dependencies on the base installation and hereby reduce the need for reinstallation of the damn VM to only changes that affect the Windows installation and the base Cygwin + OpenSSH setup. Signed-off-by: aszlig --- .../vm/windows/controller/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index da3be51c1026..3d7634681139 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -67,6 +67,19 @@ let initScript = writeScript "init.sh" ('' #!${stdenv.shell} + ${coreutils}/bin/cp -L "${sshKey}" /ssh.key + ${coreutils}/bin/chmod 600 /ssh.key + '' + (if installMode then '' + echo -n "Waiting for Windows installation to finish..." + while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do + echo -n . + # Print a dot every 10 seconds only to shorten line length. + ${coreutils}/bin/sleep 10 + done + echo " success." + # Loop forever, because this VM is going to be killed. + ${loopForever} + '' else '' ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba ${coreutils}/bin/cat > /etc/samba/smb.conf < Date: Sun, 16 Feb 2014 16:53:02 +0100 Subject: [PATCH 161/449] vm/windows: Avoid shadowing the Nix store. This is done by putting the non-initrd /nix/store into a subdirectory, which we then chroot to and pass along the SSH command. Also, we now collect the exit code after the chroot command and power off the VM thereafter, because the store is no longer shadowed and we have still access to the busybox inside the initrd. Signed-off-by: aszlig --- .../vm/windows/controller/default.nix | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 3d7634681139..60ec1d4783a8 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -8,8 +8,7 @@ let inherit (import {}) lib stdenv writeScript vmTools makeInitrd; - inherit (import {}) samba vde2 busybox openssh; - inherit (import {}) socat netcat coreutils gzip; + inherit (import {}) samba vde2 openssh socat netcat coreutils gzip; preInitScript = writeScript "preinit.sh" '' #!${vmTools.initrdUtils}/bin/ash -e @@ -26,7 +25,9 @@ let insmod $i done - mkdir -p /tmp /dev + mkdir -p /dev /fs + + mount -t tmpfs none /dev mknod /dev/null c 1 3 mknod /dev/zero c 1 5 mknod /dev/random c 1 8 @@ -36,22 +37,31 @@ let ifconfig lo up ifconfig eth0 up 192.168.0.2 - mkdir -p /xchg /nix/store /etc /var/run /var/log + mount -t tmpfs none /fs + mkdir -p /fs/nix/store /fs/xchg /fs/dev /fs/sys /fs/proc /fs/etc /fs/tmp - cat > /etc/passwd < /fs/etc/passwd < /fs/xchg/in-vm-exit - mount -t 9p \ - -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \ - store /nix/store - - exec "$command" + poweroff -f ''; initrd = makeInitrd { @@ -80,7 +90,8 @@ let # Loop forever, because this VM is going to be killed. ${loopForever} '' else '' - ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private /var/lib/samba + ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private \ + /var/lib/samba /var/log /var/run ${coreutils}/bin/cat > /etc/samba/smb.conf < Date: Sun, 16 Feb 2014 18:58:08 +0100 Subject: [PATCH 162/449] vm/windows: Fix perms of the Samba shares. We now map all guest accounts to the root user, because in the end the permissions of the current user boil down to the build user of the Nix builder of the host. That way it's not possible to gain more permissions at all and just makes the VM communication a lot easier. However, setting "writable" to yes instead of "read only" to no doesn't change anything here, I just found it to be clearer. Also, we now no longer need to have a "nobody" user. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/controller/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 60ec1d4783a8..fd6ad6354aae 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -52,10 +52,7 @@ let -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \ xchg /fs/xchg - cat > /fs/etc/passwd < /fs/etc/passwd set +e chroot /fs $command $out @@ -96,6 +93,7 @@ let [global] security = user map to guest = Bad User + guest account = root workgroup = cygwin netbios name = controller server string = %h @@ -105,12 +103,12 @@ let [nixstore] path = /nix/store - read only = no + writable = yes guest ok = yes [xchg] path = /xchg - read only = no + writable = yes guest ok = yes CONFIG From d16dae8d3215c82070132694d82a1309d140f124 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 22:12:42 +0100 Subject: [PATCH 163/449] vm/windows: Use &&, not set -e in runAndSuspend. We now have proper quoting, so we no longer need the workaround using "set -e". Signed-off-by: aszlig --- pkgs/build-support/vm/windows/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 89acb9a2d689..36795fbb78ed 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -17,8 +17,7 @@ let }); runAndSuspend = runInVM "winvm.img" { - command = lib.concatStringsSep "; " [ - "set -e" + command = lib.concatStringsSep " && " [ "net config server /autodisconnect:-1" "net use S: '\\\\192.168.0.2\\nixstore' /persistent:yes" "net use X: '\\\\192.168.0.2\\xchg' /persistent:yes" From 5258bbe4c97113dfa663a32408691fc93ee2dd9b Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 22:27:39 +0100 Subject: [PATCH 164/449] vm/windows: Create fstab entries in suspended VM. Cygwin initializes mounts on _every_ login via SSH and doesn't keep them consistently like on Unix systems, that's why we need to also add fstab entries for the bind mounts to the store and xchg shares. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 36795fbb78ed..bb0833beec28 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -23,8 +23,10 @@ let "net use X: '\\\\192.168.0.2\\xchg' /persistent:yes" "mkdir -p /nix/store" "mount -o bind /cygdrive/s /nix/store" + "echo /cygdrive/s /nix/store none bind 0 0 >> /etc/fstab" "mkdir -p /tmp/xchg" "mount -o bind /cygdrive/x /tmp/xchg" + "echo /cygdrive/x /tmp/xchg none bind 0 0 >> /etc/fstab" ]; suspendTo = "state.gz"; }; From 707b7ad1bddf8b95ca1348260dea132b0514089d Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 22:30:40 +0100 Subject: [PATCH 165/449] vm/windows: Generate mounts from an attribute set. This is mainly to make it easier to quickly change mappings, without making room for errors such as typos. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/default.nix | 32 +++++++++++++++-------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index bb0833beec28..8ca31bc39d7b 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -16,18 +16,28 @@ let ]; }); - runAndSuspend = runInVM "winvm.img" { - command = lib.concatStringsSep " && " [ - "net config server /autodisconnect:-1" - "net use S: '\\\\192.168.0.2\\nixstore' /persistent:yes" - "net use X: '\\\\192.168.0.2\\xchg' /persistent:yes" - "mkdir -p /nix/store" - "mount -o bind /cygdrive/s /nix/store" - "echo /cygdrive/s /nix/store none bind 0 0 >> /etc/fstab" - "mkdir -p /tmp/xchg" - "mount -o bind /cygdrive/x /tmp/xchg" - "echo /cygdrive/x /tmp/xchg none bind 0 0 >> /etc/fstab" + runAndSuspend = let + drives = { + s = { + source = "nixstore"; + target = "/nix/store"; + }; + x = { + source = "xchg"; + target = "/tmp/xchg"; + }; + }; + + genDriveCmds = letter: { source, target }: [ + "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes" + "mkdir -p '${target}'" + "mount -o bind '/cygdrive/${letter}' '${target}'" + "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab" ]; + in runInVM "winvm.img" { + command = lib.concatStringsSep " && " ([ + "net config server /autodisconnect:-1" + ] ++ lib.concatLists (lib.mapAttrsToList genDriveCmds drives)); suspendTo = "state.gz"; }; From dd8b0fcf527fa33e5dfe71b589ccb1044412bfad Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 22:34:45 +0100 Subject: [PATCH 166/449] vm/windows: Save envirenoment before running VM. Later, when we start the actual builder, we're going to restore those environment variables. We're using "(set; declare -p)", here, because the former is just printing _all_ environment variables, even those not supported, and the latter only lists specifically declared variables, which also encludes exports. The "declare -p" command also emits those variables in a format similar to the "export" command. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/controller/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index fd6ad6354aae..4a3e88a22c69 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -172,7 +172,9 @@ let }); preVM = '' + (set; declare -p) > saved-env XCHG_DIR="$(${coreutils}/bin/mktemp -d nix-vm.XXXXXXXXXX --tmpdir)" + ${coreutils}/bin/mv saved-env "$XCHG_DIR/" QEMU_VDE_SOCKET="$(pwd)/vde.ctl" MONITOR_SOCKET="$(pwd)/monitor" ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" & From b01c9624cf0c77837e1928a49778f74446ddfaa0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 22:42:10 +0100 Subject: [PATCH 167/449] vm/windows: Add new runInWindowsVM function. This function is quite similar to runInLinuxVM, but also ensures that the builder is run decoupled of the Nix store and using the userland inside the VM. We're now picking up the environment variables saved in the previous commit. The reason we suppress all errors from the source operation is that it would emit a ton of errors because we're trying to set read-only variables. Also, detecting whether the origBuilder is using the default builder from the stdenv is currently a bit of a workaround until we have a specialized pseudo-cross-stdenv someday in the future[TM]. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/default.nix | 42 +++++++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 8ca31bc39d7b..9d870633ff17 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -60,11 +60,39 @@ let inherit command; }; - runFromSuspended = command: stdenv.mkDerivation { - name = "cygwin-vm-run"; - buildCommand = '' - ${resumeAndRun command} - ''; - }; + builder = '' + source /tmp/xchg/saved-env 2> /dev/null || true + export NIX_STORE=/nix/store + export NIX_BUILD_TOP=/tmp + export TMPDIR=/tmp + export PATH=/empty + cd "$NIX_BUILD_TOP" + exec $origBuilder $origArgs + ''; -in runFromSuspended "uname -a" +in { + runInWindowsVM = drv: let + newDrv = drv.override { + stdenv = drv.stdenv.override { + shell = "/bin/sh"; + }; + }; + in lib.overrideDerivation drv (attrs: { + requiredSystemFeatures = [ "kvm" ]; + buildur = "${stdenv.shell}"; + args = ["-e" (resumeAndRun builder)]; + origArgs = attrs.args; + origBuilder = if attrs.builder == attrs.stdenv.shell + then "/bin/sh" + else attrs.builder; + + postHook = '' + PATH=/usr/bin:/bin:/usr/sbin:/sbin + SHELL=/bin/sh + eval "$origPostHook" + ''; + + origPostHook = attrs.postHook or ""; + fixupPhase = ":"; + }); +} From e40f41e50562873fcdb78bec891a8f19141d4b42 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Feb 2014 00:34:19 +0100 Subject: [PATCH 168/449] vm/windows: Collect exit code from xchg. This is the last item that was missing to get a fully working runInWindowsVM function. Apart from checking exit codes, we also now have preVM/postVM hooks which we can use to write arbitrary constructs around this architecture, without the need to worry about specific details. Signed-off-by: aszlig --- .../vm/windows/controller/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 4a3e88a22c69..621729eaabb2 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -128,12 +128,10 @@ let -i /ssh.key \ -l Administrator \ 192.168.0.1 -- ${shellEscape command} - - ${lib.optionalString (suspendTo != null) '' + '') + lib.optionalString (suspendTo != null) '' ${coreutils}/bin/touch /xchg/suspend_now ${loopForever} - ''} - '')); + ''); kernelAppend = lib.concatStringsSep " " [ "panic=1" @@ -175,6 +173,9 @@ let (set; declare -p) > saved-env XCHG_DIR="$(${coreutils}/bin/mktemp -d nix-vm.XXXXXXXXXX --tmpdir)" ${coreutils}/bin/mv saved-env "$XCHG_DIR/" + + eval "$preVM" + QEMU_VDE_SOCKET="$(pwd)/vde.ctl" MONITOR_SOCKET="$(pwd)/monitor" ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" & @@ -190,7 +191,9 @@ let '' else '' ${vmTools.qemuProg} ${cygwinQemuArgs} & ${vmTools.qemuProg} ${controllerQemuArgs}${bgBoth} - '' + lib.optionalString (suspendTo != null) '' + ''; + + postVM = if suspendTo != null then '' while ! test -e "$XCHG_DIR/suspend_now"; do sleep 1; done ${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET < Date: Mon, 17 Feb 2014 02:10:00 +0100 Subject: [PATCH 169/449] vm/windows: Factor out bootstrapping process. This now isolates the vmTools integration from the bootstrap process and thus removes our fixed Windows ISO and product key. The latter can now be provided by an attribute "windowsImage" to runInWindowsVM. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/bootstrap.nix | 61 ++++++++++++++++++ pkgs/build-support/vm/windows/default.nix | 68 ++------------------- 2 files changed, 67 insertions(+), 62 deletions(-) create mode 100644 pkgs/build-support/vm/windows/bootstrap.nix diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix new file mode 100644 index 000000000000..26aa6c7a6861 --- /dev/null +++ b/pkgs/build-support/vm/windows/bootstrap.nix @@ -0,0 +1,61 @@ +{ isoFile, productKey }: + +let + inherit (import {}) lib stdenv qemu; +in rec { + installedVM = import ./install { + inherit isoFile productKey; + }; + + runInVM = img: attrs: import ./controller (attrs // { + inherit (installedVM) sshKey; + qemuArgs = attrs.qemuArgs or [] ++ [ + "-boot order=c" + "-drive file=${img},index=0,media=disk" + ]; + }); + + runAndSuspend = let + drives = { + s = { + source = "nixstore"; + target = "/nix/store"; + }; + x = { + source = "xchg"; + target = "/tmp/xchg"; + }; + }; + + genDriveCmds = letter: { source, target }: [ + "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes" + "mkdir -p '${target}'" + "mount -o bind '/cygdrive/${letter}' '${target}'" + "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab" + ]; + in runInVM "winvm.img" { + command = lib.concatStringsSep " && " ([ + "net config server /autodisconnect:-1" + ] ++ lib.concatLists (lib.mapAttrsToList genDriveCmds drives)); + suspendTo = "state.gz"; + }; + + suspendedVM = stdenv.mkDerivation { + name = "cygwin-suspended-vm"; + buildCommand = '' + ${qemu}/bin/qemu-img create \ + -b "${installedVM}/disk.img" \ + -f qcow2 winvm.img + ${runAndSuspend} + ensureDir "$out" + cp winvm.img "$out/disk.img" + cp state.gz "$out/state.gz" + ''; + }; + + resumeAndRun = command: runInVM "${suspendedVM}/disk.img" { + resumeFrom = "${suspendedVM}/state.gz"; + qemuArgs = lib.singleton "-snapshot"; + inherit command; + }; +} diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 9d870633ff17..8e8809f370f0 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -1,64 +1,5 @@ let - inherit (import {}) lib stdenv requireFile writeText qemu; - - winISO = /path/to/iso/XXX; - - installedVM = import ./install { - isoFile = winISO; - productKey = "XXX"; - }; - - runInVM = img: attrs: import ./controller (attrs // { - inherit (installedVM) sshKey; - qemuArgs = attrs.qemuArgs or [] ++ [ - "-boot order=c" - "-drive file=${img},index=0,media=disk" - ]; - }); - - runAndSuspend = let - drives = { - s = { - source = "nixstore"; - target = "/nix/store"; - }; - x = { - source = "xchg"; - target = "/tmp/xchg"; - }; - }; - - genDriveCmds = letter: { source, target }: [ - "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes" - "mkdir -p '${target}'" - "mount -o bind '/cygdrive/${letter}' '${target}'" - "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab" - ]; - in runInVM "winvm.img" { - command = lib.concatStringsSep " && " ([ - "net config server /autodisconnect:-1" - ] ++ lib.concatLists (lib.mapAttrsToList genDriveCmds drives)); - suspendTo = "state.gz"; - }; - - suspendedVM = stdenv.mkDerivation { - name = "cygwin-suspended-vm"; - buildCommand = '' - ${qemu}/bin/qemu-img create \ - -b "${installedVM}/disk.img" \ - -f qcow2 winvm.img - ${runAndSuspend} - ensureDir "$out" - cp winvm.img "$out/disk.img" - cp state.gz "$out/state.gz" - ''; - }; - - resumeAndRun = command: runInVM "${suspendedVM}/disk.img" { - resumeFrom = "${suspendedVM}/state.gz"; - qemuArgs = lib.singleton "-snapshot"; - inherit command; - }; + inherit (import {}) lib stdenv; builder = '' source /tmp/xchg/saved-env 2> /dev/null || true @@ -77,10 +18,13 @@ in { shell = "/bin/sh"; }; }; - in lib.overrideDerivation drv (attrs: { + in lib.overrideDerivation drv (attrs: let + bootstrap = import ./bootstrap.nix attrs.windowsImage; + in { requiredSystemFeatures = [ "kvm" ]; buildur = "${stdenv.shell}"; - args = ["-e" (resumeAndRun builder)]; + args = ["-e" (bootstrap.resumeAndRun builder)]; + windowsImage = bootstrap.suspendedVM; origArgs = attrs.args; origBuilder = if attrs.builder == attrs.stdenv.shell then "/bin/sh" From 623f1940c0a9f8fcc150fb9c72ee08496025605a Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 26 Feb 2014 05:43:34 +0100 Subject: [PATCH 170/449] vm/windows: Make list of dependencies explicit. So far, the VMs have always been using the native architecture, because it was reimporting several times. Now, we propagate a list of packages down to all sub-imports, which not only makes clearer which dependencies a part actually has, but also will make it easier in case we want to refactor those parts to use callPackage. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/bootstrap.nix | 31 +++++++++++++++---- .../vm/windows/controller/default.nix | 31 ++++++++++--------- .../vm/windows/cygwin-iso/default.nix | 4 +-- pkgs/build-support/vm/windows/default.nix | 14 ++++++--- .../vm/windows/install/default.nix | 18 +++++++---- .../vm/windows/install/unattended-image.nix | 8 ++--- 6 files changed, 70 insertions(+), 36 deletions(-) diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix index 26aa6c7a6861..b2febf19a89e 100644 --- a/pkgs/build-support/vm/windows/bootstrap.nix +++ b/pkgs/build-support/vm/windows/bootstrap.nix @@ -1,13 +1,32 @@ +{ stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd +, python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu +, samba, socat, vde2, cdrkit, pathsFromGraph +}: + { isoFile, productKey }: +with stdenv.lib; + let - inherit (import {}) lib stdenv qemu; + controller = import ./controller { + inherit stdenv writeScript vmTools makeInitrd; + inherit samba vde2 openssh socat netcat coreutils gzip; + }; + + mkCygwinImage = import ./cygwin-iso { + inherit stdenv fetchurl runCommand python perl cdrkit pathsFromGraph; + }; + + installer = import ./install { + inherit controller mkCygwinImage; + inherit stdenv runCommand openssh qemu writeText dosfstools mtools; + }; in rec { - installedVM = import ./install { + installedVM = installer { inherit isoFile productKey; }; - runInVM = img: attrs: import ./controller (attrs // { + runInVM = img: attrs: controller (attrs // { inherit (installedVM) sshKey; qemuArgs = attrs.qemuArgs or [] ++ [ "-boot order=c" @@ -34,9 +53,9 @@ in rec { "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab" ]; in runInVM "winvm.img" { - command = lib.concatStringsSep " && " ([ + command = concatStringsSep " && " ([ "net config server /autodisconnect:-1" - ] ++ lib.concatLists (lib.mapAttrsToList genDriveCmds drives)); + ] ++ concatLists (mapAttrsToList genDriveCmds drives)); suspendTo = "state.gz"; }; @@ -55,7 +74,7 @@ in rec { resumeAndRun = command: runInVM "${suspendedVM}/disk.img" { resumeFrom = "${suspendedVM}/state.gz"; - qemuArgs = lib.singleton "-snapshot"; + qemuArgs = singleton "-snapshot"; inherit command; }; } diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 621729eaabb2..fe4b5b7f6c24 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -1,3 +1,7 @@ +{ stdenv, writeScript, vmTools, makeInitrd +, samba, vde2, openssh, socat, netcat, coreutils, gzip +}: + { sshKey , qemuArgs ? [] , command ? "sync" @@ -6,10 +10,9 @@ , installMode ? false }: -let - inherit (import {}) lib stdenv writeScript vmTools makeInitrd; - inherit (import {}) samba vde2 openssh socat netcat coreutils gzip; +with stdenv.lib; +let preInitScript = writeScript "preinit.sh" '' #!${vmTools.initrdUtils}/bin/ash -e export PATH=${vmTools.initrdUtils}/bin @@ -62,13 +65,13 @@ let ''; initrd = makeInitrd { - contents = lib.singleton { + contents = singleton { object = preInitScript; symlink = "/init"; }; }; - shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; + shellEscape = x: "'${replaceChars ["'"] [("'\\'" + "'")] x}'"; loopForever = "while :; do ${coreutils}/bin/sleep 1; done"; @@ -128,12 +131,12 @@ let -i /ssh.key \ -l Administrator \ 192.168.0.1 -- ${shellEscape command} - '') + lib.optionalString (suspendTo != null) '' + '') + optionalString (suspendTo != null) '' ${coreutils}/bin/touch /xchg/suspend_now ${loopForever} ''); - kernelAppend = lib.concatStringsSep " " [ + kernelAppend = concatStringsSep " " [ "panic=1" "loglevel=4" "console=tty1" @@ -141,7 +144,7 @@ let "command=${initScript}" ]; - controllerQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [ + controllerQemuArgs = concatStringsSep " " (maybeKvm64 ++ [ "-nographic" "-no-reboot" "-virtfs local,path=/nix/store,security_model=none,mount_tag=store" @@ -153,20 +156,20 @@ let "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET" ]); - maybeKvm64 = lib.optional (stdenv.system == "x86_64-linux") "-cpu kvm64"; + maybeKvm64 = optional (stdenv.system == "x86_64-linux") "-cpu kvm64"; - cygwinQemuArgs = lib.concatStringsSep " " (maybeKvm64 ++ [ + cygwinQemuArgs = concatStringsSep " " (maybeKvm64 ++ [ "-monitor unix:$MONITOR_SOCKET,server,nowait" "-nographic" "-net nic,vlan=0,macaddr=52:54:00:12:01:01" "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET" "-rtc base=2010-01-01,clock=vm" - ] ++ qemuArgs ++ lib.optionals (resumeFrom != null) [ + ] ++ qemuArgs ++ optionals (resumeFrom != null) [ "-incoming 'exec: ${gzip}/bin/gzip -c -d \"${resumeFrom}\"'" ]); - modulesClosure = lib.overrideDerivation vmTools.modulesClosure (o: { - rootModules = o.rootModules ++ lib.singleton "virtio_net"; + modulesClosure = overrideDerivation vmTools.modulesClosure (o: { + rootModules = o.rootModules ++ singleton "virtio_net"; }); preVM = '' @@ -183,7 +186,7 @@ let UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20 ''; - bgBoth = lib.optionalString (suspendTo != null) " &"; + bgBoth = optionalString (suspendTo != null) " &"; vmExec = if installMode then '' ${vmTools.qemuProg} ${controllerQemuArgs} & diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index 17e4cff855b7..c7b1cc8bbcba 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -1,11 +1,11 @@ +{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph }: + { packages ? [] , mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin" , extraContents ? [] }: let - inherit (import {}) fetchurl runCommand python; - cygPkgList = fetchurl { url = "${mirror}/x86_64/setup.ini"; sha256 = "19vfm7zr8kcp1algmggk8vsilkccycx22mdf0ynfl6lcmp6dkfsz"; diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 8e8809f370f0..758120ed4f2f 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -1,5 +1,11 @@ +pkgs: + let - inherit (import {}) lib stdenv; + bootstrapper = import ./bootstrap.nix { + inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd; + inherit (pkgs) coreutils dosfstools gzip mtools netcat openssh qemu samba; + inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph; + }; builder = '' source /tmp/xchg/saved-env 2> /dev/null || true @@ -18,11 +24,11 @@ in { shell = "/bin/sh"; }; }; - in lib.overrideDerivation drv (attrs: let - bootstrap = import ./bootstrap.nix attrs.windowsImage; + in pkgs.lib.overrideDerivation drv (attrs: let + bootstrap = bootstrapper attrs.windowsImage; in { requiredSystemFeatures = [ "kvm" ]; - buildur = "${stdenv.shell}"; + buildur = "${pkgs.stdenv.shell}"; args = ["-e" (bootstrap.resumeAndRun builder)]; windowsImage = bootstrap.suspendedVM; origArgs = attrs.args; diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix index 64177ea17137..10690bf6b287 100644 --- a/pkgs/build-support/vm/windows/install/default.nix +++ b/pkgs/build-support/vm/windows/install/default.nix @@ -1,10 +1,12 @@ +{ stdenv, runCommand, openssh, qemu, controller, mkCygwinImage +, writeText, dosfstools, mtools +}: + { isoFile , productKey }: let - inherit (import {}) lib stdenv runCommand openssh qemu; - bootstrapAfterLogin = runCommand "bootstrap.sh" {} '' cat > "$out" < {}) lib stdenv writeText dosfstools mtools; - afterSetup = [ cygwinSetup "-L -n -q" @@ -80,7 +80,7 @@ let ; Turn off all components [Components] - ${lib.concatMapStrings (comp: "${comp} = Off\n") [ + ${stdenv.lib.concatMapStrings (comp: "${comp} = Off\n") [ "AccessOpt" "Appsrv_console" "Aspnet" "BitsServerExtensionsISAPI" "BitsServerExtensionsManager" "Calc" "Certsrv" "Certsrv_client" "Certsrv_server" "Charmap" "Chat" "Clipbook" "Cluster" "Complusnetwork" @@ -107,7 +107,7 @@ let Mode = 0 [SetupParams] - UserExecute = "${lib.concatStringsSep " " afterSetup}" + UserExecute = "${stdenv.lib.concatStringsSep " " afterSetup}" [GuiRunOnce] Command0 = "${cygwinRoot}\bin\bash -l ${shExecAfterwards}" From 895a683d399afca1b6e7ab8e02b9508dd81b281b Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 26 Feb 2014 06:19:05 +0100 Subject: [PATCH 171/449] vm/windows: Add setup.ini for 32bit architecture. Also update 64bit setup.ini and check whether we have a 64 bit stdenv in order to choose the proper Cygwin version. Otherwise we now have the setup.ini for 32bit available as well. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/cygwin-iso/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index c7b1cc8bbcba..a806ea9571ff 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -6,9 +6,12 @@ }: let - cygPkgList = fetchurl { + cygPkgList = if stdenv.is64bit then fetchurl { url = "${mirror}/x86_64/setup.ini"; - sha256 = "19vfm7zr8kcp1algmggk8vsilkccycx22mdf0ynfl6lcmp6dkfsz"; + sha256 = "142f8zyfwgi6s2djxv3z5wn0ysl94pxwa79z8rjfqz4kvnpgz120"; + } else fetchurl { + url = "${mirror}/x86/setup.ini"; + sha256 = "1v596lln2iip5h7wxjnig5rflzvqa21zzd2iyhx07zs28q5h76i9"; }; makeCygwinClosure = { packages, packageList }: let From 88ea17284eea19315137638c8fe0c720ea5e3ad9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 26 Feb 2014 06:21:48 +0100 Subject: [PATCH 172/449] vmTools: Hook in runInWindowsVM function. Signed-off-by: aszlig --- pkgs/build-support/vm/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index c6b774fc06cd..3dcb8aa17055 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1714,5 +1714,4 @@ rec { }; }; - -} +} // import ./windows pkgs From 78e7d5db0014b9ee4d60e4c0ee3fb8e1e08b0949 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 26 Feb 2014 09:35:28 +0100 Subject: [PATCH 173/449] calibre: upgrade from 1.23.0 to 1.25.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index c2672393bc5f..f3d7c26fe5cc 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.23.0"; + name = "calibre-1.25.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1sm6v53c12nkqnpv7n4g1mzkwmzbn74a8v83bzvvjiz0i9c7cl59"; + sha256 = "1y221r5vgq426ldqjrx3qvgf3j3v2wncwzra747psvhwf95zd5fd"; }; inherit python; From 2fd60ee9484fbbb412f80672367199409d58147c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Feb 2014 06:07:22 -0500 Subject: [PATCH 174/449] Add graph-wrapper haskell package --- .../libraries/haskell/graph-wrapper/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/graph-wrapper/default.nix diff --git a/pkgs/development/libraries/haskell/graph-wrapper/default.nix b/pkgs/development/libraries/haskell/graph-wrapper/default.nix new file mode 100644 index 000000000000..86d25c24fda3 --- /dev/null +++ b/pkgs/development/libraries/haskell/graph-wrapper/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "graph-wrapper"; + version = "0.2.4.2"; + sha256 = "0cf70xvmzn4w5pg1bxizajqgcbjwwk6jrd7hnb3kfqy1v3apifyf"; + meta = { + homepage = "http://www.github.com/batterseapower/graph-wrapper"; + description = "A wrapper around the standard Data.Graph with a less awkward interface"; + 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 227e6be1eb27..88ebf6f5ae15 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1237,6 +1237,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x graphviz = callPackage ../development/libraries/haskell/graphviz {}; + graphWrapper = callPackage ../development/libraries/haskell/graph-wrapper {}; + groups = callPackage ../development/libraries/haskell/groups {}; groupoids = callPackage ../development/libraries/haskell/groupoids {}; From 687fe455824fea27fd019fb907e7eab993daf430 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Wed, 26 Feb 2014 19:18:29 +0800 Subject: [PATCH 175/449] renpy: update to 6.17.1 --- pkgs/development/interpreters/renpy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 60884fce69d1..4cd719842b67 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, python, pkgconfig, wrapPython +{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython , pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib }: stdenv.mkDerivation { - name = "renpy-6.16.3"; + name = "renpy-6.17.1"; meta = { description = "Ren'Py Visual Novel Engine"; @@ -14,12 +14,12 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://www.renpy.org/dl/6.16.3/renpy-6.16.3-source.tar.bz2"; - sha256 = "0yd7wj85kp0hlaqlrhl40irhkmcng89vcxypyx40pqmk87gjagqn"; + url = "http://www.renpy.org/dl/6.17.1/renpy-6.17.1-source.tar.bz2"; + sha256 = "024v05yifs6c13chpg0azjpi6xk1srrhd1d0hcs946xbjvbbadpc"; }; buildInputs = [ - python pkgconfig wrapPython + python cython pkgconfig wrapPython SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame ]; From 1ce6fff4e21906a3e6cfd26fdf4372f7501541cd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Feb 2014 07:54:04 -0500 Subject: [PATCH 176/449] Merge mysql55 module into mysql This also removes the default for services.mysql.package, as this should not generally be updated automatically if we change the mysql attribute --- nixos/modules/rename.nix | 2 + nixos/modules/services/databases/mysql.nix | 21 +- nixos/modules/services/databases/mysql55.nix | 248 ------------------- pkgs/servers/sql/mariadb/default.nix | 2 + pkgs/servers/sql/mysql/5.1.x.nix | 2 + pkgs/servers/sql/mysql/5.5.x.nix | 2 + 6 files changed, 26 insertions(+), 251 deletions(-) delete mode 100644 nixos/modules/services/databases/mysql55.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 8393b5758f3c..f41bababd293 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -124,6 +124,8 @@ in zipModules ([] ++ obsolete [ "services" "mesa" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ] ++ obsolete [ "services" "mesa" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ] +++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ] + # Options that are obsolete and have no replacement. ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ] ++ obsolete' [ "boot" "initrd" "luks" "enable" ] diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 8be05a27cdcb..62fbc2a1415b 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -8,6 +8,10 @@ let mysql = cfg.package; + is55 = mysql.mysqlVersion == "5.5"; + + mysqldDir = if is55 then "${mysql}/bin" else "${mysql}/libexec"; + pidFile = "${cfg.pidDir}/mysqld.pid"; mysqldOptions = @@ -19,7 +23,7 @@ let [mysqld] ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} - ${optionalString (cfg.replication.role == "slave") + ${optionalString (cfg.replication.role == "slave" && !is55) '' master-host = ${cfg.replication.masterHost} master-user = ${cfg.replication.masterUser} @@ -47,7 +51,8 @@ in }; package = mkOption { - default = pkgs.mysql; + type = types.package; + example = literalExample "pkgs.mysql"; description = " Which MySQL derivation to use. "; @@ -176,7 +181,7 @@ in chown -R ${cfg.user} ${cfg.pidDir} ''; - serviceConfig.ExecStart = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; + serviceConfig.ExecStart = "${mysqldDir}/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; postStart = '' @@ -216,6 +221,16 @@ in fi '') cfg.initialDatabases} + ${optionalString (cfg.replication.role == "slave" && is55) + '' + # Set up the replication master + + ( echo "stop slave;" + echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';" + echo "start slave;" + ) | ${mysql}/bin/mysql -u root -N + ''} + ${optionalString (cfg.initialScript != null) '' # Execute initial script diff --git a/nixos/modules/services/databases/mysql55.nix b/nixos/modules/services/databases/mysql55.nix deleted file mode 100644 index fe8b29e3c6b7..000000000000 --- a/nixos/modules/services/databases/mysql55.nix +++ /dev/null @@ -1,248 +0,0 @@ -{ config, pkgs, ... }: - -with pkgs.lib; - -let - - cfg = config.services.mysql55; - - mysql = cfg.package; - - pidFile = "${cfg.pidDir}/mysqld.pid"; - - mysqldOptions = - "--user=${cfg.user} --datadir=${cfg.dataDir} " + - "--pid-file=${pidFile}"; - - myCnf = pkgs.writeText "my.cnf" - '' - [mysqld] - ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} - ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} - ${cfg.extraOptions} - ''; - -in - -{ - - ###### interface - - options = { - - services.mysql55 = { - - enable = mkOption { - default = false; - description = " - Whether to enable the MySQL server. - "; - }; - - package = mkOption { - default = pkgs.mysql55; - description = " - Which MySQL derivation to use. - "; - }; - - port = mkOption { - default = "3306"; - description = "Port of MySQL"; - }; - - user = mkOption { - default = "mysql"; - description = "User account under which MySQL runs"; - }; - - dataDir = mkOption { - default = "/var/mysql"; # !!! should be /var/db/mysql - description = "Location where MySQL stores its table files"; - }; - - pidDir = mkOption { - default = "/var/run/mysql"; - description = "Location of the file which stores the PID of the MySQL server"; - }; - - extraOptions = mkOption { - default = ""; - example = '' - key_buffer_size = 6G - table_cache = 1600 - log-error = /var/log/mysql_err.log - ''; - description = '' - Provide extra options to the MySQL configuration file. - - Please note, that these options are added to the - [mysqld] section so you don't need to explicitly - state it again. - ''; - }; - - initialDatabases = mkOption { - default = []; - description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL"; - example = [ - { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; } - { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; } - ]; - }; - - initialScript = mkOption { - default = null; - description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database"; - }; - - # FIXME: remove this option; it's a really bad idea. - rootPassword = mkOption { - default = null; - description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty."; - }; - - replication = { - role = mkOption { - default = "none"; - description = "Role of the MySQL server instance. Can be either: master, slave or none"; - }; - - serverId = mkOption { - default = 1; - description = "Id of the MySQL server instance. This number must be unique for each instance"; - }; - - masterHost = mkOption { - description = "Hostname of the MySQL master server"; - }; - - masterUser = mkOption { - description = "Username of the MySQL replication user"; - }; - - masterPassword = mkOption { - description = "Password of the MySQL replication user"; - }; - - masterPort = mkOption { - default = 3306; - description = "Port number on which the MySQL master server runs"; - }; - }; - }; - - }; - - - ###### implementation - - config = mkIf config.services.mysql55.enable { - - users.extraUsers.mysql = { - description = "MySQL server user"; - group = "mysql"; - uid = config.ids.uids.mysql; - }; - - users.extraGroups.mysql.gid = config.ids.gids.mysql; - - environment.systemPackages = [mysql]; - - systemd.services.mysql = - { description = "MySQL Server"; - - wantedBy = [ "multi-user.target" ]; - - unitConfig.RequiresMountsFor = "${cfg.dataDir}"; - - preStart = - '' - if ! test -e ${cfg.dataDir}/mysql; then - mkdir -m 0700 -p ${cfg.dataDir} - chown -R ${cfg.user} ${cfg.dataDir} - ${mysql}/bin/mysql_install_db ${mysqldOptions} - touch /tmp/mysql_init - fi - - mkdir -m 0700 -p ${cfg.pidDir} - chown -R ${cfg.user} ${cfg.pidDir} - ''; - - serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; - - postStart = - '' - # Wait until the MySQL server is available for use - count=0 - while [ ! -e /tmp/mysql.sock ] - do - if [ $count -eq 30 ] - then - echo "Tried 30 times, giving up..." - exit 1 - fi - - echo "MySQL daemon not yet started. Waiting for 1 second..." - count=$((count++)) - sleep 1 - done - - if [ -f /tmp/mysql_init ] - then - ${concatMapStrings (database: - '' - # Create initial databases - if ! test -e "${cfg.dataDir}/${database.name}"; then - echo "Creating initial database: ${database.name}" - ( echo "create database ${database.name};" - echo "use ${database.name};" - - if [ -f "${database.schema}" ] - then - cat ${database.schema} - elif [ -d "${database.schema}" ] - then - cat ${database.schema}/mysql-databases/*.sql - fi - ) | ${mysql}/bin/mysql -u root -N - fi - '') cfg.initialDatabases} - - ${optionalString (cfg.replication.role == "slave") - '' - # Set up the replication master - - ( echo "stop slave;" - echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';" - echo "start slave;" - ) | ${mysql}/bin/mysql -u root -N - ''} - - ${optionalString (cfg.initialScript != null) - '' - # Execute initial script - cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N - ''} - - ${optionalString (cfg.rootPassword != null) - '' - # Change root password - - ( echo "use mysql;" - echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';" - echo "flush privileges;" - ) | ${mysql}/bin/mysql -u root -N - ''} - - rm /tmp/mysql_init - fi - ''; # */ - - serviceConfig.ExecStop = - "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown"; - }; - - }; - -} diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index e09943d86c8d..db6797a8d687 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.mysqlVersion = "5.5"; + meta = { description = "An enhanced, drop-in replacement for MySQL"; homepage = https://mariadb.org/; diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index c210c9965327..c309158a6705 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { rm -rf $out/mysql-test $out/sql-bench $out/share/info ''; + passthru.mysqlVersion = "5.1"; + meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index bd30b7db75ff..e8da8a48d65f 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { rm -rf $out/mysql-test $out/sql-bench ''; + passthru.mysqlVersion = "5.5"; + meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; From c9f9835ddaad104f4d917d6af6e787aaf9b4becf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Feb 2014 07:56:59 -0500 Subject: [PATCH 177/449] Document mysql changes --- nixos/doc/manual/release-notes.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml index 4a0fc6a52e4c..8899cbb21498 100644 --- a/nixos/doc/manual/release-notes.xml +++ b/nixos/doc/manual/release-notes.xml @@ -21,6 +21,10 @@ enhancements are the following: NixOS is now based on Glibc 2.18 and GCC 4.8. + The mysql55 service has been merged into the + mysql service, which no longer sets a default for the 'package + option. + From efb18d9aa5b82414b39668afdd9d975e2906ac3a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Feb 2014 08:49:21 -0500 Subject: [PATCH 178/449] D'oh --- nixos/modules/module-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 391cc2503bd2..f6f95564d4a0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -87,7 +87,6 @@ ./services/databases/mongodb.nix ./services/databases/redis.nix ./services/databases/mysql.nix - ./services/databases/mysql55.nix ./services/databases/openldap.nix ./services/databases/postgresql.nix ./services/databases/virtuoso.nix From 69b6b939efbc17ec9cedde521763ea26c29982b3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Feb 2014 10:06:28 -0500 Subject: [PATCH 179/449] rename.nix: Handle renaming of a whole set of options mkIf was pushed down, making the obsoleted argument unconditionally evaluated Signed-off-by: Shea Levy --- nixos/modules/rename.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index f41bababd293..1a08a1cf4f35 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -56,7 +56,7 @@ let inherit visible; }); } - { config = setTo (mkIf (fromOf options).isDefined (define (mkMerge (fromOf options).definitions))); + { config = setTo (mkMerge (if (fromOf options).isDefined then [ (define (mkMerge (fromOf options).definitions)) ] else [])); } ]; From 08dfbebbf1f12e5d32f49c4f6270abd9fb9e2785 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 26 Feb 2014 16:19:42 +0000 Subject: [PATCH 180/449] haskellPackages.singletons: New expression Haddock's are disabled for the singletons library as it can't yet understand some of the extensions that this library uses. --- .../libraries/haskell/singletons/default.nix | 16 ++++++++++++++++ .../libraries/haskell/th-desugar/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/haskell/singletons/default.nix create mode 100644 pkgs/development/libraries/haskell/th-desugar/default.nix diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix new file mode 100644 index 000000000000..692cc5284546 --- /dev/null +++ b/pkgs/development/libraries/haskell/singletons/default.nix @@ -0,0 +1,16 @@ +{ cabal, mtl, syb, thDesugar }: + +cabal.mkDerivation (self: { + pname = "singletons"; + version = "0.9.3"; + sha256 = "0m90k3ygm04c0gjfiaw5rmajyn2yz0ldcqm2xmm39d10270skpb4"; + buildDepends = [ mtl syb thDesugar ]; + meta = { + homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; + description = "A framework for generating singleton types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; + noHaddock = true; +}) diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix new file mode 100644 index 000000000000..f3aa1628aae7 --- /dev/null +++ b/pkgs/development/libraries/haskell/th-desugar/default.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, syb }: + +cabal.mkDerivation (self: { + pname = "th-desugar"; + version = "1.2.1"; + sha256 = "12a8m1vzfbn728psaiqxwngmksrbybci3g7a47z04rjbsjf3cy4v"; + buildDepends = [ mtl syb ]; + meta = { + homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; + description = "Functions to desugar Template Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 88ebf6f5ae15..ca4e9424c8e8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2267,6 +2267,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x show = callPackage ../development/libraries/haskell/show {}; + singletons = callPackage ../development/libraries/haskell/singletons {}; + SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; socketActivation = callPackage ../development/libraries/haskell/socket-activation {}; @@ -2391,6 +2393,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x thespian = callPackage ../development/libraries/haskell/thespian {}; + thDesugar = callPackage ../development/libraries/haskell/th-desugar {}; + thExtras = callPackage ../development/libraries/haskell/th-extras {}; thLift = callPackage ../development/libraries/haskell/th-lift {}; From 32470621d51fce499dfcabccfbdecbf93c0388b9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Feb 2014 13:35:04 -0500 Subject: [PATCH 181/449] Restart keys.target on reconfiguration --- nixos/modules/system/boot/systemd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index e0773c1fab42..2d1bb5ae9802 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -649,6 +649,7 @@ in systemd.targets.keys = { description = "Security Keys"; + unitConfig.X-StopOnReconfiguration = true; }; systemd.units = From 68e9829134590abb6fcac238baf4dac51cdd0c22 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 26 Feb 2014 20:47:30 +0200 Subject: [PATCH 182/449] youtubeDL: update from 2014.02.19.1 to 2014.02.26 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index ef4bc68b1c80..29463a358e9f 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 = "2014.02.19.1"; + version = "2014.02.26"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0bilardg46xikw4gl4n50bg9wrmarmnzhrhhwhdcyrx0p0idl4fn"; + sha256 = "069p3iyh96xc7y9ixzl4v5smq8i6d4gnhyy2yyzphjlfnpvwhb7j"; }; buildInputs = [ python ]; From 05c19ced9b6997edb00fca5a96282921303564c9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 26 Feb 2014 20:49:27 +0200 Subject: [PATCH 183/449] linuxPackages_3_12.perf: update from 3.12.12 to 3.12.13 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 84c865b6542b..d276de69446a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.12"; + version = "3.12.13"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0wndjj5bdjfl4i9s5mj9wylhspygsvnl3pnwps6d65q2jm813lrv"; + sha256 = "08r4k64v0nkr0dnmir3n3x7f4i83akl3ahx9cl7rbj29zc4ninmd"; }; features.iwlwifi = true; From 2059d4c3395922b2f969a12a5d55e31812f75467 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 25 Feb 2014 21:39:30 -0600 Subject: [PATCH 184/449] cb0cat: version 20131216153906 Signed-off-by: Austin Seipp --- pkgs/tools/security/cb0cat/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/security/cb0cat/default.nix diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix new file mode 100644 index 000000000000..e35434f3cc26 --- /dev/null +++ b/pkgs/tools/security/cb0cat/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "cb0cat-${version}"; + version = "20131216153906"; + + src = fetchurl { + url = "https://www.cblnk.com/cb0cat/dist/${name}.tgz"; + sha256 = "182767nxfyiis7ac8bn5v8rxb9vlly8n5w42pz1dd0751xwdlp82"; + }; + + installPhase = '' + mkdir -p $out/bin + mv cb0cat $out/bin + ''; + + meta = { + description = "cryptographic tool based on the CBEAMr0 sponge function"; + homepage = "https://www.cblnk.com"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44a23e828dfd..e7b9a078a8ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -424,6 +424,8 @@ let aescrypt = callPackage ../tools/misc/aescrypt { }; + cb0cat = callPackage ../tools/security/cb0cat { }; + ahcpd = callPackage ../tools/networking/ahcpd { }; aircrackng = callPackage ../tools/networking/aircrack-ng { }; From c23ec33c7743a9c7f9eb5055e8425475321dc2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Feb 2014 13:06:23 +0100 Subject: [PATCH 185/449] Add selenium-server-standalone (submitted by coreyoconnor) --- .../tools/selenium/server/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/selenium/server/default.nix diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix new file mode 100644 index 000000000000..efb1e85c2d73 --- /dev/null +++ b/pkgs/development/tools/selenium/server/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "selenium-server-standalone-${version}"; + version = "2.39.0"; + + src = fetchurl { + url = "https://selenium.googlecode.com/files/${name}.jar"; + sha256 = "11ixh5x5f9kia2va8wssd3n7y57dkv3snw6xvk85y4qhzg64b65f"; + }; + + unpack = ""; + + buildCommand = '' + mkdir -p $out/share/lib/${name} + cp $src $out/share/lib/${name}/${name}.jar + ''; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/selenium; + description = "Selenium Server for remote WebDriver."; + maintainers = [ maintainers.coconnor ]; + platforms = platforms.all; + hydraPlatforms = []; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44a23e828dfd..b54648613b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3736,6 +3736,8 @@ let jre = jdk; }; + selenium-server-standalone = callPackage ../development/tools/selenium/server { }; + scons = callPackage ../development/tools/build-managers/scons { }; simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; From 1e7300ad676d91717ef36a8eeee46763287c0ee2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 27 Feb 2014 06:37:22 -0500 Subject: [PATCH 186/449] mediawiki rewrite rules only needed with no urlPrefix --- .../web-servers/apache-httpd/mediawiki.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 9f4189e4d499..29efc975a383 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -126,7 +126,17 @@ in ''} - ${optionalString (config.urlPrefix != "") "Alias ${config.urlPrefix} ${mediawikiRoot}"} + ${if config.urlPrefix != "" then "Alias ${config.urlPrefix} ${mediawikiRoot}" else '' + RewriteEngine On + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + RewriteRule ^(.*)$ %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == "" + then "" + else "${config.articleUrlPrefix}/" + }index.php [L] + + RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */ + ''} Order allow,deny @@ -137,13 +147,6 @@ in ${optionalString (config.articleUrlPrefix != "") '' Alias ${config.articleUrlPrefix} ${mediawikiRoot}/index.php ''} - - RewriteEngine On - RewriteCond ${mediawikiRoot}/$0 !-f - RewriteCond ${mediawikiRoot}/$0 !-d - RewriteRule ^(.*)$ ${mediawikiRoot}/index.php [L] - - RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */ ''; documentRoot = if config.urlPrefix == "" then mediawikiRoot else null; From f7c04b1e6b43114c6ffa822c29e93621e97ed35a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 27 Feb 2014 07:17:05 -0500 Subject: [PATCH 187/449] mediawiki: Don't rewrite /images if uploads are enabled --- .../services/web-servers/apache-httpd/mediawiki.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 29efc975a383..f5669faebc97 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -130,12 +130,13 @@ in RewriteEngine On RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d - RewriteRule ^(.*)$ %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == "" + RewriteRule ${if config.enableUploads + then "!^/images" + else "^.*\$" + } %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == "" then "" else "${config.articleUrlPrefix}/" }index.php [L] - - RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */ ''} From 97a0dd9eb92014be027ccc89cb39e43baabe090d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Feb 2014 13:22:04 +0100 Subject: [PATCH 188/449] nixos: set all package options to have type package --- nixos/modules/config/pulseaudio.nix | 2 +- nixos/modules/services/databases/firebird.nix | 1 + nixos/modules/services/databases/mongodb.nix | 1 + nixos/modules/services/databases/postgresql.nix | 2 +- nixos/modules/services/databases/redis.nix | 1 + nixos/modules/services/misc/cgminer.nix | 1 + nixos/modules/services/misc/nix-daemon.nix | 2 +- nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +- nixos/modules/services/web-servers/nginx/default.nix | 1 + 9 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index e7cbe7a28f36..db4f1b43a114 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -77,7 +77,7 @@ in { }; package = mkOption { - type = types.path; + type = types.package; default = pulseaudio; example = literalExample "pulseaudio.override { jackaudioSupport = true; }"; description = '' diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 75c225bdb67b..f9f7e9d7c518 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -49,6 +49,7 @@ in package = mkOption { default = pkgs.firebirdSuper; + type = types.package; /* Example: package = pkgs.firebirdSuper.override { icu = pkgs.icu; }; which is not recommended for compatibility diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 213a60687b23..a2f2593e7973 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -39,6 +39,7 @@ in package = mkOption { default = pkgs.mongodb; + type = types.package; description = " Which MongoDB derivation to use. "; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 265d26e8ce98..cc4230d4d6a7 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -55,7 +55,7 @@ in }; package = mkOption { - type = types.path; + type = types.package; example = literalExample "pkgs.postgresql92"; description = '' PostgreSQL package to use. diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index ea6399ba4f44..9a4ce36a5cb1 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -45,6 +45,7 @@ in package = mkOption { default = pkgs.redis; description = "Which Redis derivation to use."; + type = types.package; }; user = mkOption { diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index f715013b51f3..20b7c34e886e 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -42,6 +42,7 @@ in package = mkOption { default = pkgs.cgminer; description = "Which cgminer derivation to use."; + type = types.package; }; user = mkOption { diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1a957993f98f..785d43973473 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -58,7 +58,7 @@ in nix = { package = mkOption { - type = types.path; + type = types.package; default = pkgs.nix; description = '' This option specifies the Nix package instance to use throughout the system. diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index f239d4fd6c35..a22ef10312d4 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -419,7 +419,7 @@ in }; package = mkOption { - type = types.path; + type = types.package; default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; }; example = "pkgs.apacheHttpd_2_4"; description = '' diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 512da831aa39..1a39fe43bbee 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -25,6 +25,7 @@ in package = mkOption { default = pkgs.nginx; + type = types.package; description = " Nginx package to use. "; From 62438c09f7cc811f994510550614c9265b3b1d18 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 17 Jan 2014 00:30:16 +0000 Subject: [PATCH 189/449] update couchdb to 1.5.0(current latest) and add service for it --- nixos/modules/module-list.nix | 1 + nixos/modules/services/databases/couchdb.nix | 214 +++++++++++++++++++ pkgs/servers/http/couchdb/default.nix | 36 +++- 3 files changed, 242 insertions(+), 9 deletions(-) create mode 100644 nixos/modules/services/databases/couchdb.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f6f95564d4a0..76620f1d02ae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -82,6 +82,7 @@ ./services/backup/rsnapshot.nix ./services/databases/4store-endpoint.nix ./services/databases/4store.nix + ./services/databases/couchdb.nix ./services/databases/firebird.nix ./services/databases/memcached.nix ./services/databases/mongodb.nix diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix new file mode 100644 index 000000000000..4dc2429786d6 --- /dev/null +++ b/nixos/modules/services/databases/couchdb.nix @@ -0,0 +1,214 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + + cfg = config.services.couchdb; + configFile = pkgs.writeText "couchdb.ini" + '' + [couchdb] + database_dir = ${cfg.databaseDir} + uri_file = ${cfg.uriFile} + view_index_dir = ${cfg. viewIndexDir} + + [httpd] + port = ${toString cfg.port} + bind_address = ${cfg.bindAddress} + + [log] + file = ${cfg.logFile} + ''; + configExtraFile = pkgs.writeText "couchdb-extra.ini" cfg.extraConfig; + +in +{ + + ###### interface + + options = { + + services.couchdb = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run CouchDB Server. + ''; + }; + + package = mkOption { + type = types.path; + default = pkgs.couchdb; + example = literalExample "pkgs.couchdb"; + description = '' + CouchDB package to use. + ''; + }; + + + user = mkOption { + type = types.string; + default = "couchdb"; + description = '' + User account under which couchdb runs. + ''; + }; + + group = mkOption { + type = types.string; + default = "couchdb"; + description = '' + Group account under which couchdb runs. + ''; + }; + + pidFile = mkOption { + type = types.string; + default = "/var/run/couchdb/couchdb.pid"; + description = '' + pid file. + ''; + }; + + # couchdb options: http://docs.couchdb.org/en/latest/config/index.html + + databaseDir = mkOption { + type = types.string; + default = "/var/lib/couchdb"; + description = '' + Specifies location of CouchDB database files (*.couch named). This + location should be writable and readable for the user the CouchDB + service runs as (couchdb by default). + ''; + }; + + uriFile = mkOption { + type = types.string; + default = "/var/run/couchdb/couchdb.uri"; + description = '' + This file contains the full URI that can be used to access this + instance of CouchDB. It is used to help discover the port CouchDB is + running on (if it was set to 0 (e.g. automatically assigned any free + one). This file should be writable and readable for the user that + runs the CouchDB service (couchdb by default). + ''; + }; + + viewIndexDir = mkOption { + type = types.string; + default = "/var/lib/couchdb"; + description = '' + Specifies location of CouchDB view index files. This location should + be writable and readable for the user that runs the CouchDB service + (couchdb by default). + ''; + }; + + bindAddress = mkOption { + type = types.string; + default = "127.0.0.1"; + description = '' + Defines the IP address by which CouchDB will be accessible. + ''; + }; + + port = mkOption { + type = types.int; + default = 5984; + description = '' + Defined the port number to listen. + ''; + }; + + logFile = mkOption { + type = types.string; + default = "/var/log/couchdb.log"; + description = '' + Specifies the location of file for logging output. + ''; + }; + + extraConfig = mkOption { + type = types.string; + default = ""; + description = '' + Extra configuration. Overrides any other cofiguration. + ''; + }; + + customConfigFile = mkOption { + type = types.string; + default = "/var/lib/couchdb/custom.ini"; + description = '' + Custom configuration file. File needs to be readable and writable + from couchdb user/group. + ''; + }; + }; + + }; + + ###### implementation + + config = mkIf config.services.couchdb.enable { + + environment.systemPackages = [ cfg.package ]; + + systemd.services.couchdb = { + description = "CouchDB Server"; + wantedBy = [ "multi-user.target" ]; + + preStart = + '' + if ! test -e ${cfg.pidFile}; then + mkdir -p `dirname ${cfg.pidFile}`; + fi + if ! test -e ${cfg.uriFile}; then + mkdir -p `dirname ${cfg.uriFile}`; + touch ${cfg.uriFile}; + fi + if ! test -e ${cfg.logFile}; then + mkdir -p `dirname ${cfg.logFile}`; + touch ${cfg.logFile}; + fi + if ! test -e ${cfg.customConfigFile}; then + mkdir -p `dirname ${cfg.customConfigFile}`; + touch ${cfg.customConfigFile}; + fi + if ! test -e ${cfg.databaseDir}; then + mkdir -p ${cfg.databaseDir}; + fi + if ! test -e ${cfg.viewIndexDir}; then + mkdir -p ${cfg.viewIndexDir}; + fi + chown ${cfg.user}:${cfg.group} ${cfg.pidFile} + chown ${cfg.user}:${cfg.group} ${cfg.uriFile} + chown ${cfg.user}:${cfg.group} ${cfg.logFile} + chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile} + chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} + chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} + ''; + + serviceConfig = { + PermissionsStartOnly = true; + User = cfg.user; + Group = cfg.group; + Type = "forking"; + ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}"; + #ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}"; + ExecStop = "${cfg.package}/bin/couchdb -d"; + }; + }; + + users.extraUsers.couchdb = { + description = "CouchDB Server user"; + group = "couchdb"; + uid = config.ids.uids.couchdb; + }; + + users.extraGroups.couchdb.gid = config.ids.gids.couchdb; + + }; +} diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 08bc45443a34..808a86946b04 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,21 +1,39 @@ -args @ {stdenv, fetchurl, erlang, spidermonkey, - icu, getopt, curl, ...}: - -let s = import ./src-for-default.nix; in +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python +, sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { - inherit (s) name; + name = "couchdb-${version}"; + version = "1.5.0"; + src = fetchurl { - inherit (s) url; - sha256 = s.hash; + url = "mirror://apache/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"; + sha256 = "1vwgcckp3svgifmagyjmgazm6387i9m6z182p6ja891i8fkb5gdb"; }; - buildInputs = [erlang spidermonkey icu curl]; + buildInputs = [ + erlang icu openssl spidermonkey curl help2man sphinx which file pkgconfig + ]; postInstall = '' sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb ''; - configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include --with-js-include=${spidermonkey}/include --with-js-lib=${spidermonkey}/lib"; + /* + Versions of SpiderMonkey after the js185-1.0.0 release remove the optional + enforcement of preventing anonymous functions in a statement context. This + will most likely break your existing JavaScript code as well as render all + example code invalid. + If you wish to ignore this error pass --enable-js-trunk to ./configure. + */ + configureFlags = '' + --enable-js-trunk + ''; + + meta = { + description = "Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; + homepage = "http://couchdb.apache.org"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ viric garbas ]; + }; } From a6a3b22bc03bfa0934bf79248d6b4db2ec4c6b18 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 17 Jan 2014 00:32:03 +0000 Subject: [PATCH 190/449] removing unused couchdb files --- pkgs/servers/http/couchdb/src-for-default.nix | 9 --------- pkgs/servers/http/couchdb/src-info-for-default.nix | 7 ------- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/servers/http/couchdb/src-for-default.nix delete mode 100644 pkgs/servers/http/couchdb/src-info-for-default.nix diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix deleted file mode 100644 index 6e07077d3332..000000000000 --- a/pkgs/servers/http/couchdb/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.2.0"; - name="couchdb-1.2.0"; - hash="0dswinmg32zn217049dkbx3pab3qwihzmlbc7i6vq7a7lbg4s98g"; - url="mirror://apache/couchdb/releases/1.2.0/apache-couchdb-${version}.tar.gz"; - advertisedUrl="http://www.apache.org/dist/couchdb/releases/1.2.0/apache-couchdb-1.2.0.tar.gz"; - - -} diff --git a/pkgs/servers/http/couchdb/src-info-for-default.nix b/pkgs/servers/http/couchdb/src-info-for-default.nix deleted file mode 100644 index 5904bdcb232f..000000000000 --- a/pkgs/servers/http/couchdb/src-info-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - downloadPage = "http://couchdb.apache.org/downloads.html"; - baseName = "couchdb"; - choiceCommand = ''head -1 | sed -re "$skipRedirectApache" ''; - mirrorSedScript = ''$apacheMirror''; -} - From 55cff93f042fb0af7f0a6b0195121980492cc944 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 18 Jan 2014 18:24:03 +0000 Subject: [PATCH 191/449] couchdb(nixos): removing whitespace and line that was commented --- nixos/modules/services/databases/couchdb.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 4dc2429786d6..926cb02c5e5b 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -10,7 +10,7 @@ let [couchdb] database_dir = ${cfg.databaseDir} uri_file = ${cfg.uriFile} - view_index_dir = ${cfg. viewIndexDir} + view_index_dir = ${cfg.viewIndexDir} [httpd] port = ${toString cfg.port} @@ -197,7 +197,6 @@ in Group = cfg.group; Type = "forking"; ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}"; - #ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}"; ExecStop = "${cfg.package}/bin/couchdb -d"; }; }; From 0bebcd7d1fb10a9d4a191e1766597b08f3eff8c2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 18 Jan 2014 19:38:13 +0000 Subject: [PATCH 192/449] folders of pidFile and uriFile should be writable by couchdb user/group --- nixos/modules/services/databases/couchdb.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 926cb02c5e5b..334b0ac77297 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -167,7 +167,6 @@ in fi if ! test -e ${cfg.uriFile}; then mkdir -p `dirname ${cfg.uriFile}`; - touch ${cfg.uriFile}; fi if ! test -e ${cfg.logFile}; then mkdir -p `dirname ${cfg.logFile}`; @@ -183,8 +182,8 @@ in if ! test -e ${cfg.viewIndexDir}; then mkdir -p ${cfg.viewIndexDir}; fi - chown ${cfg.user}:${cfg.group} ${cfg.pidFile} - chown ${cfg.user}:${cfg.group} ${cfg.uriFile} + chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}` + chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}` chown ${cfg.user}:${cfg.group} ${cfg.logFile} chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile} chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} From 9d55a4c513392fb1c6b3625c070cf03ab400c5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Feb 2014 14:33:30 +0100 Subject: [PATCH 193/449] couchdb: add ids --- nixos/modules/misc/ids.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 95b7683ba2f1..ae7a8234e071 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -114,6 +114,7 @@ logcheck = 103; nix-ssh = 104; dictd = 105; + couchdb = 106; # When adding a uid, make sure it doesn't match an existing gid. @@ -206,6 +207,7 @@ munin = 95; keys = 96; dictd = 105; + couchdb = 106; # When adding a gid, make sure it doesn't match an existing uid. From d6a3cada9ba08a8610068af2ec3d467615932a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Feb 2014 14:33:50 +0100 Subject: [PATCH 194/449] couchdb: stricter types --- nixos/modules/services/databases/couchdb.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 334b0ac77297..46f0e5c6ee90 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -39,7 +39,7 @@ in }; package = mkOption { - type = types.path; + type = types.package; default = pkgs.couchdb; example = literalExample "pkgs.couchdb"; description = '' @@ -65,7 +65,7 @@ in }; pidFile = mkOption { - type = types.string; + type = types.path; default = "/var/run/couchdb/couchdb.pid"; description = '' pid file. @@ -75,7 +75,7 @@ in # couchdb options: http://docs.couchdb.org/en/latest/config/index.html databaseDir = mkOption { - type = types.string; + type = types.path; default = "/var/lib/couchdb"; description = '' Specifies location of CouchDB database files (*.couch named). This @@ -85,7 +85,7 @@ in }; uriFile = mkOption { - type = types.string; + type = types.path; default = "/var/run/couchdb/couchdb.uri"; description = '' This file contains the full URI that can be used to access this @@ -97,7 +97,7 @@ in }; viewIndexDir = mkOption { - type = types.string; + type = types.path; default = "/var/lib/couchdb"; description = '' Specifies location of CouchDB view index files. This location should @@ -123,7 +123,7 @@ in }; logFile = mkOption { - type = types.string; + type = types.path; default = "/var/log/couchdb.log"; description = '' Specifies the location of file for logging output. From ab0aae42a402e56c9003ef6d034684acb2007ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Feb 2014 14:34:19 +0100 Subject: [PATCH 195/449] couchdb: remove redundant customConfigFile --- nixos/modules/services/databases/couchdb.nix | 40 ++++---------------- pkgs/top-level/all-packages.nix | 2 + 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 46f0e5c6ee90..01631e9879a2 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -131,21 +131,12 @@ in }; extraConfig = mkOption { - type = types.string; + type = types.lines; default = ""; description = '' Extra configuration. Overrides any other cofiguration. ''; }; - - customConfigFile = mkOption { - type = types.string; - default = "/var/lib/couchdb/custom.ini"; - description = '' - Custom configuration file. File needs to be readable and writable - from couchdb user/group. - ''; - }; }; }; @@ -162,30 +153,15 @@ in preStart = '' - if ! test -e ${cfg.pidFile}; then - mkdir -p `dirname ${cfg.pidFile}`; - fi - if ! test -e ${cfg.uriFile}; then - mkdir -p `dirname ${cfg.uriFile}`; - fi - if ! test -e ${cfg.logFile}; then - mkdir -p `dirname ${cfg.logFile}`; - touch ${cfg.logFile}; - fi - if ! test -e ${cfg.customConfigFile}; then - mkdir -p `dirname ${cfg.customConfigFile}`; - touch ${cfg.customConfigFile}; - fi - if ! test -e ${cfg.databaseDir}; then - mkdir -p ${cfg.databaseDir}; - fi - if ! test -e ${cfg.viewIndexDir}; then - mkdir -p ${cfg.viewIndexDir}; - fi + mkdir -p `dirname ${cfg.pidFile}`; + mkdir -p `dirname ${cfg.uriFile}`; + mkdir -p `dirname ${cfg.logFile}`; + touch ${cfg.logFile}; + mkdir -p ${cfg.databaseDir}; + mkdir -p ${cfg.viewIndexDir}; chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}` chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}` chown ${cfg.user}:${cfg.group} ${cfg.logFile} - chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile} chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} ''; @@ -195,7 +171,7 @@ in User = cfg.user; Group = cfg.group; Type = "forking"; - ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}"; + ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile}"; ExecStop = "${cfg.package}/bin/couchdb -d"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b54648613b06..824d7458505e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6175,6 +6175,8 @@ let couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; + python = python27; + sphinx = python27Packages.sphinx; }; dico = callPackage ../servers/dico { }; From 991b23c3821041bee45618dc3c07e347e6603f65 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 27 Feb 2014 14:56:13 +0100 Subject: [PATCH 196/449] Added a static identifier to the installing nixos chapter --- nixos/doc/manual/installation.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml index 6ccb12b115e7..f6b477ed69bc 100644 --- a/nixos/doc/manual/installation.xml +++ b/nixos/doc/manual/installation.xml @@ -1,5 +1,6 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xml:id="installing-nixos"> Installing NixOS From 50c4291251c008724f6bb8be3b45852cbf60b80f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 27 Feb 2014 14:57:28 +0100 Subject: [PATCH 197/449] Fixed link to the installation instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a220e28ba6c..8ded8807ede9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code. -* [NixOS installation instructions](http://nixos.org/nixos/manual/#idm139984689550080) +* [NixOS installation instructions](http://nixos.org/nixos/manual/#installing-nixos) * [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/) * [Manual (NixOS)](http://nixos.org/nixos/manual/) * [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined) From d7df8b41a3f5b5ede3b95932f3617392176ef22f Mon Sep 17 00:00:00 2001 From: Mihaly Barasz Date: Thu, 27 Feb 2014 15:05:29 +0100 Subject: [PATCH 198/449] Byte-compile Agda's elisp files --- pkgs/development/libraries/haskell/Agda/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index 749802f95b25..5a1f00a995ce 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -1,4 +1,4 @@ -{ cabal, alex, binary, deepseq, filepath, geniplate, happy +{ cabal, alex, binary, deepseq, emacs, filepath, geniplate, happy , hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel , QuickCheck, text, time, unorderedContainers, xhtml, zlib }: @@ -14,8 +14,11 @@ cabal.mkDerivation (self: { haskellSrcExts mtl parallel QuickCheck text time unorderedContainers xhtml zlib ]; - buildTools = [ alex happy ]; + buildTools = [ alex emacs happy ]; jailbreak = true; + postInstall = '' + $out/bin/agda-mode compile + ''; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; From 901999857676ff1f285d2850c484cee2a506d6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Feb 2014 16:35:37 +0100 Subject: [PATCH 199/449] refactor cython into pythonPackages, fixes #1803 --- .../interpreters/cython/2/default.nix | 21 ------------------- .../interpreters/cython/3/default.nix | 21 ------------------- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++ 4 files changed, 20 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/interpreters/cython/2/default.nix delete mode 100644 pkgs/development/interpreters/cython/3/default.nix diff --git a/pkgs/development/interpreters/cython/2/default.nix b/pkgs/development/interpreters/cython/2/default.nix deleted file mode 100644 index 5b3cfd588c9f..000000000000 --- a/pkgs/development/interpreters/cython/2/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig }: - -stdenv.mkDerivation { - name = "cython-0.20"; - - src = fetchurl { - url = http://www.cython.org/release/Cython-0.20.tar.gz; - sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah"; - }; - - buildPhase = "python setup.py build --build-base $out"; - - installPhase = "python setup.py install --prefix=$out"; - - buildInputs = [ python pkgconfig ]; - - meta = { - description = "An interpreter to help writing C extensions for Python 2"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/interpreters/cython/3/default.nix b/pkgs/development/interpreters/cython/3/default.nix deleted file mode 100644 index d977ea87b3e1..000000000000 --- a/pkgs/development/interpreters/cython/3/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, python3, pkgconfig }: - -stdenv.mkDerivation { - name = "cython3-0.20"; - - src = fetchurl { - url = http://www.cython.org/release/Cython-0.20.tar.gz; - sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah"; - }; - - buildPhase = "python3 setup.py build --build-base $out"; - - installPhase = "python3 setup.py install --prefix=$out"; - - buildInputs = [ python3 pkgconfig ]; - - meta = { - description = "An interpreter to help writing C extensions for Python3"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 824d7458505e..2005c4327809 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2360,8 +2360,8 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; - cython = callPackage ../development/interpreters/cython/2 { }; - cython3 = callPackage ../development/interpreters/cython/3 { }; + cython = pythonPackages.cython; + cython3 = python3Packages.cython; dylan = callPackage ../development/compilers/gwydion-dylan { dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3340e3059f2d..1c36dc7fcd50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1122,6 +1122,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ pythonPackages.coverage ]; }; + cython = buildPythonPackage rec { + name = "Cython-0.20.1"; + + src = fetchurl { + url = "http://www.cython.org/release/${name}.tar.gz"; + sha256 = "0v3nc9z5ynnnjdgcgkyy5g9wazmkjv53nnpjal1v3mr199s6799i"; + }; + + setupPyBuildFlags = ["--build-base=$out"]; + + buildInputs = [ pkgs.pkgconfig ]; + + meta = { + description = "An interpreter to help writing C extensions for Python 2"; + platforms = stdenv.lib.platforms.all; + }; + }; + cryptacular = buildPythonPackage rec { name = "cryptacular-1.4.1"; From 65a34b7f85cbd0b04049ba7313df2aa9881dc184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Feb 2014 16:37:29 +0100 Subject: [PATCH 200/449] add kazam --- .../video/kazam/bug_1190693.patch | 14 ++++++ pkgs/applications/video/kazam/datadir.patch | 11 ++++ pkgs/applications/video/kazam/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 77 insertions(+) create mode 100644 pkgs/applications/video/kazam/bug_1190693.patch create mode 100644 pkgs/applications/video/kazam/datadir.patch create mode 100644 pkgs/applications/video/kazam/default.nix diff --git a/pkgs/applications/video/kazam/bug_1190693.patch b/pkgs/applications/video/kazam/bug_1190693.patch new file mode 100644 index 000000000000..9f00c6b60791 --- /dev/null +++ b/pkgs/applications/video/kazam/bug_1190693.patch @@ -0,0 +1,14 @@ +=== modified file 'kazam/frontend/indicator.py' +--- a/kazam/frontend/indicator.py 2013-01-26 01:53:53 +0000 ++++ b/kazam/frontend/indicator.py 2013-06-13 18:18:37 +0000 +@@ -291,3 +291,9 @@ + def start_recording(self): + logger.debug("Recording started.") + self.indicator.set_from_icon_name("kazam-recording") ++ ++ def hide_it(self): ++ self.indicator.set_visible(False) ++ ++ def show_it(self): ++ self.indicator.set_visible(True) + diff --git a/pkgs/applications/video/kazam/datadir.patch b/pkgs/applications/video/kazam/datadir.patch new file mode 100644 index 000000000000..114d4228be2d --- /dev/null +++ b/pkgs/applications/video/kazam/datadir.patch @@ -0,0 +1,11 @@ +--- a/bin/kazam 2014-02-03 23:11:38.465614061 +0100 ++++ b/bin/kazam-1 2014-02-03 23:12:28.447058700 +0100 +@@ -68,7 +68,7 @@ + # when base install path is not /usr + curpath = os.path.abspath(__file__) + curpath = os.path.realpath(curpath) +- datadir = curpath.split('bin/')[0] + "share/kazam/" ++ datadir = os.path.realpath(os.path.join(curpath, "./../../", "share/kazam/")) + + try: + import platform diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix new file mode 100644 index 000000000000..ed93f81b6623 --- /dev/null +++ b/pkgs/applications/video/kazam/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection +, gtk3, libwnck3, keybinder, intltool, libcanberra }: + + +python3Packages.buildPythonPackage rec { + name = "kazam-${version}"; + version = "1.4.3"; + + src = fetchurl { + url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz"; + sha256 = "00bcn0yj9xrv87sf6xd3wpilsjgjpsj15zzpjh351ffpjnr0ica8"; + }; + + # TODO: keybinder, appindicator3 + buildInputs = with python3Packages; + [ pygobject3 pyxdg pycairo gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gobjectIntrospection gtk3 libwnck3 distutils_extra + intltool dbus ]; + + # TODO: figure out why PYTHONPATH is not passed automatically for those programs + pythonPath = with python3Packages; + [ pygobject3 pyxdg pycairo dbus ]; + + patches = [ ./datadir.patch ./bug_1190693.patch ]; + prePatch = '' + rm setup.cfg + substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra}/bin/canberra-gtk-play" + ''; + + # no tests + doCheck = false; + + preFixup = '' + wrapProgram $out/bin/kazam \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${gtk3}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share" \ + --set GST_REGISTRY "/tmp/kazam.gstreamer.registry"; + ''; + + + meta = with stdenv.lib; { + description = "Cross-platform, Friend-2-Friend and secure decentralised communication platform"; + homepage = https://code.launchpad.net/kazam; + #license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2005c4327809..ae6742ebd2f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1225,6 +1225,8 @@ let jscoverage = callPackage ../development/tools/misc/jscoverage { }; jwhois = callPackage ../tools/networking/jwhois { }; + + kazam = callPackage ../applications/video/kazam { }; kexectools = callPackage ../os-specific/linux/kexectools { }; From d380290640a56863c9d083e8fc931e5495c62b00 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:35:34 +0200 Subject: [PATCH 201/449] vlc: update from 2.1.3 to 2.1.4 --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c38e4dea443b..3df447fad626 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "04d1lr7lxrq2767rjy4j0wr3sirx5sf1s9wdl3p4x500r7z64dp0"; + sha256 = "1lymhbb2bns73qivdaqanhggjjhyc9fwfgf5ikhng0a74msnqmiy"; }; buildInputs = From 8121dc2aa6431662e043b885d9a48abf3067ca52 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:37:44 +0200 Subject: [PATCH 202/449] libtorrentRasterbar: update from 0.16.14 to 0.16.15 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 6e8567d2c46f..9c4d3bfd2dd9 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.14"; + version = "0.16.15"; src = fetchurl { - url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.14.tar.gz; - sha256 = "0s4f36f28cgq55pgx4h99q18a0p566bhifxmqxjhlb63a1w20m2c"; + url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.15.tar.gz; + sha256 = "0xcz4hphgkcdxcbmgzk27mxn7478hy417pn55zn5hnpllgndy3w2"; }; buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ]; From de2de21e4a6d1e369d5d8d82c270115e5a46d043 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:41:00 +0200 Subject: [PATCH 203/449] libmicrohttpd: update from 0.9.33 to 0.9.34 --- pkgs/development/libraries/libmicrohttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 3354161baef0..d9dfaa004de8 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, curl, libgcrypt}: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.33"; + name = "libmicrohttpd-0.9.34"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "0nfm3h7mfb03hf4kfyap8dr35shm6sppsq6da03853sljy27wn6r"; + sha256 = "122snbhhn10s8az46f0lrkirhj0k38lq7hmqav3n1prdzpabz8i9"; }; buildInputs = [ curl libgcrypt ]; From 638957269bce7c171516eb238b15b8c0b7a8e21e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:45:04 +0200 Subject: [PATCH 204/449] mjpegtools: update from 2.0.0 to 2.1.0 --- pkgs/tools/video/mjpegtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index b70d8f4c9ba4..33b497fa3eb4 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -6,10 +6,10 @@ # - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no stdenv.mkDerivation rec { - name = "mjpegtools-2.0.0"; + name = "mjpegtools-2.1.0"; src = fetchurl { url = "mirror://sourceforge/mjpeg/${name}.tar.gz"; - sha256 = "bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97"; + sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6"; }; buildInputs = [ gtk libdv libjpeg libpng libX11 pkgconfig SDL SDL_gfx ]; } From 6ef0c3220edb7c11dc1f0aef8d885887ac68467f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:48:22 +0200 Subject: [PATCH 205/449] mpd: update from 0.18.5 to 0.18.8 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 3b0069b8118a..c39045cd9af7 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.18.5"; + name = "mpd-0.18.8"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "1jhkpbwjmzicnkjl8nsfjdgsvqvkcdjm497rl081sy8mq1jzr80c"; + sha256 = "1ryqh0xf76xv4mpwy1gjwy275ar4wmbzifa9ccjim9r7lk2hgp5v"; }; buildInputs = [ pkgconfig glib ] From d189a57fd7decb26ea743f3e3c09e14f79f38148 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:49:28 +0200 Subject: [PATCH 206/449] ncdu: update from 1.8 to 1.10 --- pkgs/tools/misc/ncdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 47b96023ce0f..ff751eb40da3 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.8"; + version = "1.10"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "42aaf0418c05e725b39b220166a9c604a9c54c0fbf7692c9c119b36d0ed5d099"; + sha256 = "0rqc5wpqcbfqpcwxgh3jxwa0yw2py0hv0acpsf0a9g6v9144m6gm"; }; buildInputs = [ ncurses ]; From 6eecf5f03f0237a601b10471e60034472d1413c3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:52:05 +0200 Subject: [PATCH 207/449] parallel: update from 20130422 to 20140222 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d58b57196d21..fa6f147efe49 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20130422"; + name = "parallel-20140222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0aygc6d2sf2xrnyldv62a17masfs5am4zfm68k4fhvymwcfbp41h"; + sha256 = "0zb3hg92br6a53jn0pzfl16ffc1hfw81jk7nzw5spkshsdrcqx3y"; }; patchPhase = From 3b6d3eebc52f49626987c93cda851f7d7d0bba85 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:53:48 +0200 Subject: [PATCH 208/449] nodejs: update from 0.10.25 to 0.10.26 --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 2c2d343838c9..062d7f4ec066 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -6,7 +6,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.25"; + version = "0.10.26"; # !!! Should we also do shared libuv? deps = { @@ -26,7 +26,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "0vxkyvl8hyhxxpkh96zws4j6i9f3ykqpqbrbvj0j0nj7snwz7vj6"; + sha256 = "1ahx9cf2irp8injh826sk417wd528awi4l1mh7vxg7k8yak4wppg"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); From fb448ba4a1f7ef02ab28090717cb47680ea76803 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Feb 2014 18:56:09 +0200 Subject: [PATCH 209/449] p11_kit: update from 0.20.1 to 0.20.2 --- pkgs/development/libraries/p11-kit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 67be64921e75..be6216b758c9 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }: stdenv.mkDerivation rec { - name = "p11-kit-0.20.1"; + name = "p11-kit-0.20.2"; src = fetchurl { url = "${meta.homepage}releases/${name}.tar.gz"; - sha256 = "0lsaxd1rg74ax1vkclq7r52b43rhy14mn5i14xqvb8dzlgq4hiaj"; + sha256 = "0z7gwmsj9hcmpk3ai2lwla59y3h9jc13xmqk5rijnv645zcm3v84"; }; postInstall = "rm -frv $out/share/gtk-doc"; From 416db1de92304cf683ef1492c409824f54aab1c1 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 27 Feb 2014 18:46:06 +0100 Subject: [PATCH 210/449] androidsdk: Make AVD storage dir configurable and make activation step optional --- .../mobile/androidenv/emulate-app.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 536878681028..5117c8aa2472 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -2,9 +2,9 @@ { name, app ? null , platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false , enableGPU ? false, extraAVDFiles ? [] -, package ? null, activity ? null}: - -assert app != null -> package != null && activity != null; +, package ? null, activity ? null +, avdHomeDir ? null +}: let androidsdkComposition = androidsdk { @@ -28,8 +28,12 @@ stdenv.mkDerivation { export TMPDIR=/tmp fi - # Store the virtual devices somewhere else, instead of polluting a user's HOME directory - export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) + ${if avdHomeDir == null then '' + # Store the virtual devices somewhere else, instead of polluting a user's HOME directory + export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) + '' else '' + export ANDROID_SDK_HOME=${avdHomeDir} + ''} # We have to look for a free TCP port @@ -106,7 +110,9 @@ stdenv.mkDerivation { ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath" # Start the application - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity} + ${stdenv.lib.optionalString (package != null && activity != null) '' + ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} + ''} ''} EOF chmod +x $out/bin/run-test-emulator From 5e091757657b0dea0a0988f47ad1aa45190f238d Mon Sep 17 00:00:00 2001 From: Matthew Sackman Date: Thu, 27 Feb 2014 19:11:08 +0100 Subject: [PATCH 211/449] add serfdom (close #1672) --- lib/maintainers.nix | 1 + pkgs/servers/serfdom/default.nix | 101 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 104 insertions(+) create mode 100644 pkgs/servers/serfdom/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 195e77b58204..7bef639ca7c7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -44,6 +44,7 @@ matejc = "Matej Cotman "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; + msackman = "Matthew Sackman "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix new file mode 100644 index 000000000000..13c878888e29 --- /dev/null +++ b/pkgs/servers/serfdom/default.nix @@ -0,0 +1,101 @@ +{ stdenv, fetchurl, fetchgit, go, lib }: + +let + goDeps = [ + { + dir = "github.com/hashicorp"; + name = "serf"; + rev = "21113c8207d8e02b7ff738c9be80fcaabf67251d"; + sha256 = "10lmgb0caffp0x02nriahyfq9p6qkhr8carfq38m8cjxqxs2v0nk"; + } + { + dir = "github.com/armon"; + name = "go-metrics"; + rev = "8ceaed1d0bc3a25db6e65e79ee4f895013313c17"; + sha256 = "1yzajmx26br4812m9gz4v7qj6fcmhg4a9jz9l3i20hh2x06srmpg"; + } + { + dir = "github.com/hashicorp"; + name = "logutils"; + rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; + sha256 = "184lnn7x1v3xvj6zz1rg9s0252wkkd59kij2iyrrm7y80bym2jys"; + } + { + dir = "github.com/hashicorp"; + name = "memberlist"; + rev = "825ad4aca57c7323e8dadde149bfdec9d9621ffe"; + sha256 = "0mm0hm2kncafq5ml58ki7ilh3b47ni0w19n50ilahhhm4lsfry7z"; + } + { + dir = "github.com/ugorji"; + name = "go"; + rev = "cdeae7b76625959e4164eab9eb303087a794f2cc"; + sha256 = "0pcjlbhp6vxnksy12rav6c8bvi2v010407l5hibxqdvnampvhlkb"; + } + { + dir = "github.com/mitchellh"; + name = "cli"; + rev = "69f0b65ce53b27f729b1b807b88dc88007f41dd3"; + sha256 = "0hnnqd8vg5ca2hglkrj141ba2akdh7crl2lsrgz8d6ipw6asszx3"; + } + { + dir = "github.com/armon"; + name = "mdns"; + rev = "17be83de467449f38a8395c30534a9cf0c03e5ea"; + sha256 = "1fhb6vldclgdx9aqqh1gl87cl5sw3nbq9b7mibkljhbk3cdajyxn"; + } + { + dir = "github.com/miekg"; + name = "dns"; + rev = "5eec7f362c392f0a7eaadea69b13667d665feb82"; + sha256 = "0irlzhd78qmn3lyfbkxmwajv0mm6jp6x0cg7hb9hyj6d01ynlv09"; + } + { + dir = "github.com/mitchellh"; + name = "mapstructure"; + rev = "57bb2fa7a7e00b26c80e4c4b0d4f15a210d94039"; + sha256 = "13lvd5vw8y6h5zl3samkrb7237kk778cky7k7ys1cm46mfd957zy"; + } + ]; + createGoPathCmds = + lib.concatStrings + (map (desc: + let + fetched = fetchgit { url = "https://${desc.dir}/${desc.name}"; + inherit (desc) rev sha256; }; + in '' + mkdir -p $GOPATH/src/${desc.dir} + ln -s ${fetched} $GOPATH/src/${desc.dir}/${desc.name} + '') goDeps); +in + stdenv.mkDerivation rec { + version = "0.4.1"; + name = "serfdom-${version}"; + + src = fetchurl { + url = "https://github.com/hashicorp/serf/archive/v${version}.tar.gz"; + sha256 = "0f4fxhw2r31ks9rs9h3wx9lsymnp8szk0gzggvibwhl2bm6kn6d8"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + mkdir $TMPDIR/go + export GOPATH=$TMPDIR/go + ${createGoPathCmds} + go build -v -o bin/serf + ''; + + installPhase = '' + ensureDir $out/bin + cp bin/serf $out/bin + ''; + + meta = with stdenv.lib; { + description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; + homepage = http://www.serfdom.io/; + license = licenses.mpl20; + maintainers = [ maintainers.msackman ]; + platforms = platforms.linux; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae6742ebd2f2..bbfaee4dafd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6396,6 +6396,8 @@ let libunwind = null; }); + serfdom = callPackage ../servers/serfdom { }; + shishi = callPackage ../servers/shishi { }; sipwitch = callPackage ../servers/sip/sipwitch { }; From 9d7b1dca8ffedfbab7f157d5c3e60ad214e8cc1a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 27 Feb 2014 19:26:18 +0100 Subject: [PATCH 212/449] androidsdk: only create AVD if needed + some fixes --- .../mobile/androidenv/emulate-app.nix | 45 +++++++++++-------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 5117c8aa2472..f5cacbcba887 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/run-test-emulator << "EOF" - #!/bin/sh -e + #! ${stdenv.shell} -e # We need a TMPDIR if [ "$TMPDIR" = "" ] @@ -32,7 +32,8 @@ stdenv.mkDerivation { # Store the virtual devices somewhere else, instead of polluting a user's HOME directory export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) '' else '' - export ANDROID_SDK_HOME=${avdHomeDir} + mkdir -p "${avdHomeDir}" + export ANDROID_SDK_HOME="${avdHomeDir}" ''} # We have to look for a free TCP port @@ -58,17 +59,22 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" - # Create a virtual android device - yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS + # Create a virtual android device for testing if it does not exists - ${stdenv.lib.optionalString enableGPU '' - # Enable GPU acceleration - echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini - ''} + if [ "$(android list avd | grep 'Name: device')" = "" ] + then + # Create a virtual android device + yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS - ${stdenv.lib.concatMapStrings (extraAVDFile: '' - ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd - '') extraAVDFiles} + ${stdenv.lib.optionalString enableGPU '' + # Enable GPU acceleration + echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini + ''} + + ${stdenv.lib.concatMapStrings (extraAVDFile: '' + ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd + '') extraAVDFiles} + fi # Launch the emulator ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & @@ -98,16 +104,19 @@ stdenv.mkDerivation { echo "ready" >&2 ${stdenv.lib.optionalString (app != null) '' - # Install the App through the debugger + # Install the App through the debugger, if it has not been installed yet - if [ -d "${app}" ] + if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell 'pm list packages | grep -x package:${package}')" = "" ] then - appPath="$(echo ${app}/*.apk)" - else - appPath="${app}" + if [ -d "${app}" ] + then + appPath="$(echo ${app}/*.apk)" + else + appPath="${app}" + fi + + ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath" fi - - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath" # Start the application ${stdenv.lib.optionalString (package != null && activity != null) '' From ebe57b1ac83792128c8ef613f9009e2234bb05b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Feb 2014 21:27:29 +0100 Subject: [PATCH 213/449] Remove lib.typeOf It clashes with builtins.typeOf. --- lib/types.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 9bce56bf8073..baf8aa5e5743 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -10,7 +10,6 @@ with import ./strings.nix; rec { isType = type: x: (x._type or "") == type; - typeOf = x: x._type or ""; setType = typeName: value: value // { _type = typeName; From 70449b220d31e27a95c0d54841fcd3f1ee9df920 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 27 Feb 2014 23:08:13 +0100 Subject: [PATCH 214/449] androidsdk: fix activity launching --- pkgs/development/mobile/androidenv/emulate-app.nix | 2 +- .../mobile/titaniumenv/examples/emulate-kitchensink/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index f5cacbcba887..278c073dc586 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString (app != null) '' # Install the App through the debugger, if it has not been installed yet - if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell 'pm list packages | grep -x package:${package}')" = "" ] + if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] then if [ -d "${app}" ] then diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix index 5187b0e02387..cad4503dc96e 100644 --- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix @@ -6,5 +6,5 @@ androidenv.emulateApp { platformVersion = "16"; useGoogleAPIs = true; package = "com.appcelerator.kitchensink"; - activity = "KitchensinkActivity"; + activity = ".KitchensinkActivity"; } From 84011efb7474dfb12bd56140327dc49197b3341a Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 27 Feb 2014 13:08:09 +0100 Subject: [PATCH 215/449] paxctl: Use http instead of https This is needed since paxctl is going to be added to stdenv but early stdenv curl does not support https. --- pkgs/os-specific/linux/paxctl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index d664f119c340..69656f510423 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7"; src = fetchurl { - url = "https://pax.grsecurity.net/${name}.tar.bz2"; + url = "http://pax.grsecurity.net/${name}.tar.bz2"; sha256 = "1j6dg6wd1v7na5i4xj8zmbff0mdqdnw6cvqy0rsbz5anra27f1zp"; }; From 53fbbe3262072e99e36fe167ae8a7d6538b6a54a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 27 Feb 2014 20:37:28 +0100 Subject: [PATCH 216/449] gnome3: Setup hook for gdk-pixbuf and gnome-icon-theme Add necessary paths to the environment so that applications can find icons. --- pkgs/desktops/gnome-3/core/baobab/default.nix | 18 ++++++++++-------- .../gnome-3/core/gnome-icon-theme/default.nix | 2 ++ .../core/gnome-icon-theme/setup-hook.sh | 10 ++++++++++ pkgs/desktops/gnome-3/core/yelp/default.nix | 18 ++++++++---------- .../libraries/gdk-pixbuf/default.nix | 2 ++ .../libraries/gdk-pixbuf/setup-hook.sh | 19 +++++++++++++++++++ 6 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh create mode 100644 pkgs/development/libraries/gdk-pixbuf/setup-hook.sh diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index b905a05474d3..07805644d906 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,14 +1,13 @@ -{ stdenv, intltool, fetchurl, vala, libgtop, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2, gnome3 }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic +{ stdenv, intltool, fetchurl, vala, libgtop +, pkgconfig, gtk3, glib, hicolor_icon_theme +, bash, makeWrapper, itstool, libxml2 +, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { name = "baobab-3.10.1"; src = fetchurl { - url = "https://download.gnome.org/sources/baobab/3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/baobab/3.10/${name}.tar.xz"; sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9"; }; @@ -19,15 +18,18 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 gnome3.gsettings_desktop_schemas makeWrapper ]; - installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; + installFlags = "gsettingsschemadir=\${out}/share/baobab/glib-2.0/schemas/"; postInstall = '' wrapProgram "$out/bin/baobab" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/baobab:$XDG_ICON_DIRS" ''; preFixup = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix index 474a2ccb9a45..5b16f827ae00 100644 --- a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66"; }; + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh new file mode 100644 index 000000000000..d7156f3d4630 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh @@ -0,0 +1,10 @@ +make_gtk_applications_find_icon_themes() { + + # where to find icon themes + if [ -d "$1/share/icons" ]; then + addToSearchPath XDG_ICON_DIRS $1/share + fi + +} + +envHooks+=(make_gtk_applications_find_icon_themes) diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index ee98f96bc270..d84bd288707d 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,18 +1,18 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf -, bash, makeWrapper, itstool, libxml2, libxslt, icu }: +, bash, makeWrapper, itstool, libxml2, libxslt, icu }: stdenv.mkDerivation rec { name = "yelp-3.10.1"; src = fetchurl { - url = "https://download.gnome.org/sources/yelp/3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp/3.10/${name}.tar.xz"; sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816"; }; - propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard - gnome3.gnome_icon_theme hicolor_icon_theme - gnome3.gnome_icon_theme_symbolic ]; + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ librsvg gdk_pixbuf gnome3.gnome_icon_theme + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; @@ -20,14 +20,12 @@ stdenv.mkDerivation rec { libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl gnome3.gsettings_desktop_schemas ]; - installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; + installFlags = "gsettingsschemadir=\${out}/share/yelp/glib-2.0/schemas/"; postInstall = '' - mkdir -p $out/lib/yelp/gdk-pixbuf-2.0/2.10.0 - cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache wrapProgram "$out/bin/yelp" \ - --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache` \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 7a06f08aea60..cd3e76316186 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0ldhpdalbyi6q5k1dz498i9hqcsd51yxq0f91ck9p0h4v38blfx1"; }; + setupHook = ./setup-hook.sh; + # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. buildInputs = [ libX11 libintlOrEmpty ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh new file mode 100644 index 000000000000..280d9aa4f1ba --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -0,0 +1,19 @@ +make_gtk_applications_find_pixbuf_loaders() { + + # set pixbuf loaders.cache for this package + mkdir -p "$out/lib/$name/gdk-pixbuf" + + if [ -f "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]; then + cat "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" >> "$out/lib/$name/gdk-pixbuf/loaders.cache" + fi + + if [ -f "$1/lib/gdk-pixbuf/loaders.cache" ]; then + cat "$1/lib/gdk-pixbuf/loaders.cache" >> "$out/lib/$name/gdk-pixbuf/loaders.cache" + fi + + # note, this is not a search path + export GDK_PIXBUF_MODULE_FILE=$(readlink -e "$out/lib/$name/gdk-pixbuf/loaders.cache") + +} + +envHooks+=(make_gtk_applications_find_pixbuf_loaders) From 5726600c042c4a46e830ebf20b7cd7c2d307327f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 01:39:11 +0100 Subject: [PATCH 217/449] doc: gdk-pixbuf setup-hook --- doc/stdenv.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index f0cabe425a3d..a0741c4aa225 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1156,6 +1156,13 @@ echo @foo@ to Qt’s path. + + gdk-pixbuf + Exports GDK_PIXBUF_MODULE_FILE + environment variable the the builder. Add librsvg package + to buildInputs to get svg support. + + GHC Creates a temporary package database and registers From b192f9ee13ec1bb7067ff6bceccc7d5610ba45c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 01:40:04 +0100 Subject: [PATCH 218/449] gnome3 apps: correctly render icons --- pkgs/desktops/gnome-3/core/empathy/default.nix | 6 ++---- pkgs/desktops/gnome-3/core/eog/default.nix | 3 ++- pkgs/desktops/gnome-3/core/evince/default.nix | 13 +++++++------ .../core/gnome-icon-theme-symbolic/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 3 ++- .../gnome-3/core/gnome-themes-standard/default.nix | 6 ------ pkgs/desktops/gnome-3/core/nautilus/default.nix | 9 +++++---- pkgs/desktops/gnome-3/misc/gitg/default.nix | 5 +++-- pkgs/misc/solfege/default.nix | 3 +-- 9 files changed, 23 insertions(+), 27 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index cfa774599e1d..2d0c22213a43 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -42,11 +42,9 @@ stdenv.mkDerivation rec { installFlags = "gsettingsschemadir=\${out}/share/empathy/glib-2.0/schemas/"; postInstall = '' - mkdir -p $out/lib/empathy/gdk-pixbuf-2.0/2.10.0 - cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache wrapProgram "$out/bin/empathy" \ - --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache` \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index d117964b1961..99e87b3c584c 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/eog" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index b4282c410073..de8f28ddaab1 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -15,19 +15,20 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool perl perlXMLParser libxml2 glib gtk3 pango atk gdk_pixbuf - itstool gnome3.gnome_icon_theme gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas + itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas poppler ghostscriptX djvulibre libspectre - makeWrapper libsecret + makeWrapper libsecret librsvg ]; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; configureFlags = [ "--disable-nautilus" # Do not use nautilus - "--disable-dbus" # strange compilation error ]; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + preConfigure = with stdenv.lib; optionalString doCheck '' for file in test/*.py; do @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { # Tell Glib/GIO about the MIME info directory, which is used # by `g_file_info_get_content_type ()'. wrapProgram "$out/bin/evince" \ - --set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf/loaders.cache \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:${shared_mime_info}/share:$out/share" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:${shared_mime_info}/share:$out/share" ''; doCheck = false; # would need pythonPackages.dogTail, which is missing diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix index 0d2d406876b2..feb3d84b994e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { make -C src install ''; - buildInputs = [ pkgconfig iconnamingutils gtk]; + buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 7dee64a8aff5..59f62b6948d3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-shell" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ - --set GDK_PIXBUF_MODULE_FILE ${gnome_themes_standard}/lib/gdk-pixbuf/loaders.cache \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gnome_control_center}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share" + wrapProgram "$out/libexec/gnome-shell-calendar-server" \ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share" ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix index e3de21806d30..08d82b7ae918 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix @@ -9,12 +9,6 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; - preConfigure = '' - mkdir -p $out/lib/gdk-pixbuf/ - cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/gdk-pixbuf/loaders.cache - export GDK_PIXBUF_MODULE_FILE=`readlink -e $out/lib/gdk-pixbuf/loaders.cache` - ''; - meta = with stdenv.lib; { platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 551b9db1246b..091e48626ae8 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif , gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, makeWrapper, exempi }: +, libnotify, makeWrapper, exempi, librsvg }: stdenv.mkDerivation rec { name = "nautilus-3.10.1"; @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tracker=no" ]; - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi - gnome3.gnome_desktop gnome3.gsettings_desktop_schemas libnotify makeWrapper ]; + buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg + gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas libnotify makeWrapper ]; postInstall = '' wrapProgram "$out/bin/nautilus" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 629ff4a77002..7ae43f6c2069 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -27,12 +27,13 @@ stdenv.mkDerivation rec { buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview - gobjectIntrospection makeWrapper ]; + gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; postInstall = '' wrapProgram "$out/bin/gitg" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" ''; preFixup = '' diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index b40ebe84bcb1..9426684165db 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { postInstall = '' set -x - find "${librsvg}" "${gdk_pixbuf}" -name loaders.cache -print0 | xargs -0 cat > "$out/gdk-pixbuf.loaders" wrapProgram "$out/bin/solfege" \ --prefix PYTHONPATH ':' "$PYTHONPATH" \ - --set GDK_PIXBUF_MODULE_FILE "$out/gdk-pixbuf.loaders" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; meta = with stdenv.lib; { From 0e58538fa86fb33ec264f1c3a8eb82fed90c36a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 02:02:27 +0100 Subject: [PATCH 219/449] doc: gstreamer setup-hook --- doc/stdenv.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index a0741c4aa225..afea416da8ac 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1169,6 +1169,14 @@ echo @foo@ every Haskell build input in it (TODO: how?). + + GStreamer + Adds the + GStreamer plugins subdirectory of + each build input to the GST_PLUGIN_SYSTEM_PATH_1_0 or + GST_PLUGIN_SYSTEM_PATH environment variable. + + From e9f3199973ea5c7ad5507d928d2f315117a2c0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 02:03:07 +0100 Subject: [PATCH 220/449] add gstreamer 1.0 setup-hook and use it where appropriate --- nixos/modules/programs/environment.nix | 2 +- pkgs/applications/audio/mopidy/default.nix | 5 ++--- pkgs/applications/audio/quodlibet/default.nix | 9 ++------- pkgs/applications/video/gnash/default.nix | 4 +--- pkgs/desktops/xfce/applications/parole.nix | 11 +++-------- pkgs/development/libraries/gstreamer/core/default.nix | 2 ++ .../libraries/gstreamer/core/setup-hook.sh | 9 +++++++++ .../gstreamer/legacy/gstreamer/setup-hook.sh | 2 +- 8 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/libraries/gstreamer/core/setup-hook.sh diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 7c1922cdfd89..489a7a4d269a 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -45,7 +45,7 @@ in TERMINFO_DIRS = [ "${i}/share/terminfo" ]; PERL5LIB = [ "${i}/lib/perl5/site_perl" ]; ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ]; - GST_PLUGIN_PATH = [ "${i}/lib/gstreamer-0.10" ]; + GST_PLUGIN_SYSTEM_PATH = [ "${i}/lib/gstreamer-0.10" ]; KDEDIRS = [ "${i}" ]; STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ]; QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index b684fee37d56..04393372cf30 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka pyspotify pylast cherrypy ws4py + gst_python pygobject pykka pyspotify pylast cherrypy ws4py gst_plugins_base gst_plugins_good ]; # python zip complains about old timestamps @@ -27,8 +27,7 @@ pythonPackages.buildPythonPackage rec { postInstall = '' for p in $out/bin/mopidy $out/bin/mopidy-scan; do wrapProgram $p \ - --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \ - --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10 + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" done ''; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index fa63c9f654ad..de1aba2a7f6f 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -52,13 +52,8 @@ buildPythonPackage { postInstall = stdenv.lib.optionalString withGstPlugins '' # Wrap quodlibet so it finds the GStreamer plug-ins - wrapProgram "$out/bin/quodlibet" --prefix \ - GST_PLUGIN_PATH ":" \ - ${ stdenv.lib.concatStringsSep ":" - (map (s: s+"/lib/gstreamer-0.10") - (stdenv.lib.filter (s: s != null) [ - gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad - ])) } + wrapProgram "$out/bin/quodlibet" --prefix \ + GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" \ ''; meta = { diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index c3b78b64d932..ef40d614a397 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -97,9 +97,7 @@ stdenv.mkDerivation rec { # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's). for prog in "$out/bin/"* do - wrapProgram "$prog" --prefix \ - GST_PLUGIN_PATH ":" \ - "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10" + wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" done ''; diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix index c1a4ecd787d8..491bb0112d95 100644 --- a/pkgs/desktops/xfce/applications/parole.nix +++ b/pkgs/desktops/xfce/applications/parole.nix @@ -18,21 +18,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - makeWrapper gst_all_1.gst-plugins-base + makeWrapper gtk dbus_glib libxfce4ui libxfce4util xfconf taglib libnotify - ]; + ] ++ with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]; configureFlags = [ "--with-gstreamer=1.0" ]; postInstall = stdenv.lib.optionalString withGstPlugins '' wrapProgram "$out/bin/parole" --prefix \ - GST_PLUGIN_PATH ":" ${stdenv.lib.concatStringsSep ":" - (map (s: s+"/lib/gstreamer-1.0") (with gst_all_1; [ - gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly - gst-libav - ])) } + GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; meta = { diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 85730c1bf259..881f31c66a6a 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -23,4 +23,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ glib ]; + + setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh new file mode 100644 index 000000000000..4e75044e732a --- /dev/null +++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -0,0 +1,9 @@ +addGstreamerLibPath () { + if test -d "$1/lib/gstreamer-1.0" + then + export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0" + fi +} + +envHooks=(${envHooks[@]} addGstreamerLibPath) + diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh index ad184dc21e99..10671f9d227c 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh @@ -1,7 +1,7 @@ addGstreamerLibPath () { if test -d "$1/lib/gstreamer-0.10" then - export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-0.10" + export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10" fi } From a8c77b6084caaf9b7f8582fcdfea4cfe24f362c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 09:11:50 +0100 Subject: [PATCH 221/449] fix eval --- pkgs/desktops/xfce/applications/parole.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix index 491bb0112d95..598c50380928 100644 --- a/pkgs/desktops/xfce/applications/parole.nix +++ b/pkgs/desktops/xfce/applications/parole.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeWrapper gtk dbus_glib libxfce4ui libxfce4util xfconf taglib libnotify - ] ++ with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]; + ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]); configureFlags = [ "--with-gstreamer=1.0" ]; From 9fc9fcde6c519f673ad488eead845bd88cbeef2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 10:17:33 +0100 Subject: [PATCH 222/449] gnome3.gitg, gnome3.empathy: fix icons --- pkgs/desktops/gnome-3/core/empathy/default.nix | 6 +++--- pkgs/desktops/gnome-3/misc/gitg/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 2d0c22213a43..1e0c94d0c7ff 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196"; }; - propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.gnome_icon_theme hicolor_icon_theme gnome_online_accounts shared_mime_info gnome3.gnome_icon_theme_symbolic ]; @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { libxml2 libxslt icu file makeWrapper telepathy_glib clutter_gtk clutter-gst cogl gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret pulseaudio gnome3.yelp_xsl + gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf libnotify clutter libsoup gnutls libgee p11_kit libcanberra_gtk3 telepathy_farstream farstream - gnome3.gsettings_desktop_schemas file libtool ]; + gnome3.gsettings_desktop_schemas file libtool librsvg ]; NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0" diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 7ae43f6c2069..26268f4c90c6 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib , json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib }: +, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }: # TODO: icons and theme still does not work # use packaged gnome3.gnome_icon_theme_symbolic @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gnome3.gnome_themes_standard ]; buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview + libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; postInstall = '' From 21234d5f1af02c5851b38c75352e23f4494a22bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 11:02:31 +0100 Subject: [PATCH 223/449] flashtool: add version 0.9.14.0 --- pkgs/development/mobile/flashtool/default.nix | 71 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/mobile/flashtool/default.nix diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix new file mode 100644 index 000000000000..6f85ee648f6f --- /dev/null +++ b/pkgs/development/mobile/flashtool/default.nix @@ -0,0 +1,71 @@ +{ stdenv, requireFile, p7zip, jre, libusb1, androidsdk, gtk2, glib, libXtst }: + +# TODO: +# +# The FlashTool and FlashToolConsole scripts are messy and should probably we +# replaced entirely. All these scripts do is try to guess the environment in +# which to run the Java binary (and they guess wrong on NixOS). +# +# The release contains a freaky mixture of 32 and 64 bit binaries. +# Personally, I run these things (as 'root') in 32 bit Linux by way of: +# +# setarch i686 ./FlashTool +# +# It should be possible to run them in 64 bit mode, too. +# +# The FlashTool scripts run 'chmod' on the binaries installed in the Nix +# store. These commands fail, naturally, because the Nix story is (hopefully) +# mounted read-only. This doesn't matter, though, because the build +# instructions fix the executable bits already. + +stdenv.mkDerivation rec { + name = "flashtool-0.9.14.0"; + + src = requireFile { + url = "http://dfiles.eu/files/n8c1c3pgc"; + name = "flashtool-0.9.14.0-linux.tar.7z"; + sha256 = "0mfjdjj7clz2dhkg7lzy1m8hk8ngla7zgcryf51aki1gnpbb2zc1"; + }; + + buildInputs = [ p7zip jre ]; + + unpackPhase = '' + 7z e ${src} + tar xf ${name}-linux.tar + sourceRoot=FlashTool + ''; + + buildPhase = '' + for n in x10flasher_lib/adb.linux.*; do + ln -sfv ${androidsdk}/bin/adb $n + done + for n in x10flasher_lib/fastboot.linux.*; do + ln -sfv ${androidsdk}/bin/fastboot $n + done + for n in "x10flasher_lib/linux/lib"*"/"*"/libus"*".so"* ; do + ln -sfv ${libusb1}/lib/libusb-1.0.so.0 $n + done + sed -i \ + -e 's|ln -sf libusbx-1.0.so.0.1.0|ln -sf ${libusb1}/lib/libusb-1.0.so.0|' \ + -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \ + -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \ + FlashTool FlashToolConsole + chmod +x x10flasher_lib/unyaffs.linux.x86 + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 + ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux.x64 + ''; + + installPhase = '' + mkdir -p $out + mv * $out/ + ''; + + meta = { + homepage = "http://www.flashtool.net/"; + description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; + + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a113188cacd0..7e013cab7c09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -925,6 +925,11 @@ let fio = callPackage ../tools/system/fio { }; + flashtool = callPackage_i686 ../development/mobile/flashtool { + androidsdk = pkgs.pkgsi686Linux.androidsdk_4_1; + inherit (pkgs.pkgsi686Linux.xlibs) libXtst; + }; + flpsed = callPackage ../applications/editors/flpsed { }; flvstreamer = callPackage ../tools/networking/flvstreamer { }; From 6c6c145ffcb31fab2d4e7c073bfd6f70fa8bba8d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 11:02:46 +0100 Subject: [PATCH 224/449] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e013cab7c09..c50fbdb4d823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1232,7 +1232,7 @@ let jscoverage = callPackage ../development/tools/misc/jscoverage { }; jwhois = callPackage ../tools/networking/jwhois { }; - + kazam = callPackage ../applications/video/kazam { }; kexectools = callPackage ../os-specific/linux/kexectools { }; @@ -7923,7 +7923,7 @@ let gtimelog = pythonPackages.gtimelog; inherit (gnome3) gucharmap; - + guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; @@ -8189,7 +8189,7 @@ let inherit (xorg) libxkbfile; cairo = cairo.override { xcbSupport = true; }; }; - + i3minator = callPackage ../tools/misc/i3minator { }; i3status = callPackage ../applications/window-managers/i3/status.nix { }; From 19350fac6606e15e57650622e0f7092dbb398a19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 11:01:05 +0100 Subject: [PATCH 225/449] nixUnstable: Update to 1.7pre3520_1017bd6 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index a340d51fd7d9..33b304eec4c3 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.7pre3327_0e2ca26"; + name = "nix-1.7pre3520_1017bd6"; src = fetchurl { - url = "http://hydra.nixos.org/build/8316406/download/5/${name}.tar.xz"; - sha256 = "52cc082f4ce8ec3c316f032c0201cc76980df2845b15714e71acb2ef7715f1de"; + url = "http://hydra.nixos.org/build/9253720/download/4/${name}.tar.xz"; + sha256 = "7144ad4b4a7ff77165dc96424366fa28fb1a9e19b4f7c26d123b5f6bccf53d2d"; }; nativeBuildInputs = [ perl pkgconfig ]; From 34874dac7a7dc4ba3c552bbcda38a0434c1f5d8c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 11:01:32 +0100 Subject: [PATCH 226/449] google-talk-plugin: Update to 5.1.5.0 --- .../mozilla-plugins/google-talk-plugin/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index d9cd8f9be539..e319425d0b1d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,20 +45,22 @@ in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; - # Use the following to determine the current upstream version: - # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p' - version = "5.1.4.0"; + + # You can get the upstream version and SHA-1 hash from the following URLs: + # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Package + # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages + version = "5.1.5.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "19x1ss6kx7w8833f40pg1mwqr6sygz4ij4a7r7h3flmk67zywj4c"; + sha1 = "fc830f4c7f5816f4578ec73e6d4aef059ad4a0b1"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "1jxcridpqx46sdy4bw381rvffn1z93s280vhihwbgmiwjq5h4g41"; + sha1 = "9b7043c3585b3479ba11aabb7b8af755a61df963"; } else throw "Google Talk does not support your platform."; From 88078e4379dc84d2faccfbf2eb3bcb64d94f79f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 12:13:29 +0100 Subject: [PATCH 227/449] flashtool: clean up the build some more --- pkgs/development/mobile/flashtool/default.nix | 35 ++++++++----------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 6f85ee648f6f..b193709d90d0 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,4 +1,6 @@ -{ stdenv, requireFile, p7zip, jre, libusb1, androidsdk, gtk2, glib, libXtst }: +{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }: + +assert stdenv.system == "i686-linux"; # TODO: # @@ -6,13 +8,6 @@ # replaced entirely. All these scripts do is try to guess the environment in # which to run the Java binary (and they guess wrong on NixOS). # -# The release contains a freaky mixture of 32 and 64 bit binaries. -# Personally, I run these things (as 'root') in 32 bit Linux by way of: -# -# setarch i686 ./FlashTool -# -# It should be possible to run them in 64 bit mode, too. -# # The FlashTool scripts run 'chmod' on the binaries installed in the Nix # store. These commands fail, naturally, because the Nix story is (hopefully) # mounted read-only. This doesn't matter, though, because the build @@ -36,23 +31,21 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - for n in x10flasher_lib/adb.linux.*; do - ln -sfv ${androidsdk}/bin/adb $n - done - for n in x10flasher_lib/fastboot.linux.*; do - ln -sfv ${androidsdk}/bin/fastboot $n - done - for n in "x10flasher_lib/linux/lib"*"/"*"/libus"*".so"* ; do - ln -sfv ${libusb1}/lib/libusb-1.0.so.0 $n - done + ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux + ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux + ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so + + chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 + ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux + + ln -s swt32.jar x10flasher_lib/swtlin/swt.jar + sed -i \ - -e 's|ln -sf libusbx-1.0.so.0.1.0|ln -sf ${libusb1}/lib/libusb-1.0.so.0|' \ + -e 's|$(uname -m)|i686|' \ -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \ -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \ FlashTool FlashToolConsole - chmod +x x10flasher_lib/unyaffs.linux.x86 - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 - ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux.x64 ''; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c50fbdb4d823..4c79f3a7d321 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -926,8 +926,7 @@ let fio = callPackage ../tools/system/fio { }; flashtool = callPackage_i686 ../development/mobile/flashtool { - androidsdk = pkgs.pkgsi686Linux.androidsdk_4_1; - inherit (pkgs.pkgsi686Linux.xlibs) libXtst; + platformTools = androidenv.platformTools; }; flpsed = callPackage ../applications/editors/flpsed { }; From 893fc5e2f39d9fef2a43fcbda9522ea45eedab26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 12:13:37 +0100 Subject: [PATCH 228/449] flashtool: add a license tag --- pkgs/development/mobile/flashtool/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index b193709d90d0..060c1a5bdb9d 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.flashtool.net/"; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; + license = stdenv.lib.license.unfreeRedistributableFirmware; platforms = stdenv.lib.platforms.linux; hydraPlatforms = stdenv.lib.platforms.none; From 691f6c4c5907bd0db7b8f64b44d0f000ce4087b5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Feb 2014 06:16:57 -0500 Subject: [PATCH 229/449] Fix mysql test evaluation --- nixos/tests/mysql-replication.nix | 1 + nixos/tests/mysql.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index 28a1187dd184..a68d21c82b41 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -11,6 +11,7 @@ in { services.mysql.enable = true; + services.mysql.package = pkgs.mysql; services.mysql.replication.role = "master"; services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; services.mysql.initialScript = pkgs.writeText "initmysql" diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index b48850738b72..abdd39092216 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -9,6 +9,7 @@ services.mysql.enable = true; services.mysql.replication.role = "master"; services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.package = pkgs.mysql; }; }; From dbafe00eba6f01257316437c9f2f22df64b8a4c2 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Fri, 7 Feb 2014 16:20:47 +0400 Subject: [PATCH 230/449] haskell-lushtags: add version 0.0.1 --- .../libraries/haskell/lushtags/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lushtags/default.nix diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix new file mode 100644 index 000000000000..bf05cd5e63d0 --- /dev/null +++ b/pkgs/development/libraries/haskell/lushtags/default.nix @@ -0,0 +1,17 @@ +{ cabal, haskellSrcExts, text, vector }: + +cabal.mkDerivation (self: { + pname = "lushtags"; + version = "0.0.1"; + sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c"; + isLibrary = false; + isExecutable = true; + buildDepends = [ haskellSrcExts text vector ]; + jailbreak = true; + meta = { + homepage = "https://github.com/bitc/lushtags"; + description = "Create ctags compatible tags files for Haskell programs"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ca4e9424c8e8..c0112f22718b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1638,6 +1638,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x logict = callPackage ../development/libraries/haskell/logict {}; + lushtags = callPackage ../development/libraries/haskell/lushtags {}; + maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; From f019d8e101c7681f5980697537d1a3147a30abcf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:27:50 +0100 Subject: [PATCH 231/449] haskell-libjenkins: re-generate with cabal2nix --- pkgs/development/libraries/haskell/libjenkins/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix index 977ef112f09e..722e280c6e54 100644 --- a/pkgs/development/libraries/haskell/libjenkins/default.nix +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -16,11 +16,10 @@ cabal.mkDerivation (self: { httpClient httpConduit httpTypes lens monadControl network text transformers xmlConduit ]; + doCheck = false; meta = { description = "Jenkins API interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - # Test wants access to /etc/ssl - doCheck = false; }) From e5b65b7f1dde4878bcea69ad43e6a43ccd8cae86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:28:02 +0100 Subject: [PATCH 232/449] haskell-scotty: re-generate with cabal2nix --- pkgs/development/libraries/haskell/scotty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 5d354af308d3..e51c2a7a64c0 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -11,11 +11,11 @@ cabal.mkDerivation (self: { aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat text transformers wai waiExtra warp ]; + jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - jailbreak = true; }) From 723f85d29346b5828daae2ac0d1fef0f381f6c77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:28:25 +0100 Subject: [PATCH 233/449] haskell-singletons: re-generate with cabal2nix --- pkgs/development/libraries/haskell/singletons/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix index 692cc5284546..48f12cd88258 100644 --- a/pkgs/development/libraries/haskell/singletons/default.nix +++ b/pkgs/development/libraries/haskell/singletons/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.9.3"; sha256 = "0m90k3ygm04c0gjfiaw5rmajyn2yz0ldcqm2xmm39d10270skpb4"; buildDepends = [ mtl syb thDesugar ]; + noHaddock = true; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; description = "A framework for generating singleton types"; @@ -12,5 +13,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; - noHaddock = true; }) From 849b16129c51d5856ea429359866cadf927bd0e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:37 +0100 Subject: [PATCH 234/449] haskell-largeword: update to version 1.1.0 The latest version of largeword needs "jailbreak" to fix inconsistent version requirements within its own Cabal file: https://github.com/idontgetoutmuch/largeword/issues/6 --- .../libraries/haskell/largeword/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index da0cafb9ba73..c9ee79e47603 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -1,15 +1,17 @@ -{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2 +{ cabal, binary, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "largeword"; - version = "1.0.5"; - sha256 = "0icwqwpn59xd0qfpaihvwz1waax617qqcl05jv9f26sjdr8688dl"; + version = "1.1.0"; + sha256 = "1xpyzgwhjz625jkr8ax21g8cdkrk89jknrx4nxscwfaw67rla8ja"; + buildDepends = [ binary ]; testDepends = [ - HUnit QuickCheck testFramework testFrameworkHunit + binary HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + jailbreak = true; meta = { homepage = "https://github.com/idontgetoutmuch/largeword"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; From fbd57958521c7c9f9b3320db39928cc21fcaf80c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:45 +0100 Subject: [PATCH 235/449] haskell-yi-contrib: update to version 0.7.1 --- pkgs/applications/editors/yi/yi-contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix index e2fadcca345d..0ed6e8778622 100644 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ b/pkgs/applications/editors/yi/yi-contrib.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yi-contrib"; - version = "0.7.0"; - sha256 = "12x9ps5yrszr8dlj15kmsm9myq3gzd9x9nacvl3x6cq91wk53mzj"; + version = "0.7.1"; + sha256 = "0915ikck01kc5npbvywd9r7azylqrhfymzc72rf4iaghz4w939li"; buildDepends = [ dataAccessor filepath mtl split yi ]; meta = { homepage = "http://haskell.org/haskellwiki/Yi"; From 861061cf65507b58bcb43da663c2a887f32f4927 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:47 +0100 Subject: [PATCH 236/449] haskell-yi: update to version 0.7.1 --- pkgs/applications/editors/yi/yi.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index 4dfc60bef769..b504af149045 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -1,25 +1,24 @@ { cabal, alex, binary, Cabal, cautiousFile, concreteTyperep , dataAccessor, dataAccessorMtl, dataAccessorTemplate, derive, Diff -, dlist, dyre, filepath, fingertree, ghcPaths, glib, gtk, hashable -, hint, HUnit, mtl, pango, parsec, pointedlist, pureMD5, QuickCheck -, random, regexBase, regexTdfa, split, testFramework -, testFrameworkHunit, time, uniplate, unixCompat -, unorderedContainers, utf8String, vty, xdgBasedir +, dlist, dyre, filepath, fingertree, glib, gtk, hashable, hint +, HUnit, mtl, pango, parsec, pointedlist, QuickCheck, random +, regexBase, regexTdfa, split, testFramework, testFrameworkHunit +, time, uniplate, unixCompat, unorderedContainers, utf8String, vty +, xdgBasedir }: cabal.mkDerivation (self: { pname = "yi"; - version = "0.7.0"; - sha256 = "0mzcjgp12k5mxb37r6chxsk726b1qxds49ch656bpgrg7n22w2j1"; + version = "0.7.1"; + sha256 = "111xg7qpjhsqf6pfr136wh8km3lrgpzghd9h5rlypafr61w59vly"; isLibrary = true; isExecutable = true; buildDepends = [ binary Cabal cautiousFile concreteTyperep dataAccessor dataAccessorMtl dataAccessorTemplate derive Diff dlist dyre - filepath fingertree ghcPaths glib gtk hashable hint mtl pango - parsec pointedlist pureMD5 QuickCheck random regexBase regexTdfa - split time uniplate unixCompat unorderedContainers utf8String vty - xdgBasedir + filepath fingertree glib gtk hashable hint mtl pango parsec + pointedlist QuickCheck random regexBase regexTdfa split time + uniplate unixCompat unorderedContainers utf8String vty xdgBasedir ]; testDepends = [ filepath HUnit QuickCheck testFramework testFrameworkHunit From 8cd17a8b0312fcb455195a4c1f45f9a652184e12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:49 +0100 Subject: [PATCH 237/449] haskell-git-annex: update to version 5.20140227 --- .../git-and-tools/git-annex/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 3019785a40c0..8a6244525e69 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 @@ -2,35 +2,35 @@ , caseInsensitive, clientsession, cryptoApi, cryptohash, curl , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet -, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse -, json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl -, network, networkConduit, networkInfo, networkMulticast +, hinotify, hS3, hslogger, HTTP, httpClient, httpConduit, httpTypes +, IfElse, json, liftedBase, lsof, MissingH +, MonadCatchIOTransformers, monadControl, mtl, network +, networkConduit, networkInfo, networkMulticast , networkProtocolXmpp, openssh, optparseApplicative, perl , QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm , tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time , transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp -, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault -, yesodForm, yesodStatic +, which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm +, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140221"; - sha256 = "0z6awqbk6kagssx26ddixbrl381c1kmsmlgaqmx087g4rwp43wqb"; + version = "5.20140227"; + sha256 = "0zdaryvfpbmc454798z3z3sshf0br8v3sw0vnksqng3zm3w73dah"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter caseInsensitive clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus dlist dns editDistance extensibleExceptions feed filepath gnutls hamlet - hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json - MissingH MonadCatchIOTransformers monadControl mtl network - networkConduit networkInfo networkMulticast networkProtocolXmpp - optparseApplicative QuickCheck random regexTdfa SafeSemaphore SHA - stm tasty tastyHunit tastyQuickcheck tastyRerun text time - transformers unixCompat utf8String uuid wai waiLogger warp - xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm - yesodStatic + hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse + json liftedBase MissingH MonadCatchIOTransformers monadControl mtl + network networkConduit networkInfo networkMulticast + networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa + SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck tastyRerun + text time transformers unixCompat utf8String uuid wai waiLogger + warp xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fS3 From f9fd012c03c60564483001d46a1fc3618447224d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:51 +0100 Subject: [PATCH 238/449] haskell-JuicyPixels: update to version 3.1.4.1 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index be9c67f797e7..5e12adc39a8f 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.3.3"; - sha256 = "1j1kdr6x7rhpa45is04haxgf4i2jghcgak4km0f2i0k3pyiv647x"; + version = "3.1.4.1"; + sha256 = "12yq6wv0hs8kdckw1wgfssvnl8nvfanic8ciz8r2cjcwnlidh324"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; From dfa12250a6c1b4a993eaa8268aa9973b1a154923 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:53 +0100 Subject: [PATCH 239/449] haskell-MemoTrie: update to version 0.6.2 --- pkgs/development/libraries/haskell/MemoTrie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index f3bd183d1373..5d8fc314819e 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MemoTrie"; - version = "0.6.1"; - sha256 = "1bx0xd28irxjrq181wirx0vdrdj4qg4n4wj7ya27lkh408mwsxm6"; + version = "0.6.2"; + sha256 = "1g4b82s30bqkfids3iywf873nyn8h7l8rp8l3xl58smj5lbi3p4x"; buildDepends = [ void ]; meta = { homepage = "http://haskell.org/haskellwiki/MemoTrie"; From 417d6bd4f6307b47dd750595f69311a891993e56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:54 +0100 Subject: [PATCH 240/449] haskell-conduit: update to version 1.0.15.1 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index bf28c20e714c..c5fe6d9d379d 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.15"; - sha256 = "1ciys2b7a6n5k0ld66wpjxnrs5ys5dvg9n5k8282bc5zsd54mb59"; + version = "1.0.15.1"; + sha256 = "0pbrsa00x8qr856532iinw9lyliwh7gwzyd1pshdmj3gkbqpf2bv"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text textStreamDecode transformers transformersBase void From e515209b0d2ebffba5cff223ca58a18cafbf8d37 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:56 +0100 Subject: [PATCH 241/449] haskell-hamlet: update to version 1.1.9.2 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index f7456f1fdafc..445fb67386e8 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.9"; - sha256 = "194a4qnmpgralhvrv6813qfjjy80919famh824lyl9iryqwsbfkc"; + version = "1.1.9.2"; + sha256 = "122wfkk23a2bvz29hrgxj24k6cf315fwdbz70ih3nclawh0bhani"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare systemFileio systemFilepath text time From 40d3105e81662a745fdaea6f1668f6a4be955fc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:43:58 +0100 Subject: [PATCH 242/449] haskell-iproute: update to version 1.2.12 --- pkgs/development/libraries/haskell/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index 045bb64035c4..89a576141609 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "iproute"; - version = "1.2.11"; - sha256 = "14f96sb41f5m14186900rz84vwv7idjiylp8m5nsm6gganvh4sh4"; + version = "1.2.12"; + sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5"; buildDepends = [ appar byteorder network ]; testDepends = [ appar byteorder doctest hspec network QuickCheck safe From 56201a4996682609c6446437155403de5440a61f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:44:00 +0100 Subject: [PATCH 243/449] haskell-mime: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/mime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix index b4d2f7d7e50a..6e1a3482c042 100644 --- a/pkgs/development/libraries/haskell/mime/default.nix +++ b/pkgs/development/libraries/haskell/mime/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime"; - version = "0.4.0"; - sha256 = "159jp7dcyx26slda2743zdr2prnm707mnglcb9p66hr1wjh98kx4"; + version = "0.4.0.1"; + sha256 = "1m987sqnns54qbsg68332mnrjkh71z6s83cma2kwavf0y305mrp0"; buildDepends = [ text ]; meta = { homepage = "https://github.com/GaloisInc/mime"; From 648adb54479f85fb519def1c2511f10fe700178a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:44:01 +0100 Subject: [PATCH 244/449] haskell-mono-traversable: update to version 0.3.0.3 --- .../libraries/haskell/mono-traversable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 9c6e2c70cdf0..e0cb6e3a3de4 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.3.0.2"; - sha256 = "1aa6dm75ff822fazdnjfgggy3y2zxa8vy4dn2vvx0y8i9pgh0m0l"; + version = "0.3.0.3"; + sha256 = "0n8bgynapx43f4agbp596ywnfv0cm12x3ihifr3vzv78iixnl0xh"; buildDepends = [ comonad hashable semigroupoids semigroups text transformers unorderedContainers vector vectorInstances From 057bbc47a2eb292187e4d1eb6d25405e0f5a19fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:44:03 +0100 Subject: [PATCH 245/449] haskell-network-conduit-tls: update to version 1.0.4.2 --- .../haskell/network-conduit-tls/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 28cf920cf284..4884a462a6d4 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -1,17 +1,15 @@ -{ cabal, aeson, certificate, conduit, connection, cprngAes -, cryptoApi, cryptoRandomApi, dataDefault, HUnit, monadControl, mtl -, network, networkConduit, pem, systemFileio, systemFilepath, tls -, transformers +{ cabal, conduit, connection, cprngAes, dataDefault, HUnit +, monadControl, mtl, network, networkConduit, systemFileio +, systemFilepath, tls, transformers }: cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.0.4.1"; - sha256 = "1l79v4ippyfw6pl4h3vqswh79vcif80phf6kq5fr4xmv3b6nbc06"; + version = "1.0.4.2"; + sha256 = "1pgb6k6g10hy2k4sihj88n6w7400d4grja2crhhv1cydqdn858rc"; buildDepends = [ - aeson certificate conduit connection cprngAes cryptoApi - cryptoRandomApi dataDefault monadControl network networkConduit pem - systemFileio systemFilepath tls transformers + conduit connection cprngAes dataDefault monadControl network + networkConduit systemFileio systemFilepath tls transformers ]; testDepends = [ conduit connection HUnit mtl networkConduit ]; meta = { From 8d5a80645e00a5062fc4ba427ed035cc47405587 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:44:05 +0100 Subject: [PATCH 246/449] haskell-pipes-postgresql-simple: update to version 0.1.2.0 --- .../libraries/haskell/pipes-postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix index aced7c741abd..830f188fed89 100644 --- a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-postgresql-simple"; - version = "0.1.1.2"; - sha256 = "0m9p3ddrv73c24yh0a2q14zkr4iibfysy2q9bwp6m100z3qk1bgy"; + version = "0.1.2.0"; + sha256 = "12ij2msdwjzzc93mlvvizh6amam5ld9j1a0b9xsa2awdjd21mwc1"; buildDepends = [ async exceptions mtl pipes pipesConcurrency pipesSafe postgresqlSimple stm text transformers From cbc1e6fa6f413c668c23e83acf87660e070128e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:44:07 +0100 Subject: [PATCH 247/449] haskell-shake: update to version 0.11.3 --- pkgs/development/libraries/haskell/shake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index f3ec1471cbe9..f7505c62fc19 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.11.2"; - sha256 = "1mhll4h6za67pjcm4amdcibfd7ny2kfx4mfws0lrd903j1p5b00q"; + version = "0.11.3"; + sha256 = "0j4b9fd60kvkayf5zgr8d8w0i4k8ly2v0vnfg80k0lkwpka7nwzl"; isLibrary = true; isExecutable = true; buildDepends = [ From 5b497746516f0d05cf78a23000b462a4f41a4cce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:44:08 +0100 Subject: [PATCH 248/449] haskell-text-stream-decode: update to version 0.1.0.4 --- .../libraries/haskell/text-stream-decode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix index 9954dc4f6a22..eb55d68666c5 100644 --- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix +++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text-stream-decode"; - version = "0.1.0.3"; - sha256 = "0gz5w7n7yb6z5mfzlg3yg9s89wsqnmmk4j94invj2da0rw7d03xv"; + version = "0.1.0.4"; + sha256 = "041winxbqkz1y6vx6sgbhl925n5qxii2q7ijcwa85sj4dkrqpafr"; buildDepends = [ text ]; testDepends = [ deepseq hspec text ]; meta = { From 2438017f300bf3d2cf95eef909fd347d87f933b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 10:44:10 +0100 Subject: [PATCH 249/449] haskell-yesod-form: update to version 1.3.5.2 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 7474884d4a09..7a7d1f16e05b 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.5.1"; - sha256 = "0jvza4ly3kjfsbayjcggf8fq0lcb8n9f6cp0q6fcif1xkwkkhmdh"; + version = "1.3.5.2"; + sha256 = "0ppzj04c5y02k2daw52g2pkzf85mhsg7n4hbkm05xk1crzbrbcxj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet From b792394119b8ffc4a2fd34a67048fe205a08dcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 13:32:08 +0100 Subject: [PATCH 250/449] nixos-manual: show manual on tty8 by default --- nixos/modules/services/misc/nixos-manual.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 1a8b85db3290..9a5b170d5e66 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -63,7 +63,7 @@ in services.nixosManual.showManual = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to show the NixOS manual on one of the virtual consoles. From 9f67bfe7d2847a57b898e1abef238d07fe9e2fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 16:11:53 +0100 Subject: [PATCH 251/449] pythonPackages.pytz: 2012c -> 2013.9, fix Babel --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c36dc7fcd50..5d2b8efd446d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4940,7 +4940,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz"; }; - buildInputs = [ pytz ]; + propagatedBuildInputs = [ pytz ]; meta = { homepage = http://babel.edgewall.org; @@ -5674,11 +5674,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pytz = buildPythonPackage rec { - name = "pytz-2012c"; + name = "pytz-2013.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.bz2"; - md5 = "660e0cee7f6c419ca2665db460f65131"; + md5 = "ec7076947a46a8a3cb33cbf2983a562c"; }; meta = { From ed4fd067bc0925598221aea1d38887f3d0a26576 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 16:09:24 +0100 Subject: [PATCH 252/449] doxygen: Update to 1.8.6 --- .../tools/documentation/doxygen/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 69c1f4181cc7..9a8979aaa6cf 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, perl, flex, bison, qt4 }: +{ stdenv, fetchurl, perl, python, flex, bison, qt4 }: let - name = "doxygen-1.8.5"; + name = "doxygen-1.8.6"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "09fcsz1rd4a9njsz3as7z8s3mk621pvcclavxbb6ib8jvdkqnfi4"; + sha256 = "0pskjlkbj76m9ka7zi66yj8ffjcv821izv3qxqyyphf0y0jqcwba"; }; patches = [ ./tmake.patch ]; buildInputs = - [ perl flex bison ] + [ perl python flex bison ] ++ stdenv.lib.optional (qt4 != null) qt4; prefixKey = "--prefix "; @@ -23,7 +23,10 @@ stdenv.mkDerivation { [ "--dot dot" ] ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard"; - preConfigure = stdenv.lib.optionalString (qt4 != null) + preConfigure = + '' + patchShebangs . + '' + stdenv.lib.optionalString (qt4 != null) '' echo "using QTDIR=${qt4}..." export QTDIR=${qt4} From 4c2d1184fae99797476c3ad7847d83510ad05cd3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 16:14:11 +0100 Subject: [PATCH 253/449] flashtool: Fix evaluation --- pkgs/development/mobile/flashtool/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 060c1a5bdb9d..92b8c9a18456 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -56,8 +56,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.flashtool.net/"; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; - license = stdenv.lib.license.unfreeRedistributableFirmware; - + license = stdenv.lib.licenses.unfreeRedistributableFirmware; platforms = stdenv.lib.platforms.linux; hydraPlatforms = stdenv.lib.platforms.none; maintainers = [ stdenv.lib.maintainers.simons ]; From da2a336a3c79c6cd302fde4801c5d1cbc31c9f19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 16:16:57 +0100 Subject: [PATCH 254/449] Remove tabs --- nixos/tests/mysql-replication.nix | 28 ++++++++++++++-------------- nixos/tests/mysql.nix | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index a68d21c82b41..945321895864 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -12,11 +12,11 @@ in { services.mysql.enable = true; services.mysql.package = pkgs.mysql; - services.mysql.replication.role = "master"; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; - services.mysql.initialScript = pkgs.writeText "initmysql" + services.mysql.replication.role = "master"; + services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.initialScript = pkgs.writeText "initmysql" '' - create user '${replicateUser}'@'%' identified by '${replicatePassword}'; + create user '${replicateUser}'@'%' identified by '${replicatePassword}'; grant replication slave on *.* to '${replicateUser}'@'%'; ''; }; @@ -26,11 +26,11 @@ in { services.mysql.enable = true; - services.mysql.replication.role = "slave"; - services.mysql.replication.serverId = 2; - services.mysql.replication.masterHost = nodes.master.config.networking.hostName; - services.mysql.replication.masterUser = replicateUser; - services.mysql.replication.masterPassword = replicatePassword; + services.mysql.replication.role = "slave"; + services.mysql.replication.serverId = 2; + services.mysql.replication.masterHost = nodes.master.config.networking.hostName; + services.mysql.replication.masterUser = replicateUser; + services.mysql.replication.masterPassword = replicatePassword; }; slave2 = @@ -38,11 +38,11 @@ in { services.mysql.enable = true; - services.mysql.replication.role = "slave"; - services.mysql.replication.serverId = 3; - services.mysql.replication.masterHost = nodes.master.config.networking.hostName; - services.mysql.replication.masterUser = replicateUser; - services.mysql.replication.masterPassword = replicatePassword; + services.mysql.replication.role = "slave"; + services.mysql.replication.serverId = 3; + services.mysql.replication.masterHost = nodes.master.config.networking.hostName; + services.mysql.replication.masterUser = replicateUser; + services.mysql.replication.masterPassword = replicatePassword; }; }; diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index abdd39092216..bceeb8beabc2 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -7,8 +7,8 @@ { services.mysql.enable = true; - services.mysql.replication.role = "master"; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.replication.role = "master"; + services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; services.mysql.package = pkgs.mysql; }; }; From 1d9cd24d0baaaf1deebaf41c51830be473ee4789 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 16:17:34 +0100 Subject: [PATCH 255/449] Fix mysql-replication test --- nixos/tests/mysql-replication.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index 945321895864..f8c82f7ce9c8 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -26,6 +26,7 @@ in { services.mysql.enable = true; + services.mysql.package = pkgs.mysql; services.mysql.replication.role = "slave"; services.mysql.replication.serverId = 2; services.mysql.replication.masterHost = nodes.master.config.networking.hostName; @@ -38,6 +39,7 @@ in { services.mysql.enable = true; + services.mysql.package = pkgs.mysql; services.mysql.replication.role = "slave"; services.mysql.replication.serverId = 3; services.mysql.replication.masterHost = nodes.master.config.networking.hostName; From 037684283af7561026374930a8c7c51874ce46a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 16:47:05 +0100 Subject: [PATCH 256/449] typo --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index e319425d0b1d..e1bc4e977f6a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; # You can get the upstream version and SHA-1 hash from the following URLs: - # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Package + # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages # http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages version = "5.1.5.0"; From 9e4b5366f843e70a2f854c9ae9fce373a76e5274 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 16:56:17 +0100 Subject: [PATCH 257/449] Bump the overly optimistic version number --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index 07167f90842e..af805b45bd8d 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -14.02 \ No newline at end of file +14.04 \ No newline at end of file From 0fef1c502b3de6e28596308e5e6208a8ea1e3f71 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner Date: Fri, 28 Feb 2014 17:06:18 +0100 Subject: [PATCH 258/449] Add indentation for multi-line strings in seafile-client expression --- .../networking/seafile-client/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 82e5d08da413..4ab0a9f80690 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -14,19 +14,19 @@ stdenv.mkDerivation rec buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; builder = writeScript "${name}-builder.sh" '' - source $stdenv/setup + source $stdenv/setup - tar xvfz $src - cd seafile-client-* + tar xvfz $src + cd seafile-client-* - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" . - make -j1 + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" . + make -j1 - make install + make install - wrapProgram $out/bin/seafile-applet \ - --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin - ''; + wrapProgram $out/bin/seafile-applet \ + --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin + ''; meta = { From 997fffb54e9fa969db9e3a31e8aece744016312d Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner Date: Fri, 28 Feb 2014 17:10:43 +0100 Subject: [PATCH 259/449] Set meta.platforms attribute to platforms.linux for Seafile packages and their prerequisites --- pkgs/applications/networking/seafile-client/default.nix | 1 + pkgs/development/libraries/libsearpc/default.nix | 1 + pkgs/development/libraries/libzdb/default.nix | 1 + pkgs/misc/seafile-shared/default.nix | 1 + pkgs/tools/networking/ccnet/default.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 4ab0a9f80690..d24437aabb6b 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec homepage = "https://github.com/haiwen/seafile-clients"; description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; }; } diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index b27519fa66c6..863a42b741ba 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec homepage = "https://github.com/haiwen/libsearpc"; description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System."; license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; }; } \ No newline at end of file diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 25eef6c7a990..90692569f089 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec homepage = "http://www.tildeslash.com/libzdb/"; description = "A small, easy to use Open Source Database Connection Pool Library."; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; }; } \ No newline at end of file diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index f392e9ece7ae..53092e3a8b74 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec homepage = "https://github.com/haiwen/seafile"; description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; }; } diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 95479b8598e9..14b88ddafe84 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec homepage = "https://github.com/haiwen/ccnet"; description = "A framework for writing networked applications in C."; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; }; } From 6c77e15f19a4984bbcd112ef271fcec4ec221893 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 18:33:45 +0100 Subject: [PATCH 260/449] doxygen: Remove 1.7 Current 1.8 seems to generate LaTeX output fine. --- .../tools/documentation/doxygen/1.7.nix | 52 ------------------- pkgs/top-level/all-packages.nix | 6 --- 2 files changed, 58 deletions(-) delete mode 100644 pkgs/development/tools/documentation/doxygen/1.7.nix diff --git a/pkgs/development/tools/documentation/doxygen/1.7.nix b/pkgs/development/tools/documentation/doxygen/1.7.nix deleted file mode 100644 index f530ed70e37f..000000000000 --- a/pkgs/development/tools/documentation/doxygen/1.7.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, perl, flex, bison, qt4 }: - -let - name = "doxygen-1.7.4"; -in -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44"; - }; - - patches = [ ./tmake.patch ]; - - buildInputs = - [ perl flex bison ] - ++ stdenv.lib.optional (qt4 != null) qt4; - - prefixKey = "--prefix "; - - configureFlags = - [ "--dot dot" ] - ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard"; - - preConfigure = stdenv.lib.optionalString (qt4 != null) - '' - echo "using QTDIR=${qt4}..." - export QTDIR=${qt4} - ''; - - makeFlags = "MAN1DIR=share/man/man1"; - - enableParallelBuilding = true; - - meta = { - license = "GPLv2+"; - homepage = "http://doxygen.org/"; - description = "Doxygen, a source code documentation generator tool"; - - longDescription = '' - Doxygen is a documentation system for C++, C, Java, Objective-C, - Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP, - C\#, and to some extent D. It can generate an on-line - documentation browser (in HTML) and/or an off-line reference - manual (in LaTeX) from a set of documented source files. - ''; - - maintainers = [stdenv.lib.maintainers.simons]; - platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c79f3a7d321..6e0b9b1b4ade 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3574,12 +3574,6 @@ let doxygen = lowPrio (doxygen_gui.override { qt4 = null; }); - /* XXX: The LaTeX output with Doxygen 1.8.0 makes LaTeX barf. - See . */ - doxygen_1_7 = callPackage ../development/tools/documentation/doxygen/1.7.nix { - qt4 = null; - }; - doxygen_gui = callPackage ../development/tools/documentation/doxygen { }; drush = callPackage ../development/tools/misc/drush { }; From 72783a8c5bd09e2e5402d9068270b3091062dde7 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Fri, 28 Feb 2014 21:55:07 +0400 Subject: [PATCH 261/449] Add Symbola font --- pkgs/data/fonts/symbola/default.nix | 40 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/data/fonts/symbola/default.nix diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix new file mode 100644 index 000000000000..993a4c4f46d6 --- /dev/null +++ b/pkgs/data/fonts/symbola/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "symbola-7.12"; + + ttf = fetchurl { + url = "http://users.teilar.gr/~g1951d/Symbola.ttf"; + sha256 = "7acc058bd4e56cc986b2a46420520f59be402c3565c202b5dcebca7f3bfd8b5a"; + }; + docs_pdf = fetchurl { + url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; + sha256 = "11bb082ba5c2780a6f94a9bcddf4f314a54e2650bb63ce3081d1dc867c5e6843"; + }; + docs_docx = fetchurl { + url = "http://users.teilar.gr/~g1951d/Symbola.docx"; + sha256 = "4f0ab494e1e5a7aac147aa7bb8b8bdba7278aee2da942a35f995feb9051515b9"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v "$ttf" $out/share/fonts/truetype/"${ttf.name}" + + mkdir -p "$out/doc/${name}" + cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}" + cp -v "$docs_docx" "$out/doc/${name}/${docs_docx.name}" + ''; + + meta = { + description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode..."; + + # In lieu of a licence: + # Fonts in this site are offered free for any use; + # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. + license = "Unicode Fonts for Ancient Scripts"; + + homepage = http://users.teilar.gr/~g1951d/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c79f3a7d321..109dea68232d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7355,6 +7355,8 @@ let stdmanpages = callPackage ../data/documentation/std-man-pages { }; + symbola = callPackage ../data/fonts/symbola { }; + iana_etc = callPackage ../data/misc/iana-etc { }; poppler_data = callPackage ../data/misc/poppler-data { }; From 6180ed8af3750380d2a585def7bd64ca46473aca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 16:13:07 +0100 Subject: [PATCH 262/449] haskell-packages.nix: switch default versions to aeson 0.7.x and lens 4.x The only package remaining user of lens 3.x is the 'diagrams' package. --- pkgs/top-level/haskell-packages.nix | 63 ++++++++++++++--------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c0112f22718b..cb34eff7b2f4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -530,7 +530,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix { blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null; }; - aeson = self.aeson_0_6_2_1; + aeson = self.aeson_0_7_0_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; @@ -941,12 +941,24 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dice = callPackage ../development/libraries/haskell/dice {}; diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {}; - diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {}; - diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {}; - diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {}; - diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {}; - diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {}; - diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {}; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix { + lens = self.lens_3_10_2; + }; + diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix { + lens = self.lens_3_10_2; + }; + diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix { + lens = self.lens_3_10_2; + }; + diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix { + lens = self.lens_3_10_2; + }; + diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix { + lens = self.lens_3_10_2; + }; + diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix { + lens = self.lens_3_10_2; + }; Diff = callPackage ../development/libraries/haskell/Diff {}; @@ -958,10 +970,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {}; - digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson { - aeson = self.aeson_0_7_0_1; - lens = self.lens_4_0_4; - }; + digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {}; digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {}; @@ -1116,7 +1125,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x foldl = callPackage ../development/libraries/haskell/foldl {}; - forceLayout = callPackage ../development/libraries/haskell/force-layout {}; + forceLayout = callPackage ../development/libraries/haskell/force-layout { + lens = self.lens_3_10_2; + }; free = callPackage ../development/libraries/haskell/free {}; @@ -1432,9 +1443,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; - hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens { - lens = self.lens_4_0_4; - }; + hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; @@ -1535,10 +1544,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x json = callPackage ../development/libraries/haskell/json {}; - jsonAssertions = callPackage ../development/libraries/haskell/json-assertions { - aeson = self.aeson_0_7_0_1; - lens = self.lens_4_0_4; - }; + jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {}; jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; @@ -1573,10 +1579,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {}; - lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix { - aeson = self.aeson_0_7_0_1; - }; - lens = self.lens_3_10_2; + lens_4_0_4 = callPackage ../development/libraries/haskell/lens/4.0.4.nix {}; + lens = self.lens_4_0_4; lensAeson = callPackage ../development/libraries/haskell/lens-aeson {}; @@ -1588,9 +1592,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x libffi = pkgs.libffi; }; - libjenkins = callPackage ../development/libraries/haskell/libjenkins { - lens = self.lens_4_0_4; - }; + libjenkins = callPackage ../development/libraries/haskell/libjenkins {}; libmpd = callPackage ../development/libraries/haskell/libmpd {}; @@ -1602,9 +1604,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; - linear = callPackage ../development/libraries/haskell/linear { - lens = self.lens_4_0_4; - }; + linear = callPackage ../development/libraries/haskell/linear {}; List = callPackage ../development/libraries/haskell/List {}; @@ -2182,10 +2182,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x socks = callPackage ../development/libraries/haskell/socks {}; - sparse = callPackage ../development/libraries/haskell/sparse { - lens = self.lens_4_0_4; - linear = self.linear.override { lens = self.lens_4_0_4; }; - }; + sparse = callPackage ../development/libraries/haskell/sparse {}; srcloc = callPackage ../development/libraries/haskell/srcloc {}; From 6478f4da8193cbf7f4ccac9ac59ae607a28c4a79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Feb 2014 13:55:40 +0100 Subject: [PATCH 263/449] haskell-largeword: update to version 1.1.1 --- pkgs/development/libraries/haskell/largeword/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index c9ee79e47603..18ea22d6cd0d 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "largeword"; - version = "1.1.0"; - sha256 = "1xpyzgwhjz625jkr8ax21g8cdkrk89jknrx4nxscwfaw67rla8ja"; + version = "1.1.1"; + sha256 = "0dizzyicfj41cmdr9s0k75gf7cqbd2z1qk9kkvlq6rcz0249fz0x"; buildDepends = [ binary ]; testDepends = [ binary HUnit QuickCheck testFramework testFrameworkHunit From 2bbe3130903f421f1c0a2966ccbd4ddc47222019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Feb 2014 11:48:59 +0100 Subject: [PATCH 264/449] haskell-Chart: jailbreak to fix build with lens 4.x Fixes . --- pkgs/development/libraries/haskell/Chart/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 3b08c2d0e2ca..5f7e8c2cb4bd 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { buildDepends = [ colour dataDefaultClass lens mtl operational time ]; + jailbreak = true; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; From 1f822d3b5f8b2e7e4b20476b3ed51775d33a18c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Feb 2014 23:21:53 +0100 Subject: [PATCH 265/449] fix tarball --- doc/stdenv.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index afea416da8ac..1846886919d7 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1158,7 +1158,7 @@ echo @foo@ gdk-pixbuf - Exports GDK_PIXBUF_MODULE_FILE + Exports GDK_PIXBUF_MODULE_FILE environment variable the the builder. Add librsvg package to buildInputs to get svg support. @@ -1174,7 +1174,7 @@ echo @foo@ Adds the GStreamer plugins subdirectory of each build input to the GST_PLUGIN_SYSTEM_PATH_1_0 or - GST_PLUGIN_SYSTEM_PATH environment variable. + GST_PLUGIN_SYSTEM_PATH environment variable. From 7f01311f53c9d6cc35ddbdce81a1ef11b99a420d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 24 Feb 2014 18:18:30 +0100 Subject: [PATCH 266/449] networkmanager: add opensresolv --- pkgs/tools/networking/network-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 8a8306ea30c1..ce7f2635b6c9 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll -, gobjectIntrospection, modemmanager }: +, gobjectIntrospection, modemmanager, openresolv }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--with-dhcpcd=no" "--with-iptables=${iptables}/sbin/iptables" "--with-udev-dir=\${out}/lib/udev" - "--without-resolvconf" + "--with-resolvconf=${openresolv}/sbin/openresolv" "--sysconfdir=/etc" "--localstatedir=/var" "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" From f3e23d60ef5cd8350c48c81af150f1504fbfa886 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 28 Feb 2014 08:48:28 -0600 Subject: [PATCH 267/449] NetworkManager: correct resolvconf executable name --- pkgs/tools/networking/network-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index ce7f2635b6c9..20102aedeb91 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--with-dhcpcd=no" "--with-iptables=${iptables}/sbin/iptables" "--with-udev-dir=\${out}/lib/udev" - "--with-resolvconf=${openresolv}/sbin/openresolv" + "--with-resolvconf=${openresolv}/sbin/resolvconf" "--sysconfdir=/etc" "--localstatedir=/var" "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" From c2e26097a775820ed3f00073f356b485bc42fcb2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 28 Feb 2014 11:33:21 -0600 Subject: [PATCH 268/449] openresolv: wrap resolvconf to set PATH --- pkgs/tools/networking/openresolv/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 36d3bfeca56f..98a76dc98b18 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { name = "openresolv-3.5.6"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1n3cw1vbm7mh5d95ykhzdn2mrrf3pm65sp61p8iwydz1gqkp2inv"; }; + buildInputs = [ makeWrapper ]; + configurePhase = '' cat > config.mk < Date: Sat, 1 Mar 2014 05:13:49 +0200 Subject: [PATCH 269/449] manpages: update from 3.60 to 3.61 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 4a177327e0e5..e997dd487c5a 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.60"; + name = "man-pages-3.61"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "0h4wzjcrz1hqbzwn1g0q11byzss7l4f1ynj7vzgbxar7z10gr5b6"; + sha256 = "1qh1rwh0klk9s1wja6rzr5gdyvijh88i0fwqap83grbgqs661c61"; }; preBuild = From e346341b95882cf5f4a637946bbc069729c59487 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 1 Mar 2014 05:17:16 +0200 Subject: [PATCH 270/449] libmemcached: update from 1.0.8 to 1.0.18 --- pkgs/development/libraries/libmemcached/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 9ab1962806ad..ebd0d08717de 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.8"; + name = "libmemcached-1.0.18"; src = fetchurl { - url = https://launchpad.net/libmemcached/1.0/1.0.8/+download/libmemcached-1.0.8.tar.gz; - sha256 = "198wcvhrqjnak0cjnkxmjsr3xkjc1k6yq2a77nlk852gcf8ypx03"; + url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; + sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; buildInputs = [ cyrus_sasl libevent ]; From 26514f98d08c34320c38cf11a0f70e78f28a98ec Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 1 Mar 2014 05:19:40 +0200 Subject: [PATCH 271/449] libinfinity: update from 0.5.4 to 0.5.5 --- pkgs/development/libraries/libinfinity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c305239e6e21..c7513b0a167f 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -11,10 +11,10 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.5.4"; + name = "libinfinity-0.5.5"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1i7nj8qjay6amg455mwhhfqjvxnfyyql9y40a6a4a3ky170ly004"; + sha256 = "1i4cnwbvfv56m7zyyf9wki2bj000r8md414yv3cf1jdz4jbyxij7"; }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] From 2291ae241cdfc32647bdc38e756ef42de346eeee Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 1 Mar 2014 05:25:28 +0200 Subject: [PATCH 272/449] homebank: update from 4.5.4 to 4.5.5 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index d531a327d7cc..5e5c98e82601 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,7 +2,7 @@ let download_root = "http://homebank.free.fr/public/"; - name = "homebank-4.5.4"; + name = "homebank-4.5.5"; lastrelease = download_root + name + ".tar.gz"; oldrelease = download_root + "old/" + name + ".tar.gz"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ lastrelease oldrelease ]; - sha256 = "10xh76mxwbl56xp118gg3b4isv16yvhsvqxwqc28pqqxkpr7vpdk"; + sha256 = "05k4497qsb6fzr662h9yxz1amsavd287wh0sabrpr9jdbh3jcfkg"; }; buildInputs = [ pkgconfig gtk libofx intltool ]; From 399269e6e09194a73facb955dda32fc431747f37 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 1 Mar 2014 05:26:44 +0200 Subject: [PATCH 273/449] help2man: update from 1.43.3 to 1.44.1 --- pkgs/development/tools/misc/help2man/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index a3e1348f940d..2d60a06fb3e1 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.43.3"; + name = "help2man-1.44.1"; src = fetchurl { - url = "mirror://gnu/help2man/${name}.tar.gz"; - sha256 = "00yk86rvvaavg7y6i5bvk5xhm417jl9dpr8bqvqdksw0i48qv5v7"; + url = "mirror://gnu/help2man/${name}.tar.xz"; + sha256 = "1yyyfw9zrfdvslnv91bnhyqmazwx243wmkc9wdaz888rfx36ipi2"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; From 031a44a817ed101883e148344836e9e935d2a2d8 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 1 Mar 2014 05:29:14 +0200 Subject: [PATCH 274/449] inetutils: update from 1.9.1 to 1.9.2 --- pkgs/tools/networking/inetutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 24d73ff4d6fe..295cb0bf1391 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "inetutils-1.9.1"; + name = "inetutils-1.9.2"; src = fetchurl { url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "0azzg6njgq79byl6960kb0wihfhhzf49snslhxgvi30ribgfpa82"; + sha256 = "04wrm0v7l4890mmbaawd6wjwdv08bkglgqhpz0q4dkb0l50fl8q4"; }; buildInputs = [ ncurses /* for `talk' */ ]; From 1425fa5b3b264917d784b3e1950370e147a8b554 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 1 Mar 2014 09:51:28 -0500 Subject: [PATCH 275/449] Disable efi tests again OVMF sucks --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 419f71bc2593..94bc2f796eb7 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -44,7 +44,7 @@ in rec { (all nixos.iso_graphical) (all nixos.ova) - (all nixos.tests.efi-installer.simple) + # (all nixos.tests.efi-installer.simple) (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.installer.grub1) From 405ea01e676de953ff418bc8ca49e4fccd566800 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Mar 2014 16:54:07 +0100 Subject: [PATCH 276/449] Add aangifte-2013 --- .../taxes/aangifte-2005/builder.sh | 17 -------- .../taxes/aangifte-2005/default.nix | 13 ------ .../taxes/aangifte-2006/default.nix | 3 ++ .../taxes/aangifte-2007/default.nix | 3 ++ .../taxes/aangifte-2008/default.nix | 3 ++ .../taxes/aangifte-2009/default.nix | 3 ++ .../taxes/aangifte-2010/default.nix | 3 ++ .../taxes/aangifte-2011/default.nix | 3 ++ .../taxes/aangifte-2012/default.nix | 3 ++ .../taxes/aangifte-2013/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 11 files changed, 64 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/taxes/aangifte-2005/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2005/default.nix create mode 100644 pkgs/applications/taxes/aangifte-2013/default.nix diff --git a/pkgs/applications/taxes/aangifte-2005/builder.sh b/pkgs/applications/taxes/aangifte-2005/builder.sh deleted file mode 100644 index 8d284176d444..000000000000 --- a/pkgs/applications/taxes/aangifte-2005/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2005/default.nix b/pkgs/applications/taxes/aangifte-2005/default.nix deleted file mode 100644 index 03ba20b11dae..000000000000 --- a/pkgs/applications/taxes/aangifte-2005/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, libX11, libXext}: - -stdenv.mkDerivation { - name = "aangifte2005-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2005_linux.tar.gz; - md5 = "9cc709b8ad041f4b20154ff1491d0436"; - }; - - inherit libX11 libXext; -} diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix index 8bf5ddeee40d..72d6999fa1d7 100644 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ b/pkgs/applications/taxes/aangifte-2006/default.nix @@ -14,5 +14,8 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2006"; url = "http://www.belastingdienst.nl/download/1341.html"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix index 3cd472b51c25..15c826feb6e7 100644 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ b/pkgs/applications/taxes/aangifte-2007/default.nix @@ -17,5 +17,8 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2007"; url = "http://www.belastingdienst.nl/download/1341.html"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix index 85d5b3045be0..905471cb76b8 100644 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ b/pkgs/applications/taxes/aangifte-2008/default.nix @@ -18,5 +18,8 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)"; url = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index eeeb4a1d1e53..9aa7a8172711 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -33,5 +33,8 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index 65ff561ee9ef..23338c01ec3e 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -33,5 +33,8 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)"; url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix index 0bffad95d50b..e5bc233affa0 100644 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ b/pkgs/applications/taxes/aangifte-2011/default.nix @@ -33,5 +33,8 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)"; url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 8f36fd485ddd..544fe4ec55f9 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -34,5 +34,8 @@ stdenv.mkDerivation { meta = { description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)"; url = http://www.belastingdienst.nl/particulier/aangifte2012/download/; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix new file mode 100644 index 000000000000..5cf90320adc7 --- /dev/null +++ b/pkgs/applications/taxes/aangifte-2013/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: + +stdenv.mkDerivation { + name = "aangifte2013-1"; + + src = fetchurl { + url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz; + sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c"; + }; + + dontStrip = true; + dontPatchELF = true; + + buildInputs = [ makeWrapper ]; + + buildPhase = + '' + for i in bin/*; do + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + $i + done + ''; + + installPhase = + '' + mkdir -p $out + cp -prvd * $out/ + wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ + --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1 + ''; + + meta = { + description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)"; + url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e0b9b1b4ade..08854c2974a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7396,8 +7396,6 @@ let a2jmidid = callPackage ../applications/audio/a2jmidid { }; - aangifte2005 = callPackage_i686 ../applications/taxes/aangifte-2005 { }; - aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; @@ -7412,6 +7410,8 @@ let aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { }; + aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { }; + abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; libcdio = libcdio082; From 350277d9c555f085fb925eabfe5c53ea998731c5 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 1 Mar 2014 22:21:06 +0400 Subject: [PATCH 277/449] dwb: update version --- pkgs/applications/networking/browsers/dwb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index e10acf294bf7..c638e2b1adb8 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-01-29"; + name = "dwb-2014-03-01"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "eaf090af9ad63341a846377cb9ce473feee8f032"; - sha256 = "1wqa5dry9p3x3y07zpq3km8ycr8wvz8c11754vf99pv1kzk8gq0n"; + rev = "e8d4b8d7937b70279d006da4938dfe52fb85f9e8"; + sha256 = "0m4730zqmnvb9k6xyydi221sh0wbanzbhg07xvwil3kn1d29340w"; }; buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4 ]; From 90759ebf6307a7c7a1f54296ad2ab85550cb1ae1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 1 Mar 2014 12:37:39 -0600 Subject: [PATCH 278/449] Add pcmanfm-1.2.0 --- pkgs/applications/misc/pcmanfm/default.nix | 17 +++++++++++++++++ pkgs/development/libraries/libfm/default.nix | 17 +++++++++++++++++ .../libraries/menu-cache/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 4 files changed, 57 insertions(+) create mode 100644 pkgs/applications/misc/pcmanfm/default.nix create mode 100644 pkgs/development/libraries/libfm/default.nix create mode 100644 pkgs/development/libraries/menu-cache/default.nix diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix new file mode 100644 index 000000000000..3700dc34d3df --- /dev/null +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: + +stdenv.mkDerivation { + name = "pcmanfm-1.2.0"; + src = fetchurl { + url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.0.tar.xz"; + sha256 = "1cmskj7dpjgrrn89z7cc1h1nsmd6qq3bakf207ldrhrxxv3fxl2j"; + }; + + buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; + + meta = { + homepage = "http://blog.lxde.org/?cat=28/"; + license = stdenv.lib.licenses.gpl2Plus; + description = "File manager with GTK+ interface"; + }; +} diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix new file mode 100644 index 000000000000..2a901d367611 --- /dev/null +++ b/pkgs/development/libraries/libfm/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala }: + +stdenv.mkDerivation { + name = "libfm-1.2.0"; + src = fetchurl { + url = "mirror://sourceforge/pcmanfm/libfm-1.2.0.tar.xz"; + sha256 = "08pwdrmfm9rl41lj2niyjqq2bdvydxk7v2shjxh5gk1xwj238lgh"; + }; + + buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ]; + + meta = { + homepage = "http://blog.lxde.org/?cat=28/"; + license = stdenv.lib.licenses.gpl2Plus; + description = "A glib-based library for file management"; + }; +} diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix new file mode 100644 index 000000000000..b22d1e7669f7 --- /dev/null +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, glib, pkgconfig }: + +stdenv.mkDerivation { + name = "menu-cache-0.5.1"; + src = fetchurl { + url = "mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz"; + sha256 = "08m1msgbl6j7j72cwcg18klb99jif8h1phkcnbplxkdf3w15irh8"; + }; + + buildInputs = [ glib pkgconfig ]; + + meta = { + homepage = "http://blog.lxde.org/?tag=menu-cache"; + license = stdenv.lib.licenses.gpl2Plus; + description = "Library to read freedesktop.org menu files"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44a23e828dfd..a09ee4d5466e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4714,6 +4714,8 @@ let libelf = callPackage ../development/libraries/libelf { }; + libfm = callPackage ../development/libraries/libfm { }; + libgadu = callPackage ../development/libraries/libgadu { }; libgdata = gnome3.libgdata; @@ -5182,6 +5184,8 @@ let # failed to build mediastreamer = callPackage ../development/libraries/mediastreamer { }; + menu-cache = callPackage ../development/libraries/menu-cache { }; + mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; }; @@ -8515,6 +8519,8 @@ let mutt = callPackage ../applications/networking/mailreaders/mutt { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; + ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { ruby = ruby19; hoe = rubyLibs.hoe; From f4a3ea123bf9faeac026c7b70df4502d75e50c74 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 1 Mar 2014 22:37:39 +0100 Subject: [PATCH 279/449] fix torbrowser build by adding /lib64 for 64 bit systems --- pkgs/tools/security/tor/torbrowser.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index cd1fda47e437..2554e999e0d3 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -15,6 +15,9 @@ let ]; }; + ldLibraryPath = if bits == "64" then torEnv+"/lib:"+torEnv+"/lib64" + else torEnv+"/lib"; + in stdenv.mkDerivation rec { name = "tor-browser-${version}"; version = "3.5"; @@ -36,7 +39,7 @@ in stdenv.mkDerivation rec { # Just do a simple test if all libraries get loaded by running help on # firefox and tor echo "Checking firefox..." - LD_LIBRARY_PATH=${torEnv}/lib Browser/firefox --help 1> /dev/null + LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null echo "Checking tor..." LD_LIBRARY_PATH=${torEnv}/lib:Tor Tor/tor --help 1> /dev/null ''; @@ -53,7 +56,7 @@ in stdenv.mkDerivation rec { echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \ ~/Data/Browser/profile.default/preferences/extension-overrides.js fi - export LD_LIBRARY_PATH=${torEnv}/lib:$out/share/tor-browser/Tor + export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Tor $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" EOF chmod +x $out/bin/tor-browser @@ -65,6 +68,6 @@ in stdenv.mkDerivation rec { description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet"; homepage = https://www.torproject.org/; platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.matejc ]; }; } From 2bd2747a504bd6e4ce8ebdc942716a9035b1a239 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 1 Mar 2014 18:46:53 -0600 Subject: [PATCH 280/449] arpack: version 3.1.5, fix pkgconfig --- .../libraries/science/math/arpack/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 48bbd3aa7853..20b24d10fe60 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,17 +1,22 @@ { stdenv, fetchurl, gfortran, openblas }: -let version = "3.1.4"; +let version = "3.1.5"; in stdenv.mkDerivation { name = "arpack-${version}"; src = fetchurl { url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${version}.tar.gz"; - sha256 = "0m4cqy3d7fpzx1nac3brhr298qj7vx3fchjdz5b7n0pp616cmcm1"; + sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2"; }; buildInputs = [ gfortran ]; propagatedBuildInputs = [ openblas ]; + preConfigure = '' + substituteInPlace arpack.pc.in \ + --replace "@BLAS_LIBS@" "-L${openblas}/lib @BLAS_LIBS@" + ''; + # Auto-detection fails because gfortran brings in BLAS by default configureFlags="--with-blas=-lopenblas --with-lapack=-lopenblas"; From 2e99141805317cf3a8603f2a337275d3f5b09867 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 2 Mar 2014 12:46:47 +0800 Subject: [PATCH 281/449] renpy: update to 6.17.2 --- pkgs/development/interpreters/renpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 4cd719842b67..9c7b08d80101 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - name = "renpy-6.17.1"; + name = "renpy-6.17.2"; meta = { description = "Ren'Py Visual Novel Engine"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://www.renpy.org/dl/6.17.1/renpy-6.17.1-source.tar.bz2"; - sha256 = "024v05yifs6c13chpg0azjpi6xk1srrhd1d0hcs946xbjvbbadpc"; + url = "http://www.renpy.org/dl/6.17.2/renpy-6.17.2-source.tar.bz2"; + sha256 = "1iadhdi8g2a7gyg08y0190bv56cc8csckdj4p9f4m2hgg1ybw1qx"; }; buildInputs = [ From d2dd22651d1ffcc5a248bb6930ee691644538a9f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 2 Mar 2014 08:17:22 +0100 Subject: [PATCH 282/449] idris-mode: upgrade to current version --- pkgs/applications/editors/emacs-modes/idris/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 572ca8cdb22a..289c8868876d 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation rec { - name = "idris-mode-20140106"; + name = "idris-mode-20140223"; src = fetchgit { url = https://github.com/idris-hackers/idris-mode.git; - rev = "47df65dd5b554c1d7cf70a07c3bd06d80867f870"; - sha256 = "55df66d1bace134bea83f0547e01daf068fc96dc080cf88ea8945ddcb2d08ea4"; + rev = "486470533e74c55192e92a1afa050475915ee1e7"; + sha256 = "ff2e6bd8fbf421e8f2db0789d2ff56c5103775b911b99bab64e4652d332bad43"; }; buildInputs = [ emacs ]; From 3a7e38eb1a8c0f628db445985d3b188436877e52 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Mar 2014 20:03:26 +0100 Subject: [PATCH 283/449] idris: no longer depends on old versions of trifecta and parsers --- pkgs/top-level/haskell-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cb34eff7b2f4..ea09d5d7f5d3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2800,8 +2800,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { - parsers = self.parsers_0_9; - trifecta = self.trifecta_1_1; llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; From 13f8c07b54f51b3e49476212a67a406cfa8ab48a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Mar 2014 20:03:49 +0100 Subject: [PATCH 284/449] haskell-trifecta: remove old versions --- .../libraries/haskell/trifecta/1.1.nix | 34 ------------------- .../libraries/haskell/trifecta/1.2.nix | 34 ------------------- .../haskell/trifecta/{1.4.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 7 +--- 4 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/trifecta/1.1.nix delete mode 100644 pkgs/development/libraries/haskell/trifecta/1.2.nix rename pkgs/development/libraries/haskell/trifecta/{1.4.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix deleted file mode 100644 index 4f5841d68812..000000000000 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml -, blazeMarkup, charset, comonad, deepseq, doctest, filepath -, fingertree, hashable, lens, mtl, parsers, reducers, semigroups -, transformers, unorderedContainers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "trifecta"; - version = "1.1"; - sha256 = "19wnblpn31hvdi5dc8ir24s0hfjj4vvzr43gg9ydl2qdjq6s166w"; - buildDepends = [ - ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup - charset comonad deepseq fingertree hashable lens mtl parsers - reducers semigroups transformers unorderedContainers utf8String - ]; - testDepends = [ doctest filepath ]; - postPatch = '' - substituteInPlace trifecta.cabal \ - --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ - --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --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 "comonad == 3.*," "comonad >= 3 && < 5," \ - --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," - ''; - meta = { - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix deleted file mode 100644 index fae592e73f07..000000000000 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml -, blazeMarkup, charset, comonad, deepseq, doctest, filepath -, fingertree, hashable, lens, mtl, parsers, reducers, semigroups -, transformers, unorderedContainers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "trifecta"; - version = "1.2.1.1"; - sha256 = "1bv35ip7g0h7r2w0s8pkcbvm0b9hx91vblf5w57q3jr843v9314c"; - buildDepends = [ - ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup - charset comonad deepseq fingertree hashable lens mtl parsers - reducers semigroups transformers unorderedContainers utf8String - ]; - testDepends = [ doctest filepath ]; - postPatch = '' - substituteInPlace trifecta.cabal \ - --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ - --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --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 "comonad == 3.*," "comonad >= 3 && < 5," \ - --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," - ''; - meta = { - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/trifecta/1.4.nix b/pkgs/development/libraries/haskell/trifecta/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/trifecta/1.4.nix rename to pkgs/development/libraries/haskell/trifecta/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ea09d5d7f5d3..539564f94c39 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2441,12 +2441,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {}; - trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix { - parsers = self.parsers_0_9; - }; - trifecta_1_2 = callPackage ../development/libraries/haskell/trifecta/1.2.nix {}; - trifecta_1_4 = callPackage ../development/libraries/haskell/trifecta/1.4.nix {}; - trifecta = self.trifecta_1_4; + trifecta = callPackage ../development/libraries/haskell/trifecta {}; tuple = callPackage ../development/libraries/haskell/tuple {}; From cba5d36df1649d028bb6d6265c0ec90989147dfa Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Mar 2014 20:04:04 +0100 Subject: [PATCH 285/449] haskell-parsers: remove old versions --- .../libraries/haskell/parsers/0.9.nix | 17 ----------------- .../haskell/parsers/{0.10.3.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/parsers/0.9.nix rename pkgs/development/libraries/haskell/parsers/{0.10.3.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/parsers/0.9.nix b/pkgs/development/libraries/haskell/parsers/0.9.nix deleted file mode 100644 index dc42228df66a..000000000000 --- a/pkgs/development/libraries/haskell/parsers/0.9.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, charset, doctest, filepath, text, transformers -, unorderedContainers -}: - -cabal.mkDerivation (self: { - pname = "parsers"; - version = "0.9"; - sha256 = "04lbayvdv2hax4s9sqlnia7jpzv1sgls41ylql0xbi2zhz5rvyyi"; - buildDepends = [ charset text transformers unorderedContainers ]; - testDepends = [ doctest filepath ]; - meta = { - homepage = "http://github.com/ekmett/parsers/"; - description = "Parsing combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/parsers/0.10.3.nix rename to pkgs/development/libraries/haskell/parsers/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 539564f94c39..b35e1714226e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1880,9 +1880,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec3 = self.parsec_3_1_5; parsec = self.parsec3; - parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; - parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers = self.parsers_0_10_3; + parsers = callPackage ../development/libraries/haskell/parsers {}; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From 08d739ea4cd9f6b4174655806946de42528ae649 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 2 Mar 2014 12:21:50 +0800 Subject: [PATCH 286/449] libass: update to 0.11.1, add more meta attributes Close #1865. --- pkgs/development/libraries/libass/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 499639b3a87c..15b80053218d 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,17 +1,34 @@ -{ stdenv, fetchurl, freetype, fontconfig, pkgconfig, enca ? null }: +{ stdenv, fetchurl, pkgconfig, yasm +, freetype, fribidi, fontconfig +, enca ? null +, harfbuzz ? null +}: -stdenv.mkDerivation rec { - name = "libass-0.9.11"; +let + version = "0.11.1"; + sha256 = "1b0ki1zdkhflszzj5qr45j9qsd0rfbb6ws5pqkny8jhih0l3lxwx"; + baseurl = "https://github.com/libass/libass/releases/download"; +in stdenv.mkDerivation rec { + name = "libass-${version}"; src = fetchurl { - url = "http://libass.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0p3li523s8n85kfh5xdbbfffr17z8xdh2qcgvdg7ki1myv6agl7z"; + url = "${baseurl}/${version}/${name}.tar.xz"; + inherit sha256; }; - buildInputs = [ freetype fontconfig enca pkgconfig ]; + nativeBuildInputs = [ pkgconfig yasm ]; + + buildInputs = [ + freetype fribidi fontconfig + enca harfbuzz + ]; meta = { + description = "Portable ASS/SSA subtitle renderer"; homepage = http://code.google.com/p/libass/; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.urkud ]; + repositories.git = git://github.com/libass/libass.git; }; } From 433257ad94e892ff3cf302c5d955889582392c9e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:50:35 -0600 Subject: [PATCH 287/449] cb0cat: add 'unix' to platforms list Signed-off-by: Austin Seipp --- pkgs/tools/security/cb0cat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/cb0cat/default.nix b/pkgs/tools/security/cb0cat/default.nix index e35434f3cc26..251c91260561 100644 --- a/pkgs/tools/security/cb0cat/default.nix +++ b/pkgs/tools/security/cb0cat/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "cryptographic tool based on the CBEAMr0 sponge function"; homepage = "https://www.cblnk.com"; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; From 7d561c5ba9627fc705ac9da893d9928d46d709f1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:51:22 -0600 Subject: [PATCH 288/449] spark: Remove unneeded whitespace. Signed-off-by: Austin Seipp --- pkgs/applications/networking/cluster/spark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 18aae784cbc7..34c3af161261 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; - meta = { + meta = { description = "Spark cluster computing"; homepage = "http://spark.incubator.apache.org"; platforms = stdenv.lib.platforms.all; From 6a88b95ac7092475e37ab7d907ed77fab4c9de51 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:51:49 -0600 Subject: [PATCH 289/449] checksec: add homepage Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/checksec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 5e5ed6da1c92..0f3b87361f83 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for checking security bits on executables"; + homepage = "http://www.trapkit.de/tools/checksec.html"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; From 73bcce319b5836808788ff024b887b46620b07af Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:52:34 -0600 Subject: [PATCH 290/449] ktap: Update to 0.5-e7a38ef0 This adds a new, useful net library as well. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/ktap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index 21996e26131b..7a54f0aeebef 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktap-${version}"; - version = "0.5-7ee59b19"; + version = "0.5-e7a38ef0"; src = fetchgit { url = "https://github.com/ktap/ktap.git"; - rev = "7ee59b19d536fd3d3164ff0a0623faff827e5d97"; - sha256 = "0a46836469d0afb088e72fd6310406a86c487d17bac40e390cec8bc869e7379c"; + rev = "e7a38ef06bec9a651c9e8bdb3ad66a104210d475"; + sha256 = "07acf20e1926d3afd89b13855154b8cc792c57261e7d3cae2da70cb08844f9c8"; }; buildPhase = '' From 812d17f177e3013e9088b716c45866ce4d32d967 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 2 Mar 2014 05:53:08 -0600 Subject: [PATCH 291/449] ktap: don't use FFI by default It's not yet supported on i386 - instead, make it optional and controlled by a `useFFI` attribute. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/ktap/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index 7a54f0aeebef..542096733595 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchgit, kernel }: +{ stdenv, fetchgit, kernel, useFFI ? false }: +let + ffiArgs = stdenv.lib.optionalString useFFI "FFI=1"; +in stdenv.mkDerivation rec { name = "ktap-${version}"; version = "0.5-e7a38ef0"; @@ -10,7 +13,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - make FFI=1 KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build + make ${ffiArgs} KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build ''; installPhase = '' From bb2d066140a7828e0a616bc1cf14ea8660c4c0c7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 1 Mar 2014 14:25:59 -0600 Subject: [PATCH 292/449] Add haskell-gnuplot-0.5.2 --- .../libraries/haskell/gnuplot/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/gnuplot/default.nix diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix new file mode 100644 index 000000000000..8390ef2520aa --- /dev/null +++ b/pkgs/development/libraries/haskell/gnuplot/default.nix @@ -0,0 +1,22 @@ +{ cabal, dataAccessor, dataAccessorTransformers, deepseq, filepath +, temporary, time, transformers, utilityHt +}: + +cabal.mkDerivation (self: { + pname = "gnuplot"; + version = "0.5.2"; + sha256 = "11gma33bikx97jra04vgnhikylw9wm1l37hdrsknl7mgk2qbrs74"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + dataAccessor dataAccessorTransformers deepseq filepath temporary + time transformers utilityHt + ]; + jailbreak = true; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; + description = "2D and 3D plots using gnuplot"; + 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 cb34eff7b2f4..1a3d4538b77e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1227,6 +1227,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; + gnuplot = callPackage ../development/libraries/haskell/gnuplot {}; + gnutls = callPackage ../development/libraries/haskell/gnutls { inherit (pkgs) gnutls; }; gsasl = callPackage ../development/libraries/haskell/gsasl { inherit (pkgs) gsasl; }; From 8109de905a7f27f21079e7cff2e5bd5a939a3372 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 26 Feb 2014 20:34:23 +0000 Subject: [PATCH 293/449] linux: Update to 3.13.5 --- pkgs/os-specific/linux/kernel/linux-3.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix index 827910ca28b4..05a4f55d0203 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.13.4"; + version = "3.13.5"; extraMeta.branch = "3.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0hzxr8gsafnyc96x5p2clgi827ahidk1hma0yd48gdx9dhynrq2r"; + sha256 = "03yggix59k2i2lf0m3kkqslcvvfcg19xx96ywbrfkfbb7vplw67w"; }; features.iwlwifi = true; From 69a83ba99f9d5f6aff7477f5074687512401f414 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 26 Feb 2014 20:35:29 +0000 Subject: [PATCH 294/449] grsecurity: Update stable and test patches stable: 3.0-3.2.55-201402221305 -> 3.0-3.2.55-201402241936 test: 3.0-3.13.4-201402221308 -> 3.0-3.13.5-201402241943 --- pkgs/os-specific/linux/kernel/patches.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 49fa176d7835..a5a8cbff0baf 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -81,22 +81,22 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402221305.patch; - sha256 = "0g6mqbmjmqz4xh18cq5mn3d0zlzjlk76x0lmpwbrcapdcg5apcp5"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402241936.patch; + sha256 = "0kd6bc9kyvn8y6b32fpn778hc8xfm2y4wmpiglia6dqybpyry600"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55 features.apparmor = true; }; - grsecurity_3_0_3_13_4 = - { name = "grsecurity-3.0-3.13.4"; + grsecurity_3_0_3_13_5 = + { name = "grsecurity-3.0-3.13.5"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.4-201402221308.patch; - sha256 = "0783an79485wwbsvcf8ggsmc2bwsbj1i7q6r8g22b19i9hzqmr64"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201402241943.patch; + sha256 = "1xv4plviarjprg7bcb4h88wsbrj7x2biypibhzb1pifksmxx25fn"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5 features.apparmor = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08854c2974a5..d73e535911f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6710,7 +6710,7 @@ let })) (args: grsecurityOverrider args)); linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_4 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_5 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; }; From 669e3520fd5eed92fc483939f585b4b4e3ad20c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:03:01 +0100 Subject: [PATCH 295/449] gtypist: update from 2.9.3 to 2.9.4 --- pkgs/games/gtypist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index 195679183776..3db7aecfe1a5 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation { - name = "gtypist-2.9.3"; + name = "gtypist-2.9.4"; src = fetchurl { - url = "mirror://gnu/gtypist/gtypist-2.9.3.tar.xz"; - sha256 = "0srwa841caci69hzqb47xfbxxf7fvz3640qka083p72vm8z9hsxw"; + url = "mirror://gnu/gtypist/gtypist-2.9.4.tar.xz"; + sha256 = "18f54lh7ihhfvgwk3xd9d087kmganrgi2jd7avhvwn5gcc31vrqq"; }; buildInputs = [ncurses]; From 691df2ab8365695953d7f8068647e120e3a153bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:39 +0100 Subject: [PATCH 296/449] imlib2: update from 1.4.5 to 1.4.6 --- pkgs/development/libraries/imlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index b1c154badd8e..2210976ff909 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { - name = "imlib2-1.4.5"; + name = "imlib2-1.4.6"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; - sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14"; + sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; }; buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; From f9af98f1fd7c4862922611c0e3941d4183eea17d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:41 +0100 Subject: [PATCH 297/449] ipsecTools: update from 0.8.1 to 0.8.2 --- pkgs/os-specific/linux/ipsec-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index f1faa5c4884d..6a42784d1f08 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -7,11 +7,11 @@ # the time being. stdenv.mkDerivation rec { - name = "ipsec-tools-0.8.1"; + name = "ipsec-tools-0.8.2"; src = fetchurl { url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2"; - sha256 = "1m1x2planqqxi0587g7d8xhy0gkyfaxs3ry4hhdh0bw46sxrajps"; + sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; }; buildInputs = [ readline openssl flex krb5 pam ]; From 05c7578c3d6075083293c7e4f52be39985736615 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:41 +0100 Subject: [PATCH 298/449] lout: update from 3.39 to 3.40 --- pkgs/tools/typesetting/lout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 0d1602143764..61e94d4d6185 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { - name = "lout-3.39"; + name = "lout-3.40"; src = fetchurl { urls = [ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # XXX: We could add the CTAN mirrors # (see http://www.ctan.org/tex-archive/support/lout/). ]; - sha256 = "12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq"; + sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix"; }; buildInputs = [ ghostscript ]; From 43eb9e6d536a063c975d44a99cd7025d6917722b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:41 +0100 Subject: [PATCH 299/449] mpg123: update from 1.16.0 to 1.18.1 --- pkgs/applications/audio/mpg123/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index f14e2764211e..8d4b8d4d778b 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib }: stdenv.mkDerivation { - name = "mpg123-1.16.0"; + name = "mpg123-1.18.1"; src = fetchurl { - url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2; - sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh"; + url = mirror://sourceforge/mpg123/mpg123-1.18.1.tar.bz2; + sha256 = "0bb5hv0qw3ln09xisi7d19gb4p2y69sx3905rdc293q3gr7khvdw"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; From 65cce5c38bacb66eac2aa35f5aa8b420d7ed22da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:41 +0100 Subject: [PATCH 300/449] opensmtpd: update from 201307151923p1 to 201402281146p1 --- pkgs/servers/mail/opensmtpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 49550647921b..3d7a32a00c9b 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "201307151923p1"; + version = "201402281146p1"; buildInputs = [ libevent zlib openssl db bison pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "0cggq60zzz5mgj093pmgwjp4bm6znnhyv6ibp1vhkba7cxjavr4g"; + sha256 = "0q287lx6pcz1bz6b334fb977dpbcg4rpyli3zrxj27wql4x0dg6b"; }; configureFlags = [ From d14df722a71f3d6c5d6c4ef545960e26fc18294b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:41 +0100 Subject: [PATCH 301/449] plan9port: update from 20110103 to 20140228 --- pkgs/tools/system/plan9port/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index e1e515aaf013..e5ec557a79a5 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libX11, xproto, libXt, xextproto, libXext}: stdenv.mkDerivation rec { - name = "plan9port-20110103"; + name = "plan9port-20140228"; builder = ./builder.sh; src = fetchurl { url = "http://swtch.com/plan9port/${name}.tgz"; - sha256 = "12hq3k03jgva72498qa1dyndakbhbfg0sc1jhcap9cxqj04xf0dc"; + sha256 = "1l7nsjfrrcq0l43kw0f1437jz3nyl9qw7i2vn0sbmcsv5vmsj0cr"; }; buildInputs = [ libX11 xproto libXt xextproto libXext ]; From e816a7fe5337a24ce48260595f1e0e228f15fcbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:42 +0100 Subject: [PATCH 302/449] pstoedit: update from 3.50 to 3.62 --- pkgs/tools/graphics/pstoedit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index efdeffe1ad79..62816705b8f0 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, ghostscript, gd, zlib, plotutils }: stdenv.mkDerivation { - name = "pstoedit-3.50"; + name = "pstoedit-3.62"; src = fetchurl { - url = mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz; - sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92"; + url = mirror://sourceforge/pstoedit/pstoedit-3.62.tar.gz; + sha256 = "0j410dm9nqwa7n03yiyz0jwvln0jlqc3n9iv4nls33yl6x3c8x40"; }; buildInputs = [ pkgconfig ghostscript gd zlib plotutils ]; From 506da15579aa3969ccad35b97472ad067c8f8e83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:42 +0100 Subject: [PATCH 303/449] pv: update from 1.4.12 to 1.5.2 --- pkgs/tools/misc/pv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index bf0c44de1419..480e00c850d3 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.4.12"; + name = "pv-1.5.2"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "0hnpv4l5kidfwxzba7ibm9wjs71ing9gzx0m80bgr3ia8k4s8nka"; + sha256 = "1sz5ishd66xliwnhv0x3vr48fbp7id4xd8fsrbm66y7f5mfd7qp2"; }; meta = { From 19cb32a36cfb6232d2e5eb290b2f921f6e2e1f6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:42 +0100 Subject: [PATCH 304/449] root: update from 5.34.14 to 5.34.15 --- pkgs/applications/science/misc/root/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index f4de3ba6eea0..53a045ac6f0e 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "5.34.14"; + version = "5.34.15"; src = fetchurl { url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz"; - sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b"; + sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i"; }; buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ]; From bc3008846de7fcbfefef348c5edd76e003ef4485 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:42 +0100 Subject: [PATCH 305/449] scons: update from 2.3.0 to 2.3.1 --- pkgs/development/tools/build-managers/scons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 11d81c3beb7c..c6856dae5651 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -2,7 +2,7 @@ let name = "scons"; - version = "2.3.0"; + version = "2.3.1"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; - sha256 = "0jrv8v5dpdp231n1gsfmirqy27f7qas6m255jjm2qjygk6chchll"; + sha256 = "00822ax62cfi2fvz9zhw80hl1273524d97xfycq4q276z1lb86h9"; }; buildInputs = [python makeWrapper]; From dd3f07e0f2094f450f89334fc97ebbdda7ce8a3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:42 +0100 Subject: [PATCH 306/449] skype: update from 4.2.0.11 to 4.2.0.13 --- .../networking/instant-messengers/skype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index ebd84ff47b89..20a304952a7a 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -5,11 +5,11 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "skype-4.2.0.11"; + name = "skype-4.2.0.13"; src = fetchurl { url = "http://download.skype.com/linux/${name}.tar.bz2"; - sha256 = "0kh66p50m3x4ql6j8ciz73c30npcizd00ya9qrhid711rar0mlw7"; + sha256 = "137kp6c0v4z7n7pp4hwrx4gjgk4knwj815dc6swh44lb5cj1c5m5"; }; buildInputs = From 0968d527fa16c870e3a463b27a272264ab5cfbb6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:42 +0100 Subject: [PATCH 307/449] xlockmore: update from 5.38 to 5.43 --- pkgs/misc/screensavers/xlockmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index b3c71c891912..7e750d9c9b37 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.38"; + name = "xlockmore-5.43"; src = fetchurl { url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; - sha256 = "15x5l43zdjn881xf2m9psz9s2hvd2l8py2kzdhdh1v9m4ml20nf4"; + sha256 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499"; }; # Optionally, it can use GTK+. From 34ef383d452db195087b253abb3dc8ecc11e7703 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:43 +0100 Subject: [PATCH 308/449] xterm: update from 300 to 301 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 1d050182da33..a13dd76fd039 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-300"; + name = "xterm-301"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "1k8p7q4d1gpk6zikb8hys8b30yq2v001nlp3r9g40my31ij9al31"; + sha256 = "040rarvv18zg0lk7qy0m3n7gv10mh40jic708wvng01z4rlbpfhz"; }; buildInputs = From 98cb9c073f89c65ca5a1f7bb4a1a3c5067c7ee66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:43 +0100 Subject: [PATCH 309/449] xsel: update from 0.9.6 to 1.2.0 --- pkgs/tools/misc/xsel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 5c8d6f37c7c6..74eadaf5e2e9 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, x11}: stdenv.mkDerivation { - name = "xsel-0.9.6"; + name = "xsel-1.2.0"; src = fetchurl { - url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-0.9.6.tar.gz; - md5 = "cec2fb09a4101b7f2beab8094234e2f4"; + url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-1.2.0.tar.gz; + sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr"; }; buildInputs = [x11]; From c4873add803cde6cb50f29f5ac896ef8b16a6958 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:43 +0100 Subject: [PATCH 310/449] youtubeDL: update from 2014.02.26 to 2014.02.28 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 29463a358e9f..ded669a6febc 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 = "2014.02.26"; + version = "2014.02.28"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "069p3iyh96xc7y9ixzl4v5smq8i6d4gnhyy2yyzphjlfnpvwhb7j"; + sha256 = "1xizqk47f3wd1g1mqs87iand4v3pjxxdzh4z7s6525hlkb8z5813"; }; buildInputs = [ python ]; From db2776ee8aa7ec9175326f98987fbf0c610dee77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:43 +0100 Subject: [PATCH 311/449] feh: update from 2.9.3 to 2.10 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 1e920ff65c5f..4f52e6dec0fd 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,11 +2,11 @@ , libXinerama, curl }: stdenv.mkDerivation rec { - name = "feh-2.9.3"; + name = "feh-2.10"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1wlhfbglzc1jzsh80s4s1fawclgzyjy2105ffzx2mw9s0c1xds5l"; + sha256 = "10ya8j0mxlni08qli3gdkyjhy54g4d2q2kc0hhragmzd9s42ly5w"; }; buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ]; From 97298922e560a3a85a2df8a13f4e8df11adaf52c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:43 +0100 Subject: [PATCH 312/449] gitAndTools.hub: update from 1.11.1 to 1.12.0 --- .../version-management/git-and-tools/hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 87bb0a6d2854..28484322d351 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hub-${version}"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/github/hub/archive/v${version}.tar.gz"; - sha256 = "09wqxxzgrgcx6p3n3bhrb5ka3194qfwnli5j3frv37448hx6wd4n"; + sha256 = "1lbl4dl7483q320qw4jm6mqq4dbbk3xncypxgg86zcdigxvw6igv"; }; buildInputs = [ rake makeWrapper ]; From aa8ef327e410ca10dec65885a08cab8d6626570c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:44 +0100 Subject: [PATCH 313/449] gitAndTools.gitflow: update from 1.6.1 to 1.7.0 --- .../version-management/git-and-tools/gitflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 26a7826d4f0c..0898345c30b6 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gitflow-${version}"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "https://github.com/petervanderdoes/gitflow/archive/${version}.tar.gz"; - sha256 = "1f4879ahi8diddn7qvhr0dkj96gh527xnfihbf1ha83fn9cvvcls"; + sha256 = "0rppgyqgk0drip6852bdm2479zks16cb3mj1jdw6jq80givrqnjx"; }; preBuild = '' From 9c2c002a3b81c9a50258ae93d9ab355e9156ed03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:08:44 +0100 Subject: [PATCH 314/449] gparted: update from 0.15.0 to 0.18.0 --- pkgs/tools/misc/gparted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 00d2f759be4f..50af2a12c24b 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -2,11 +2,11 @@ , pkgconfig, gtkmm, libxml2 }: stdenv.mkDerivation rec { - name = "gparted-0.15.0"; + name = "gparted-0.18.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.bz2"; - sha256 = "03s9dp2q281lkkfjgk9ahc8i6dk4d2a03z4bh2d19a7r3b2mmdww"; + sha256 = "0slyf0sbv7a7xvdcpn9ibnixpy0w4s6zwpz6sklkxcyfybw1j7xz"; }; configureFlags = "--disable-doc"; From 7bf77e413d848c863a13950dfa1ef2d54d08aedf Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 15:08:56 +1100 Subject: [PATCH 315/449] lesstif: fix build on Darwin * x11 = xlibsWrapper on non-Darwin systems, but is darwinX11AndOpenGL on Darwin systems, so pass in xlibsWrapper to the lesstif build instead --- pkgs/development/libraries/lesstif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index 21b4eac30af3..8d01c2f2f438 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, libXp, libXau}: +{stdenv, fetchurl, xlibsWrapper, libXp, libXau}: stdenv.mkDerivation { name = "lesstif-0.95.0-p2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2; md5 = "ab895165c149d7f95843c7584b1c7ad4"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; propagatedBuildInputs = [libXp libXau]; # The last stable release of lesstif was in June 2006. These From ff4ec6d5f06edf07daf9e9df07f5131b7dd4795a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 15:10:37 +1100 Subject: [PATCH 316/449] t1lib: fix build on Darwin * x11 = xlibsWrapper on non-Darwin systems, but is darwinX11AndOpenGL on Darwin systems, so pass in xlibsWrapper to the t1lib build instead --- pkgs/development/libraries/t1lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 9a4ba00e1d33..ebd8699dc17c 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, libXaw, libXpm}: +{stdenv, fetchurl, xlibsWrapper, libXaw, libXpm}: stdenv.mkDerivation { name = "t1lib-5.1.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; }; - buildInputs = [x11 libXaw libXpm]; + buildInputs = [xlibsWrapper libXaw libXpm]; buildFlags = "without_doc"; } From af3cf0dbeb56eb0e67d949ea7126640f4f394a43 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 1 Mar 2014 10:00:36 +0100 Subject: [PATCH 317/449] Add structured-haskell-mode --- .../structured-haskell-mode/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix new file mode 100644 index 000000000000..25055df8ea35 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix @@ -0,0 +1,23 @@ +{ cabal, emacs, haskellSrcExts }: + +cabal.mkDerivation (self: { + pname = "structured-haskell-mode"; + version = "1.0.2"; + sha256 = "1lwdhlr38y5hdr78nplplr3q0hrjhryw378f1857qh0lvp03gwl2"; + isLibrary = false; + isExecutable = true; + buildDepends = [ haskellSrcExts ]; + buildTools = [ emacs ]; + postInstall = '' + emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el + install -d $out/share/emacs/site-lisp + install "elisp/"*.elc $out/share/emacs/site-lisp + ''; + meta = { + homepage = "https://github.com/chrisdone/structured-haskell-mode"; + description = "Structured editing Emacs mode for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.pSub ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d73e535911f3..0d22468e5eca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7778,6 +7778,10 @@ let ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; + structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode { + inherit (haskellPackages) cabal haskellSrcExts; + }; + tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; From de6792a4604a7e74bda29a57d35417a11b2b52ae Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 15:11:51 +1100 Subject: [PATCH 318/449] graphite2: enable build on Darwin This builds on Darwin without any modifications, so it has been added to the platforms array --- pkgs/development/libraries/silgraphite/graphite2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f6aa7c35f394..f874804c0010 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.unix; }; } From a577082e5e9765e72b40e559f48b256e7944bb1f Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 16:31:22 +1100 Subject: [PATCH 319/449] re-enable au debian mirror --- pkgs/build-support/fetchurl/mirrors.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index c6c294d55042..c4841c50d94c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -159,7 +159,7 @@ rec { # Debian. debian = [ - #ftp://ftp.au.debian.org/debian/ + ftp://ftp.au.debian.org/debian/ ftp://ftp.de.debian.org/debian/ ftp://ftp.es.debian.org/debian/ ftp://ftp.fr.debian.org/debian/ From 13979ab58cb8e45f48722aa71ec6363fc7c9b444 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 16:31:44 +1100 Subject: [PATCH 320/449] upgrade texlive-extra to 2013.20140215 The old version (2013.20131112) was no longer available on the debian mirrors, hence building from source was impossible. --- pkgs/tools/typesetting/tex/texlive/extra.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index c6624e469e5d..056c7e0bf4e0 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,9 +1,11 @@ args: with args; rec { - name = "texlive-extra-2013"; + name = "texlive-extra-2013"; + version = "2013.20140215"; + src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131219.orig.tar.xz; - sha256 = "09iijzq0y5kq16f3lv2jrln190ldbbzywpwr33hrmnw5yp3izmrh"; + url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; + sha256 = "04a67pns6q8kw1nl2v6x5p443kvhk8fr26qkcj7z098n68fpwls8"; }; buildInputs = [texLive xz]; From 30da7690985c8deac78c72c7acf982d28872440e Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 16:33:12 +1100 Subject: [PATCH 321/449] upgrade texlive-base, texlive-lang Upgraded to 2013.20140215. The old version (2013.20131112) was no longer available on the debian FTP server, so building from source was impossible. --- pkgs/tools/typesetting/tex/texlive/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 3158f2859334..8fab16de6746 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,14 +5,16 @@ rec { sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd"; }; + texmfVersion = "2013.20140215"; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20140123.orig.tar.xz; - sha256 = "1lwvqryfykz0d9pcjkhq1qh7dlcb6lsvjp7fizl18ji6166159iw"; + url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; + sha256 = "0f1xqa1a1yklsiqz12rgihdc6viw8ghdbx2s2pw2k3h0dfsd6ss3"; }; + langTexmfVersion = "2013.20140215"; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20140123.orig.tar.xz; - sha256 = "1smzkg31msn9ci7fc69xq5klhxab00z8bcxmz5daqzcal8ak3d2d"; + url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; + sha256 = "0igz9kpd1rfbq7smb1wyd75cz396rinbh25rk19lxqh25dix0xzj"; }; passthru = { inherit texmfSrc langTexmfSrc; }; From f0680440191f3dcd774d9f2a1971defc2b139e64 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 3 Mar 2014 16:34:53 +1100 Subject: [PATCH 322/449] texLiveFull: fix build on Darwin Added --with-system-icu=no, --with-system-harfbuzz=no (looks like the omission of --with-system-icu was not sufficient to force the builder not to look for system ICU libs). Disable building bibtex-x: complains about missing ICU directory. Disable building dvisvgm: a test fails (and I can't work out how to prevent the tests from running just for this). Disable building devnag: failing tests. --- .../tools/typesetting/tex/texlive/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 8fab16de6746..98a8a0fd810f 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -45,7 +45,7 @@ rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; - ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \ + ./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \ ${args.lib.concatStringsSep " " configureFlags} cd Work '' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ]; @@ -116,14 +116,22 @@ rec { configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" - "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" - ] - ++ ( if stdenv.isDarwin - # ironically, couldn't get xetex compiling on darwin - then [ "--disable-xetex" "--disable-xdv2pdf" "--disable-xdvipdfmx" ] - # couldn't seem to get system icu working on darwin - else [ "--with-system-icu" ] ); + "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" + "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + # Complains about a missing ICU directory + "--disable-bibtex-x" + + # TODO: We should be able to fix these tests + "--disable-devnag" + "--disable-dvisvgm" + "--disable-xdv2pdf" + "--disable-xdvipdfmx" + "--disable-xetex" + + "--with-system-harfbuzz=no" + "--with-system-icu=no" + ]; phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ]; From b0c23548095f464fbb4bae866300c1446e9720e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 13:10:05 +0100 Subject: [PATCH 323/449] bind: update to version 9.9.5-W1 (fixes CVE-2013-6230 and CVE 2014-0591) --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index b609c6686a25..db8db908d1ec 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.9.4-P2"; in +let version = "9.9.5-W1"; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "128aqizcjbakrqrijjpy54qffqz1jafa94lhnqig7lr63r1wdwsh"; + sha256 = "1b3ycb376b1j2fc0k6w16k8j9vgsfrzy3nlw1vxzzi41fgyqmcd3"; }; patchPhase = '' From ad7c518e45221533e2094acb20fea6ade477da75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Mar 2014 13:37:44 +0100 Subject: [PATCH 324/449] Sync /tmp/xchg to ensure that the coverage data is flushed --- nixos/lib/test-driver/test-driver.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl index c6a707cdf6b9..31f3281cefe0 100644 --- a/nixos/lib/test-driver/test-driver.pl +++ b/nixos/lib/test-driver/test-driver.pl @@ -144,6 +144,13 @@ sub runTests { } }); + $log->nest("syncing", sub { + foreach my $vm (values %vms) { + next unless $vm->isUp(); + $vm->execute("sync /tmp/xchg"); + } + }); + if ($nrTests != 0) { $log->log("$nrSucceeded out of $nrTests tests succeeded", ($nrSucceeded < $nrTests ? { error => 1 } : { })); From 497997cc388ce791ca0b4dc55f46ab515e8fb5d9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Mar 2014 13:39:30 +0100 Subject: [PATCH 325/449] Move generation of coverage reports from nixos/lib/testing to releaseTools Also, turn some stdenv adapters into setup hooks. --- nixos/lib/testing.nix | 54 ++----------------- nixos/release.nix | 3 +- nixos/tests/quake3.nix | 4 +- nixos/tests/subversion.nix | 2 +- pkgs/build-support/release/default.nix | 6 ++- pkgs/build-support/release/gcov-report.nix | 49 +++++++++++++++++ pkgs/build-support/release/nix-build.nix | 2 +- .../enable-coverage-instrumentation.sh | 17 ++++++ .../setup-hooks/keep-build-tree.sh | 6 +++ pkgs/stdenv/adapters.nix | 40 +------------- pkgs/top-level/all-packages.nix | 8 +-- 11 files changed, 94 insertions(+), 97 deletions(-) create mode 100644 pkgs/build-support/release/gcov-report.nix create mode 100644 pkgs/build-support/setup-hooks/keep-build-tree.sh diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 3407229e921a..d5338bc04cac 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -67,62 +67,16 @@ rec { }; - # Generate a coverage report from the coverage data produced by - # runTests. - makeReport = x: runCommand "report" { buildInputs = [rsync]; } - '' - mkdir -p $TMPDIR/gcov/ - - for d in ${x}/coverage-data/*; do - echo "doing $d" - [ -n "$(ls -A "$d")" ] || continue - - for i in $(cd $d/nix/store && ls); do - if ! test -e $TMPDIR/gcov/nix/store/$i; then - echo "copying $i" - mkdir -p $TMPDIR/gcov/$(echo $i | cut -c34-) - rsync -rv /nix/store/$i/.build/* $TMPDIR/gcov/ - fi - done - - chmod -R u+w $TMPDIR/gcov - - find $TMPDIR/gcov -name "*.gcda" -exec rm {} \; - - for i in $(cd $d/nix/store && ls); do - rsync -rv $d/nix/store/$i/.build/* $TMPDIR/gcov/ - done - - find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \; - - echo "producing info..." - ${pkgs.lcov}/bin/geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info - cat $TMPDIR/app.info >> $TMPDIR/full.info - done - - echo "making report..." - mkdir -p $out/coverage - ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage - cp $TMPDIR/full.info $out/coverage/ - - mkdir -p $out/nix-support - cat ${x}/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products - echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products - [ ! -e ${x}/nix-support/failed ] || touch $out/nix-support/failed - ''; # */ - - makeTest = testFun: complete (call testFun); makeTests = testsFun: lib.mapAttrs (name: complete) (call testsFun); apply = makeTest; # compatibility call = f: f { inherit pkgs system; }; - complete = t: t // rec { + complete = { testScript, ... } @ t: t // rec { + nodes = buildVirtualNetwork ( - if t ? nodes then t.nodes else - if t ? machine then { machine = t.machine; } - else { } ); + t.nodes or (if t ? machine then { machine = t.machine; } else { })); testScript = # Call the test script with the computed nodes. @@ -162,7 +116,7 @@ rec { test = runTests driver; - report = makeReport test; + report = releaseTools.gcovReport { coverageRuns = [ test ]; }; }; diff --git a/nixos/release.nix b/nixos/release.nix index ff094cce05fa..b98976c2ccea 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -213,7 +213,8 @@ in rec { with lib; let testsFor = system: - mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)]) + mapAttrsRecursiveCond (x: !x ? test) + (n: v: listToAttrs [(nameValuePair system (if v.makeCoverageReport or false then v.report else v.test))]) (import ./tests { inherit nixpkgs system; }); in fold recursiveUpdate {} (map testsFor systems); } diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 925011077805..fefbd75b4a3c 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -14,11 +14,13 @@ in rec { + makeCoverageReport = true; + client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.driSupport = true; + hardware.opengl.driSupport = true; services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16; environment.systemPackages = [ pkgs.quake3demo ]; nixpkgs.config.packageOverrides = overrides; diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix index 309da90c5df1..49450c78f3b8 100644 --- a/nixos/tests/subversion.nix +++ b/nixos/tests/subversion.nix @@ -20,7 +20,7 @@ let # To build the kernel with coverage instrumentation, we need a # special patch to make coverage data available under /proc. linux = pkgs.linux.override (orig: { - stdenv = cleanupBuildTree (keepBuildTree orig.stdenv); + stdenv = overrideInStdenv pkgs.stdenv [ pkgs.keepBuildTree ]; extraConfig = '' GCOV_KERNEL y diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index acad3487dad2..6288935ec2a5 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -27,10 +27,14 @@ rec { } // args); coverageAnalysis = args: nixBuild ( - { inherit lcov enableCoverageInstrumentation makeCoverageAnalysisReport; + { inherit lcov enableGCOVInstrumentation makeGCOVReport; doCoverageAnalysis = true; } // args); + gcovReport = args: import ./gcov-report.nix ( + { inherit runCommand lcov rsync; + } // args); + rpmBuild = args: import ./rpm-build.nix ( { inherit vmTools; } // args); diff --git a/pkgs/build-support/release/gcov-report.nix b/pkgs/build-support/release/gcov-report.nix new file mode 100644 index 000000000000..8ce5c0488a7d --- /dev/null +++ b/pkgs/build-support/release/gcov-report.nix @@ -0,0 +1,49 @@ +{ runCommand, lcov, rsync, coverageRuns, lcovFilter ? [ "/nix/store/*" ], baseDirHack ? false }: + +runCommand "coverage" + { buildInputs = [ lcov rsync ]; + inherit lcovFilter baseDirHack; + } + '' + mkdir -p $TMPDIR/gcov $out/nix-support $out/coverage + info=$out/coverage/full.info + + for p in ${toString coverageRuns}; do + if [ -f $p/nix-support/hydra-build-products ]; then + cat $p/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products + fi + + [ ! -e $p/nix-support/failed ] || touch $out/nix-support/failed + + opts= + for d in $p/coverage-data/*; do + for i in $(cd $d/nix/store && ls); do + if ! [ -e /nix/store/$i/.build ]; then continue; fi + if [ -e $TMPDIR/gcov/nix/store/$i ]; then continue; fi + echo "copying $i..." + rsync -a /nix/store/$i/.build/* $TMPDIR/gcov/ + if [ -n "$baseDirHack" ]; then + opts="-b $TMPDIR/gcov/$(cd /nix/store/$i/.build && ls)" + fi + done + + for i in $(cd $d/nix/store && ls); do + rsync -a $d/nix/store/$i/.build/* $TMPDIR/gcov/ --include '*/' --include '*.gcda' --exclude '*' + done + done + + chmod -R u+w $TMPDIR/gcov + + echo "producing info..." + geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info $opts + cat $TMPDIR/app.info >> $info + done + + echo "making report..." + set -o noglob + lcov --remove $info ''$lcovFilter > $info.tmp + set +o noglob + mv $info.tmp $info + genhtml --show-details $info -o $out/coverage + echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products + '' diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 993f12bc3002..8ebae24c6733 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation ( prePhases = ["initPhase"] ++ prePhases; - buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeCoverageAnalysisReport; + buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport; lcovFilter = ["/nix/store/*"] ++ lcovFilter; diff --git a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh index 08ef490e2447..7175b408b02f 100644 --- a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh +++ b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh @@ -1,3 +1,5 @@ +postPhases+=" cleanupBuildDir" + # Force GCC to build with coverage instrumentation. Also disable # optimisation, since it may confuse things. export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage" @@ -12,3 +14,18 @@ postUnpack() { substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)' done } + +# Get rid of everything that isn't a gcno file or a C source file. +# Also strip the `.tmp_' prefix from gcno files. (The Linux kernel +# creates these.) +cleanupBuildDir() { + if ! [ -e $out/.build ]; then return; fi + + find $out/.build/ -type f -a ! \ + \( -name "*.c" -o -name "*.cc" -o -name "*.cpp" -o -name "*.h" -o -name "*.hh" -o -name "*.y" -o -name "*.l" -o -name "*.gcno" \) \ + | xargs rm -f -- + + for i in $(find $out/.build/ -name ".tmp_*.gcno"); do + mv "$i" "$(echo $i | sed s/.tmp_//)" + done +} diff --git a/pkgs/build-support/setup-hooks/keep-build-tree.sh b/pkgs/build-support/setup-hooks/keep-build-tree.sh new file mode 100644 index 000000000000..754900bfc337 --- /dev/null +++ b/pkgs/build-support/setup-hooks/keep-build-tree.sh @@ -0,0 +1,6 @@ +prePhases+=" moveBuildDir" + +moveBuildDir() { + mkdir -p $out/.build + cd $out/.build +} diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index cb7e3ba925f5..0e45ad05531c 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -187,51 +187,13 @@ rec { { mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); }; - /* Return a modified stdenv that performs the build under $out/.build - instead of in $TMPDIR. Thus, the sources are kept available. - This is useful for things like debugging or generation of - dynamic analysis reports. */ - keepBuildTree = stdenv: - addAttrsToDerivation - { prePhases = "moveBuildDir"; - - moveBuildDir = - '' - mkdir -p $out/.build - cd $out/.build - ''; - } stdenv; - - - cleanupBuildTree = stdenv: - addAttrsToDerivation - { postPhases = "cleanupBuildDir"; - - # Get rid of everything that isn't a gcno file or a C source - # file. This also includes the gcda files; we're not - # interested in coverage resulting from the package's own test - # suite. Also strip the `.tmp_' prefix from gcno files. (The - # Linux kernel creates these.) - cleanupBuildDir = - '' - find $out/.build/ -type f -a ! \ - \( -name "*.c" -o -name "*.h" -o -name "*.gcno" \) \ - | xargs rm -f -- - - for i in $(find $out/.build/ -name ".tmp_*.gcno"); do - mv "$i" "$(echo $i | sed s/.tmp_//)" - done - ''; - } stdenv; - - /* Return a modified stdenv that builds packages with GCC's coverage instrumentation. The coverage note files (*.gcno) are stored in $out/.build, along with the source code of the package, to enable programs like lcov to produce pretty-printed reports. */ addCoverageInstrumentation = stdenv: - cleanupBuildTree (keepBuildTree (overrideInStdenv stdenv [ pkgs.enableCoverageInstrumentation ])); + overrideInStdenv stdenv [ pkgs.enableGCOVInstrumentation pkgs.keepBuildTree ]; /* Replace the meta.maintainers field of a derivation. This is useful diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d22468e5eca..a79317cd6baa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -396,10 +396,12 @@ let fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; - enableCoverageInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; + keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; - makeCoverageAnalysisReport = makeSetupHook - { deps = [ pkgs.lcov pkgs.enableCoverageInstrumentation ]; } + enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; + + makeGCOVReport = makeSetupHook + { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; From 6a9168ad06a8f6e851b4481c32a7bfa78e66deeb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Mar 2014 13:55:50 +0100 Subject: [PATCH 326/449] Get rid of services.mesa.* message --- nixos/modules/rename.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1a08a1cf4f35..a26f930eda1d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -115,14 +115,10 @@ in zipModules ([] # !!! this hardcodes bash, could we detect from config which shell is actually used? ++ obsolete [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ] -++ obsolete [ "services" "xserver" "driSupport" ] [ "services" "mesa" "driSupport" ] -++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "services" "mesa" "driSupport32Bit" ] -++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "services" "mesa" "s3tcSupport" ] -++ obsolete [ "services" "xserver" "videoDrivers" ] [ "services" "mesa" "videoDrivers" ] -++ obsolete [ "services" "mesa" "driSupport" ] [ "hardware" "opengl" "driSupport" ] -++ obsolete [ "services" "mesa" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ] -++ obsolete [ "services" "mesa" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ] -++ obsolete [ "services" "mesa" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ] +++ obsolete [ "services" "xserver" "driSupport" ] [ "hardware" "opengl" "driSupport" ] +++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ] +++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ] +++ obsolete [ "services" "xserver" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ] ++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ] From 38d69b08febe4b06e566055cd3868fc70a456929 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Mon, 3 Mar 2014 14:06:12 +0100 Subject: [PATCH 327/449] Added pew and virtualenv-clone --- pkgs/top-level/python-packages.nix | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1afadd1a2760..53b1cff64c3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1782,6 +1782,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + pew = buildPythonPackage rec { + name = "pew-0.1.9"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz"; + md5 = "90a82400074b50a9e73c3045ed9ac217"; + }; + + buildInputs = [ virtualenv virtualenv-clone ]; + + meta = with stdenv.lib; { + description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + pudb = buildPythonPackage rec { name = "pudb-2013.3.6"; @@ -7229,6 +7246,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + virtualenv-clone = buildPythonPackage rec { + name = "virtualenv-clone-0.2.4"; + + src = fetchgit { + url = "https://github.com/berdario/virtualenv-clone.git"; + rev = ''c302ca84e524cb22f88c834cccb23dd410cced97''; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Script to clone virtualenvs"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + waitress = buildPythonPackage rec { name = "waitress-0.8.7"; From 83771bd926d37158144c9e26aaf6af1404dd05ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 3 Mar 2014 14:21:07 +0100 Subject: [PATCH 328/449] add python 3.4.0rc2 --- .../interpreters/python/3.4/default.nix | 88 +++++++++++++++++++ .../interpreters/python/3.4/setup-hook.sh | 15 ++++ pkgs/top-level/all-packages.nix | 9 +- 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/python/3.4/default.nix create mode 100644 pkgs/development/interpreters/python/3.4/setup-hook.sh diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix new file mode 100644 index 000000000000..8d7da9d91e64 --- /dev/null +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -0,0 +1,88 @@ +{ stdenv, fetchurl +, bzip2 +, db +, gdbm +, libX11, xproto +, ncurses +, openssl +, readline +, sqlite +, tcl, tk +, zlib +}: + +assert readline != null -> ncurses != null; + +with stdenv.lib; + +let + majorVersion = "3.4"; + version = "${majorVersion}.0"; + fullVersion = "${version}rc2"; + + buildInputs = filter (p: p != null) [ + zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto + ]; +in +stdenv.mkDerivation { + name = "python3-${fullVersion}"; + inherit majorVersion version; + + src = fetchurl { + url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; + sha256 = "0v37mlkwzbc8m54h3nb04x6xm2yx5fmd7flq2shn37ixf9d0ih6z"; + }; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + + preConfigure = '' + for i in /usr /sw /opt /pkg; do # improve purity + substituteInPlace ./setup.py --replace $i /no-such-path + done + ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} + + configureFlagsArray=( --enable-shared --with-threads + CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" + LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + ) + ''; + + setupHook = ./setup-hook.sh; + + postInstall = '' + rm -rf "$out/lib/python${majorVersion}/test" + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + ''; + + passthru = { + zlibSupport = zlib != null; + sqliteSupport = sqlite != null; + dbSupport = db != null; + readlineSupport = readline != null; + opensslSupport = openssl != null; + tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); + libPrefix = "python${majorVersion}"; + executable = "python3.4m"; + is_py3k = true; + }; + + enableParallelBuilding = true; + + meta = { + homepage = http://python.org; + description = "A high-level dynamically-typed programming language"; + longDescription = '' + Python is a remarkably powerful dynamic programming language that + is used in a wide variety of application domains. Some of its key + distinguishing features include: clear, readable syntax; strong + introspection capabilities; intuitive object orientation; natural + expression of procedural code; full modularity, supporting + hierarchical packages; exception-based error handling; and very + high level dynamic data types. + ''; + license = stdenv.lib.licenses.psfl; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; + }; +} diff --git a/pkgs/development/interpreters/python/3.4/setup-hook.sh b/pkgs/development/interpreters/python/3.4/setup-hook.sh new file mode 100644 index 000000000000..ae71b4147ab7 --- /dev/null +++ b/pkgs/development/interpreters/python/3.4/setup-hook.sh @@ -0,0 +1,15 @@ +addPythonPath() { + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.4/site-packages +} + +toPythonPath() { + local paths="$1" + local result= + for i in $paths; do + p="$i/lib/python3.4/site-packages" + result="${result}${result:+:}$p" + done + echo $result +} + +envHooks=(${envHooks[@]} addPythonPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a79317cd6baa..12b0bc5e4f8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3243,8 +3243,9 @@ let }; python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); - python33 = callPackage ../development/interpreters/python/3.3 { }; python32 = callPackage ../development/interpreters/python/3.2 { }; + python33 = callPackage ../development/interpreters/python/3.3 { }; + python34 = callPackage ../development/interpreters/python/3.4 { }; python = python27; python26 = callPackage ../development/interpreters/python/2.6 { @@ -6061,6 +6062,12 @@ let python = python33; }); + python34Packages = import ./python-packages.nix { + inherit pkgs; + inherit (lib) lowPrio; + python = python34; + }; + python32Packages = import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; From 6c12e8d2bde6bd5d775230359ed5312908b4abbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 3 Mar 2014 14:58:34 +0100 Subject: [PATCH 329/449] pythonPackages.mrbob: 0.1a9 -> 0.1.1 --- pkgs/top-level/python-packages.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d2b8efd446d..00ef1ea8b0ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3844,13 +3844,19 @@ pythonPackages = modules // import ./python-packages-generated.nix { mrbob = buildPythonPackage rec { name = "mrbob-${version}"; - version = "0.1a9"; + version = "0.1.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip"; - md5 = "2d27d9bd1fc6269a3ecfd1a1ae47cd8a"; + md5 = "84a117c9a75b86842b0fa5f5c9c767f3"; }; + # some files in tests dir include unicode names + preBuild = '' + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + export LC_ALL="en_US.UTF-8" + ''; + buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++ From ef7a5deaee1514e9aa546fd10df2954ceb6828f9 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 3 Mar 2014 15:40:07 +0000 Subject: [PATCH 330/449] haskellPackages.stripe: New expression --- .../libraries/haskell/stripe/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stripe/default.nix diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix new file mode 100644 index 000000000000..1759143eb9bf --- /dev/null +++ b/pkgs/development/libraries/haskell/stripe/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, httpConduit, httpTypes, mtl, text, time +, unorderedContainers, utf8String +}: + +cabal.mkDerivation (self: { + pname = "stripe"; + version = "0.7.0"; + sha256 = "02kyxipifdaf08bk85cbgksvm3jn7i648h9afb3jfxqam5j4a7a0"; + buildDepends = [ + aeson httpConduit httpTypes mtl text time unorderedContainers + utf8String + ]; + meta = { + homepage = "https://github.com/michaelschade/hs-stripe"; + description = "A Haskell implementation of the Stripe API"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e0d68ea434a8..0559c42315bb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2304,6 +2304,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {}; + stripe = callPackage ../development/libraries/haskell/stripe { + aeson = self.aeson_0_6_2_1; + }; + svgcairo = callPackage ../development/libraries/haskell/svgcairo { libc = pkgs.stdenv.gcc.libc; }; From a19cf91652400fbea2ce8c2fdff2c809ab0f4b19 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Feb 2014 14:09:49 -0600 Subject: [PATCH 331/449] wpa_supplicant: Update 2.0 -> 2.1 --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index ec2c704cfb5c..bd2caed265f2 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,13 +5,13 @@ assert readlineSupport -> readline != null; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "02cy6wrs4nzm7wbq9mc1vby8lnj58k4sb10h718ks8mmzc4mc49c"; + sha256 = "0xxjw7lslvql1ykfbwmbhdrnjsjljf59fbwf837418s97dz2wqwi"; }; extraConfig = From f0125f019e3492b3ca4042bd1cbf66a2f4a99258 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Mar 2014 10:34:26 -0600 Subject: [PATCH 332/449] paypalrestsdk: Add package --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d2b8efd446d..08ba1ca40c46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4544,6 +4544,22 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + paypalrestsdk = buildPythonPackage rec { + name = "paypalrestsdk-0.7.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/paypalrestsdk/${name}.tar.gz"; + sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6"; + }; + + propagatedBuildInputs = [ httplib2 ]; + + meta = { + homepage = https://developer.paypal.com/; + description = "Python APIs to create, process and manage payment"; + license = "PayPal SDK License"; + }; + }; pep8 = buildPythonPackage rec { name = "pep8-${version}"; From ea5d87fedfbdcf9722a9daaa5822ce5e5e43690c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Mar 2014 10:25:33 -0600 Subject: [PATCH 333/449] sorl_thumbnail: Add package --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08ba1ca40c46..fef5a7aac239 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6601,6 +6601,22 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + sorl_thumbnail = buildPythonPackage rec { + name = "sorl-thumbnail-11.12"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/sorl-thumbnail/${name}.tar.gz"; + sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4"; + }; + + doCheck = false; + + meta = { + homepage = http://sorl-thumbnail.readthedocs.org/en/latest/; + description = "Thumbnails for Django"; + license = stdenv.lib.licenses.bsd3; + }; + }; supervisor = buildPythonPackage rec { name = "supervisor-3.0"; From 347681ef74c4787052b442b5f6e60c3baa8b20f2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 3 Mar 2014 12:30:58 -0600 Subject: [PATCH 334/449] sorl: Describe test failures --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fef5a7aac239..4e444d939fdb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6609,6 +6609,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4"; }; + # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. doCheck = false; meta = { From 9597c8f8fe43427503ee8feaa3dbdde821f42ab0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:42 +0100 Subject: [PATCH 335/449] haskell-SVGFonts: update to version 1.4.0.2 --- pkgs/development/libraries/haskell/SVGFonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix index de47bd200ee7..509efd61968b 100644 --- a/pkgs/development/libraries/haskell/SVGFonts/default.nix +++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "SVGFonts"; - version = "1.4.0.1"; - sha256 = "0f878xg6qngl8ahk8zz03f1kyn2jq1dz05zw8av7s91x2ms8q3rg"; + version = "1.4.0.2"; + sha256 = "1a1f0jdz36zpj1196zv5qwg35rm4ra0b4z5spr1m3696292nj8ph"; buildDepends = [ attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec split text tuple vector vectorSpace xml From a72f47b2f87f0b9b53a849e85517ebe9323c7bd0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:45 +0100 Subject: [PATCH 336/449] haskell-assert-failure: update to version 0.1.1.0 --- pkgs/development/libraries/haskell/assert-failure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix index bfb340147a80..b5cc0bdc4460 100644 --- a/pkgs/development/libraries/haskell/assert-failure/default.nix +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "assert-failure"; - version = "0.1"; - sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr"; + version = "0.1.1.0"; + sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1"; buildDepends = [ prettyShow text ]; jailbreak = true; meta = { From eeb8e36bad804c44503260aba1418efa760437ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:47 +0100 Subject: [PATCH 337/449] haskell-base-compat: update to version 0.4.0 --- pkgs/development/libraries/haskell/base-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index 6ce94b0d6c00..9e5375a24d8c 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base-compat"; - version = "0.3.0"; - sha256 = "0jjj953hr00jj99ld2977al6n6qk67ds9qfzkzwkh5ifgmi6f20i"; + version = "0.4.0"; + sha256 = "0ps26w4mjp465a3mh3hpzkdkc97yvfhzh86fcnlqszy9wgj13w65"; buildDepends = [ errorcallEqInstance ]; testDepends = [ hspec setenv ]; meta = { From 2978b1c334a8a242412e6dd93c0f2305ad19a0ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:49 +0100 Subject: [PATCH 338/449] haskell-cairo: update to version 0.12.5.3 --- pkgs/development/libraries/haskell/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index b009f6763ab1..25029618b235 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.5.1"; - sha256 = "02a57kg7s1bjfvk7cnkppfva5g7akhpwsrsa1qzm0kdld51cs86l"; + version = "0.12.5.3"; + sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7"; buildDepends = [ mtl utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; From b6c93edded216b8011d9e6343d25345790cec4a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:51 +0100 Subject: [PATCH 339/449] haskell-crypto-pubkey-types: update to version 0.4.2.2 --- .../libraries/haskell/crypto-pubkey-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 7d6a5c1b6153..264c420842a5 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.4.2.1"; - sha256 = "01jxvx4bjk4qj024ydwskp942gsgy15i9jfh3diq9la8yqnidwj2"; + version = "0.4.2.2"; + sha256 = "18z1fnh2xjq600ya8m175m64nwr6bwscr2q47zjy7k38zlm9c8h5"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; From f4883496825f349557e704ddd32b182abf418ff5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:52 +0100 Subject: [PATCH 340/449] haskell-gio: update to version 0.12.5.3 --- pkgs/development/libraries/haskell/gio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 6506800a1740..19d51d93aab5 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gio"; - version = "0.12.5.0"; - sha256 = "08gg3dh3xsgvj3hwylg5pgrhdrvi1chsybkd0l4hd4bycpm3sx98"; + version = "0.12.5.3"; + sha256 = "1n9sima0m30w1bmfk0wb4fawrg76vgpvlzki0kwdh6f0sfczxywc"; buildDepends = [ glib mtl ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ glib ]; From 7e7dc6feff69254ea62195c4bc530e173341289d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:54 +0100 Subject: [PATCH 341/449] haskell-glib: update to version 0.12.5.3 --- pkgs/development/libraries/haskell/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 4761c35127e3..9ae07187f5af 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.12.5.0"; - sha256 = "0s3gw4xd6d84hylzniy3sjjzz2ia2q4249vplhqn6y64dj96l196"; + version = "0.12.5.3"; + sha256 = "0hn55x0bzc6xxsd5fhlnh2mpdn8n80295i2irgbgxqc1wn226frc"; buildDepends = [ utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From 1095825fd2294af14e07e91e5312f2e437b5f21e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:56 +0100 Subject: [PATCH 342/449] haskell-gtk: update to version 0.12.5.4 --- pkgs/development/libraries/haskell/gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 9ac6fb2f6f2b..8198960854cd 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.12.5.2"; - sha256 = "06jlwln3w2pgzahhy8n4sqv1chmh899naz8avqabr9ni4hmbrssb"; + version = "0.12.5.4"; + sha256 = "0vs31lzrmd3546q8dqql8sf1vfagyr24p5i6ddi792vw14mj3why"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From 011ca0210b0926e5bbb6b453abe3d0e5a7cfe8a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:52:58 +0100 Subject: [PATCH 343/449] haskell-http-reverse-proxy: update to version 0.3.0.1 --- .../libraries/haskell/http-reverse-proxy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index a8e0afc786ea..f78205c49a09 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,15 +1,15 @@ { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit -, dataDefault, hspec, httpClient, httpConduit, httpTypes +, dataDefaultClass, hspec, httpClient, httpConduit, httpTypes , liftedBase, monadControl, network, networkConduit, resourcet , text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.0"; - sha256 = "0wwrcm3hhbq9kawk3s12s8ws82vancmc8a5d29f6871jfq3vvzc2"; + version = "0.3.0.1"; + sha256 = "01rbczzf300ivb08wncm19wq64m7n6r5xfbgh82phjxjmmx9h6wj"; buildDepends = [ - basicPrelude blazeBuilder caseInsensitive conduit dataDefault + basicPrelude blazeBuilder caseInsensitive conduit dataDefaultClass httpClient httpTypes liftedBase monadControl network networkConduit resourcet text wai waiLogger word8 ]; From b6c59de5517cb7c9a54428ecab92835725040ade Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:00 +0100 Subject: [PATCH 344/449] haskell-miniutter: update to version 0.4.3.0 --- pkgs/development/libraries/haskell/miniutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index 346e1c6a428d..389a79dd6e1e 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "miniutter"; - version = "0.4.2"; - sha256 = "00027aqxa0631v3n1jsv4aj9kf39s5yivi3dl573s5nj0wibj008"; + version = "0.4.3.0"; + sha256 = "0hslks4vr1738pczgzzcl0mrb9jqs1986vjgw4xpvzz9p3ki1n50"; buildDepends = [ binary minimorph text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { From be693f08cbf24e4e1f65e837b54793cee8f1971d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:01 +0100 Subject: [PATCH 345/449] haskell-mono-traversable: update to version 0.3.1 --- .../libraries/haskell/mono-traversable/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index e0cb6e3a3de4..f6c261145c1d 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -1,19 +1,19 @@ -{ cabal, comonad, hashable, hspec, QuickCheck, semigroupoids +{ cabal, comonad, foldl, hashable, hspec, QuickCheck, semigroupoids , semigroups, text, transformers, unorderedContainers, vector , vectorInstances }: cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.3.0.3"; - sha256 = "0n8bgynapx43f4agbp596ywnfv0cm12x3ihifr3vzv78iixnl0xh"; + version = "0.3.1"; + sha256 = "0a0vy0hp34sw1q7153jd614mqydzg79pw645kfxlihs3j7ac2b3j"; buildDepends = [ comonad hashable semigroupoids semigroups text transformers unorderedContainers vector vectorInstances ]; testDepends = [ - hspec QuickCheck semigroups text transformers unorderedContainers - vector + foldl hspec QuickCheck semigroups text transformers + unorderedContainers vector ]; meta = { homepage = "https://github.com/snoyberg/mono-traversable"; From 867b2cb42fe28049b14a5454f9c0ff7d700ddd69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:03 +0100 Subject: [PATCH 346/449] haskell-multiarg: update to version 0.26.0.0 --- pkgs/development/libraries/haskell/multiarg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index ba2249c717ad..e8e608f0e0b1 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,10 +1,10 @@ -{ cabal, utf8String }: +{ cabal, bifunctors, utf8String }: cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.24.0.4"; - sha256 = "1f572046hlv2yngqa4bcxc4kwi8sc5q7v2dw2aap6pv7jfm8m8ws"; - buildDepends = [ utf8String ]; + version = "0.26.0.0"; + sha256 = "0fjzjr66yan62911kfndnr7xmy3waidh4cqazabk6yr1cznpsx8m"; + buildDepends = [ bifunctors utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; description = "Combinators to build command line parsers"; From 18f1e8df59d63efa7aac03d6f5b8c54e7f873564 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:05 +0100 Subject: [PATCH 347/449] haskell-pango: update to version 0.12.5.3 --- pkgs/development/libraries/haskell/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index db426f397247..84823b90e470 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.12.5.0"; - sha256 = "06hchdnw4nfnpb46nb1gwgpwwk41dhp0xfimnbf310idiy0pavcg"; + version = "0.12.5.3"; + sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From e84bb182b2bcfd9da629ca644b4c6d9edaddbb25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:06 +0100 Subject: [PATCH 348/449] haskell-poppler: update to version 0.12.3 --- pkgs/development/libraries/haskell/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix index 5af2ead5e8e0..aecd54c39986 100644 --- a/pkgs/development/libraries/haskell/poppler/default.nix +++ b/pkgs/development/libraries/haskell/poppler/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "poppler"; - version = "0.12.2.2"; - sha256 = "1ln5akiarv1ng5gjrzf8bnkm556xzl50m209qvi5nk98g7fyhqs7"; + version = "0.12.3"; + sha256 = "1ny2r1cpsshpg00w6bd0f5mw26xsy99l7dgx2xq8f01zcwdy4nrp"; buildDepends = [ cairo glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; From e74767282c82135e16ff0d2005d28e416480caba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:08 +0100 Subject: [PATCH 349/449] haskell-shelly: update to version 1.4.4.2 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 72b3e280b3ba..720bbea89331 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.4.4"; - sha256 = "0gxmwwpg7p5ai35ng8fsx743w3q9p5jl0c1c3ckiqvz4jbwgyf7y"; + version = "1.4.4.2"; + sha256 = "01h08bw7j7f5vi3bffd4ipvj5nmab8j5rqgxav688n2jm2342jzk"; buildDepends = [ async mtl systemFileio systemFilepath text time unixCompat ]; From 9dd8579769b00901b434dd9b43beadaaffe7efcd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:21 +0100 Subject: [PATCH 350/449] haskell-utility-ht: update to version 0.0.10 --- pkgs/development/libraries/haskell/utility-ht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 76ce975b11e8..3a407cc4b59f 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "utility-ht"; - version = "0.0.9"; - sha256 = "1m5mjxwf51jd00swp1f4cimaqaral6827y1sidbq61qkw7l6ss8r"; + version = "0.0.10"; + sha256 = "17ydzb0p8xhddvfvm4wjv5yjmy0v7nj6fsj11srnnpj91wc9k0xd"; testDepends = [ QuickCheck ]; meta = { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; From 63a72b6ea04970393548c8473d1980744622f2b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:22 +0100 Subject: [PATCH 351/449] haskell-x509: update to version 1.4.10 --- pkgs/development/libraries/haskell/x509/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index 979f477e0858..24ebf7462026 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "x509"; - version = "1.4.9"; - sha256 = "0yrlkmrc0ygki61wlfvavvrm5aklircrj5w1nbvjlimrc4j8vq9g"; + version = "1.4.10"; + sha256 = "1xsq0g7f5ki6l9yx604j6bsl1k7s3p1xr6hh2086hsgl9fp1f9ap"; buildDepends = [ asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes filepath mtl pem time From ae8d12259e95c88a4922be60791fbd13c46b98ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:24 +0100 Subject: [PATCH 352/449] haskell-yesod-auth: update to version 1.2.6 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 56048aeb6277..3831cac76e43 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.3"; - sha256 = "0rpyx9p3si5453166v9paq18nz209w6lxz3hy5nxg1hyihwh8gy9"; + version = "1.2.6"; + sha256 = "1w7svh49zqdrw1qp8v7df6y6mvkf40cn27k5ckxjyfin00rz0x31"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network From cd262e83129ef3e8ec1728a326ef4dd55ec5c949 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 11:53:26 +0100 Subject: [PATCH 353/449] haskell-yesod-bin: update to version 1.2.6.1 --- .../libraries/haskell/yesod-bin/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index a466da06d415..59eeac6e3cfc 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,27 +1,27 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, dataDefault, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit -, httpReverseProxy, httpTypes, liftedBase, network, networkConduit -, optparseApplicative, parsec, projectTemplate, resourcet -, shakespeare, shakespeareCss, shakespeareJs, shakespeareText -, split, systemFileio, systemFilepath, tar, text, time -, transformers, unixCompat, unorderedContainers, wai, warp, yaml -, zlib +, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths +, httpConduit, httpReverseProxy, httpTypes, liftedBase, network +, networkConduit, optparseApplicative, parsec, projectTemplate +, resourcet, shakespeare, shakespeareCss, shakespeareJs +, shakespeareText, split, systemFileio, systemFilepath, tar, text +, time, transformers, unixCompat, unorderedContainers, wai, warp +, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.6"; - sha256 = "10p0j5w8s2lfjlmkyw4f2lslfr4xb8mzx5ijwavcpc7q9zw9zjk5"; + version = "1.2.6.1"; + sha256 = "0w3qar315w96139j16fq4py4qs83bhm6pab9pzjbx8h451sqjarh"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base64Bytestring blazeBuilder Cabal conduit dataDefault - fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy - httpTypes liftedBase network networkConduit optparseApplicative - parsec projectTemplate resourcet shakespeare shakespeareCss - shakespeareJs shakespeareText split systemFileio systemFilepath tar - text time transformers unixCompat unorderedContainers wai warp yaml - zlib + attoparsec base64Bytestring blazeBuilder Cabal conduit + dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit + httpReverseProxy httpTypes liftedBase network networkConduit + optparseApplicative parsec projectTemplate resourcet shakespeare + shakespeareCss shakespeareJs shakespeareText split systemFileio + systemFilepath tar text time transformers unixCompat + unorderedContainers wai warp yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; From 513073afc1d9ba71d15f7d9ce6c23bb23c08caeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 13:28:06 +0100 Subject: [PATCH 354/449] haskell-scientific: jailbreak to fix build with recent versions of tasty --- pkgs/development/libraries/haskell/scientific/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix index 24c0759d6e94..aa57f9dc5df8 100644 --- a/pkgs/development/libraries/haskell/scientific/default.nix +++ b/pkgs/development/libraries/haskell/scientific/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "0xwxds884pqywjbc4j6qkx27nbi64sihig8ps9v884sk08021wrp"; buildDepends = [ deepseq hashable text ]; testDepends = [ smallcheck tasty tastySmallcheck text ]; + jailbreak = true; meta = { homepage = "https://github.com/basvandijk/scientific"; description = "Arbitrary-precision floating-point numbers represented using scientific notation"; From 164cf167b469b317448430791578e269ad1b527b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 20:25:01 +0100 Subject: [PATCH 355/449] xmobar: drop obsolete patch files --- .../misc/xmobar/add-freeration-variable.patch | 58 ------------------- 1 file changed, 58 deletions(-) delete mode 100644 pkgs/applications/misc/xmobar/add-freeration-variable.patch diff --git a/pkgs/applications/misc/xmobar/add-freeration-variable.patch b/pkgs/applications/misc/xmobar/add-freeration-variable.patch deleted file mode 100644 index a8c10e1a30d6..000000000000 --- a/pkgs/applications/misc/xmobar/add-freeration-variable.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/readme.md b/readme.md -index f4f07e8..de679c7 100644 ---- a/readme.md -+++ b/readme.md -@@ -645,7 +645,7 @@ something like: - - Args: default monitor arguments - - Variables that can be used with the `-t`/`--template` argument: - `total`, `free`, `buffer`, `cache`, `rest`, `used`, -- `usedratio`, `usedbar`, `freebar` -+ `usedratio`, `usedbar`, `freeratio`, `freebar` - - Default template: `Mem: % (M)` - - ### `Swap Args RefreshRate` -diff --git a/src/Plugins/Monitors/Mem.hs b/src/Plugins/Monitors/Mem.hs -index 5c55ee2..3cf46c7 100644 ---- a/src/Plugins/Monitors/Mem.hs -+++ b/src/Plugins/Monitors/Mem.hs -@@ -19,8 +19,8 @@ import Plugins.Monitors.Common - memConfig :: IO MConfig - memConfig = mkMConfig - "Mem: % (M)" -- template -- ["usedbar", "freebar", "usedratio", "total", -- "free", "buffer", "cache", "rest", "used"] -- available replacements -+ ["usedbar", "freebar", "usedratio", "freeratio", "total", -+ "free", "buffer", "cache", "rest", "used"] -- available replacements - - fileMEM :: IO String - fileMEM = readFile "/proc/meminfo" -@@ -33,7 +33,8 @@ parseMEM = - rest = free + buffer + cache - used = total - rest - usedratio = used / total -- return [usedratio, total, free, buffer, cache, rest, used] -+ freeratio = free / total -+ return [usedratio, freeratio, total, free, buffer, cache, rest, used, freeratio] - - totalMem :: IO Float - totalMem = fmap ((*1024) . (!!1)) parseMEM -@@ -42,15 +43,16 @@ usedMem :: IO Float - usedMem = fmap ((*1024) . (!!6)) parseMEM - - formatMem :: [Float] -> Monitor [String] --formatMem (r:xs) = -+formatMem (r:fr:xs) = - do let f = showDigits 0 - rr = 100 * r - ub <- showPercentBar rr r - fb <- showPercentBar (100 - rr) (1 - r) - rs <- showPercentWithColors r -+ fs <- showPercentWithColors fr - s <- mapM (showWithColors f) xs -- return (ub:fb:rs:s) --formatMem _ = return $ replicate 9 "N/A" -+ return (ub:fb:rs:fs:s) -+formatMem _ = return $ replicate 10 "N/A" - - runMem :: [String] -> Monitor String - runMem _ = From 191dabf92342e1205a87b92f208add13001be939 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 21:45:08 +0100 Subject: [PATCH 356/449] haskell-control-monad-free: add version 0.5.3 --- .../haskell/control-monad-free/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/control-monad-free/default.nix diff --git a/pkgs/development/libraries/haskell/control-monad-free/default.nix b/pkgs/development/libraries/haskell/control-monad-free/default.nix new file mode 100644 index 000000000000..93fed5fae060 --- /dev/null +++ b/pkgs/development/libraries/haskell/control-monad-free/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq, transformers }: + +cabal.mkDerivation (self: { + pname = "control-monad-free"; + version = "0.5.3"; + sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1"; + buildDepends = [ deepseq transformers ]; + meta = { + homepage = "http://github.com/pepeiborra/control-monad-free"; + description = "Free monads and monad transformers"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0559c42315bb..4144fb0701ff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -818,6 +818,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x constraints = callPackage ../development/libraries/haskell/constraints {}; + controlMonadFree = callPackage ../development/libraries/haskell/control-monad-free {}; + controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; convertible = callPackage ../development/libraries/haskell/convertible {}; From 2a46778cbf3632bbf133db6b11c4680fbd7c827f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Mar 2014 21:45:20 +0100 Subject: [PATCH 357/449] haskell-wizards: add version 1.0.1 --- .../libraries/haskell/wizards/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wizards/default.nix diff --git a/pkgs/development/libraries/haskell/wizards/default.nix b/pkgs/development/libraries/haskell/wizards/default.nix new file mode 100644 index 000000000000..08c88138101b --- /dev/null +++ b/pkgs/development/libraries/haskell/wizards/default.nix @@ -0,0 +1,13 @@ +{ cabal, controlMonadFree, haskeline, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "wizards"; + version = "1.0.1"; + sha256 = "08dn24injfzvhs34yw39y336pyi6p98bdrafx3lhd6lcbp531sca"; + buildDepends = [ controlMonadFree haskeline mtl transformers ]; + meta = { + description = "High level, generic library for interrogative user interfaces"; + 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 4144fb0701ff..401baa1d0255 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2594,6 +2594,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {}; + wizards = callPackage ../development/libraries/haskell/wizards {}; + word8 = callPackage ../development/libraries/haskell/word8 {}; wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; From ca8cdcda06b3a337056ac4514ef6e22460a4ea28 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Mar 2014 22:42:10 +0100 Subject: [PATCH 358/449] vm/windows: Fix typo in runInWindowsVM. Coincidentally, even with this typo, most tests work anyway, so I didn't notice it in the first place. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index 758120ed4f2f..f9b44d450d99 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -28,7 +28,7 @@ in { bootstrap = bootstrapper attrs.windowsImage; in { requiredSystemFeatures = [ "kvm" ]; - buildur = "${pkgs.stdenv.shell}"; + builder = "${pkgs.stdenv.shell}"; args = ["-e" (bootstrap.resumeAndRun builder)]; windowsImage = bootstrap.suspendedVM; origArgs = attrs.args; From 40635ed343f3f887189c0a929e13d30b68f8a45e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Mar 2014 22:45:14 +0100 Subject: [PATCH 359/449] vm/windows: Remove stray "import ". Signed-off-by: aszlig --- pkgs/build-support/vm/windows/cygwin-iso/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index a806ea9571ff..cb31dd6e61c6 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -28,7 +28,7 @@ let in map gen expr; in import { - inherit (import {}) stdenv perl cdrkit pathsFromGraph; + inherit stdenv perl cdrkit pathsFromGraph; contents = [ { source = fetchurl { url = "http://cygwin.com/setup-x86_64.exe"; From 1771e07e205710ecd9c284d582eaa45ccfbbfa77 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Mar 2014 22:47:05 +0100 Subject: [PATCH 360/449] os-specific/windows: Add new package cygwinSetup. This is primarily going to be used for vmTools.runInWindowsVM, but in theory, it could also work with Nix on CygWin which I haven't tested. Signed-off-by: aszlig --- .../windows/cygwin-setup/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/os-specific/windows/cygwin-setup/default.nix diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix new file mode 100644 index 000000000000..9f765a4cf0a6 --- /dev/null +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkgconfig +, zlib, bzip2, lzma, libgcrypt_1_6 +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "cygwin-setup-${version}"; + version = "20131101"; + + src = fetchcvs { + cvsRoot = ":pserver:anoncvs@cygwin.com:/cvs/cygwin-apps"; + module = "setup"; + date = version; + sha256 = "024wxaaxkf7p1i78bh5xrsqmfz7ss2amigbfl2r5w9h87zqn9aq3"; + }; + + nativeBuildInputs = [ autoconf automake libtool flex bison pkgconfig ]; + + buildInputs = let + mkStatic = flip overrideDerivation (o: { + dontDisableStatic = true; + configureFlags = toList (o.configureFlags or []) ++ [ "--enable-static" ]; + buildInputs = map mkStatic (o.buildInputs or []); + propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); + }); + in map mkStatic [ zlib bzip2 lzma libgcrypt_1_6 ]; + + configureFlags = "--disable-shared"; + + dontDisableStatic = true; + + preConfigure = '' + autoreconf -vfi + ''; + + installPhase = '' + install -vD setup.exe "$out/bin/setup.exe" + ''; + + meta = { + homepage = https://sourceware.org/cygwin-apps/setup.html; + description = "A tool for installing Cygwin"; + license = licenses.gpl2Plus; + platforms = platforms.cygwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12b0bc5e4f8d..6cd584e6f1f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7170,6 +7170,8 @@ let }; windows = rec { + cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { }; + jom = callPackage ../os-specific/windows/jom { }; w32api = callPackage ../os-specific/windows/w32api { From 5bd52771ba557eb0e8564ef18da3c863db331c9f Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Mar 2014 23:21:34 +0100 Subject: [PATCH 361/449] vm/windows: Replace binary with cross cygwinSetup. As the official Cygwin setup binary download doesn't come in snapshots or even versioned, the fetchurl of setup.exe will frequently fail, which in turn will annoy us as hell (or at least me). One warning though: The fetchurl is currently broken and the cross-build might not work yet for example on mingw32 (mingw-w64 branch on its way), but the upstream URL has already changed and the new version contains a bug (not yet tracked down) which breaks our Windows bootstrap process. So to conclude: If it's already broken, make it at least "less broken". "Not broken" is coming soon with the merge of the mingw-w64 branch. Signed-off-by: aszlig --- .../vm/windows/cygwin-iso/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index cb31dd6e61c6..506aef7900e8 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -14,6 +14,21 @@ let sha256 = "1v596lln2iip5h7wxjnig5rflzvqa21zzd2iyhx07zs28q5h76i9"; }; + cygwinCross = (import ../../../../top-level/all-packages.nix { + inherit (stdenv) system; + crossSystem = { + libc = "msvcrt"; + platform = {}; + openssl.system = "mingw64"; + } // (if stdenv.is64bit then { + config = "x86_64-w64-mingw32"; + arch = "x86_64"; + } else { + config = "i686-w64-mingw32"; + arch = "i686"; + }); + }).windows.cygwinSetup.crossDrv; + makeCygwinClosure = { packages, packageList }: let expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } '' python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out" @@ -30,10 +45,7 @@ let in import { inherit stdenv perl cdrkit pathsFromGraph; contents = [ - { source = fetchurl { - url = "http://cygwin.com/setup-x86_64.exe"; - sha256 = "1bjmq9h1p6mmiqp6f1kvmg94jbsdi1pxfa07a5l497zzv9dsfivm"; - }; + { source = "${cygwinCross}/bin/setup.exe"; target = "setup.exe"; } { source = cygPkgList; From e86ffa08b7a885b655094d916c1c1d14683405b5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Mar 2014 23:37:41 +0100 Subject: [PATCH 362/449] vm/windows: Update SHAs for Cygwin setup.ini. Another very annoying part. Unfortunately, the only option we might have here is to include it in nixpkgs or maybe make a fixed Hash on the result of the closure fetcher. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/cygwin-iso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index 506aef7900e8..038ceaa0f829 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -8,10 +8,10 @@ let cygPkgList = if stdenv.is64bit then fetchurl { url = "${mirror}/x86_64/setup.ini"; - sha256 = "142f8zyfwgi6s2djxv3z5wn0ysl94pxwa79z8rjfqz4kvnpgz120"; + sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9"; } else fetchurl { url = "${mirror}/x86/setup.ini"; - sha256 = "1v596lln2iip5h7wxjnig5rflzvqa21zzd2iyhx07zs28q5h76i9"; + sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv"; }; cygwinCross = (import ../../../../top-level/all-packages.nix { From c6cb3276dd4dfa78cac7d088c54db19e1e8924cf Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 4 Mar 2014 00:52:39 +0100 Subject: [PATCH 363/449] windows/cygwin-setup: Drop meta.platforms attr. This prevents cross-builds, so let's drop it for now. Signed-off-by: aszlig --- pkgs/os-specific/windows/cygwin-setup/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 9f765a4cf0a6..d0995ffc662a 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -42,6 +42,5 @@ stdenv.mkDerivation rec { homepage = https://sourceware.org/cygwin-apps/setup.html; description = "A tool for installing Cygwin"; license = licenses.gpl2Plus; - platforms = platforms.cygwin; }; } From 19c59ab984e4256b92fefa2c97106deb635457c6 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sat, 22 Feb 2014 20:56:05 -0800 Subject: [PATCH 364/449] upgrade bbswitch to 0.8 --- pkgs/os-specific/linux/bbswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 373f814f6e02..e12c80e08864 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -2,7 +2,7 @@ let baseName = "bbswitch"; - version = "0.7"; + version = "0.8"; name = "${baseName}-${version}-${kernel.version}"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz"; - sha256 = "0na6gfnvmp5fjbm430ms342hmrsbr6cf78n6hldqb8js2ry3f8dw"; + sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn"; }; preBuild = '' From c4d5757e294b9e894fc6781a04d546cff6e1da82 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 3 Mar 2014 15:33:11 -0600 Subject: [PATCH 365/449] grsecurity updates - stable: 3.0-3.2.55-201402241936 -> 3.0-3.2.55-201403022154 - testing: 3.0-3.13.5-201402241943 -> 3.0-3.13.5-201403031445 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a5a8cbff0baf..e63ff168a61e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -81,8 +81,8 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402241936.patch; - sha256 = "0kd6bc9kyvn8y6b32fpn778hc8xfm2y4wmpiglia6dqybpyry600"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403022154.patch; + sha256 = "0pqp8mfj4zbgb94c7g6ykh0amlwlilxjiqsyc6smmwwbg6klgvkr"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55 @@ -92,8 +92,8 @@ rec { grsecurity_3_0_3_13_5 = { name = "grsecurity-3.0-3.13.5"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201402241943.patch; - sha256 = "1xv4plviarjprg7bcb4h88wsbrj7x2biypibhzb1pifksmxx25fn"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.5-201403031445.patch; + sha256 = "0b22jbm9swghhj7a9c07z5yprk88bgp0iv3c8xmfqqyy0yighq1l"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.5 From c2fcf07f06d1366e57a2852be0cc7ad2adbd1b9f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 4 Mar 2014 09:10:23 +0100 Subject: [PATCH 366/449] Use feh only as a fallback if the xserver is actually enabled. Otherwise feh is installed even though no xserver is available. --- nixos/modules/services/x11/desktop-managers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 707507706633..dde5b333f329 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -7,9 +7,9 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager; - # Whether desktop manager `d' is capable of setting a background. - # If it isn't, the `feh' program is used as a fallback. - needBGCond = d: ! (d ? bgSupport && d.bgSupport); + # If desktop manager `d' isn't capable of setting a background and + # the xserver is enabled, the `feh' program is used as a fallback. + needBGCond = d: ! (d ? bgSupport && d.bgSupport) && xcfg.enable; in From bd2d120c0856f0489869b7cdd78b3bc43a300aa3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 4 Mar 2014 08:13:22 +0100 Subject: [PATCH 367/449] vm/windows: Allow to specify a different arch. So far, we determined this based on stdenv.is64bit, but there are cases where you want to run/build a 32bit program on a 64 bit Windows. This is now possible, by passing windowsImage.arch = "i686" | "x86_64" to runInWindowsVM. Based an what was passed, the corresponding Cygwin packages and setup.exe are bootstrapped. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/bootstrap.nix | 5 ++++- .../vm/windows/cygwin-iso/default.nix | 16 +++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix index b2febf19a89e..47afce5b5a37 100644 --- a/pkgs/build-support/vm/windows/bootstrap.nix +++ b/pkgs/build-support/vm/windows/bootstrap.nix @@ -3,7 +3,7 @@ , samba, socat, vde2, cdrkit, pathsFromGraph }: -{ isoFile, productKey }: +{ isoFile, productKey, arch ? null }: with stdenv.lib; @@ -15,6 +15,9 @@ let mkCygwinImage = import ./cygwin-iso { inherit stdenv fetchurl runCommand python perl cdrkit pathsFromGraph; + arch = let + defaultArch = if stdenv.is64bit then "x86_64" else "i686"; + in if arch == null then defaultArch else arch; }; installer = import ./install { diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index 038ceaa0f829..d9801428a887 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph }: +{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph +, arch ? "x86_64" +}: { packages ? [] , mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin" @@ -6,7 +8,7 @@ }: let - cygPkgList = if stdenv.is64bit then fetchurl { + cygPkgList = if arch == "x86_64" then fetchurl { url = "${mirror}/x86_64/setup.ini"; sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9"; } else fetchurl { @@ -20,13 +22,9 @@ let libc = "msvcrt"; platform = {}; openssl.system = "mingw64"; - } // (if stdenv.is64bit then { - config = "x86_64-w64-mingw32"; - arch = "x86_64"; - } else { - config = "i686-w64-mingw32"; - arch = "i686"; - }); + inherit arch; + config = "${arch}-w64-mingw32"; + }; }).windows.cygwinSetup.crossDrv; makeCygwinClosure = { packages, packageList }: let From 5d05dde655e2af07fb391ddaf70becef77085c46 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 4 Mar 2014 12:44:15 +0100 Subject: [PATCH 368/449] ldm: Use meta.repositories.git. Improves reliability of nixpkgs-monitor. --- pkgs/os-specific/linux/ldm/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index df98b5260c6b..202831309f0e 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -3,17 +3,18 @@ assert mountPath != ""; let - name = "ldm-0.4.2"; + version = "v0.4.2"; + git = https://github.com/LemonBoy/ldm.git; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "ldm-${version}"; # There is a stable release, but we'll use the lvm branch, which # contains important fixes for LVM setups. src = fetchgit { - url = "https://github.com/LemonBoy/ldm.git"; - rev = "26633ce07b"; - sha256 = "bb733d3b9b3bd5843b9cf1507a04a063c5aa45b398480411709fc727ae10b8b1"; + url = meta.repositories.git; + rev = "refs/tags/${version}"; + sha256 = "1fdm3l00csjyvz40py6wlsh8s441rbp4az3sc2i14ag7srh2yim8"; }; buildInputs = [ udev utillinux ]; @@ -34,5 +35,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.the-kenny ]; + repositories.git = git; }; } From 56cf2cb396fc95cda513b0824f6213bb369218db Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 4 Mar 2014 13:03:08 +0100 Subject: [PATCH 369/449] imlib2: Remove @my_libs@ from config.in. --- pkgs/development/libraries/imlib2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 2210976ff909..5b19323f9434 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + preConfigure = '' + substituteInPlace imlib2-config.in \ + --replace "@my_libs@" "" + ''; + meta = { hydraPlatforms = stdenv.lib.platforms.linux; }; From 26d42a894a9b229391aa32c1ad8ffbee845cddea Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Tue, 4 Mar 2014 13:17:57 +0100 Subject: [PATCH 370/449] Added jitsi --- .../instant-messengers/jitsi/default.nix | 45 +++++++++++++++++++ .../instant-messengers/jitsi/jitsi.patch | 27 +++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/instant-messengers/jitsi/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix new file mode 100644 index 000000000000..9cefee228c84 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, makeDesktopItem, unzip, ant, jdk }: + +stdenv.mkDerivation rec { + + name = "jitsi-${version}"; + version = "2.4.4997"; + + src = fetchurl { + url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip"; + sha256 = "f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825"; + }; + + patches = [ ./jitsi.patch ]; + + jitsiItem = makeDesktopItem { + name = "Jitsi"; + exec = "jitsi"; + comment = "VoIP and Instant Messaging client"; + desktopName = "Jitsi"; + genericName = "Instant Messaging"; + categories = "Application;Internet;"; + }; + + buildInputs = [unzip ant jdk]; + + buildPhase = ''ant make''; + + installPhase = '' + mkdir -p $out + cp -a lib $out/ + cp -a sc-bundles $out/ + mkdir $out/bin + cp resources/install/generic/run.sh $out/bin/jitsi + chmod +x $out/bin/jitsi + patchShebangs $out + ''; + + meta = { + homepage = https://jitsi.org/; + description = "Open Source Video Calls and Chat"; + license = stdenv.lib.licenses.lgpl21Plus.shortName; + platforms = stdenv.lib.platforms.linux; + }; + +} diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch new file mode 100644 index 000000000000..9163cecd175b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch @@ -0,0 +1,27 @@ +--- /home/dario/Downloads/jitsi/resources/install/generic/run.sh 2013-11-01 15:37:21.000000000 +0000 ++++ jitsi/resources/install/generic/run.sh 2014-03-04 11:52:30.796397567 +0000 +@@ -1,4 +1,9 @@ +-mkdir -p $HOME/.sip-communicator/log ++#! /bin/bash ++# A modified version of the generic run.sh ++ ++#mkdir -p $HOME/.sip-communicator/log ++ ++cd "$( dirname "$( dirname "${BASH_SOURCE[0]}" )" )" + + # Get architecture + ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/` +@@ -6,10 +11,12 @@ + # Additionnal JVM arguments + CLIENTARGS="" + ++NATIVELIBS="lib/native/linux-64" + if [ $ARCH -eq 32 ] + then + CLIENTARGS="-client -Xmx256m" ++ NATIVELIBS="lib/native/linux" + fi + + export PATH=$PATH:native +-java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator ++exec java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90e59c96c29e..9f0b53030e3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8150,7 +8150,7 @@ let inherit (xorg) libxkbfile; cairo = cairo.override { xcbSupport = true; }; }; - + i3minator = callPackage ../tools/misc/i3minator { }; i3status = callPackage ../applications/window-managers/i3/status.nix { }; @@ -8247,6 +8247,8 @@ let jigdo = callPackage ../applications/misc/jigdo { }; + jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; + joe = callPackage ../applications/editors/joe { }; jbrout = callPackage ../applications/graphics/jbrout { From 6d5176a28bd953c74682ed13eaf0d23d013b4df6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Mar 2014 07:48:27 -0500 Subject: [PATCH 371/449] php54: enable fpm support --- pkgs/development/interpreters/php/5.4.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index bf60e90d634a..cc6e34b76fed 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -167,6 +167,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-ftp"]; }; + fpm = { + configureFlags = ["--enable-fpm"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -208,6 +212,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) bz2Support = config.php.bz2 or false; zipSupport = config.php.zip or true; ftpSupport = config.php.ftp or true; + fpmSupport = config.php.fpm or true; }; configurePhase = '' From adc2e191184b13b7051de09469a1d1d6656cb567 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Mar 2014 09:01:35 -0500 Subject: [PATCH 372/449] Add interpolate haskell package --- .../libraries/haskell/interpolate/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/interpolate/default.nix diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix new file mode 100644 index 000000000000..6b0ee4b6e363 --- /dev/null +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -0,0 +1,18 @@ +{ cabal, doctest, haskellSrcMeta, hspec, QuickCheck +, quickcheckInstances, text +}: + +cabal.mkDerivation (self: { + pname = "interpolate"; + version = "0.0.2"; + sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8"; + buildDepends = [ haskellSrcMeta ]; + testDepends = [ + doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text + ]; + meta = { + description = "String interpolation done right"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 401baa1d0255..040df54fc06f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1507,6 +1507,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x interlude = callPackage ../development/libraries/haskell/interlude {}; + interpolate = callPackage ../development/libraries/haskell/interpolate {}; + interpolatedstringPerl6 = callPackage ../development/libraries/haskell/interpolatedstring-perl6 {}; intervals = callPackage ../development/libraries/haskell/intervals {}; From 7ab3adcaa2c009bf05fb762072425d2722d43280 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Mar 2014 09:11:14 -0500 Subject: [PATCH 373/449] Add mysql haskell package --- .../libraries/haskell/mysql/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/mysql/default.nix diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix new file mode 100644 index 000000000000..4deec5bb7676 --- /dev/null +++ b/pkgs/development/libraries/haskell/mysql/default.nix @@ -0,0 +1,15 @@ +{ cabal, mysqlConfig, zlib }: + +cabal.mkDerivation (self: { + pname = "mysql"; + version = "0.1.1.6"; + sha256 = "1sxzx5f4ysxhq1nimkj4xwf87i7prwp5wg0kjbhv9pbn65zc9mmj"; + buildTools = [ mysqlConfig ]; + extraLibraries = [ zlib ]; + meta = { + homepage = "https://github.com/bos/mysql"; + description = "A low-level MySQL client library"; + 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 040df54fc06f..9b2270881047 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1755,6 +1755,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; + mysql = callPackage ../development/libraries/haskell/mysql { + mysqlConfig = pkgs.mysql; + inherit (pkgs) zlib; + }; + NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; nanospec = callPackage ../development/libraries/haskell/nanospec {}; From 25476fe25afa569121bc28af1f84e93d9b734308 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Mar 2014 09:12:41 -0500 Subject: [PATCH 374/449] Add mysql-simple haskell package --- .../haskell/mysql-simple/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/mysql-simple/default.nix diff --git a/pkgs/development/libraries/haskell/mysql-simple/default.nix b/pkgs/development/libraries/haskell/mysql-simple/default.nix new file mode 100644 index 000000000000..e61d493cdbec --- /dev/null +++ b/pkgs/development/libraries/haskell/mysql-simple/default.nix @@ -0,0 +1,19 @@ +{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual +, mysql, pcreLight, text, time +}: + +cabal.mkDerivation (self: { + pname = "mysql-simple"; + version = "0.2.2.4"; + sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6"; + buildDepends = [ + attoparsec base16Bytestring blazeBuilder blazeTextual mysql + pcreLight text time + ]; + meta = { + homepage = "https://github.com/bos/mysql-simple"; + description = "A mid-level MySQL client library"; + 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 9b2270881047..ec624fa361ef 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1760,6 +1760,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x inherit (pkgs) zlib; }; + mysqlSimple = callPackage ../development/libraries/haskell/mysql-simple {}; + NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; nanospec = callPackage ../development/libraries/haskell/nanospec {}; From b97d6b0318c98e2b2324ec633a7a54486138ec5f Mon Sep 17 00:00:00 2001 From: Mihaly Barasz Date: Tue, 4 Mar 2014 16:42:52 +0100 Subject: [PATCH 375/449] Add lens-family-core Haskell package --- .../libraries/haskell/lens-family-core/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lens-family-core/default.nix diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix new file mode 100644 index 000000000000..7bfb401c7565 --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix @@ -0,0 +1,13 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "lens-family-core"; + version = "1.0.0"; + sha256 = "149wfxddw58h5q42r3nknmac8wsc9c8xzsw6vrlfb4yasg7bhw53"; + buildDepends = [ transformers ]; + meta = { + description = "Haskell 98 Lens Families"; + 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 ec624fa361ef..d98b90debb4d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1592,6 +1592,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {}; + lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {}; + lenses = callPackage ../development/libraries/haskell/lenses {}; libffi = callPackage ../development/libraries/haskell/libffi { From 66c9ac3b7716860a3374eccaa31794ef6ad3b197 Mon Sep 17 00:00:00 2001 From: Mihaly Barasz Date: Tue, 4 Mar 2014 17:35:22 +0100 Subject: [PATCH 376/449] Add pipes-binary Haskell package --- .../haskell/pipes-binary/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pipes-binary/default.nix diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix new file mode 100644 index 000000000000..33f9482ca3fc --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix @@ -0,0 +1,24 @@ +{ cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse +, smallcheck, tasty, tastyHunit, tastySmallcheck, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-binary"; + version = "0.4.0"; + sha256 = "021shl5czrr82b06awy7biy93qf6nh0wwiadhr7qsawzdnzqz2vc"; + buildDepends = [ + binary pipes pipesBytestring pipesParse transformers + ]; + testDepends = [ + binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit + tastySmallcheck transformers + ]; + # Depends on an out-of-date version of smallcheck + doCheck = false; + meta = { + homepage = "https://github.com/k0001/pipes-binary"; + description = "Encode and decode binary streams using the pipes and binary libraries"; + 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 d98b90debb4d..e006f66938b1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1929,6 +1929,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {}; + pipesBinary = callPackage ../development/libraries/haskell/pipes-binary { + binary = self.binary_0_7_1_0; + }; + pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {}; pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {}; From fdf97c5df39292a877d5c700bec573f5b7a912fd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 4 Mar 2014 13:02:51 +0100 Subject: [PATCH 377/449] chromium: Update all channels stable: 33.0.1750.117 -> 33.0.1750.146 beta: 33.0.1750.117 -> 34.0.1847.14 dev: 34.0.1847.3 -> 35.0.1862.2 --- .../networking/browsers/chromium/sources.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 0a8adfee40aa..63b4c9033a33 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "34.0.1847.3"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz"; - sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg"; + version = "35.0.1862.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1862.2.tar.xz"; + sha256 = "19426x4x3bnx21qjhqc4sk27k7dnhm1pw84079h6gk0hyjzcwn0f"; }; beta = { - version = "33.0.1750.117"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz"; - sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f"; + version = "34.0.1847.14"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.14.tar.xz"; + sha256 = "038bz2d40rgjppkalal9ycjhfvkhph926k35v8pc3618z2fy10cn"; }; stable = { - version = "33.0.1750.117"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz"; - sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f"; + version = "33.0.1750.146"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.146.tar.xz"; + sha256 = "0x2a5kyaj38661c5s33pywhrwkm8kj2fbr1z940c5al6y2hfgc6m"; }; } From 15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Mar 2014 14:52:43 -0500 Subject: [PATCH 378/449] psql: Use less as the default pager less is more common and better than more Fixes #1681 --- pkgs/servers/sql/postgresql/8.4.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.0.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.1.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.2.x.nix | 2 +- pkgs/servers/sql/postgresql/9.3.x.nix | 2 +- pkgs/servers/sql/postgresql/less-is-more.patch | 12 ++++++++++++ 6 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/less-is-more.patch diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index f91f78c4d574..58d7159034ad 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + passthru = { inherit readline; }; meta = { diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index c50c6a4aba20..033328cbcfe1 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + passthru = { inherit readline; psqlSchema = "9.0"; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 9bc971b9dfd6..7e876322808b 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + postInstall = '' mkdir -p $out/share/man diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 3d1e0d6ec334..da0516a96181 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - patches = [ ./disable-resolve_symlinks.patch ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 2230c3703355..7f6e2d25d187 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - patches = [ ./disable-resolve_symlinks.patch ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/less-is-more.patch b/pkgs/servers/sql/postgresql/less-is-more.patch new file mode 100644 index 000000000000..d640d24bdaad --- /dev/null +++ b/pkgs/servers/sql/postgresql/less-is-more.patch @@ -0,0 +1,12 @@ +diff -Naur postgresql-9.2.7-orig/src/bin/psql/print.h postgresql-9.2.7/src/bin/psql/print.h +--- postgresql-9.2.7-orig/src/bin/psql/print.h 2014-02-17 14:38:15.000000000 -0500 ++++ postgresql-9.2.7/src/bin/psql/print.h 2014-03-04 14:42:28.874014415 -0500 +@@ -178,7 +178,7 @@ + extern const printTextFormat *get_line_style(const printTableOpt *opt); + + #ifndef __CYGWIN__ +-#define DEFAULT_PAGER "more" ++#define DEFAULT_PAGER "less" + #else + #define DEFAULT_PAGER "less" + #endif From 738a5321bcd89452f65df19057367ce004402693 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Mar 2014 22:31:02 +0100 Subject: [PATCH 379/449] gnutls: Update to 3.2.12, 3.1.22 CVE-2014-0092 Unfortunately, 3.2.12 doesn't pass the tests with Guile bindings enabled, so I've turned them off in the default build. --- pkgs/development/libraries/gnutls/2.12.nix | 1 + pkgs/development/libraries/gnutls/3.2.nix | 45 +++++++------------ pkgs/development/libraries/gnutls/default.nix | 30 +++++-------- pkgs/top-level/all-packages.nix | 15 ++++--- 4 files changed, 38 insertions(+), 53 deletions(-) diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix index 59f0131b9d4d..4a1332a7f155 100644 --- a/pkgs/development/libraries/gnutls/2.12.nix +++ b/pkgs/development/libraries/gnutls/2.12.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { license = "LGPLv2.1+"; maintainers = [ ]; + broken = true; # CVE-2014-0092 }; } diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index ad873b3eae85..e950e463a9b5 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -3,15 +3,22 @@ assert guileBindings -> guile != null; -stdenv.mkDerivation (rec { - - name = "gnutls-3.2.10"; +stdenv.mkDerivation rec { + name = "gnutls-3.2.12"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "1g1w93d66sz51977zbqd56641r501a1djcwhykbjm8alhyz1564h"; + sha256 = "1zwk9qkxn3190nssyamd7jsb3ag6mnnln3jwbgmjs1w306dzwafi"; }; + patches = + # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. + stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch + # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail. + # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db + # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html + ++ stdenv.lib.optional stdenv.isDarwin ./fix_gnutls_x86_cpuid_s_multi_definitions.patch; + # Note: GMP is a dependency of Nettle, whose public headers include # GMP headers, hence the hack. configurePhase = '' @@ -21,15 +28,14 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ --with-libnettle-prefix="${nettle}" \ CPPFLAGS="-I${gmp}/include" \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} + ${stdenv.lib.optionalString guileBindings + "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} ''; # Build of the Guile bindings is not parallel-safe. See # # for the actual fix. - enableParallelBuilding = false; + enableParallelBuilding = !guileBindings; buildInputs = [ zlib lzo lzip ] ++ stdenv.lib.optional guileBindings guile; @@ -42,7 +48,7 @@ stdenv.mkDerivation (rec { # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); - meta = with stdenv.lib; { + meta = { description = "The GNU Transport Layer Security Library"; longDescription = '' @@ -61,25 +67,8 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/gnutls/; license = "LGPLv2.1+"; - maintainers = [ ]; - platforms = platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } -// - -(stdenv.lib.optionalAttrs stdenv.isFreeBSD { - # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. - patches = [ ./guile-gnulib-includes.patch ]; -}) - -// - -(stdenv.lib.optionalAttrs stdenv.isDarwin { - # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail. - # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db - # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html - patches = [ ./fix_gnutls_x86_cpuid_s_multi_definitions.patch ]; -}) - -) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 8750dd568f75..1046310946a4 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -3,15 +3,17 @@ assert guileBindings -> guile != null; -stdenv.mkDerivation (rec { - - name = "gnutls-3.1.20"; +stdenv.mkDerivation rec { + name = "gnutls-3.1.22"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz"; - sha256 = "1a8pzc29sn1kmbqvldljf4kmbz60pdk931dirk5jdd0qpf8fzd5x"; + sha256 = "177kmq4jn67s7mmb249722nwxmbjwjpphmib7bhzfk43z02j3pvh"; }; + # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. + patches = stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch; + # Note: GMP is a dependency of Nettle, whose public headers include # GMP headers, hence the hack. configurePhase = '' @@ -21,15 +23,14 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ --with-libnettle-prefix="${nettle}" \ CPPFLAGS="-I${gmp}/include" \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} + ${stdenv.lib.optionalString guileBindings + "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} ''; # Build of the Guile bindings is not parallel-safe. See # # for the actual fix. - enableParallelBuilding = false; + enableParallelBuilding = !guileBindings; buildInputs = [ zlib lzo lzip ] ++ stdenv.lib.optional guileBindings guile; @@ -42,7 +43,7 @@ stdenv.mkDerivation (rec { # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); - meta = with stdenv.lib; { + meta = { description = "The GNU Transport Layer Security Library"; longDescription = '' @@ -61,13 +62,6 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/gnutls/; license = "LGPLv2.1+"; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; -} - -// - -(stdenv.lib.optionalAttrs stdenv.isFreeBSD { - # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. - patches = [ ./guile-gnulib-includes.patch ]; -})) +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cd584e6f1f8..08bb9de91680 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4361,20 +4361,21 @@ let gnu-efi = callPackage ../development/libraries/gnu-efi { }; gnutls = gnutls32; - gnutls31 = callPackage ../development/libraries/gnutls { - guileBindings = config.gnutls.guile or true; - }; gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { - guileBindings = config.gnutls.guile or true; + guileBindings = config.gnutls.guile or false; + }; + + gnutls31 = callPackage ../development/libraries/gnutls { + guileBindings = config.gnutls.guile or false; }; gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { - guileBindings = config.gnutls.guile or true; + guileBindings = config.gnutls.guile or false; }; - gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; }); - gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; }); + gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; }); + gnutls2_with_guile = lowPrio (gnutls2.override { guileBindings = true; }); gpac = callPackage ../applications/video/gpac { }; From c824acb84c6adb2fccf923cdf2b3af9e4ed3bef1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Mar 2014 22:33:20 +0100 Subject: [PATCH 380/449] Rename misleadingly named gnutls/default.nix (it's not the default) --- pkgs/development/libraries/gnutls/{default.nix => 3.1.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/gnutls/{default.nix => 3.1.nix} (100%) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/3.1.nix similarity index 100% rename from pkgs/development/libraries/gnutls/default.nix rename to pkgs/development/libraries/gnutls/3.1.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08bb9de91680..7dd6058339d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4366,7 +4366,7 @@ let guileBindings = config.gnutls.guile or false; }; - gnutls31 = callPackage ../development/libraries/gnutls { + gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix { guileBindings = config.gnutls.guile or false; }; From e0eb72cd179c7434b1aa1ee8e12412a78b66ec71 Mon Sep 17 00:00:00 2001 From: Ronny Esterluss Date: Tue, 4 Mar 2014 22:50:01 +0100 Subject: [PATCH 381/449] added telegram-cli as instant-messenger application --- .../telegram-cli/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/telegram-cli/default.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix new file mode 100644 index 000000000000..51639f6050dc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib +}: + +stdenv.mkDerivation rec { + name = "telegram-cli"; + + src = fetchgit { + url = "https://github.com/vysheng/tg.git"; + rev = "ac6079a00ac66bb37a3179a82af130b41ec39bc9"; + sha256 = "1rpwnyzmqk7p97n5pd00m5c6rypc39mb3hs94qxxrdcpwpgcb73q"; + }; + + buildInputs = [ libconfig lua5_2 openssl readline zlib ]; + + installPhase = '' + mkdir -p $out/bin + cp ./telegram $out/bin/telegram-wo-key + cp ./tg.pub $out/ + cat > $out/bin/telegram < Date: Wed, 5 Mar 2014 05:10:23 +0200 Subject: [PATCH 382/449] nginx: update from 1.4.5 to 1.4.6 --- pkgs/servers/http/nginx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 4504d49edbb4..f2bc07656364 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -5,10 +5,10 @@ , moreheaders ? false}: let - version = "1.4.5"; + version = "1.4.6"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "0zh7w1bz8rcxrs5bwp39m91nzm454mxlf3m5krkv1wm8ar1h5sdd"; + sha256 = "1ihjb3dqw4icc5pvgaqbp740cyr4m8zxjfvj3v3bkd88swamp2vs"; }; rtmp-ext = fetchgit { From 2dd320a382929d86c704dd196afebe928b2a5551 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 5 Mar 2014 05:12:09 +0200 Subject: [PATCH 383/449] youtubeDL: update from 2014.02.28 to 2014.03.04.2 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index ded669a6febc..8f27798d08a0 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 = "2014.02.28"; + version = "2014.03.04.2"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1xizqk47f3wd1g1mqs87iand4v3pjxxdzh4z7s6525hlkb8z5813"; + sha256 = "1plqrjs7z4vbfa4h67zgd14j9ka9rnkzkqiwd948k9y3krxijg4p"; }; buildInputs = [ python ]; From db1e1d134fd17cbe66d98221ca735f5c5498a4d8 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 5 Mar 2014 05:23:59 +0200 Subject: [PATCH 384/449] mpd: update from 0.18.8 to 0.18.9 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index c39045cd9af7..7a2f3538fb8c 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.18.8"; + name = "mpd-0.18.9"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "1ryqh0xf76xv4mpwy1gjwy275ar4wmbzifa9ccjim9r7lk2hgp5v"; + sha256 = "0mgfyrhjlalwngx9j3xxfpfwygh9a31k1ni1isi898bb2x8zsl08"; }; buildInputs = [ pkgconfig glib ] From 265be593c86263eb51747a3255ffef18ccdba849 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Wed, 5 Mar 2014 12:22:38 +0800 Subject: [PATCH 385/449] renpy: update to 6.17.3 --- pkgs/development/interpreters/renpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 9c7b08d80101..237e58b5f932 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - name = "renpy-6.17.2"; + name = "renpy-6.17.3"; meta = { description = "Ren'Py Visual Novel Engine"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://www.renpy.org/dl/6.17.2/renpy-6.17.2-source.tar.bz2"; - sha256 = "1iadhdi8g2a7gyg08y0190bv56cc8csckdj4p9f4m2hgg1ybw1qx"; + url = "http://www.renpy.org/dl/6.17.3/renpy-6.17.3-source.tar.bz2"; + sha256 = "1707xrjmnr4a209jqm4zkda0jyjd76f679g7d51g7vd5cs46s6ph"; }; buildInputs = [ From 0142e4d6859edb898cbd2d40383f880f33337547 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 5 Mar 2014 13:05:56 +0400 Subject: [PATCH 386/449] Glib-networking apparently works with GNUTLS3 now --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 1e9fdd4f0aaa..53d447cf5cae 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy +{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy , gsettings_desktop_schemas, libgcrypt, libtasn1 }: stdenv.mkDerivation { @@ -17,5 +17,5 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = - [ glib libtool gnutls2 libproxy libgcrypt libtasn1 gsettings_desktop_schemas ]; + [ glib libtool gnutls libproxy libgcrypt libtasn1 gsettings_desktop_schemas ]; } From a9a728af64fdc570925e4f24ce7a26cef6b50fc8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 5 Mar 2014 13:26:41 +0400 Subject: [PATCH 387/449] Fresh bitlbee builds with GNU TLS 3 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dd6058339d1..40d7b4728725 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7517,7 +7517,7 @@ let bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { # For some reason, TLS support is broken when using GnuTLS 3.0 (can't # connect to jabber.org, for instance.) - gnutls = gnutls2; + gnutls = gnutls; libotr = libotr_3_2; }; From cfc2aabc846c9b7fcff3750c9c6a3fda021cb4ae Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 5 Mar 2014 10:54:25 +0100 Subject: [PATCH 388/449] requests2: Add new package --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2525aacfffe4..fe68d4617cbc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5854,6 +5854,21 @@ pythonPackages = modules // import ./python-packages-generated.nix { homepage = http://docs.python-requests.org/en/latest/; }; }; + + + requests2 = buildPythonPackage rec { + name = "requests-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "ac27081135f58d1a43e4fb38258d6f4e"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; requests_oauthlib = buildPythonPackage rec { From 48ce981d13ea253bb203fda709c0bff4b00c5cf8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Mar 2014 11:28:42 +0100 Subject: [PATCH 389/449] mercurial: Update to 2.9.1 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 10283c171dbb..609e2654d595 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - name = "mercurial-2.9"; + name = "mercurial-2.9.1"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "08m6h2zxik4hcqb5qq3k2anwgjrf0p9kj77lvikcaw8rqmz06y3h"; + sha256 = "06n07di6cf57bglnbh8szimngclyvf9c5ismz470gnyb9r1v23x2"; }; inherit python; # pass it so that the same version can be used in hg2git From dffac3e40edd8bf593104e5ecbc137623abb2aea Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 5 Mar 2014 07:08:03 -0500 Subject: [PATCH 390/449] Update node packages --- pkgs/top-level/node-packages-generated.nix | 2534 ++++++++++++++++---- 1 file changed, 2104 insertions(+), 430 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index d3220d30e5c6..93e965235fcc 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,6 +1,25 @@ { self, fetchurl, fetchgit ? null, lib }: { + by-spec."Base64"."~0.2.0" = + self.by-version."Base64"."0.2.0"; + by-version."Base64"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-Base64-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/Base64/-/Base64-0.2.0.tgz"; + name = "Base64-0.2.0.tgz"; + sha1 = "448879efb6803979daaf7f36e7807e8a1d291205"; + }) + ]; + buildInputs = + (self.nativeDeps."Base64" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "Base64" ]; + }; by-spec."CSSselect"."0.x" = self.by-version."CSSselect"."0.5.0"; by-version."CSSselect"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -15,7 +34,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.2" + self.by-version."CSSwhat"."0.4.5" self.by-version."domutils"."1.4.0" self.by-version."boolbase"."1.0.0" self.by-version."nth-check"."1.0.0" @@ -38,7 +57,7 @@ buildInputs = (self.nativeDeps."CSSselect" or []); deps = [ - self.by-version."CSSwhat"."0.4.2" + self.by-version."CSSwhat"."0.4.5" self.by-version."domutils"."1.4.0" ]; peerDependencies = [ @@ -46,14 +65,14 @@ passthru.names = [ "CSSselect" ]; }; by-spec."CSSwhat"."0.4" = - self.by-version."CSSwhat"."0.4.2"; - by-version."CSSwhat"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSwhat-0.4.2"; + self.by-version."CSSwhat"."0.4.5"; + by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-CSSwhat-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.2.tgz"; - name = "CSSwhat-0.4.2.tgz"; - sha1 = "7291585b71c5707ee7f49bbf3e9ae413ea715ff5"; + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz"; + name = "CSSwhat-0.4.5.tgz"; + sha1 = "85d7b2799ff3d98055353c802949e39913e16a62"; }) ]; buildInputs = @@ -64,6 +83,48 @@ ]; passthru.names = [ "CSSwhat" ]; }; + by-spec."JSONStream"."~0.6.4" = + self.by-version."JSONStream"."0.6.4"; + by-version."JSONStream"."0.6.4" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.6.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz"; + name = "JSONStream-0.6.4.tgz"; + sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb"; + }) + ]; + buildInputs = + (self.nativeDeps."JSONStream" or []); + deps = [ + self.by-version."jsonparse"."0.0.5" + self.by-version."through"."2.2.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "JSONStream" ]; + }; + by-spec."JSONStream"."~0.7.1" = + self.by-version."JSONStream"."0.7.1"; + by-version."JSONStream"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "node-JSONStream-0.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.1.tgz"; + name = "JSONStream-0.7.1.tgz"; + sha1 = "0a6bf7f85459beb1319486927d293c7cef8a0260"; + }) + ]; + buildInputs = + (self.nativeDeps."JSONStream" or []); + deps = [ + self.by-version."jsonparse"."0.0.5" + self.by-version."through"."2.2.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "JSONStream" ]; + }; by-spec."StringScanner"."~0.0.3" = self.by-version."StringScanner"."0.0.3"; by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -106,6 +167,27 @@ self.by-version."abbrev"."1.0.4"; by-spec."abbrev"."~1.0.4" = self.by-version."abbrev"."1.0.4"; + by-spec."accepts"."1.0.0" = + self.by-version."accepts"."1.0.0"; + by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.0.0.tgz"; + name = "accepts-1.0.0.tgz"; + sha1 = "3604c765586c3b9cf7877b6937cdbd4587f947dc"; + }) + ]; + buildInputs = + (self.nativeDeps."accepts" or []); + deps = [ + self.by-version."mime"."1.2.11" + self.by-version."negotiator"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "accepts" ]; + }; by-spec."active-x-obfuscator"."0.0.1" = self.by-version."active-x-obfuscator"."0.0.1"; by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -466,6 +548,25 @@ }; by-spec."argparse"."~ 0.1.11" = self.by-version."argparse"."0.1.15"; + by-spec."ascii-json"."~0.2" = + self.by-version."ascii-json"."0.2.0"; + by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-ascii-json-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz"; + name = "ascii-json-0.2.0.tgz"; + sha1 = "10ddb361fd48f72595309fd10a6ea2e7bf2c9218"; + }) + ]; + buildInputs = + (self.nativeDeps."ascii-json" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ascii-json" ]; + }; by-spec."ascli"."*" = self.by-version."ascli"."0.3.0"; by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -527,6 +628,8 @@ passthru.names = [ "assert" ]; }; "assert" = self.by-version."assert"."1.1.1"; + by-spec."assert"."~1.1.0" = + self.by-version."assert"."1.1.1"; 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 { @@ -565,6 +668,26 @@ ]; passthru.names = [ "assertion-error" ]; }; + by-spec."astw"."~0.1.0" = + self.by-version."astw"."0.1.0"; + by-version."astw"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-astw-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz"; + name = "astw-0.1.0.tgz"; + sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085"; + }) + ]; + buildInputs = + (self.nativeDeps."astw" or []); + deps = [ + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "astw" ]; + }; by-spec."async"."*" = self.by-version."async"."0.2.10"; by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { @@ -648,6 +771,8 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.1.22" = self.by-version."async"."0.1.22"; + by-spec."async"."~0.2.10" = + self.by-version."async"."0.2.10"; by-spec."async"."~0.2.6" = self.by-version."async"."0.2.10"; by-spec."async"."~0.2.7" = @@ -796,6 +921,25 @@ ]; passthru.names = [ "backoff" ]; }; + by-spec."base64-js"."~0.0.4" = + self.by-version."base64-js"."0.0.6"; + by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-base64-js-0.0.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"; + name = "base64-js-0.0.6.tgz"; + sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947"; + }) + ]; + buildInputs = + (self.nativeDeps."base64-js" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "base64-js" ]; + }; by-spec."base64id"."0.1.0" = self.by-version."base64id"."0.1.0"; by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -1041,7 +1185,7 @@ self.by-version."decompress-zip"."0.0.4" self.by-version."fstream"."0.1.25" self.by-version."fstream-ignore"."0.0.7" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.2" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" @@ -1235,14 +1379,14 @@ passthru.names = [ "bower-registry-client" ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."3.0.0"; - by-version."bower2nix"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "bower2nix-3.0.0"; + self.by-version."bower2nix"."2.1.0"; + by-version."bower2nix"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bower2nix-2.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower2nix/-/bower2nix-3.0.0.tgz"; - name = "bower2nix-3.0.0.tgz"; - sha1 = "afe3c676baff67b86e06f5514a325be45b317184"; + url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz"; + name = "bower2nix-2.1.0.tgz"; + sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6"; }) ]; buildInputs = @@ -1251,6 +1395,9 @@ self.by-version."temp"."0.6.0" self.by-version."fs.extra"."1.2.1" self.by-version."bower-json"."0.4.0" + self.by-version."bower-endpoint-parser"."0.2.1" + self.by-version."bower-logger"."0.2.1" + self.by-version."bower"."1.2.8" self.by-version."argparse"."0.1.15" self.by-version."clone"."0.1.11" self.by-version."semver"."2.2.1" @@ -1260,7 +1407,7 @@ ]; passthru.names = [ "bower2nix" ]; }; - "bower2nix" = self.by-version."bower2nix"."3.0.0"; + "bower2nix" = self.by-version."bower2nix"."2.1.0"; by-spec."broadway"."0.2.9" = self.by-version."broadway"."0.2.9"; by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { @@ -1287,15 +1434,59 @@ }; by-spec."broadway"."0.2.x" = self.by-version."broadway"."0.2.9"; - by-spec."browserchannel"."*" = - self.by-version."browserchannel"."1.0.8"; - by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-browserchannel-1.0.8"; + by-spec."browser-pack"."~2.0.0" = + self.by-version."browser-pack"."2.0.1"; + by-version."browser-pack"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "browser-pack-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.8.tgz"; - name = "browserchannel-1.0.8.tgz"; - sha1 = "96da83d139d8943f5bd616c334f148bd008dbac4"; + url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz"; + name = "browser-pack-2.0.1.tgz"; + sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-pack" or []); + deps = [ + self.by-version."JSONStream"."0.6.4" + self.by-version."through"."2.3.4" + self.by-version."combine-source-map"."0.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browser-pack" ]; + }; + by-spec."browser-resolve"."~1.2.1" = + self.by-version."browser-resolve"."1.2.2"; + by-version."browser-resolve"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-browser-resolve-1.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.2.tgz"; + name = "browser-resolve-1.2.2.tgz"; + sha1 = "83b1eaed8f120b906f56078e134669db0a4a5c11"; + }) + ]; + buildInputs = + (self.nativeDeps."browser-resolve" or []); + deps = [ + self.by-version."resolve"."0.6.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browser-resolve" ]; + }; + by-spec."browser-resolve"."~1.2.2" = + self.by-version."browser-resolve"."1.2.2"; + by-spec."browserchannel"."*" = + self.by-version."browserchannel"."1.1.1"; + by-version."browserchannel"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-browserchannel-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.1.1.tgz"; + name = "browserchannel-1.1.1.tgz"; + sha1 = "223aeddf06892314e11f15fd2d4e2ade64a1bba5"; }) ]; buildInputs = @@ -1304,12 +1495,77 @@ self.by-version."hat"."0.0.3" self.by-version."connect"."2.13.0" self.by-version."request"."2.34.0" + self.by-version."ascii-json"."0.2.0" ]; peerDependencies = [ ]; passthru.names = [ "browserchannel" ]; }; - "browserchannel" = self.by-version."browserchannel"."1.0.8"; + "browserchannel" = self.by-version."browserchannel"."1.1.1"; + by-spec."browserify"."~3.31.2" = + self.by-version."browserify"."3.31.2"; + by-version."browserify"."3.31.2" = lib.makeOverridable self.buildNodePackage { + name = "browserify-3.31.2"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/browserify/-/browserify-3.31.2.tgz"; + name = "browserify-3.31.2.tgz"; + sha1 = "ec5bbd7fff284645db59280c340d972868e0ab1b"; + }) + ]; + buildInputs = + (self.nativeDeps."browserify" or []); + deps = [ + self.by-version."module-deps"."1.7.1" + self.by-version."browser-pack"."2.0.1" + self.by-version."deps-sort"."0.1.1" + self.by-version."shell-quote"."0.0.1" + self.by-version."through"."2.3.4" + self.by-version."duplexer"."0.1.1" + self.by-version."stream-combiner"."0.0.4" + self.by-version."concat-stream"."1.4.1" + self.by-version."insert-module-globals"."3.2.0" + self.by-version."syntax-error"."0.1.0" + self.by-version."browser-resolve"."1.2.2" + self.by-version."inherits"."2.0.1" + self.by-version."JSONStream"."0.7.1" + self.by-version."umd"."2.0.0" + self.by-version."parents"."0.0.2" + self.by-version."deep-equal"."0.1.2" + self.by-version."constants-browserify"."0.0.1" + self.by-version."os-browserify"."0.1.1" + self.by-version."console-browserify"."1.0.3" + self.by-version."vm-browserify"."0.0.4" + self.by-version."zlib-browserify"."0.0.3" + self.by-version."assert"."1.1.1" + self.by-version."http-browserify"."1.3.2" + self.by-version."crypto-browserify"."1.0.9" + self.by-version."util"."0.10.3" + self.by-version."events"."1.0.0" + self.by-version."buffer"."2.1.4" + self.by-version."url"."0.7.9" + self.by-version."https-browserify"."0.0.0" + self.by-version."path-browserify"."0.0.0" + self.by-version."querystring"."0.2.0" + self.by-version."stream-browserify"."0.1.3" + self.by-version."string_decoder"."0.0.1" + self.by-version."tty-browserify"."0.0.0" + self.by-version."timers-browserify"."1.0.1" + self.by-version."punycode"."1.2.4" + self.by-version."defined"."0.0.0" + self.by-version."domain-browser"."1.1.1" + self.by-version."derequire"."0.6.1" + self.by-version."commondir"."0.0.1" + self.by-version."shallow-copy"."0.0.1" + self.by-version."subarg"."0.0.1" + self.by-version."resolve"."0.6.1" + self.by-version."glob"."3.2.9" + self.by-version."builtins"."0.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "browserify" ]; + }; by-spec."bson"."0.1.8" = self.by-version."bson"."0.1.8"; by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -1367,15 +1623,15 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.6" = - self.by-version."bson"."0.2.6"; - by-version."bson"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "node-bson-0.2.6"; + by-spec."bson"."0.2.7" = + self.by-version."bson"."0.2.7"; + by-version."bson"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-bson-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.6.tgz"; - name = "bson-0.2.6.tgz"; - sha1 = "d001aa3d20b92e3f9cbc19d542515a748586a743"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz"; + name = "bson-0.2.7.tgz"; + sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b"; }) ]; buildInputs = @@ -1387,6 +1643,27 @@ ]; passthru.names = [ "bson" ]; }; + by-spec."buffer"."~2.1.4" = + self.by-version."buffer"."2.1.4"; + by-version."buffer"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-buffer-2.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffer/-/buffer-2.1.4.tgz"; + name = "buffer-2.1.4.tgz"; + sha1 = "0283e62870b4f450b636e00eb9fd527cd9ae1341"; + }) + ]; + buildInputs = + (self.nativeDeps."buffer" or []); + deps = [ + self.by-version."base64-js"."0.0.6" + self.by-version."ieee754"."1.1.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "buffer" ]; + }; 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 { @@ -1485,6 +1762,25 @@ ]; passthru.names = [ "buffertools" ]; }; + by-spec."builtins"."0.0.2" = + self.by-version."builtins"."0.0.2"; + by-version."builtins"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-builtins-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/builtins/-/builtins-0.0.2.tgz"; + name = "builtins-0.0.2.tgz"; + sha1 = "b738db1ea166b752f7e0144c76f6ad5289448e51"; + }) + ]; + buildInputs = + (self.nativeDeps."builtins" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "builtins" ]; + }; by-spec."bunyan"."0.21.1" = self.by-version."bunyan"."0.21.1"; by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage { @@ -1585,6 +1881,25 @@ }; by-spec."bytes"."~0.2.1" = self.by-version."bytes"."0.2.1"; + by-spec."callsite"."~1.0.0" = + self.by-version."callsite"."1.0.0"; + by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-callsite-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + name = "callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }) + ]; + buildInputs = + (self.nativeDeps."callsite" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "callsite" ]; + }; by-spec."cardinal"."~0.4.0" = self.by-version."cardinal"."0.4.4"; by-version."cardinal"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -1599,7 +1914,7 @@ buildInputs = (self.nativeDeps."cardinal" or []); deps = [ - self.by-version."redeyed"."0.4.2" + self.by-version."redeyed"."0.4.4" self.by-version."ansicolors"."0.2.1" ]; peerDependencies = [ @@ -1648,6 +1963,28 @@ ]; passthru.names = [ "chainsaw" ]; }; + by-spec."chalk"."^0.4.0" = + self.by-version."chalk"."0.4.0"; + by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-chalk-0.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + name = "chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; + }) + ]; + buildInputs = + (self.nativeDeps."chalk" or []); + deps = [ + self.by-version."has-color"."0.1.4" + self.by-version."ansi-styles"."1.0.0" + self.by-version."strip-ansi"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "chalk" ]; + }; by-spec."chalk"."~0.1.1" = self.by-version."chalk"."0.1.1"; by-version."chalk"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1715,26 +2052,6 @@ }; by-spec."chalk"."~0.4.0" = self.by-version."chalk"."0.4.0"; - by-version."chalk"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-chalk-0.4.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - name = "chalk-0.4.0.tgz"; - sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; - }) - ]; - buildInputs = - (self.nativeDeps."chalk" or []); - deps = [ - self.by-version."has-color"."0.1.4" - 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 { @@ -1916,35 +2233,15 @@ ]; passthru.names = [ "class-extend" ]; }; - by-spec."clean-css"."2.0.x" = - self.by-version."clean-css"."2.0.8"; - by-version."clean-css"."2.0.8" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.0.8"; + by-spec."clean-css"."2.1.x" = + self.by-version."clean-css"."2.1.4"; + by-version."clean-css"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.8.tgz"; - name = "clean-css-2.0.8.tgz"; - sha1 = "e937cdfdcc5781a00817aec4079e85b3ec157a20"; - }) - ]; - buildInputs = - (self.nativeDeps."clean-css" or []); - deps = [ - self.by-version."commander"."2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "clean-css" ]; - }; - by-spec."clean-css"."~2.1.0" = - self.by-version."clean-css"."2.1.1"; - by-version."clean-css"."2.1.1" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.1.tgz"; - name = "clean-css-2.1.1.tgz"; - sha1 = "eb0a46987629bee4550e2a1b8e6b6d6259d1e677"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.1.4.tgz"; + name = "clean-css-2.1.4.tgz"; + sha1 = "82b59182c8aa02d7050329b0b977f7651bf9875e"; }) ]; buildInputs = @@ -1956,6 +2253,8 @@ ]; passthru.names = [ "clean-css" ]; }; + by-spec."clean-css"."~2.1.0" = + self.by-version."clean-css"."2.1.4"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -1970,7 +2269,7 @@ buildInputs = (self.nativeDeps."cli" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -2349,6 +2648,28 @@ ]; passthru.names = [ "columnify" ]; }; + by-spec."combine-source-map"."~0.3.0" = + self.by-version."combine-source-map"."0.3.0"; + by-version."combine-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-combine-source-map-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz"; + name = "combine-source-map-0.3.0.tgz"; + sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7"; + }) + ]; + buildInputs = + (self.nativeDeps."combine-source-map" or []); + deps = [ + self.by-version."inline-source-map"."0.3.0" + self.by-version."convert-source-map"."0.3.3" + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "combine-source-map" ]; + }; 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 { @@ -2447,8 +2768,6 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.0.x" = - self.by-version."commander"."2.0.0"; by-spec."commander"."2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -2472,6 +2791,25 @@ self.by-version."commander"."2.1.0"; by-spec."commander"."~0.6.1" = self.by-version."commander"."0.6.1"; + by-spec."commondir"."0.0.1" = + self.by-version."commondir"."0.0.1"; + by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-commondir-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"; + name = "commondir-0.0.1.tgz"; + sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2"; + }) + ]; + buildInputs = + (self.nativeDeps."commondir" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "commondir" ]; + }; by-spec."compressible"."1.0.0" = self.by-version."compressible"."1.0.0"; by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -2491,6 +2829,30 @@ ]; passthru.names = [ "compressible" ]; }; + by-spec."concat-stream"."^1.4.1" = + self.by-version."concat-stream"."1.4.1"; + by-version."concat-stream"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-concat-stream-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.1.tgz"; + name = "concat-stream-1.4.1.tgz"; + sha1 = "20358b86fe36e5ac3de29cec76f4d04ad8ff1423"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-stream" or []); + deps = [ + self.by-version."inherits"."2.0.1" + self.by-version."typedarray"."0.0.5" + self.by-version."readable-stream"."1.1.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "concat-stream" ]; + }; + by-spec."concat-stream"."~1.4.1" = + self.by-version."concat-stream"."1.4.1"; by-spec."config"."0.4.15" = self.by-version."config"."0.4.15"; by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { @@ -2575,7 +2937,7 @@ (self.nativeDeps."configstore" or []); deps = [ self.by-version."mkdirp"."0.3.5" - self.by-version."js-yaml"."3.0.1" + self.by-version."js-yaml"."3.0.2" self.by-version."osenv"."0.0.3" self.by-version."graceful-fs"."2.0.2" self.by-version."uuid"."1.4.1" @@ -2849,7 +3211,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = [ - self.by-version."jade"."1.1.5" + self.by-version."jade"."1.3.0" ]; peerDependencies = [ ]; @@ -2915,6 +3277,25 @@ ]; passthru.names = [ "console-browserify" ]; }; + by-spec."console-browserify"."~1.0.1" = + self.by-version."console-browserify"."1.0.3"; + by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-console-browserify-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz"; + name = "console-browserify-1.0.3.tgz"; + sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e"; + }) + ]; + buildInputs = + (self.nativeDeps."console-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "console-browserify" ]; + }; by-spec."constantinople"."~1.0.1" = self.by-version."constantinople"."1.0.2"; by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -2937,6 +3318,64 @@ }; by-spec."constantinople"."~1.0.2" = self.by-version."constantinople"."1.0.2"; + by-spec."constantinople"."~2.0.0" = + self.by-version."constantinople"."2.0.0"; + by-version."constantinople"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-constantinople-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/constantinople/-/constantinople-2.0.0.tgz"; + name = "constantinople-2.0.0.tgz"; + sha1 = "0558c3f340095a43acf2386149e5537074330e49"; + }) + ]; + buildInputs = + (self.nativeDeps."constantinople" or []); + deps = [ + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "constantinople" ]; + }; + by-spec."constants-browserify"."~0.0.1" = + self.by-version."constants-browserify"."0.0.1"; + by-version."constants-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-constants-browserify-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"; + name = "constants-browserify-0.0.1.tgz"; + sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2"; + }) + ]; + buildInputs = + (self.nativeDeps."constants-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "constants-browserify" ]; + }; + by-spec."convert-source-map"."~0.3.0" = + self.by-version."convert-source-map"."0.3.3"; + by-version."convert-source-map"."0.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-convert-source-map-0.3.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.3.tgz"; + name = "convert-source-map-0.3.3.tgz"; + sha1 = "f77f130ded4e611d313a1bcf78f988990831c69b"; + }) + ]; + buildInputs = + (self.nativeDeps."convert-source-map" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "convert-source-map" ]; + }; by-spec."cookie"."0.0.4" = self.by-version."cookie"."0.0.4"; by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -3070,6 +3509,25 @@ ]; passthru.names = [ "cookie-signature" ]; }; + by-spec."cookie-signature"."1.0.3" = + self.by-version."cookie-signature"."1.0.3"; + by-version."cookie-signature"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-signature-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz"; + name = "cookie-signature-1.0.3.tgz"; + sha1 = "91cd997cc51fb641595738c69cda020328f50ff9"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie-signature" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie-signature" ]; + }; by-spec."cookiejar"."1.3.0" = self.by-version."cookiejar"."1.3.0"; by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -3290,6 +3748,25 @@ ]; passthru.names = [ "crypto" ]; }; + by-spec."crypto-browserify"."~1.0.9" = + self.by-version."crypto-browserify"."1.0.9"; + by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-crypto-browserify-1.0.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz"; + name = "crypto-browserify-1.0.9.tgz"; + sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"; + }) + ]; + buildInputs = + (self.nativeDeps."crypto-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "crypto-browserify" ]; + }; by-spec."css"."~1.0.8" = self.by-version."css"."1.0.8"; by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage { @@ -3658,6 +4135,27 @@ ]; passthru.names = [ "deep-equal" ]; }; + by-spec."deep-equal"."~0.0.0" = + self.by-version."deep-equal"."0.0.0"; + by-spec."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 = "node-deep-equal-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + name = "deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-equal" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "deep-equal" ]; + }; by-spec."deep-extend"."~0.2.5" = self.by-version."deep-extend"."0.2.8"; by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage { @@ -3677,8 +4175,27 @@ ]; passthru.names = [ "deep-extend" ]; }; - by-spec."deep-extend"."~0.2.6" = + by-spec."deep-extend"."~0.2.8" = self.by-version."deep-extend"."0.2.8"; + by-spec."defined"."~0.0.0" = + self.by-version."defined"."0.0.0"; + by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-defined-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; + name = "defined-0.0.0.tgz"; + sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; + }) + ]; + buildInputs = + (self.nativeDeps."defined" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "defined" ]; + }; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -3698,6 +4215,71 @@ ]; passthru.names = [ "delayed-stream" ]; }; + by-spec."deps-sort"."~0.1.1" = + self.by-version."deps-sort"."0.1.1"; + by-version."deps-sort"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "deps-sort-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz"; + name = "deps-sort-0.1.1.tgz"; + sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6"; + }) + ]; + buildInputs = + (self.nativeDeps."deps-sort" or []); + deps = [ + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.6.4" + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "deps-sort" ]; + }; + by-spec."derequire"."~0.6.0" = + self.by-version."derequire"."0.6.1"; + by-version."derequire"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "node-derequire-0.6.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz"; + name = "derequire-0.6.1.tgz"; + sha1 = "cce8ee25380de715deb61900f0bdd38222928788"; + }) + ]; + buildInputs = + (self.nativeDeps."derequire" or []); + deps = [ + self.by-version."estraverse"."1.5.0" + self.by-version."esprima-six"."0.0.3" + self.by-version."esrefactor"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "derequire" ]; + }; + by-spec."detective"."~2.4.0" = + self.by-version."detective"."2.4.1"; + by-version."detective"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-detective-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/detective/-/detective-2.4.1.tgz"; + name = "detective-2.4.1.tgz"; + sha1 = "943b8eec4c346f6ac501de25da2ea1a57ed77819"; + }) + ]; + buildInputs = + (self.nativeDeps."detective" or []); + deps = [ + self.by-version."escodegen"."1.1.0" + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "detective" ]; + }; by-spec."di"."~0.0.1" = self.by-version."di"."0.0.1"; by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -3799,6 +4381,25 @@ ]; passthru.names = [ "dkim-signer" ]; }; + by-spec."domain-browser"."~1.1.0" = + self.by-version."domain-browser"."1.1.1"; + by-version."domain-browser"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-domain-browser-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz"; + name = "domain-browser-1.1.1.tgz"; + sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0"; + }) + ]; + buildInputs = + (self.nativeDeps."domain-browser" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "domain-browser" ]; + }; by-spec."domelementtype"."1" = self.by-version."domelementtype"."1.1.1"; by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -4194,6 +4795,8 @@ passthru.names = [ "escape-html" ]; }; "escape-html" = self.by-version."escape-html"."1.0.1"; + by-spec."escape-html"."1.0.1" = + self.by-version."escape-html"."1.0.1"; by-spec."escodegen"."*" = self.by-version."escodegen"."1.2.0"; by-version."escodegen"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -4211,7 +4814,7 @@ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."1.5.0" self.by-version."esutils"."1.0.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -4233,7 +4836,7 @@ deps = [ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."0.0.4" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -4256,12 +4859,55 @@ self.by-version."esprima"."1.0.4" self.by-version."estraverse"."1.5.0" self.by-version."esutils"."1.0.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; + by-spec."escodegen"."~1.1.0" = + self.by-version."escodegen"."1.1.0"; + by-version."escodegen"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz"; + name = "escodegen-1.1.0.tgz"; + sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf"; + }) + ]; + buildInputs = + (self.nativeDeps."escodegen" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."estraverse"."1.5.0" + self.by-version."esutils"."1.0.0" + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "escodegen" ]; + }; + by-spec."escope"."~0.0.13" = + self.by-version."escope"."0.0.16"; + by-version."escope"."0.0.16" = lib.makeOverridable self.buildNodePackage { + name = "node-escope-0.0.16"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz"; + name = "escope-0.0.16.tgz"; + sha1 = "418c7a0afca721dafe659193fd986283e746538f"; + }) + ]; + buildInputs = + (self.nativeDeps."escope" or []); + deps = [ + self.by-version."estraverse"."1.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "escope" ]; + }; by-spec."esprima"."1.0.x" = self.by-version."esprima"."1.0.4"; by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -4283,12 +4929,53 @@ }; by-spec."esprima"."~ 1.0.2" = self.by-version."esprima"."1.0.4"; - by-spec."esprima"."~1.0.0" = - 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."esprima-six"."0.0.3" = + self.by-version."esprima-six"."0.0.3"; + by-version."esprima-six"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "esprima-six-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz"; + name = "esprima-six-0.0.3.tgz"; + sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima-six" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "esprima-six" ]; + }; + by-spec."esprima-six"."~0.0.3" = + self.by-version."esprima-six"."0.0.3"; + by-spec."esrefactor"."~0.1.0" = + self.by-version."esrefactor"."0.1.0"; + by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-esrefactor-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz"; + name = "esrefactor-0.1.0.tgz"; + sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13"; + }) + ]; + buildInputs = + (self.nativeDeps."esrefactor" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."estraverse"."0.0.4" + self.by-version."escope"."0.0.16" + ]; + peerDependencies = [ + ]; + passthru.names = [ "esrefactor" ]; + }; by-spec."estraverse"."*" = self.by-version."estraverse"."1.5.0"; by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage { @@ -4308,6 +4995,8 @@ ]; passthru.names = [ "estraverse" ]; }; + by-spec."estraverse".">= 0.0.2" = + self.by-version."estraverse"."1.5.0"; by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -4428,6 +5117,25 @@ }; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.13"; + by-spec."events"."~1.0.0" = + self.by-version."events"."1.0.0"; + by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-events-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz"; + name = "events-1.0.0.tgz"; + sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0"; + }) + ]; + buildInputs = + (self.nativeDeps."events" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "events" ]; + }; by-spec."events.node".">= 0.4.0" = self.by-version."events.node"."0.4.9"; by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage { @@ -4517,37 +5225,39 @@ by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."3.4.8"; - by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.8"; + self.by-version."express"."4.0.0-rc2"; + by-version."express"."4.0.0-rc2" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.0.0-rc2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz"; - name = "express-3.4.8.tgz"; - sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; + url = "http://registry.npmjs.org/express/-/express-4.0.0-rc2.tgz"; + name = "express-4.0.0-rc2.tgz"; + sha1 = "0b3fc3b853b393cdb5042dc9960498015ed06b96"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - 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" + self.by-version."accepts"."1.0.0" + self.by-version."type-is"."1.0.0" + self.by-version."range-parser"."1.0.0" self.by-version."cookie"."0.1.0" self.by-version."buffer-crc32"."0.2.1" - self.by-version."fresh"."0.2.0" + self.by-version."fresh"."0.2.2" 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."send"."0.2.0" + self.by-version."cookie-signature"."1.0.3" + self.by-version."merge-descriptors"."0.0.2" + self.by-version."utils-merge"."1.0.0" + self.by-version."escape-html"."1.0.1" + self.by-version."qs"."0.6.6" self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."3.4.8"; + "express" = self.by-version."express"."4.0.0-rc2"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -4633,6 +5343,35 @@ }; by-spec."express"."3.x" = self.by-version."express"."3.4.8"; + by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz"; + name = "express-3.4.8.tgz"; + sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = [ + 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" + self.by-version."cookie"."0.1.0" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.2.0" + 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" ]; + }; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -4668,14 +5407,14 @@ by-spec."express"."~3.4.8" = self.by-version."express"."3.4.8"; by-spec."express-form"."*" = - self.by-version."express-form"."0.10.1"; - by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage { - name = "node-express-form-0.10.1"; + self.by-version."express-form"."0.12.0"; + by-version."express-form"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-form-0.12.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz"; - name = "express-form-0.10.1.tgz"; - sha1 = "542f43cf276c33f8ec8836b571aa3365505609a8"; + url = "http://registry.npmjs.org/express-form/-/express-form-0.12.0.tgz"; + name = "express-form-0.12.0.tgz"; + sha1 = "0525ce1365760fd90fb785829a430122aceb893a"; }) ]; buildInputs = @@ -4690,7 +5429,7 @@ ]; passthru.names = [ "express-form" ]; }; - "express-form" = self.by-version."express-form"."0.10.1"; + "express-form" = self.by-version."express-form"."0.12.0"; by-spec."express-partials"."0.0.6" = self.by-version."express-partials"."0.0.6"; by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -4867,7 +5606,7 @@ self.by-version."bower-endpoint-parser"."0.2.1" self.by-version."bower-logger"."0.2.1" self.by-version."bower"."1.2.8" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; @@ -4915,7 +5654,7 @@ self.by-version."lodash"."2.1.0" self.by-version."iconv-lite"."0.2.11" self.by-version."rimraf"."2.2.6" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."minimatch"."0.2.14" self.by-version."findup-sync"."0.1.2" self.by-version."isbinaryfile"."0.1.9" @@ -4941,21 +5680,21 @@ (self.nativeDeps."fileset" or []); deps = [ self.by-version."minimatch"."0.2.14" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "fileset" ]; }; by-spec."findit".">=1.1.0 <2.0.0" = - self.by-version."findit"."1.1.0"; - by-version."findit"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-findit-1.1.0"; + self.by-version."findit"."1.1.1"; + by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-findit-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz"; - name = "findit-1.1.0.tgz"; - sha1 = "7104c60060f838d2298bd526b16add6ce733f9ac"; + url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz"; + name = "findit-1.1.1.tgz"; + sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a"; }) ]; buildInputs = @@ -5359,7 +6098,7 @@ ]; passthru.names = [ "fresh" ]; }; - by-spec."fresh"."~0.2.1" = + by-spec."fresh"."0.2.2" = self.by-version."fresh"."0.2.2"; by-version."fresh"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "node-fresh-0.2.2"; @@ -5378,6 +6117,8 @@ ]; passthru.names = [ "fresh" ]; }; + by-spec."fresh"."~0.2.1" = + self.by-version."fresh"."0.2.2"; by-spec."fs-extra"."~0.6.1" = self.by-version."fs-extra"."0.6.4"; by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage { @@ -5767,14 +6508,14 @@ passthru.names = [ "github-url-from-username-repo" ]; }; by-spec."glob"."3" = - self.by-version."glob"."3.2.8"; - by-version."glob"."3.2.8" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-3.2.8"; + self.by-version."glob"."3.2.9"; + by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage { + name = "node-glob-3.2.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.8.tgz"; - name = "glob-3.2.8.tgz"; - sha1 = "5506f4311721bcc618c7d8dba144188750307073"; + url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz"; + name = "glob-3.2.9.tgz"; + sha1 = "56af2289aa43d07d7702666480373eb814d91d40"; }) ]; buildInputs = @@ -5831,13 +6572,13 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3.2.x" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."3.x" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob".">= 3.1.4" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob".">=3.2.7 <4" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.1.21" = self.by-version."glob"."3.1.21"; by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage { @@ -5861,13 +6602,15 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."~3.2.0" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; by-spec."glob"."~3.2.7" = - self.by-version."glob"."3.2.8"; + self.by-version."glob"."3.2.9"; + by-spec."glob"."~3.2.8" = + self.by-version."glob"."3.2.9"; by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.2"; by-version."graceful-fs"."2.0.2" = lib.makeOverridable self.buildNodePackage { @@ -6011,6 +6754,8 @@ ]; passthru.names = [ "grunt" ]; }; + by-spec."grunt"."^0.4.0" = + self.by-version."grunt"."0.4.2"; by-spec."grunt"."~0.4" = self.by-version."grunt"."0.4.2"; by-spec."grunt"."~0.4.0" = @@ -6069,29 +6814,29 @@ by-spec."grunt-cli"."~0.1.7" = self.by-version."grunt-cli"."0.1.13"; by-spec."grunt-contrib-cssmin"."*" = - self.by-version."grunt-contrib-cssmin"."0.8.0"; - by-version."grunt-contrib-cssmin"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-cssmin-0.8.0"; + self.by-version."grunt-contrib-cssmin"."0.9.0"; + by-version."grunt-contrib-cssmin"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-cssmin-0.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.8.0.tgz"; - name = "grunt-contrib-cssmin-0.8.0.tgz"; - sha1 = "eb58cbfa466e6c96136c0220f191789eb22908b8"; + url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.9.0.tgz"; + name = "grunt-contrib-cssmin-0.9.0.tgz"; + sha1 = "27241f0160a8866659dab40dc8c2776c01ec7ce2"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ self.by-version."chalk"."0.4.0" - self.by-version."clean-css"."2.1.1" - self.by-version."grunt-lib-contrib"."0.6.1" + self.by-version."clean-css"."2.1.4" + self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-cssmin" ]; }; - "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.8.0"; + "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0"; by-spec."grunt-contrib-jshint"."*" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-version."grunt-contrib-jshint"."0.8.0" = lib.makeOverridable self.buildNodePackage { @@ -6115,20 +6860,20 @@ }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.8.0"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.9.0"; - by-version."grunt-contrib-less"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-less-0.9.0"; + self.by-version."grunt-contrib-less"."0.10.0"; + by-version."grunt-contrib-less"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-less-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.9.0.tgz"; - name = "grunt-contrib-less-0.9.0.tgz"; - sha1 = "af1e6e76511c2bc328ef8d284058643ca5887675"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.10.0.tgz"; + name = "grunt-contrib-less-0.10.0.tgz"; + sha1 = "542bf636ffb35f6e14c2e931855c1151b4a291b3"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-less" or []); deps = [ - self.by-version."less"."1.6.3" + self.by-version."less"."1.7.0" self.by-version."grunt-lib-contrib"."0.6.1" self.by-version."chalk"."0.4.0" ]; @@ -6137,16 +6882,16 @@ ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.9.0"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.10.0"; 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 { - name = "node-grunt-contrib-requirejs-0.4.1"; + self.by-version."grunt-contrib-requirejs"."0.4.3"; + by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-requirejs-0.4.3"; 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"; + url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.3.tgz"; + name = "grunt-contrib-requirejs-0.4.3.tgz"; + sha1 = "ac243dc312af5c85cd095169da1b3177bfe89c59"; }) ]; buildInputs = @@ -6159,31 +6904,31 @@ ]; passthru.names = [ "grunt-contrib-requirejs" ]; }; - "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1"; + "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3"; by-spec."grunt-contrib-uglify"."*" = - self.by-version."grunt-contrib-uglify"."0.3.2"; - by-version."grunt-contrib-uglify"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "node-grunt-contrib-uglify-0.3.2"; + self.by-version."grunt-contrib-uglify"."0.4.0"; + by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-grunt-contrib-uglify-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.3.2.tgz"; - name = "grunt-contrib-uglify-0.3.2.tgz"; - sha1 = "865b00ae0d11d1f5fafca3967c9b099f8929684b"; + url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.4.0.tgz"; + name = "grunt-contrib-uglify-0.4.0.tgz"; + sha1 = "6a4df3e85ccf4bbae484b0328cc71c9f102e80be"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ self.by-version."uglify-js"."2.4.12" - self.by-version."grunt-lib-contrib"."0.6.1" self.by-version."chalk"."0.4.0" + self.by-version."maxmin"."0.1.0" ]; peerDependencies = [ self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-uglify" ]; }; - "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.3.2"; + "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0"; by-spec."grunt-karma"."*" = self.by-version."grunt-karma"."0.7.2"; by-version."grunt-karma"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -6207,7 +6952,7 @@ passthru.names = [ "grunt-karma" ]; }; "grunt-karma" = self.by-version."grunt-karma"."0.7.2"; - by-spec."grunt-lib-contrib"."~0.6.0" = + by-spec."grunt-lib-contrib"."~0.6.1" = self.by-version."grunt-lib-contrib"."0.6.1"; by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "node-grunt-lib-contrib-0.6.1"; @@ -6227,8 +6972,6 @@ ]; passthru.names = [ "grunt-lib-contrib" ]; }; - by-spec."grunt-lib-contrib"."~0.6.1" = - self.by-version."grunt-lib-contrib"."0.6.1"; by-spec."grunt-sed"."*" = self.by-version."grunt-sed"."0.1.1"; by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -6266,7 +7009,7 @@ (self.nativeDeps."guifi-earth" or []); deps = [ self.by-version."coffee-script"."1.7.1" - self.by-version."jade"."1.1.5" + self.by-version."jade"."1.3.0" self.by-version."q"."1.0.0" self.by-version."xml2js"."0.4.1" self.by-version."msgpack"."0.2.2" @@ -6276,6 +7019,27 @@ passthru.names = [ "guifi-earth" ]; }; "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; + by-spec."gzip-size"."^0.1.0" = + self.by-version."gzip-size"."0.1.0"; + by-version."gzip-size"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "gzip-size-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.0.tgz"; + name = "gzip-size-0.1.0.tgz"; + sha1 = "2beaecdaf4917bd151fe9a9d43ae199392d6c32a"; + }) + ]; + buildInputs = + (self.nativeDeps."gzip-size" or []); + deps = [ + self.by-version."concat-stream"."1.4.1" + self.by-version."zlib-browserify"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "gzip-size" ]; + }; by-spec."gzippo"."*" = self.by-version."gzippo"."0.2.0"; by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -6719,6 +7483,27 @@ ]; passthru.names = [ "http-auth" ]; }; + by-spec."http-browserify"."~1.3.1" = + self.by-version."http-browserify"."1.3.2"; + by-version."http-browserify"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "node-http-browserify-1.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.3.2.tgz"; + name = "http-browserify-1.3.2.tgz"; + sha1 = "b562c34479349a690d7a6597df495aefa8c604f5"; + }) + ]; + buildInputs = + (self.nativeDeps."http-browserify" or []); + deps = [ + self.by-version."Base64"."0.2.0" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "http-browserify" ]; + }; by-spec."http-proxy"."git://github.com/samalba/node-http-proxy" = self.by-version."http-proxy"."0.10.3"; by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { @@ -6809,6 +7594,25 @@ ]; passthru.names = [ "http-signature" ]; }; + by-spec."https-browserify"."~0.0.0" = + self.by-version."https-browserify"."0.0.0"; + by-version."https-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-https-browserify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"; + name = "https-browserify-0.0.0.tgz"; + sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd"; + }) + ]; + buildInputs = + (self.nativeDeps."https-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "https-browserify" ]; + }; by-spec."humanize"."~0.0.9" = self.by-version."humanize"."0.0.9"; by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage { @@ -6915,6 +7719,44 @@ }; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; + by-spec."ieee754"."~1.1.1" = + self.by-version."ieee754"."1.1.3"; + by-version."ieee754"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-ieee754-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.3.tgz"; + name = "ieee754-1.1.3.tgz"; + sha1 = "1d4baae872e15ba69f6ab7588a965e09d485ec50"; + }) + ]; + buildInputs = + (self.nativeDeps."ieee754" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ieee754" ]; + }; + by-spec."indexof"."0.0.1" = + self.by-version."indexof"."0.0.1"; + by-version."indexof"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-indexof-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + name = "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 { @@ -6961,6 +7803,8 @@ self.by-version."inherits"."1.0.0"; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; by-spec."ini"."1" = self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7002,12 +7846,32 @@ self.by-version."read"."1.0.5" self.by-version."read-package-json"."1.1.7" self.by-version."semver"."2.2.1" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "init-package-json" ]; }; + by-spec."inline-source-map"."~0.3.0" = + self.by-version."inline-source-map"."0.3.0"; + by-version."inline-source-map"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-inline-source-map-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.0.tgz"; + name = "inline-source-map-0.3.0.tgz"; + sha1 = "ad2acca97d82fcb9d0a56221ee72e8043116424a"; + }) + ]; + buildInputs = + (self.nativeDeps."inline-source-map" or []); + deps = [ + self.by-version."source-map"."0.1.33" + ]; + peerDependencies = [ + ]; + passthru.names = [ "inline-source-map" ]; + }; by-spec."inquirer"."~0.3.0" = self.by-version."inquirer"."0.3.5"; by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -7060,6 +7924,30 @@ ]; passthru.names = [ "inquirer" ]; }; + by-spec."insert-module-globals"."~3.2.0" = + self.by-version."insert-module-globals"."3.2.0"; + by-version."insert-module-globals"."3.2.0" = lib.makeOverridable self.buildNodePackage { + name = "insert-module-globals-3.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.2.0.tgz"; + name = "insert-module-globals-3.2.0.tgz"; + sha1 = "5692a834207adebb3effa9f9def7cf314890a63b"; + }) + ]; + buildInputs = + (self.nativeDeps."insert-module-globals" or []); + deps = [ + self.by-version."lexical-scope"."0.1.0" + self.by-version."process"."0.5.2" + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.7.1" + self.by-version."concat-stream"."1.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "insert-module-globals" ]; + }; by-spec."insight"."~0.3.0" = self.by-version."insight"."0.3.1"; by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -7124,14 +8012,14 @@ self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" self.by-version."async"."0.2.10" - self.by-version."express"."3.4.8" - self.by-version."jade"."1.1.5" + self.by-version."express"."4.0.0-rc2" + self.by-version."jade"."1.3.0" self.by-version."passport"."0.2.0" self.by-version."passport-http"."0.2.2" - self.by-version."js-yaml"."3.0.1" + self.by-version."js-yaml"."3.0.2" self.by-version."mongoose"."3.8.8" self.by-version."gridfs-stream"."0.4.1" - self.by-version."temp"."0.6.0" + self.by-version."temp"."0.7.0" self.by-version."kue"."0.7.5" self.by-version."redis"."0.10.1" self.by-version."hiredis"."0.1.16" @@ -7225,7 +8113,7 @@ self.by-version."abbrev"."1.0.4" self.by-version."wordwrap"."0.0.2" self.by-version."resolve"."0.6.1" - self.by-version."js-yaml"."3.0.1" + self.by-version."js-yaml"."3.0.2" ]; peerDependencies = [ ]; @@ -7263,14 +8151,14 @@ passthru.names = [ "istanbul" ]; }; by-spec."jade"."*" = - self.by-version."jade"."1.1.5"; - by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.1.5"; + self.by-version."jade"."1.3.0"; + by-version."jade"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz"; - name = "jade-1.1.5.tgz"; - sha1 = "e884d3d3565807e280f5ba760f68addb176627a3"; + url = "http://registry.npmjs.org/jade/-/jade-1.3.0.tgz"; + name = "jade-1.3.0.tgz"; + sha1 = "776cae93f1ad5af6b61eff2340fcdc19a3225d48"; }) ]; buildInputs = @@ -7281,14 +8169,14 @@ self.by-version."transformers"."2.1.0" self.by-version."character-parser"."1.2.0" self.by-version."monocle"."1.1.51" - self.by-version."with"."2.0.0" - self.by-version."constantinople"."1.0.2" + self.by-version."with"."3.0.0" + self.by-version."constantinople"."2.0.0" ]; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.1.5"; + "jade" = self.by-version."jade"."1.3.0"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -7333,8 +8221,32 @@ }; by-spec."jade"."1.1.5" = self.by-version."jade"."1.1.5"; + by-version."jade"."1.1.5" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz"; + name = "jade-1.1.5.tgz"; + sha1 = "e884d3d3565807e280f5ba760f68addb176627a3"; + }) + ]; + buildInputs = + (self.nativeDeps."jade" or []); + deps = [ + self.by-version."commander"."2.1.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."transformers"."2.1.0" + self.by-version."character-parser"."1.2.0" + self.by-version."monocle"."1.1.51" + self.by-version."with"."2.0.0" + self.by-version."constantinople"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "jade" ]; + }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.1.5"; + self.by-version."jade"."1.3.0"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -7362,14 +8274,14 @@ passthru.names = [ "jade" ]; }; by-spec."jayschema"."*" = - self.by-version."jayschema"."0.2.4"; - by-version."jayschema"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "jayschema-0.2.4"; + self.by-version."jayschema"."0.2.5"; + by-version."jayschema"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "jayschema-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.4.tgz"; - name = "jayschema-0.2.4.tgz"; - sha1 = "de51c61702a472c579cf50adf70652b7e23977ae"; + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.5.tgz"; + name = "jayschema-0.2.5.tgz"; + sha1 = "314e87687eac703a0a2557d77dbb3f175a0e7ada"; }) ]; buildInputs = @@ -7381,7 +8293,7 @@ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.by-version."jayschema"."0.2.4"; + "jayschema" = self.by-version."jayschema"."0.2.5"; by-spec."jedediah"."~0.1.0" = self.by-version."jedediah"."0.1.1"; by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -7402,14 +8314,14 @@ passthru.names = [ "jedediah" ]; }; by-spec."js-yaml"."*" = - 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"; + self.by-version."js-yaml"."3.0.2"; + by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; - name = "js-yaml-3.0.1.tgz"; - sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.2.tgz"; + name = "js-yaml-3.0.2.tgz"; + sha1 = "9937865f8e897a5e894e73c2c5cf2e89b32eb771"; }) ]; buildInputs = @@ -7422,7 +8334,7 @@ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."3.0.1"; + "js-yaml" = self.by-version."js-yaml"."3.0.2"; 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 { @@ -7465,8 +8377,27 @@ }; by-spec."js-yaml"."3.0.1" = 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-3.0.1.tgz"; + name = "js-yaml-3.0.1.tgz"; + sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; + }) + ]; + 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."js-yaml"."3.x" = - self.by-version."js-yaml"."3.0.1"; + self.by-version."js-yaml"."3.0.2"; by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage { @@ -7510,7 +8441,7 @@ passthru.names = [ "js-yaml" ]; }; by-spec."js-yaml"."~3.0.1" = - self.by-version."js-yaml"."3.0.1"; + self.by-version."js-yaml"."3.0.2"; by-spec."jsesc"."0.4.3" = self.by-version."jsesc"."0.4.3"; by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage { @@ -7637,6 +8568,44 @@ ]; passthru.names = [ "jsonfile" ]; }; + by-spec."jsonify"."~0.0.0" = + self.by-version."jsonify"."0.0.0"; + by-version."jsonify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-jsonify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + name = "jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jsonify" ]; + }; + by-spec."jsonparse"."0.0.5" = + self.by-version."jsonparse"."0.0.5"; + by-version."jsonparse"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-jsonparse-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; + name = "jsonparse-0.0.5.tgz"; + sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonparse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jsonparse" ]; + }; by-spec."jsontool"."*" = self.by-version."jsontool"."7.0.1"; by-version."jsontool"."7.0.1" = lib.makeOverridable self.buildNodePackage { @@ -7715,7 +8684,7 @@ self.by-version."di"."0.0.1" self.by-version."socket.io"."0.9.16" self.by-version."chokidar"."0.8.1" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."minimatch"."0.2.14" self.by-version."http-proxy"."0.10.4" self.by-version."optimist"."0.6.1" @@ -7725,11 +8694,11 @@ self.by-version."colors"."0.6.2" self.by-version."lodash"."2.4.1" self.by-version."mime"."1.2.11" - self.by-version."log4js"."0.6.10" + self.by-version."log4js"."0.6.12" self.by-version."useragent"."2.0.7" self.by-version."graceful-fs"."2.0.2" self.by-version."connect"."2.12.0" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; @@ -7869,7 +8838,7 @@ buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.by-version."wd"."0.2.10" + self.by-version."wd"."0.2.11" self.by-version."sauce-connect-launcher"."0.2.2" self.by-version."q"."0.9.7" self.by-version."saucelabs"."0.1.1" @@ -8139,22 +9108,22 @@ buildInputs = (self.nativeDeps."lcov-result-merger" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "lcov-result-merger" ]; }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; - by-spec."less"."~1.6.0" = - self.by-version."less"."1.6.3"; - by-version."less"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "less-1.6.3"; + by-spec."less"."~1.7.0" = + self.by-version."less"."1.7.0"; + by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage { + name = "less-1.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.6.3.tgz"; - name = "less-1.6.3.tgz"; - sha1 = "71ce89ec30b774b3567f254c67958f2f2c193bde"; + url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz"; + name = "less-1.7.0.tgz"; + sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84"; }) ]; buildInputs = @@ -8163,13 +9132,33 @@ self.by-version."mime"."1.2.11" self.by-version."request"."2.34.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."2.0.8" - self.by-version."source-map"."0.1.32" + self.by-version."clean-css"."2.1.4" + self.by-version."source-map"."0.1.33" ]; peerDependencies = [ ]; passthru.names = [ "less" ]; }; + by-spec."lexical-scope"."~0.1.0" = + self.by-version."lexical-scope"."0.1.0"; + by-version."lexical-scope"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-lexical-scope-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz"; + name = "lexical-scope-0.1.0.tgz"; + sha1 = "8f30004c80234ffac083b990079d7b267e18441b"; + }) + ]; + buildInputs = + (self.nativeDeps."lexical-scope" or []); + deps = [ + self.by-version."astw"."0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lexical-scope" ]; + }; by-spec."libxmljs"."~0.8.1" = self.by-version."libxmljs"."0.8.1"; by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage { @@ -8585,14 +9574,14 @@ passthru.names = [ "log-driver" ]; }; by-spec."log4js"."~0.6.3" = - self.by-version."log4js"."0.6.10"; - by-version."log4js"."0.6.10" = lib.makeOverridable self.buildNodePackage { - name = "node-log4js-0.6.10"; + self.by-version."log4js"."0.6.12"; + by-version."log4js"."0.6.12" = lib.makeOverridable self.buildNodePackage { + name = "node-log4js-0.6.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/log4js/-/log4js-0.6.10.tgz"; - name = "log4js-0.6.10.tgz"; - sha1 = "3a47a2551dc6362672901b73f7f47aee6310f785"; + url = "http://registry.npmjs.org/log4js/-/log4js-0.6.12.tgz"; + name = "log4js-0.6.12.tgz"; + sha1 = "ef806ec669ea3fc7bf5be92a95891fb67517e642"; }) ]; buildInputs = @@ -8804,6 +9793,30 @@ ]; passthru.names = [ "mailcomposer" ]; }; + by-spec."maxmin"."^0.1.0" = + self.by-version."maxmin"."0.1.0"; + by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-maxmin-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/maxmin/-/maxmin-0.1.0.tgz"; + name = "maxmin-0.1.0.tgz"; + sha1 = "95d81c5289e3a9d30f7fc7dc559c024e5030c9d0"; + }) + ]; + buildInputs = + (self.nativeDeps."maxmin" or []); + deps = [ + self.by-version."gzip-size"."0.1.0" + self.by-version."pretty-bytes"."0.1.0" + self.by-version."chalk"."0.4.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "maxmin" ]; + }; + by-spec."maxmin"."~0.1.0" = + self.by-version."maxmin"."0.1.0"; by-spec."meat"."*" = self.by-version."meat"."0.2.5"; by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -8871,6 +9884,25 @@ ]; passthru.names = [ "merge-descriptors" ]; }; + by-spec."merge-descriptors"."0.0.2" = + self.by-version."merge-descriptors"."0.0.2"; + by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-merge-descriptors-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + name = "merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }) + ]; + 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 { @@ -9117,6 +10149,8 @@ ]; passthru.names = [ "minimist" ]; }; + by-spec."minimist"."~0.0.5" = + self.by-version."minimist"."0.0.8"; by-spec."minimist"."~0.0.7" = self.by-version."minimist"."0.0.8"; by-spec."ministyle"."~0.1.3" = @@ -9283,6 +10317,33 @@ passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; + by-spec."module-deps"."~1.7.0" = + self.by-version."module-deps"."1.7.1"; + by-version."module-deps"."1.7.1" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-1.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/module-deps/-/module-deps-1.7.1.tgz"; + name = "module-deps-1.7.1.tgz"; + sha1 = "1e9a6809727282323abf1d5eee5ce8860b2e7bbf"; + }) + ]; + buildInputs = + (self.nativeDeps."module-deps" or []); + deps = [ + self.by-version."through"."2.3.4" + self.by-version."JSONStream"."0.7.1" + self.by-version."browser-resolve"."1.2.2" + self.by-version."resolve"."0.6.1" + self.by-version."concat-stream"."1.4.1" + self.by-version."minimist"."0.0.8" + self.by-version."parents"."0.0.2" + self.by-version."detective"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "module-deps" ]; + }; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -9321,7 +10382,7 @@ ]; passthru.names = [ "moment" ]; }; - by-spec."moment"."~2.5.0" = + by-spec."moment"."~2.5.1" = self.by-version."moment"."2.5.1"; by-version."moment"."2.5.1" = lib.makeOverridable self.buildNodePackage { name = "node-moment-2.5.1"; @@ -9341,27 +10402,27 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.0-rc7"; - by-version."mongodb"."1.4.0-rc7" = lib.makeOverridable self.buildNodePackage { - name = "node-mongodb-1.4.0-rc7"; + self.by-version."mongodb"."1.4.0-rc8"; + by-version."mongodb"."1.4.0-rc8" = lib.makeOverridable self.buildNodePackage { + name = "node-mongodb-1.4.0-rc8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc7.tgz"; - name = "mongodb-1.4.0-rc7.tgz"; - sha1 = "efa6da4ef5d1bf0fdf48b4f0e369e3d2186d3401"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc8.tgz"; + name = "mongodb-1.4.0-rc8.tgz"; + sha1 = "3c6048070935d2b1c7e997dd77be70119e33cced"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = [ - self.by-version."bson"."0.2.6" + self.by-version."bson"."0.2.7" self.by-version."kerberos"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.0-rc7"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc8"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -10029,6 +11090,8 @@ ]; passthru.names = [ "negotiator" ]; }; + by-spec."negotiator"."~0.3.0" = + self.by-version."negotiator"."0.3.0"; by-spec."net-ping"."1.1.7" = self.by-version."net-ping"."1.1.7"; by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage { @@ -10134,7 +11197,7 @@ self.by-version."semver"."2.1.0" self.by-version."sprintf"."0.1.3" self.by-version."temp"."0.6.0" - self.by-version."wrench"."1.5.7" + self.by-version."wrench"."1.5.8" self.by-version."uglify-js"."2.3.6" self.by-version."xmldom"."0.1.19" ]; @@ -10164,20 +11227,20 @@ }; "node-expat" = self.by-version."node-expat"."2.1.4"; by-spec."node-gyp"."*" = - 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"; + self.by-version."node-gyp"."0.13.0"; + by-version."node-gyp"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.13.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; - name = "node-gyp-0.12.2.tgz"; - sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz"; + name = "node-gyp-0.13.0.tgz"; + sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e"; }) ]; buildInputs = (self.nativeDeps."node-gyp" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."graceful-fs"."2.0.2" self.by-version."fstream"."0.1.25" self.by-version."minimatch"."0.2.14" @@ -10195,9 +11258,39 @@ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.by-version."node-gyp"."0.12.2"; + "node-gyp" = self.by-version."node-gyp"."0.13.0"; by-spec."node-gyp"."~0.12.2" = 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.2.tgz"; + name = "node-gyp-0.12.2.tgz"; + sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; + }) + ]; + buildInputs = + (self.nativeDeps."node-gyp" or []); + deps = [ + self.by-version."glob"."3.2.9" + self.by-version."graceful-fs"."2.0.2" + self.by-version."fstream"."0.1.25" + self.by-version."minimatch"."0.2.14" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.2.0" + self.by-version."npmlog"."0.0.6" + self.by-version."osenv"."0.0.3" + self.by-version."request"."2.34.0" + self.by-version."rimraf"."2.2.6" + self.by-version."semver"."2.2.1" + self.by-version."tar"."0.1.19" + self.by-version."which"."1.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-gyp" ]; + }; by-spec."node-inspector"."*" = self.by-version."node-inspector"."0.7.0"; by-version."node-inspector"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -10214,7 +11307,7 @@ deps = [ self.by-version."express"."3.4.8" self.by-version."async"."0.2.10" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."rc"."0.3.4" self.by-version."strong-data-uri"."0.1.1" self.by-version."debug"."0.7.4" @@ -10438,7 +11531,7 @@ (self.nativeDeps."nodemailer" or []); deps = [ self.by-version."mailcomposer"."0.2.8" - self.by-version."simplesmtp"."0.3.21" + self.by-version."simplesmtp"."0.3.22" self.by-version."optimist"."0.6.1" ]; peerDependencies = [ @@ -10657,7 +11750,7 @@ 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" + self.by-version."path-is-inside"."1.0.1" self.by-version."columnify"."0.1.2" self.by-version."npm-install-checks"."1.0.0" ]; @@ -10744,34 +11837,8 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.3.3" = - self.by-version."npm-registry-client"."0.3.6"; - by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-registry-client-0.3.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz"; - name = "npm-registry-client-0.3.6.tgz"; - sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e"; - }) - ]; - buildInputs = - (self.nativeDeps."npm-registry-client" or []); - deps = [ - self.by-version."request"."2.34.0" - self.by-version."graceful-fs"."2.0.2" - 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.6" - self.by-version."retry"."0.6.0" - self.by-version."npmlog"."0.0.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npm-registry-client" ]; - }; + by-spec."npm-registry-client"."~0.4.4" = + self.by-version."npm-registry-client"."0.4.4"; by-spec."npm-user-validate"."0.0.3" = self.by-version."npm-user-validate"."0.0.3"; by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10812,7 +11879,7 @@ self.by-version."tar"."0.1.17" self.by-version."temp"."0.6.0" self.by-version."fs.extra"."1.2.1" - self.by-version."findit"."1.1.0" + self.by-version."findit"."1.1.1" ]; peerDependencies = [ ]; @@ -10900,6 +11967,8 @@ ]; passthru.names = [ "npmconf" ]; }; + by-spec."npmconf"."~0.1.13" = + self.by-version."npmconf"."0.1.13"; by-spec."npmconf"."~0.1.2" = self.by-version."npmconf"."0.1.13"; by-spec."npmlog"."*" = @@ -11294,6 +12363,8 @@ self.by-version."optimist"."0.3.7"; by-spec."optimist"."~0.6.0" = self.by-version."optimist"."0.6.1"; + by-spec."optimist"."~0.6.1" = + self.by-version."optimist"."0.6.1"; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.5"; by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -11354,6 +12425,25 @@ "optparse" = self.by-version."optparse"."1.0.5"; by-spec."optparse".">= 1.0.3" = self.by-version."optparse"."1.0.5"; + by-spec."os-browserify"."~0.1.1" = + self.by-version."os-browserify"."0.1.1"; + by-version."os-browserify"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-os-browserify-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.1.tgz"; + name = "os-browserify-0.1.1.tgz"; + sha1 = "c1c6b8b27be18cb09da7fa87476e0bcf3b465cbe"; + }) + ]; + buildInputs = + (self.nativeDeps."os-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "os-browserify" ]; + }; by-spec."osenv"."0" = self.by-version."osenv"."0.0.3"; by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -11417,6 +12507,27 @@ ]; passthru.names = [ "p-throttler" ]; }; + by-spec."parents"."0.0.2" = + self.by-version."parents"."0.0.2"; + by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "parents-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz"; + name = "parents-0.0.2.tgz"; + sha1 = "67147826e497d40759aaf5ba4c99659b6034d302"; + }) + ]; + buildInputs = + (self.nativeDeps."parents" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "parents" ]; + }; + by-spec."parents"."~0.0.1" = + self.by-version."parents"."0.0.2"; by-spec."passport"."*" = self.by-version."passport"."0.2.0"; by-version."passport"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -11460,10 +12571,10 @@ ]; passthru.names = [ "passport" ]; }; - by-spec."passport"."~0.1.18" = - self.by-version."passport"."0.1.18"; by-spec."passport"."~0.1.3" = self.by-version."passport"."0.1.18"; + by-spec."passport"."~0.2.0" = + self.by-version."passport"."0.2.0"; by-spec."passport-http"."*" = self.by-version."passport-http"."0.2.2"; by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -11529,15 +12640,34 @@ ]; passthru.names = [ "passport-strategy" ]; }; - 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 = "node-path-is-inside-1.0.0"; + by-spec."path-browserify"."~0.0.0" = + self.by-version."path-browserify"."0.0.0"; + by-version."path-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-path-browserify-0.0.0"; 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"; + url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + name = "path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }) + ]; + buildInputs = + (self.nativeDeps."path-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "path-browserify" ]; + }; + by-spec."path-is-inside"."~1.0.0" = + self.by-version."path-is-inside"."1.0.1"; + by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-path-is-inside-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; + name = "path-is-inside-1.0.1.tgz"; + sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; }) ]; buildInputs = @@ -11714,6 +12844,44 @@ ]; passthru.names = [ "posix-getopt" ]; }; + by-spec."pretty-bytes"."^0.1.0" = + self.by-version."pretty-bytes"."0.1.0"; + by-version."pretty-bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "pretty-bytes-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz"; + name = "pretty-bytes-0.1.0.tgz"; + sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e"; + }) + ]; + buildInputs = + (self.nativeDeps."pretty-bytes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "pretty-bytes" ]; + }; + by-spec."process"."~0.5.1" = + self.by-version."process"."0.5.2"; + by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-process-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz"; + name = "process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }) + ]; + buildInputs = + (self.nativeDeps."process" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "process" ]; + }; by-spec."promise"."~2.0" = self.by-version."promise"."2.0.0"; by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -11877,6 +13045,25 @@ ]; passthru.names = [ "punycode" ]; }; + by-spec."punycode".">=1.0.0 <1.1.0" = + self.by-version."punycode"."1.0.0"; + by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz"; + name = "punycode-1.0.0.tgz"; + sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; by-spec."punycode"."~1.2.3" = self.by-version."punycode"."1.2.4"; by-spec."q".">= 0.0.1" = @@ -12064,6 +13251,44 @@ self.by-version."qs"."0.5.6"; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; + by-spec."querystring".">=0.1.0 <0.2.0" = + self.by-version."querystring"."0.1.0"; + by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-querystring-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz"; + name = "querystring-0.1.0.tgz"; + sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "querystring" ]; + }; + by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" = + self.by-version."querystring"."0.2.0"; + by-version."querystring"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-querystring-0.2.0"; + src = [ + (fetchurl { + url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz"; + name = "querystring-0.2.0.tgz"; + sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5"; + }) + ]; + buildInputs = + (self.nativeDeps."querystring" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "querystring" ]; + }; by-spec."rai"."~0.1" = self.by-version."rai"."0.1.9"; by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage { @@ -12102,7 +13327,7 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."range-parser"."~1.0.0" = + by-spec."range-parser"."1.0.0" = self.by-version."range-parser"."1.0.0"; by-version."range-parser"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "node-range-parser-1.0.0"; @@ -12121,7 +13346,9 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."raven"."~0.6.0" = + by-spec."range-parser"."~1.0.0" = + self.by-version."range-parser"."1.0.0"; + by-spec."raven"."~0.6.2" = self.by-version."raven"."0.6.2"; by-version."raven"."0.6.2" = lib.makeOverridable self.buildNodePackage { name = "raven-0.6.2"; @@ -12244,7 +13471,7 @@ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.2" = + by-spec."rc"."~0.3.4" = self.by-version."rc"."0.3.4"; by-spec."read"."1" = self.by-version."read"."1.0.5"; @@ -12332,7 +13559,7 @@ buildInputs = (self.nativeDeps."read-package-json" or []); deps = [ - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."lru-cache"."2.5.0" self.by-version."normalize-package-data"."0.2.12" self.by-version."graceful-fs"."2.0.2" @@ -12438,14 +13665,14 @@ passthru.names = [ "readline2" ]; }; by-spec."redeyed"."~0.4.0" = - self.by-version."redeyed"."0.4.2"; - by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-redeyed-0.4.2"; + self.by-version."redeyed"."0.4.4"; + by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-redeyed-0.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.2.tgz"; - name = "redeyed-0.4.2.tgz"; - sha1 = "f0133b990cb972bdbcf2d2dce0aec36595f419bc"; + url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz"; + name = "redeyed-0.4.4.tgz"; + sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f"; }) ]; buildInputs = @@ -12732,7 +13959,7 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request".">=2.12.0" = + by-spec."request".">=2.33.0" = self.by-version."request"."2.34.0"; by-spec."request"."~2" = self.by-version."request"."2.34.0"; @@ -12971,7 +14198,7 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.6.x" = + by-spec."resolve"."0.6.1" = self.by-version."resolve"."0.6.1"; by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "node-resolve-0.6.1"; @@ -12990,7 +14217,9 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."~0.3.1" = + by-spec."resolve"."0.6.x" = + self.by-version."resolve"."0.6.1"; + by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "node-resolve-0.3.1"; @@ -13009,6 +14238,12 @@ ]; passthru.names = [ "resolve" ]; }; + by-spec."resolve"."~0.3.1" = + self.by-version."resolve"."0.3.1"; + by-spec."resolve"."~0.6.0" = + self.by-version."resolve"."0.6.1"; + by-spec."resolve"."~0.6.1" = + self.by-version."resolve"."0.6.1"; by-spec."restify"."2.4.1" = self.by-version."restify"."2.4.1"; by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -13106,6 +14341,29 @@ ]; passthru.names = [ "revalidator" ]; }; + by-spec."rfile"."~1.0" = + self.by-version."rfile"."1.0.0"; + by-version."rfile"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-rfile-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz"; + name = "rfile-1.0.0.tgz"; + sha1 = "59708cf90ca1e74c54c3cfc5c36fdb9810435261"; + }) + ]; + buildInputs = + (self.nativeDeps."rfile" or []); + deps = [ + self.by-version."callsite"."1.0.0" + self.by-version."resolve"."0.3.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "rfile" ]; + }; + by-spec."rfile"."~1.0.0" = + self.by-version."rfile"."1.0.0"; by-spec."rimraf"."1.x.x" = self.by-version."rimraf"."1.0.9"; by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage { @@ -13196,6 +14454,29 @@ self.by-version."rimraf"."2.2.6"; by-spec."rimraf"."~2.2.5" = self.by-version."rimraf"."2.2.6"; + by-spec."rimraf"."~2.2.6" = + self.by-version."rimraf"."2.2.6"; + by-spec."ruglify"."~1.0.0" = + self.by-version."ruglify"."1.0.0"; + by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-ruglify-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz"; + name = "ruglify-1.0.0.tgz"; + sha1 = "dc8930e2a9544a274301cc9972574c0d0986b675"; + }) + ]; + buildInputs = + (self.nativeDeps."ruglify" or []); + deps = [ + self.by-version."rfile"."1.0.0" + self.by-version."uglify-js"."2.2.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ruglify" ]; + }; by-spec."s3http"."*" = self.by-version."s3http"."0.0.5"; by-version."s3http"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -13527,6 +14808,8 @@ ]; passthru.names = [ "send" ]; }; + by-spec."send"."0.2.0" = + self.by-version."send"."0.2.0"; by-spec."sequence"."2.2.1" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -13569,6 +14852,44 @@ ]; passthru.names = [ "sha" ]; }; + by-spec."shallow-copy"."0.0.1" = + self.by-version."shallow-copy"."0.0.1"; + by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-shallow-copy-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; + name = "shallow-copy-0.0.1.tgz"; + sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; + }) + ]; + buildInputs = + (self.nativeDeps."shallow-copy" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shallow-copy" ]; + }; + by-spec."shell-quote"."~0.0.1" = + self.by-version."shell-quote"."0.0.1"; + by-version."shell-quote"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-shell-quote-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"; + name = "shell-quote-0.0.1.tgz"; + sha1 = "1a41196f3c0333c482323593d6886ecf153dd986"; + }) + ]; + buildInputs = + (self.nativeDeps."shell-quote" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "shell-quote" ]; + }; by-spec."shelljs"."0.1.x" = self.by-version."shelljs"."0.1.4"; by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -13610,14 +14931,14 @@ passthru.names = [ "shelljs" ]; }; by-spec."should"."*" = - self.by-version."should"."3.1.2"; - by-version."should"."3.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-should-3.1.2"; + self.by-version."should"."3.1.3"; + by-version."should"."3.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-should-3.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-3.1.2.tgz"; - name = "should-3.1.2.tgz"; - sha1 = "4bc206253d736c2fb902153477982c2b2e988c02"; + url = "http://registry.npmjs.org/should/-/should-3.1.3.tgz"; + name = "should-3.1.3.tgz"; + sha1 = "900ff485c1497f873de0aa3bfcf9d8b913fdda24"; }) ]; buildInputs = @@ -13628,7 +14949,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."3.1.2"; + "should" = self.by-version."should"."3.1.3"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -13691,14 +15012,14 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.21"; - by-version."simplesmtp"."0.3.21" = lib.makeOverridable self.buildNodePackage { - name = "node-simplesmtp-0.3.21"; + self.by-version."simplesmtp"."0.3.22"; + by-version."simplesmtp"."0.3.22" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.22"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.21.tgz"; - name = "simplesmtp-0.3.21.tgz"; - sha1 = "79aa14d72a915bb5853ff53a8a44b0823fbe1a8f"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.22.tgz"; + name = "simplesmtp-0.3.22.tgz"; + sha1 = "5bef8fef60e7e3c4ff57117e3502190447de11e5"; }) ]; buildInputs = @@ -13997,14 +15318,14 @@ }; "sockjs" = self.by-version."sockjs"."0.3.8"; by-spec."source-map"."*" = - self.by-version."source-map"."0.1.32"; - by-version."source-map"."0.1.32" = lib.makeOverridable self.buildNodePackage { - name = "node-source-map-0.1.32"; + self.by-version."source-map"."0.1.33"; + by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage { + name = "node-source-map-0.1.33"; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; - name = "source-map-0.1.32.tgz"; - sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.33.tgz"; + name = "source-map-0.1.33.tgz"; + sha1 = "c659297a73af18c073b0aa2e7cc91e316b5c570c"; }) ]; buildInputs = @@ -14016,17 +15337,17 @@ ]; passthru.names = [ "source-map" ]; }; - "source-map" = self.by-version."source-map"."0.1.32"; + "source-map" = self.by-version."source-map"."0.1.33"; by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map".">= 0.1.2" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.30" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.31" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."source-map"."~0.1.7" = - self.by-version."source-map"."0.1.32"; + self.by-version."source-map"."0.1.33"; by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { @@ -14088,27 +15409,6 @@ ]; passthru.names = [ "ssh-agent" ]; }; - by-spec."ssh2"."~0.2.16" = - self.by-version."ssh2"."0.2.17"; - by-version."ssh2"."0.2.17" = lib.makeOverridable self.buildNodePackage { - name = "node-ssh2-0.2.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.17.tgz"; - name = "ssh2-0.2.17.tgz"; - sha1 = "ce7773e4c7c4f78a8ab19227dcc3afae0b149291"; - }) - ]; - buildInputs = - (self.nativeDeps."ssh2" or []); - deps = [ - self.by-version."streamsearch"."0.1.2" - self.by-version."asn1"."0.1.11" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ssh2" ]; - }; by-spec."stack-trace"."0.0.7" = self.by-version."stack-trace"."0.0.7"; by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -14210,6 +15510,27 @@ passthru.names = [ "statsd-librato-backend" ]; }; "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2"; + by-spec."stream-browserify"."~0.1.0" = + self.by-version."stream-browserify"."0.1.3"; + by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-stream-browserify-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz"; + name = "stream-browserify-0.1.3.tgz"; + sha1 = "95cf1b369772e27adaf46352265152689c6c4be9"; + }) + ]; + buildInputs = + (self.nativeDeps."stream-browserify" or []); + deps = [ + self.by-version."inherits"."2.0.1" + self.by-version."process"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stream-browserify" ]; + }; by-spec."stream-combiner"."~0.0.2" = self.by-version."stream-combiner"."0.0.4"; by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -14291,25 +15612,6 @@ passthru.names = [ "stream-splitter-transform" ]; }; "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4"; - by-spec."streamsearch"."0.1.2" = - self.by-version."streamsearch"."0.1.2"; - by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-streamsearch-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - name = "streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; - }) - ]; - buildInputs = - (self.nativeDeps."streamsearch" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "streamsearch" ]; - }; by-spec."string"."1.6.1" = self.by-version."string"."1.6.1"; by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage { @@ -14329,6 +15631,25 @@ ]; passthru.names = [ "string" ]; }; + by-spec."string_decoder"."~0.0.0" = + self.by-version."string_decoder"."0.0.1"; + by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-string_decoder-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz"; + name = "string_decoder-0.0.1.tgz"; + sha1 = "f5472d0a8d1650ec823752d24e6fd627b39bf141"; + }) + ]; + buildInputs = + (self.nativeDeps."string_decoder" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "string_decoder" ]; + }; by-spec."string_decoder"."~0.10.x" = self.by-version."string_decoder"."0.10.25"; by-version."string_decoder"."0.10.25" = lib.makeOverridable self.buildNodePackage { @@ -14407,6 +15728,31 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = + self.by-version."stylus"."0.42.3"; + by-version."stylus"."0.42.3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.42.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stylus/-/stylus-0.42.3.tgz"; + name = "stylus-0.42.3.tgz"; + sha1 = "23e8b3e71eb7f60bc4a657de498c8feb9c366c32"; + }) + ]; + buildInputs = + (self.nativeDeps."stylus" or []); + deps = [ + self.by-version."css-parse"."1.7.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."debug"."0.7.4" + self.by-version."sax"."0.5.8" + self.by-version."glob"."3.2.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "stylus" ]; + }; + "stylus" = self.by-version."stylus"."0.42.3"; + by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { name = "stylus-0.42.2"; @@ -14424,15 +15770,32 @@ self.by-version."mkdirp"."0.3.5" self.by-version."debug"."0.7.4" self.by-version."sax"."0.5.8" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.42.2"; - by-spec."stylus"."0.42.2" = - self.by-version."stylus"."0.42.2"; + by-spec."subarg"."0.0.1" = + self.by-version."subarg"."0.0.1"; + by-version."subarg"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-subarg-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz"; + name = "subarg-0.0.1.tgz"; + sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a"; + }) + ]; + buildInputs = + (self.nativeDeps."subarg" or []); + deps = [ + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "subarg" ]; + }; by-spec."sudo-block"."~0.2.0" = self.by-version."sudo-block"."0.2.1"; by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -14591,6 +15954,48 @@ }; by-spec."sylvester".">= 0.0.8" = self.by-version."sylvester"."0.0.21"; + by-spec."syntax-error"."~0.1.0" = + self.by-version."syntax-error"."0.1.0"; + by-version."syntax-error"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-syntax-error-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz"; + name = "syntax-error-0.1.0.tgz"; + sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65"; + }) + ]; + buildInputs = + (self.nativeDeps."syntax-error" or []); + deps = [ + self.by-version."esprima-six"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "syntax-error" ]; + }; + by-spec."tape"."~0.2.2" = + self.by-version."tape"."0.2.2"; + by-version."tape"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "tape-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz"; + name = "tape-0.2.2.tgz"; + sha1 = "64ccfa4b7ecf4a0060007e61716d424781671637"; + }) + ]; + buildInputs = + (self.nativeDeps."tape" or []); + deps = [ + self.by-version."jsonify"."0.0.0" + self.by-version."deep-equal"."0.0.0" + self.by-version."defined"."0.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tape" ]; + }; by-spec."tar"."*" = self.by-version."tar"."0.1.19"; by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage { @@ -14645,6 +16050,27 @@ by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.19"; by-spec."temp"."*" = + self.by-version."temp"."0.7.0"; + by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-temp-0.7.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz"; + name = "temp-0.7.0.tgz"; + sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f"; + }) + ]; + buildInputs = + (self.nativeDeps."temp" or []); + deps = [ + self.by-version."rimraf"."2.2.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "temp" ]; + }; + "temp" = self.by-version."temp"."0.7.0"; + by-spec."temp"."0.6.0" = self.by-version."temp"."0.6.0"; by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "node-temp-0.6.0"; @@ -14665,9 +16091,6 @@ ]; passthru.names = [ "temp" ]; }; - "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.5.1" = self.by-version."temp"."0.5.1"; by-version."temp"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -14690,6 +16113,8 @@ }; by-spec."temp"."~0.6.0" = self.by-version."temp"."0.6.0"; + by-spec."temp"."~0.7.0" = + self.by-version."temp"."0.7.0"; by-spec."tempfile"."~0.1.2" = self.by-version."tempfile"."0.1.2"; by-version."tempfile"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -14767,6 +16192,25 @@ ]; passthru.names = [ "throttleit" ]; }; + by-spec."through"."~2.2.7" = + self.by-version."through"."2.2.7"; + by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage { + name = "node-through-2.2.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz"; + name = "through-2.2.7.tgz"; + sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; + }) + ]; + buildInputs = + (self.nativeDeps."through" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "through" ]; + }; by-spec."through"."~2.3.4" = self.by-version."through"."2.3.4"; by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage { @@ -14807,6 +16251,26 @@ ]; passthru.names = [ "through2" ]; }; + by-spec."timers-browserify"."~1.0.1" = + self.by-version."timers-browserify"."1.0.1"; + by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-timers-browserify-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.1.tgz"; + name = "timers-browserify-1.0.1.tgz"; + sha1 = "7c93257b543cb1e3003d3663b57d560ee1d27057"; + }) + ]; + buildInputs = + (self.nativeDeps."timers-browserify" or []); + deps = [ + self.by-version."process"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "timers-browserify" ]; + }; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -14893,7 +16357,7 @@ self.by-version."sprintf"."0.1.3" self.by-version."temp"."0.6.0" self.by-version."winston"."0.6.2" - self.by-version."wrench"."1.5.7" + self.by-version."wrench"."1.5.8" ]; peerDependencies = [ ]; @@ -15039,6 +16503,25 @@ ]; passthru.names = [ "truncate" ]; }; + by-spec."tty-browserify"."~0.0.0" = + self.by-version."tty-browserify"."0.0.0"; + by-version."tty-browserify"."0.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-tty-browserify-0.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + name = "tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }) + ]; + buildInputs = + (self.nativeDeps."tty-browserify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tty-browserify" ]; + }; by-spec."tunnel-agent"."~0.2.0" = self.by-version."tunnel-agent"."0.2.0"; by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -15096,6 +16579,26 @@ ]; passthru.names = [ "type-detect" ]; }; + by-spec."type-is"."1.0.0" = + self.by-version."type-is"."1.0.0"; + by-version."type-is"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.0.0.tgz"; + name = "type-is-1.0.0.tgz"; + sha1 = "4ff424e97349a1ee1910b4bfc488595ecdc443fc"; + }) + ]; + buildInputs = + (self.nativeDeps."type-is" or []); + deps = [ + self.by-version."mime"."1.2.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "type-is" ]; + }; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -15115,6 +16618,25 @@ ]; passthru.names = [ "typechecker" ]; }; + by-spec."typedarray"."~0.0.5" = + self.by-version."typedarray"."0.0.5"; + by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-typedarray-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz"; + name = "typedarray-0.0.5.tgz"; + sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664"; + }) + ]; + buildInputs = + (self.nativeDeps."typedarray" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "typedarray" ]; + }; by-spec."uglify-js"."1.2.5" = self.by-version."uglify-js"."1.2.5"; by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { @@ -15149,7 +16671,30 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" + self.by-version."optimist"."0.3.7" + self.by-version."uglify-to-browserify"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "uglify-js" ]; + }; + by-spec."uglify-js"."^2.4.0" = + self.by-version."uglify-js"."2.4.12"; + by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.12"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz"; + name = "uglify-js-2.4.12.tgz"; + sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8"; + }) + ]; + buildInputs = + (self.nativeDeps."uglify-js" or []); + deps = [ + self.by-version."async"."0.2.10" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" self.by-version."uglify-to-browserify"."1.0.2" ]; @@ -15176,7 +16721,7 @@ ]; passthru.names = [ "uglify-js" ]; }; - by-spec."uglify-js"."~2.2.5" = + by-spec."uglify-js"."~2.2" = self.by-version."uglify-js"."2.2.5"; by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-2.2.5"; @@ -15190,13 +16735,15 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = [ - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" ]; peerDependencies = [ ]; passthru.names = [ "uglify-js" ]; }; + by-spec."uglify-js"."~2.2.5" = + self.by-version."uglify-js"."2.2.5"; by-spec."uglify-js"."~2.3" = self.by-version."uglify-js"."2.3.6"; by-version."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage { @@ -15212,7 +16759,7 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" + self.by-version."source-map"."0.1.33" self.by-version."optimist"."0.3.7" ]; peerDependencies = [ @@ -15223,27 +16770,8 @@ self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = self.by-version."uglify-js"."2.4.12"; - by-version."uglify-js"."2.4.12" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.12.tgz"; - name = "uglify-js-2.4.12.tgz"; - sha1 = "2354d9659f85330c1e3e2910f8acd77fe14bb4a8"; - }) - ]; - buildInputs = - (self.nativeDeps."uglify-js" or []); - deps = [ - self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.32" - self.by-version."optimist"."0.3.7" - self.by-version."uglify-to-browserify"."1.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "uglify-js" ]; - }; + by-spec."uglify-js"."~2.4.12" = + self.by-version."uglify-js"."2.4.12"; by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.2"; by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -15301,6 +16829,29 @@ ]; passthru.names = [ "uid2" ]; }; + by-spec."umd"."~2.0.0" = + self.by-version."umd"."2.0.0"; + by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "umd-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz"; + name = "umd-2.0.0.tgz"; + sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f"; + }) + ]; + buildInputs = + (self.nativeDeps."umd" or []); + deps = [ + self.by-version."rfile"."1.0.0" + self.by-version."ruglify"."1.0.0" + self.by-version."through"."2.3.4" + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "umd" ]; + }; by-spec."underscore"."*" = self.by-version."underscore"."1.6.0"; by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage { @@ -15438,14 +16989,14 @@ passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.6.2"; - by-version."ungit"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.6.2"; + self.by-version."ungit"."0.7.1"; + by-version."ungit"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.6.2.tgz"; - name = "ungit-0.6.2.tgz"; - sha1 = "e1a01531bdd987c27bd9890d973c0a8549f1e191"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.7.1.tgz"; + name = "ungit-0.7.1.tgz"; + sha1 = "9b1b768ecd97a66f7b97b5d7a1b36f29682e2bf7"; }) ]; buildInputs = @@ -15454,20 +17005,19 @@ self.by-version."express"."3.4.8" self.by-version."superagent"."0.16.0" self.by-version."lodash"."2.4.1" - self.by-version."temp"."0.6.0" + self.by-version."temp"."0.7.0" self.by-version."socket.io"."0.9.16" self.by-version."moment"."2.5.1" - self.by-version."async"."0.2.9" - self.by-version."ssh2"."0.2.17" + self.by-version."async"."0.2.10" self.by-version."rc"."0.3.4" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" - self.by-version."passport"."0.1.18" + self.by-version."passport"."0.2.0" self.by-version."passport-local"."0.1.6" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" - self.by-version."optimist"."0.6.0" + self.by-version."optimist"."0.6.1" self.by-version."crossroads"."0.12.0" self.by-version."signals"."1.0.0" self.by-version."hasher"."1.2.0" @@ -15478,15 +17028,17 @@ self.by-version."deep-extend"."0.2.8" self.by-version."raven"."0.6.2" self.by-version."knockout"."3.0.0" - self.by-version."npm-registry-client"."0.3.6" + self.by-version."npm-registry-client"."0.4.4" self.by-version."npmconf"."0.1.13" self.by-version."mkdirp"."0.3.5" + self.by-version."less"."1.7.0" + self.by-version."browserify"."3.31.2" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.6.2"; + "ungit" = self.by-version."ungit"."0.7.1"; by-spec."update-notifier"."~0.1.3" = self.by-version."update-notifier"."0.1.7"; by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -15512,6 +17064,27 @@ }; by-spec."update-notifier"."~0.1.7" = self.by-version."update-notifier"."0.1.7"; + by-spec."url"."~0.7.9" = + self.by-version."url"."0.7.9"; + by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage { + name = "node-url-0.7.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz"; + name = "url-0.7.9.tgz"; + sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0"; + }) + ]; + buildInputs = + (self.nativeDeps."url" or []); + deps = [ + self.by-version."querystring"."0.1.0" + self.by-version."punycode"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "url" ]; + }; by-spec."useragent"."~2.0.4" = self.by-version."useragent"."2.0.7"; by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage { @@ -15591,6 +17164,26 @@ ]; passthru.names = [ "util" ]; }; + by-spec."util"."~0.10.1" = + self.by-version."util"."0.10.3"; + by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage { + name = "node-util-0.10.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz"; + name = "util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }) + ]; + buildInputs = + (self.nativeDeps."util" or []); + deps = [ + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "util" ]; + }; by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -15647,6 +17240,25 @@ self.by-version."utile"."0.1.7"; by-spec."utile"."~0.2.1" = self.by-version."utile"."0.2.1"; + by-spec."utils-merge"."1.0.0" = + self.by-version."utils-merge"."1.0.0"; + by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-utils-merge-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + name = "utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }) + ]; + buildInputs = + (self.nativeDeps."utils-merge" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "utils-merge" ]; + }; by-spec."uuid"."1.4.1" = self.by-version."uuid"."1.4.1"; by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { @@ -15809,6 +17421,26 @@ passthru.names = [ "view-helpers" ]; }; "view-helpers" = self.by-version."view-helpers"."0.1.4"; + by-spec."vm-browserify"."~0.0.1" = + self.by-version."vm-browserify"."0.0.4"; + by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-vm-browserify-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; + name = "vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + }) + ]; + buildInputs = + (self.nativeDeps."vm-browserify" or []); + deps = [ + self.by-version."indexof"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "vm-browserify" ]; + }; by-spec."vows".">=0.5.13" = self.by-version."vows"."0.7.0"; by-version."vows"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -15910,14 +17542,14 @@ passthru.names = [ "watch" ]; }; by-spec."wd"."~0.2.8" = - self.by-version."wd"."0.2.10"; - by-version."wd"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.2.10"; + self.by-version."wd"."0.2.11"; + by-version."wd"."0.2.11" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.2.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.2.10.tgz"; - name = "wd-0.2.10.tgz"; - sha1 = "c4ac58eff5f32cc8e79e8f272a4c365c4240a68e"; + url = "http://registry.npmjs.org/wd/-/wd-0.2.11.tgz"; + name = "wd-0.2.11.tgz"; + sha1 = "27889d290facf3d19e050b3c789f2e852ca03f10"; }) ]; buildInputs = @@ -15936,14 +17568,14 @@ passthru.names = [ "wd" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.39.0-0"; - by-version."webdrvr"."2.39.0-0" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.39.0-0"; + self.by-version."webdrvr"."2.40.0"; + by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.40.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.39.0-0.tgz"; - name = "webdrvr-2.39.0-0.tgz"; - sha1 = "07b4867993c2d3e35869269cb8fe096e81571e0f"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz"; + name = "webdrvr-2.40.0.tgz"; + sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42"; }) ]; buildInputs = @@ -15961,7 +17593,7 @@ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.39.0-0"; + "webdrvr" = self.by-version."webdrvr"."2.40.0"; by-spec."websocket-driver".">=0.3.0" = self.by-version."websocket-driver"."0.3.2"; by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage { @@ -16168,6 +17800,26 @@ ]; passthru.names = [ "with" ]; }; + by-spec."with"."~3.0.0" = + self.by-version."with"."3.0.0"; + by-version."with"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-with-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/with/-/with-3.0.0.tgz"; + name = "with-3.0.0.tgz"; + sha1 = "38f5d5859bb974c9dad8812372b51dae4b9594cc"; + }) + ]; + buildInputs = + (self.nativeDeps."with" or []); + deps = [ + self.by-version."uglify-js"."2.4.12" + ]; + peerDependencies = [ + ]; + passthru.names = [ "with" ]; + }; by-spec."wordwrap"."0.0.x" = self.by-version."wordwrap"."0.0.2"; by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -16211,14 +17863,14 @@ passthru.names = [ "wrench" ]; }; by-spec."wrench"."~1.5.0" = - self.by-version."wrench"."1.5.7"; - by-version."wrench"."1.5.7" = lib.makeOverridable self.buildNodePackage { - name = "node-wrench-1.5.7"; + self.by-version."wrench"."1.5.8"; + by-version."wrench"."1.5.8" = lib.makeOverridable self.buildNodePackage { + name = "node-wrench-1.5.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wrench/-/wrench-1.5.7.tgz"; - name = "wrench-1.5.7.tgz"; - sha1 = "95fcbb5a35b748ba8e29d755c9490ba69f033819"; + url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; + name = "wrench-1.5.8.tgz"; + sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; }) ]; buildInputs = @@ -16230,7 +17882,7 @@ passthru.names = [ "wrench" ]; }; by-spec."wrench"."~1.5.4" = - self.by-version."wrench"."1.5.7"; + self.by-version."wrench"."1.5.8"; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { @@ -16518,7 +18170,7 @@ self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."1.3.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -16555,7 +18207,7 @@ self.by-version."underscore.string"."2.3.3" self.by-version."lodash"."2.2.1" self.by-version."mkdirp"."0.3.5" - self.by-version."glob"."3.2.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -16595,7 +18247,7 @@ 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.8" + self.by-version."glob"."3.2.9" self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."2.0.1" self.by-version."dargs"."0.1.0" @@ -16711,4 +18363,26 @@ ]; passthru.names = [ "zlib-browserify" ]; }; + by-spec."zlib-browserify"."^0.0.3" = + self.by-version."zlib-browserify"."0.0.3"; + by-version."zlib-browserify"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-zlib-browserify-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz"; + name = "zlib-browserify-0.0.3.tgz"; + sha1 = "240ccdbfd0203fa842b130deefb1414122c8cc50"; + }) + ]; + buildInputs = + (self.nativeDeps."zlib-browserify" or []); + deps = [ + self.by-version."tape"."0.2.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "zlib-browserify" ]; + }; + by-spec."zlib-browserify"."~0.0.3" = + self.by-version."zlib-browserify"."0.0.3"; } From 8f577c576c6d49a8e8342859cc79c092b5d1f216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Mar 2014 14:23:05 +0100 Subject: [PATCH 391/449] filezilla: use default gnutls instead of vulnerable gnutls2 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index b7c9a76e151f..a8b4cfaf9266 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext +{ stdenv, fetchurl, dbus, gnutls, wxGTK28, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite }: let version = "3.7.3"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite + dbus gnutls wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ]; meta = with stdenv.lib; { From 97d291d040c5e85b88f6c2695123de01de13a5c4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 5 Mar 2014 17:38:22 +0400 Subject: [PATCH 392/449] Remove obsolete comment --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40d7b4728725..d5dcb45da17c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7515,8 +7515,6 @@ let 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 - # connect to jabber.org, for instance.) gnutls = gnutls; libotr = libotr_3_2; }; From 6572708d3914a07a1c58f6162b999925ee3d695e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Mar 2014 15:20:59 +0100 Subject: [PATCH 393/449] Always load the "configs" kernel module We used to have the configuration of the kernel available in a somewhat convenient place (/run/booted-system/kernel-modules/config) but that has disappeared. So instead just make /proc/configs.gz available. It only eats a few kilobytes. --- nixos/modules/system/boot/kernel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 2b075bf6a6d2..327f3b7e1128 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -159,7 +159,7 @@ in boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel; - boot.kernelModules = [ "loop" ]; + boot.kernelModules = [ "loop" "configs" ]; boot.initrd.availableKernelModules = [ # Note: most of these (especially the SATA/PATA modules) From 5605b256a7030c9169248b9e0e65c21d556d2f44 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Mar 2014 15:23:30 +0100 Subject: [PATCH 394/449] nixUnstable: Update to 1.7pre3522_f7e077a --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 33b304eec4c3..7f52950aa366 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.7pre3520_1017bd6"; + name = "nix-1.7pre3522_f7e077a"; src = fetchurl { - url = "http://hydra.nixos.org/build/9253720/download/4/${name}.tar.xz"; - sha256 = "7144ad4b4a7ff77165dc96424366fa28fb1a9e19b4f7c26d123b5f6bccf53d2d"; + url = "http://hydra.nixos.org/build/9342392/download/4/${name}.tar.xz"; + sha256 = "f1fce2cc7bde1a7bd5d8d491153ed805542970768211ebb7b121d9630033afc2"; }; nativeBuildInputs = [ perl pkgconfig ]; From 41c662dcf68ce41c64ceb73a2f21a8aac09eb41e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Mar 2014 15:32:15 +0100 Subject: [PATCH 395/449] yap: update from 6.2.2 to 6.3.3 --- pkgs/development/compilers/yap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index a29c0de65b87..af604792f83e 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, readline, gmp, zlib }: stdenv.mkDerivation rec { - version = "6.2.2"; + version = "6.3.3"; name = "yap-${version}"; src = fetchurl { url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; - sha256 = "0l6p0vy667wws64cvwf74ssl6h9gypjzrsl3b2d32hs422186pzi"; + sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; }; buildInputs = [ readline gmp zlib ]; From a1439ae0c282e1c4e95269605f0be7c45b9772a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Mar 2014 15:32:15 +0100 Subject: [PATCH 396/449] swiProlog: update from 6.6.1 to 6.6.2 --- pkgs/development/compilers/swi-prolog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 61655e1bd1f7..aa027401b4dc 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "6.6.1"; + version = "6.6.2"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "033b7z60jd1907p9idaa3xzbid2aadhqcdwsa2g9c1c7q8fj1gy8"; + sha256 = "1kdnc1r5c4320v5s6axk6w0jnqbkza295hdi9s5kyd8r78v6x6g4"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama From a2f90518a9acc6835e6a7d7bf76a1c4ef4b0f07c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Mar 2014 15:32:15 +0100 Subject: [PATCH 397/449] cppcheck: update from 1.63 to 1.64 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5b2de20e33f4..b3769245bbe8 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.63"; + version = "1.64"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0r10z44qydqxxxlxiggl2nzksd3gkb7bp784dfmpnnr1jd2zqjwj"; + sha256 = "0n2hrg99rsp77b3plpip315pyk0x4gh8gljs9z3iwcbcg14mliff"; }; configurePhase = "makeFlags=PREFIX=$out"; From f1a707fc749407f923f9b1a2ea7b4ea28d47c005 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Mar 2014 15:40:08 +0100 Subject: [PATCH 398/449] sshfsFuse: update from 2.4 to 2.5 --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 4befab17b6fa..98cf3c533ae7 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, fuse }: stdenv.mkDerivation rec { - name = "sshfs-fuse-2.4"; + name = "sshfs-fuse-2.5"; src = fetchurl { url = "mirror://sourceforge/fuse/${name}.tar.gz"; - sha256 = "1ladfxflg0pzd5br0p9n5790sf1975va7igr9z4r702n4a2vm4rw"; + sha256 = "0gp6qr33l2p0964j0kds0dfmvyyf5lpgsn11daf0n5fhwm9185z9"; }; buildInputs = [ pkgconfig glib fuse ]; From c2cd9852acdea18f5ed425b17e2db4307cbb0319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Mar 2014 14:31:16 +0100 Subject: [PATCH 399/449] gnutls on darwin: drop patch that is integrated now --- pkgs/development/libraries/gnutls/3.2.nix | 5 +- ...gnutls_x86_cpuid_s_multi_definitions.patch | 59 ------------------- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index e950e463a9b5..fff05ed87271 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -14,10 +14,7 @@ stdenv.mkDerivation rec { patches = # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch - # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail. - # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db - # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html - ++ stdenv.lib.optional stdenv.isDarwin ./fix_gnutls_x86_cpuid_s_multi_definitions.patch; + ; # Note: GMP is a dependency of Nettle, whose public headers include # GMP headers, hence the hack. diff --git a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch deleted file mode 100644 index 1bc3086faeb2..000000000000 --- a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 54768ca1cd9049bbd1c695696ef3c8595c6052db Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Mon, 10 Feb 2014 10:43:52 +0100 -Subject: [PATCH] do not redefine the _gnutls_x86_cpuid_s symbol - ---- - lib/accelerated/x86/aes-cbc-x86-aesni.c | 2 -- - lib/accelerated/x86/aes-cbc-x86-ssse3.c | 2 -- - lib/accelerated/x86/x86.h | 3 ++- - 3 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c -index 6d4526f..1a2681f 100644 ---- a/lib/accelerated/x86/aes-cbc-x86-aesni.c -+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c -@@ -39,8 +39,6 @@ struct aes_ctx { - int enc; - }; - --unsigned int _gnutls_x86_cpuid_s[4]; -- - static int - aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) - { -diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c -index ff24578..2b2440a 100644 ---- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c -+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c -@@ -39,8 +39,6 @@ struct aes_ctx { - int enc; - }; - --unsigned int _gnutls_x86_cpuid_s[4]; -- - static int - aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) - { -diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h -index ae04d32..03fc8de 100644 ---- a/lib/accelerated/x86/x86.h -+++ b/lib/accelerated/x86/x86.h -@@ -22,6 +22,8 @@ - - #include - -+extern unsigned int _gnutls_x86_cpuid_s[4]; -+ - #if defined(ASM_X86) - - void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx, -@@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void); - (nettle_hash_digest_func *) digest_func \ - } - -- - #endif --- -1.7.1 - From a13200352a15fd35db4cebf90d724230d310809b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Mar 2014 21:22:22 +0100 Subject: [PATCH 400/449] libssh: update, incl. features and CVE-2014-0017 fix Also add pkgconfig to inputs, as it was looked for by cmake. Dependent packages seem to build fine. --- pkgs/development/libraries/libssh/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 0a06452d5d89..c201eda69e61 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cmake, zlib, libgcrypt }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "libssh-0.5.5"; + name = "libssh-0.6.3"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/51/${name}.tar.gz"; - sha256 = "17cfdff4hc0ijzrr15biq29fiabafz0bw621zlkbwbc1zh2hzpy0"; + url = "https://red.libssh.org/attachments/download/87/${name}.tar.xz"; + sha256 = "1jyaj9h1iglvn02hrvcchbx8ycjpj8b91h8mi459k7q5jp2xgd9b"; }; buildInputs = [ zlib libgcrypt ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = "-DWITH_GCRYPT=ON"; From 765e119b33ec9fdd6968f97e45fd1b98ca06fa3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Mar 2014 21:30:55 +0100 Subject: [PATCH 401/449] ffmpeg_2: update 2.1.1 -> .4, fixing CVE-2014-209{7,8,9} --- pkgs/development/libraries/ffmpeg/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index dd29e1e9e6bc..931881fd142d 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "ffmpeg-2.1.1"; + name = "ffmpeg-2.1.4"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy"; + sha256 = "00c1k84amgkc7vk5xkrg7z99q7jbfhbz3qk854cxnc38d2ynrd3z"; }; mp3Support = config.ffmpeg.mp3 or true; From ed4455a00328898845bd50cf2885a0f278684c81 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 6 Mar 2014 08:58:51 +0100 Subject: [PATCH 402/449] Security update: update to warp 2.0.3.3 See https://github.com/yesodweb/wai/issues/231 for details. --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index d3c1bdbd4c7e..f5b0f6835538 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.0.3.2"; - sha256 = "1aapwhgqn693cvdhj4zafyww2xrpjn8wzdgrwxz8k6mq0f2lh599"; + version = "2.0.3.3"; + sha256 = "02wh8jf8pcjb03xxdim9q92vr4jk9jibqqzl8kvccqlqfi5giq0f"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpDate httpTypes liftedBase network networkConduit simpleSendfile From e62bf9119c501fe90b5408ed79bfa8d77ad75f24 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Thu, 6 Mar 2014 10:58:52 +0100 Subject: [PATCH 403/449] Changed virtualenv-clone to use the version from pypi (the author will keep updating it, so I don't need my fork on github anymore) Tried to made the tests run with tox: updating tox (and the dependencies: virtualenv and py) let the installation finish, but its tests still fail --- pkgs/top-level/python-packages.nix | 38 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53b1cff64c3f..15863b2c22a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1790,7 +1790,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { md5 = "90a82400074b50a9e73c3045ed9ac217"; }; - buildInputs = [ virtualenv virtualenv-clone ]; + propagatedBuildInputs = [ virtualenv virtualenv-clone ]; meta = with stdenv.lib; { description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; @@ -4861,11 +4861,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { py = buildPythonPackage rec { - name = "py-1.4.19"; + name = "py-1.4.20"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz"; - md5 = "3857dc8309d5f284669b81184253c2bb"; + md5 = "5f1708be5482f3ff6711dfd6cafd45e0"; }; }; @@ -6997,16 +6997,18 @@ pythonPackages = modules // import ./python-packages-generated.nix { # TODO - # py.error.EACCES: [Permission denied]: mkdir('/homeless-shelter',) - # builder for `/nix/store/0czwg0n3pfkmpjphqv1jxfjlgkbziwsx-python-tox-1.4.3.drv' failed with exit code 1 - # tox = buildPythonPackage rec { - # name = "tox-1.4.3"; + # Installs correctly but fails tests that involve simple things like: + # cmd.run("tox", "-h") + # also, buildPythonPackage needs to supply the tox.ini correctly for projects that use tox for their tests # - # buildInputs = [ py virtualenv ]; + # tox = buildPythonPackage rec { + # name = "tox-1.7.0"; + # + # propagatedBuildInputs = [ py virtualenv ]; # # src = fetchurl { - # url = "https://pypi.python.org/packages/source/t/tox/tox-1.4.3.tar.gz"; - # md5 = "3727d5b0600d92edf2229a7ce6a0f752"; + # url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz"; + # md5 = "5314ceca2b179ad4a9c79f4d817b8a99"; # }; # }; @@ -7221,10 +7223,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.10"; + name = "virtualenv-1.11.4"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "9745c28256c70c76d36adb3767a00212"; + md5 = "9accc2d3f0ec1da479ce2c3d1fdff06e"; }; inherit recursivePthLoader; @@ -7248,12 +7250,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { virtualenv-clone = buildPythonPackage rec { name = "virtualenv-clone-0.2.4"; - - src = fetchgit { - url = "https://github.com/berdario/virtualenv-clone.git"; - rev = ''c302ca84e524cb22f88c834cccb23dd410cced97''; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz"; + md5 = "71168b975eaaa91e65559bcc79290b3b"; }; + buildInputs = [pytest]; + propagatedBuildInputs = [virtualenv]; + + # needs tox to run the tests doCheck = false; meta = with stdenv.lib; { From bd76470d9b7df8a46d2c2a3820c4c4d3a4a4385e Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 6 Mar 2014 11:31:29 +0100 Subject: [PATCH 404/449] opensmtpd: Update to 5.4.2p1 --- pkgs/servers/mail/opensmtpd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 3d7a32a00c9b..522d0b60f00c 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "201402281146p1"; + version = "5.4.2p1"; buildInputs = [ libevent zlib openssl db bison pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "0q287lx6pcz1bz6b334fb977dpbcg4rpyli3zrxj27wql4x0dg6b"; + sha256 = "18nrzfjhv9znb5dbhc5k3fi31a3vr1r8j36q3fzghkh47n6z9yjg"; }; configureFlags = [ @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { "--with-sock-dir=/run" "--with-privsep-user=smtpd" "--with-queue-user=smtpq" + "--with-ca-file=/etc/ssl/certs/ca-bundle.crt" ]; meta = { From 322b7124a8768979dce9cb78245c39561746e389 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Thu, 6 Mar 2014 11:54:02 +0100 Subject: [PATCH 405/449] Allow ntpq locally --- nixos/modules/services/networking/ntpd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index cdab789cd289..3d388cb10648 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -17,6 +17,8 @@ let restrict default kod nomodify notrap nopeer noquery restrict -6 default kod nomodify notrap nopeer noquery + restrict 127.0.0.1 + restrict -6 ::1 ${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)} ''; From ec407aaa86446fecd183da002fe6761c4e80a9f7 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 6 Mar 2014 15:15:44 +0100 Subject: [PATCH 406/449] dd_rescue: 1.22 -> 1.42.1 --- pkgs/tools/system/dd_rescue/default.nix | 74 ++++++++----------------- 1 file changed, 24 insertions(+), 50 deletions(-) diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 57f9a1a57d51..9c7f04134210 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,63 +1,37 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, autoconf }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="dd_rescue"; - version="1.22"; - name="${baseName}-${version}"; +stdenv.mkDerivation rec { + name = "dd_rescue-1.42.1"; + + src = fetchurl { + sha256 = "0g2d292m1cnp8syy19hh5jvly3zy7lcvcj563wgjnf20ppm2diaq"; url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; - hash="0n0vs4cn5csdcsmlndg3z36ws68zlckj17zrbm6wynrbs8iirclp"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - dd_rhelp_src = a.fetchurl { - url = "http://www.kalysto.org/pkg/dd_rhelp-0.1.2.tar.gz"; - sha256 = "0fhzkflg1ygiaj5ha0bf594d76vlgjsfwlpcmwrbady9frxvlkvv"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + dd_rhelp_src = fetchurl { + url = "http://www.kalysto.org/pkg/dd_rhelp-0.3.0.tar.gz"; + sha256 = "0br6fs23ybmic3i5s1w4k4l8c2ph85ax94gfp2lzjpxbvl73cz1g"; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["doMakeInstall" "install_dd_rhelp" "fixPaths"]; - makeFlags=[ - ''prefix="$out"'' - ''DESTDIR="$out"'' - ''INSTASROOT='' - ]; + buildInputs = [ autoconf ]; - fixPaths = a.doPatchShebangs ''$out/bin''; + preBuild = '' + substituteInPlace Makefile \ + --replace "\$(DESTDIR)/usr" "$out" \ + --replace "-o root" "" \ + --replace "-g root" "" + ''; + makeFlags = [ "LIBDIR=$out" ]; - install_dd_rhelp = a.fullDepEntry ('' + postInstall = '' mkdir -p "$out/share/dd_rescue" "$out/bin" tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" - '') ["minInit" "defEnsureDir"]; + ''; - meta = { + meta = with stdenv.lib; { description = "A tool to copy data from a damaged block device"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = with maintainers; [ raskin iElectric ]; + platforms = with platforms; linux; }; - passthru = { - updateInfo = { - downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/"; - }; - }; -}) x - +} From 7d68a626a4dee1872b33d585ddd0e147a0498259 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 6 Mar 2014 15:22:37 +0100 Subject: [PATCH 407/449] ddrescue: 1.16 -> 1.17 --- pkgs/tools/system/ddrescue/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 9afad675bb91..d2ace27b1fd6 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lzip }: stdenv.mkDerivation rec { - name = "ddrescue-1.16"; + name = "ddrescue-1.17"; src = fetchurl { - url = "mirror://gnu/ddrescue/${name}.tar.gz"; - sha256 = "1rixya7p8c4jrn4p0flf6h5dqwybrilf3hrj4r7x41h3zgjz5cvn"; + url = "mirror://gnu/ddrescue/${name}.tar.lz"; + sha256 = "0bvmsbzli2j4czwkabzs978n1y6vx31axh02kpgcf7033cc6rydy"; }; + buildInputs = [ lzip ]; + doCheck = true; meta = { @@ -41,6 +43,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; }; } From d1cc2c6c37ecb9eabaa951e195960cd14ddc3a9e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 6 Mar 2014 16:58:23 +0100 Subject: [PATCH 408/449] Add nvidiabl kernel module --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5dcb45da17c..02378b7cb19b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6851,6 +6851,8 @@ let broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; From 4120720823af3a4f977eccc14a9ac2769be2c2ed Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 6 Mar 2014 18:49:36 +0100 Subject: [PATCH 409/449] xlrd: Add python package --- pkgs/top-level/python-packages-generated.nix | 21 ++++++++++++++++++++ pkgs/top-level/python-packages.json | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index e7308e2b8164..29a9bc91a1ea 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -5349,5 +5349,26 @@ in }; + "xlrd" = self."xlrd-0.9.2"; + + "xlrd-0.9.2" = self.buildPythonPackage { + name = "xlrd-0.9.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.2.tar.gz"; + md5 = "91a81ee76233e9f3115acaaa1b251b0e"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Library for developers to extract data from Microsoft Excel (tm) spreadsheet files + ''; + homepage = "http://www.python-excel.org/"; + license = "BSD"; + }; + }; + } diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index aefd911a5583..b5b7afab85b1 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -134,6 +134,8 @@ { "name": "psycopg2", "buildInputs": [ "pkgs.postgresql" ], "doCheck": false + }, + { "name": "xlrd", + "doCheck": false } - ] From be58c4f9e484d054311ac062727c95690d24874b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 6 Mar 2014 21:21:03 +0100 Subject: [PATCH 410/449] mupdf: fix CVE-2014-2013 by upstream patch --- pkgs/applications/misc/mupdf/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 17b86910de07..57ac7da9b78b 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b"; }; + patches = [(fetchurl { + name = "CVE-2014-2013.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;" + + "h=60dabde18d7fe12b19da8b509bdfee9cc886aafc"; + sha256 = "1walj3wir9x50i6lph33bx14c8593r9xrn08gkd3v7r6d15lmjps"; + })]; + buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; enableParallelBuilding = true; From 29a906b2d83cf6e7bb5fcacdfe6499415d4a7fd0 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 7 Mar 2014 13:28:19 +0100 Subject: [PATCH 411/449] dfu-programmer: New package. --- .../tools/misc/dfu-programmer/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/misc/dfu-programmer/default.nix diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix new file mode 100644 index 000000000000..93dceb60f8d9 --- /dev/null +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libusb1 }: +let + version = "0.6.2"; +in +stdenv.mkDerivation rec { + name="dfu-programmer-${version}"; + + buildInputs = [ libusb1 ]; + + src = fetchurl { + url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; + sha256 = "0rdg4h5alpa3py3v3xgvn2vcgmnbj077am90jqj83nad89m9c801"; + }; + + preConfigure = '' + substituteInPlace configure \ + --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" + ''; + + meta = with stdenv.lib; { + license = licenses.gpl2; + description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader."; + homepage = http://dfu-programmer.sourceforge.net/; + maintainers = [ maintainers.the-kenny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4769d4170f0c..821878cf3863 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3547,6 +3547,8 @@ let inherit (gnome3) gnome_icon_theme; }; + dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; + ddd = callPackage ../development/tools/misc/ddd { }; distcc = callPackage ../development/tools/misc/distcc { }; From be649496884f1a9242b3989f365d73c16eabfeba Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 7 Mar 2014 13:32:10 +0100 Subject: [PATCH 412/449] leiningen: Hardcode path to java. ...by setting JAVA_CMD in the wrapper. --- pkgs/development/tools/build-managers/leiningen/builder.sh | 3 ++- pkgs/development/tools/build-managers/leiningen/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index e1dd9d5a7868..c28854ca0896 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -20,4 +20,5 @@ patchShebangs $out wrapProgram $out_bin \ --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \ - --set LEIN_GPG ${gnupg}/bin/gpg + --set LEIN_GPG ${gnupg}/bin/gpg \ + --set JAVA_CMD ${jdk}/bin/java diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 2c039b3fa0c2..ff21e518936c 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = ./lein_2.3.0.patch; - inherit rlwrap clojure gnupg findutils coreutils; + inherit rlwrap clojure gnupg findutils coreutils jdk; builder = ./builder.sh; From fedd018d937f638494c48a9d7cae7d80842d134d Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 7 Mar 2014 14:33:59 +0100 Subject: [PATCH 413/449] fix pypy and pypyPackages --- pkgs/development/interpreters/pypy/2.2/default.nix | 4 ++-- pkgs/development/python-modules/generic/wrap.sh | 4 ++-- pkgs/development/python-modules/setuptools/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix index 231a0a7dfaa5..2fee7bc74df7 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.2.1"; - version = "${majorVersion}"; + majorVersion = "2.2"; + version = "${majorVersion}.1"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index a7c839799b1f..bd1f526900a5 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -5,7 +5,7 @@ wrapPythonPrograms() { wrapPythonProgramsIn() { local dir="$1" local pythonPath="$2" - local python="$(type -p python)" + local python="@executable@" local i declare -A pythonPathsSeen=() @@ -22,7 +22,7 @@ wrapPythonProgramsIn() { sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" fi - if head -n1 "$i" | grep -q /python; then + if head -n1 "$i" | grep -q /@executable_name@; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 35630be22553..e33c815d23bc 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst PYTHONPATH="$dst:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install --prefix=$out + ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages wrapPythonPrograms ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cbfbe1b3f8c..544ae1694b90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28,6 +28,8 @@ pythonPackages = modules // import ./python-packages-generated.nix { wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; + substitutions.executable_name = python.executable; + substitutions.executable = "${python}/bin/${python.executable}"; } ../development/python-modules/generic/wrap.sh; From 9fab4366bf33d1b7bafd2372bc692cddefef4c6d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 7 Mar 2014 07:23:17 -0600 Subject: [PATCH 414/449] Add ttuegel to maintainers list --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7bef639ca7c7..6feafbcd3b11 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -69,6 +69,7 @@ the-kenny = "Moritz Ulrich "; thoughtpolice = "Austin Seipp "; tomberek = "Thomas Bereknyei "; + ttuegel = "Thomas Tuegel "; urkud = "Yury G. Kudryashov "; vcunat = "Vladimír Čunát "; viric = "Lluís Batlle i Rossell "; From 1b3360a28f04b239615b74be79ceed90bc22c9a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 25 Feb 2014 10:37:32 -0600 Subject: [PATCH 415/449] Add biber-1.8 and dependencies --- pkgs/tools/typesetting/biber/default.nix | 40 +++++ pkgs/top-level/all-packages.nix | 9 ++ pkgs/top-level/perl-packages.nix | 195 +++++++++++++++++++++++ 3 files changed, 244 insertions(+) create mode 100644 pkgs/tools/typesetting/biber/default.nix diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix new file mode 100644 index 000000000000..1769a59520ba --- /dev/null +++ b/pkgs/tools/typesetting/biber/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, buildPerlPackage, autovivification, BusinessISBN +, BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple +, EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder +, FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils +, ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate +, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }: + +let + version = "1.8"; + pn = "biblatex-biber"; +in +buildPerlPackage { + name = "biber-${version}"; + src = fetchurl { + url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz"; + sha256 = "0ffry64pdvg5g487r7qab5b3cs4kq8rq8n3bymxrr1qh3mp79k4n"; + }; + + buildInputs = [ + autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf + DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + ]; + preConfigure = "touch Makefile.PL"; + buildPhase = "perl Build.PL --prefix=$out; ./Build build"; + checkPhase = "./Build test"; + installPhase = "./Build install"; + + # Tests seem to be broken + doCheck = false; + + meta = { + description = "Backend for BibLaTeX"; + license = "perl"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 959afdd79323..b8ceaee7ae73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -616,6 +616,15 @@ let bgs = callPackage ../tools/X11/bgs { }; + biber = callPackage ../tools/typesetting/biber { + inherit (perlPackages) + autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf + DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K + ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils + ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX + UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter; + }; + bibtextools = callPackage ../tools/typesetting/bibtex-tools { inherit (strategoPackages016) strategoxt sdf; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 902d28c685fc..c463fb9f83b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -304,6 +304,19 @@ let self = _self // overrides; _self = with self; { }; }; + autovivification = buildPerlPackage { + name = "autovivification-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.12.tar.gz; + sha256 = "6ef8686766c63571389880e5d87a0ca1d46f7d127982e8ef38aca7568c44840c"; + }; + meta = { + homepage = http://search.cpan.org/dist/autovivification/; + description = "Lexically disable autovivification"; + license = "perl"; + }; + }; + BerkeleyDB = import ../development/perl-modules/BerkeleyDB { inherit buildPerlPackage fetchurl; inherit (pkgs) db; @@ -385,6 +398,56 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; }; + BusinessISBN = buildPerlPackage { + name = "Business-ISBN-2.07"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-2.07.tar.gz; + sha256 = "4c11279580872bf3cc7176bb75c25b165d4b59a2828fc43d9a355cec3d0a45ff"; + }; + propagatedBuildInputs = [ BusinessISBNData URI ]; + meta = { + description = "Parse and validate ISBNs"; + license = "perl"; + }; + }; + + BusinessISBNData = buildPerlPackage { + name = "Business-ISBN-Data-20120719.001"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20120719.001.tar.gz; + sha256 = "745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3"; + }; + meta = { + description = "Data pack for Business::ISBN"; + license = "perl"; + }; + }; + + BusinessISMN = buildPerlPackage { + name = "Business-ISMN-1.11"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.11.tar.gz; + sha256 = "76d5240a5672c7a8b1ba9e9ea8238a5c8882139911acbb67b7059b5ee3da342d"; + }; + propagatedBuildInputs = [ TieCycle ]; + meta = { + description = "Work with International Standard Music Numbers"; + license = "perl"; + }; + }; + + BusinessISSN = buildPerlPackage { + name = "Business-ISSN-0.91"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-0.91.tar.gz; + sha256 = "f15b192c0f547bb2967811072b3d343b94bc5ea58d02704c19122f7ae0a9d6b5"; + }; + meta = { + description = "Work with International Standard Serial Numbers"; + license = "perl"; + }; + }; + CacheCache = buildPerlPackage rec { name = "Cache-Cache-1.06"; src = fetchurl { @@ -1935,6 +1998,17 @@ let self = _self // overrides; _self = with self; { }; }; + DateSimple = buildPerlPackage { + name = "Date-Simple-3.03"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz; + sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; + }; + meta = { + license = "unknown"; + }; + }; + DateTime = buildPerlModule { name = "DateTime-1.07"; src = fetchurl { @@ -2996,6 +3070,40 @@ let self = _self // overrides; _self = with self; { }; }; + EncodeEUCJPASCII = buildPerlPackage { + name = "Encode-EUCJPASCII-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz; + sha256 = "f998d34d55fd9c82cf910786a0448d1edfa60bf68e2c2306724ca67c629de861"; + }; + meta = { + description = "EucJP-ascii - An eucJP-open mapping"; + license = "perl"; + }; + }; + + EncodeHanExtra = buildPerlPackage { + name = "Encode-HanExtra-0.23"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz; + sha256 = "1fd4b06cada70858003af153f94c863b3b95f2e3d03ba18d0451a81d51db443a"; + }; + meta = { + description = "Extra sets of Chinese encodings"; + license = "mit"; + }; + }; + + EncodeJIS2K = buildPerlPackage { + name = "Encode-JIS2K-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz; + sha256 = "5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf"; + }; + meta = { + }; + }; + EncodeLocale = buildPerlPackage rec { name = "Encode-Locale-1.03"; src = fetchurl { @@ -5027,6 +5135,18 @@ let self = _self // overrides; _self = with self; { }; }; + MIMECharset = buildPerlPackage { + name = "MIME-Charset-1.011.1"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.011.1.tar.gz; + sha256 = "2955a3b617fe12654efc2a13ae1dc7d32aad81d35cfae21f74337213cf2435d5"; + }; + meta = { + description = "Charset Information for MIME"; + license = "perl"; + }; + }; + mimeConstruct = buildPerlPackage rec { name = "mime-construct-1.11"; src = fetchurl { @@ -5138,6 +5258,19 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleInfo = buildPerlPackage rec { + name = "Module-Info-0.35"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBARBON/Module-Info-0.35.tar.gz"; + sha256 = "0r7vxg1iy3lam0jgb2sk8ghgpmp3x5fskvzqlgkb09bssq83s1xb"; + }; + buildInputs = [ TestPod TestPodCoverage ]; + meta = { + description = "Information about Perl modules"; + license = "perl"; + }; + }; + ModuleInstall = buildPerlPackage { name = "Module-Install-1.06"; src = fetchurl { @@ -5901,6 +6034,18 @@ let self = _self // overrides; _self = with self; { doCheck = false; # check can't find its own Mouse::Tiny module }; + MozillaCA = buildPerlPackage { + name = "Mozilla-CA-20130114"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20130114.tar.gz; + sha256 = "82342614add1dbca8a00daa1ee55af3e0036245aed7d445537918c045008ccd7"; + }; + meta = { + description = "Mozilla's CA cert bundle in PEM format"; + license = "unknown"; + }; + }; + MROCompat = buildPerlPackage { name = "MRO-Compat-0.12"; src = fetchurl { @@ -8885,6 +9030,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelStackTrace Moose ]; }; + TieCycle = buildPerlPackage { + name = "Tie-Cycle-1.19"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.19.tar.gz; + sha256 = "bd315874c85feaf8948eeb2f40fe2768a6ca00f089e35b32bfe88f3f384f9ca1"; + }; + meta = { + description = "Cycle through a list of values via a scalar"; + license = "perl"; + }; + }; + TieIxHash = buildPerlPackage { name = "Tie-IxHash-1.22"; src = fetchurl { @@ -9037,6 +9194,18 @@ let self = _self // overrides; _self = with self; { }; }; + UnicodeCollate = buildPerlPackage { + name = "Unicode-Collate-1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Collate-1.04.tar.gz; + sha256 = "4e3a2300b961d3aaf3789cdbfb95601edaaffb4109ed6cdb912a664d5c7bd706"; + }; + meta = { + description = "Unicode Collation Algorithm"; + license = "perl"; + }; + }; + UnicodeICUCollator = buildPerlPackage { name = "Unicode-ICU-Collator-0.002"; src = fetchurl { @@ -9052,6 +9221,19 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.icu ]; }; + UnicodeLineBreak = buildPerlPackage { + name = "Unicode-LineBreak-2013.11"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2013.11.tar.gz; + sha256 = "8946b883ae687ff652e93d6185e23a936c7f337f2e115851fdfed72e1f73c7f9"; + }; + propagatedBuildInputs = [ MIMECharset ]; + meta = { + description = "UAX #14 Unicode Line Breaking Algorithm"; + license = "perl"; + }; + }; + UnixGetrusage = buildPerlPackage { name = "Unix-Getrusage-0.03"; src = fetchurl { @@ -9264,6 +9446,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ XMLSAX ]; }; + XMLLibXMLSimple = buildPerlPackage { + name = "XML-LibXML-Simple-0.93"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.93.tar.gz; + sha256 = "f2eb1c1523d6414cf2a646a289b0325b489954382c862928d165a03a7cce767c"; + }; + propagatedBuildInputs = [ FileSlurp XMLLibXML ]; + meta = { + description = "XML::LibXML based XML::Simple clone"; + license = "perl"; + }; + }; + XMLLibXSLT = buildPerlPackage rec { name = "XML-LibXSLT-1.87"; src = fetchurl { From 45ee89222921250ac7330bb279e1c317cef4f6f3 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 7 Mar 2014 14:55:44 +0100 Subject: [PATCH 416/449] #1728: Build doxygen without checking for qt4 (fails on darwin) --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8ceaee7ae73..61738a744063 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3592,9 +3592,11 @@ let inherit python pil makeWrapper; }; - doxygen = lowPrio (doxygen_gui.override { qt4 = null; }); + doxygen = callPackage ../development/tools/documentation/doxygen { + qt4 = null; + }; - doxygen_gui = callPackage ../development/tools/documentation/doxygen { }; + doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); drush = callPackage ../development/tools/misc/drush { }; From ce2ac1f8a980df546b62a4fab34a3266bdd5d946 Mon Sep 17 00:00:00 2001 From: Matthew Sackman Date: Wed, 26 Feb 2014 18:28:36 +0000 Subject: [PATCH 417/449] erl_call should be in bin. erl_call is very useful and other distributions make erl_call available on PATH. --- pkgs/development/interpreters/erlang/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix index 9562a0dc4522..077eaa9093b0 100644 --- a/pkgs/development/interpreters/erlang/default.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { configureFlags = "--with-ssl=${openssl}"; + postInstall = '' + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" From 9906b7da34daec682f20bad6eff04b192af07950 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 28 Dec 2013 21:16:41 -0600 Subject: [PATCH 418/449] Add vobsub2srt-git-20140226-b70b6f5 --- pkgs/tools/cd-dvd/vobsub2srt/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/cd-dvd/vobsub2srt/default.nix diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix new file mode 100644 index 000000000000..b0918bfb4214 --- /dev/null +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, libtiff, pkgconfig, tesseract }: + +let rev = "b70b6f584e8151f70f9d90df054af0911ea7475e"; + shortRev = builtins.substring 0 7 rev; +in +stdenv.mkDerivation { + name = "vobsub2srt-git-20140226-${shortRev}"; + + src = fetchgit { + inherit rev; + url = https://github.com/ruediger/VobSub2SRT.git; + sha256 = "15437eba07e674cec66bc54cfa42ffe8b05816975401c9950bf9016e3881cd6a"; + }; + + buildInputs = [ cmake libtiff pkgconfig ]; + propagatedBuildInputs = [ tesseract ]; + + meta = { + homepage = https://github.com/ruediger/VobSub2SRT; + description = "Converts VobSub subtitles into SRT subtitles"; + license = stdenv.lib.libraries.gpl3Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61738a744063..bd1624c616c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2069,6 +2069,8 @@ let vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; + vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; + vorbisgain = callPackage ../tools/misc/vorbisgain { }; vpnc = callPackage ../tools/networking/vpnc { }; From 1d52f7bd68c8bb6e02cd97759b4838b9912d618f Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Fri, 7 Mar 2014 21:59:51 +0800 Subject: [PATCH 419/449] praat: update from 5323 to 5365 --- pkgs/applications/audio/praat/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index f2f196acdd85..0c89f92edb5c 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchurl, alsaLib, gtk, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }: stdenv.mkDerivation { - name = "praat-5323"; + name = "praat-5365"; + src = fetchurl { - url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz; - sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203"; + url = http://www.fon.hum.uva.nl/praat/praat5365_sources.tar.gz; + sha256 = "1w3mcq0mipx88i7ckhvzhmdj0p67nhppnn7kbkp21d01yyyz5rgq"; }; configurePhase = '' - cp makefiles/makefile.defs.linux makefile.defs + cp makefiles/makefile.defs.linux.alsa makefile.defs ''; installPhase = '' From 08fb4d6bc49c961f5f13a6e16f8a0c2757dabb9a Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Fri, 7 Mar 2014 22:01:13 +0800 Subject: [PATCH 420/449] praat: set meta.platforms to linux --- pkgs/applications/audio/praat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 0c89f92edb5c..b8a283125fc4 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { description = "Doing phonetics by computer"; homepage = http://www.fon.hum.uva.nl/praat/; license = "GPLv2+"; # Has some 3rd-party code in it though + platforms = stdenv.lib.platforms.linux; }; } From eb6a290f5ea52b1037569f8aa0bd2f9dbfa894d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 7 Mar 2014 15:12:27 +0100 Subject: [PATCH 421/449] bittorrentSync: 1.2.82 -> 1.2.91 --- .../networking/bittorrentsync/default.nix | 6 +- pkgs/development/libraries/gnutls/2.12.nix | 64 ------------------- 2 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 pkgs/development/libraries/gnutls/2.12.nix diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index 895ebd7911be..c6277da704e1 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -14,9 +14,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - version = "1.2.82"; - sha256 = if stdenv.system == "x86_64-linux" then "0cqrscav57xwz7rag6wy06xw6z7ca97xailprgg6jdjv4pnc91ra" - else if stdenv.system == "i686-linux" then "1b9rnfk0wkhj1zybvfqwgd9dcqnxwdnp7m0vf6lhrgi75cydj7is" + version = "1.2.91"; + sha256 = if stdenv.system == "x86_64-linux" then "1rx5mmk3ffkh6dbm0m33nyx6spsxqjw9djclcf9x9bs3zfyzgmnd" + else if stdenv.system == "i686-linux" then "1566mp01149gsb57dv87420w1vq2f3adp6g1c90xdxjxzd67yqpw" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix deleted file mode 100644 index 4a1332a7f155..000000000000 --- a/pkgs/development/libraries/gnutls/2.12.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile, pkgconfig, perl }: - -assert guileBindings -> guile != null; - -stdenv.mkDerivation rec { - - name = "gnutls-2.12.23"; - - src = fetchurl { # missing on standard mirrors - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/${name}.tar.bz2"; - sha256 = "1lkys703z4yxfgzarmgas5ccvn6m254w9wvm7s8v0zkj81z7m9nz"; - }; - - patches = [(fetchurl { - url = "http://anonscm.debian.org/viewvc/pkg-gnutls/packages/gnutls26/trunk/" - + "debian/patches/21_sanitycheck.diff?revision=1777&view=co"; - sha256 = "0k18a7q6irmgjzp647bd18zccjpsr82n2s9arpamnkakgnny4ks9"; - name = "CVE-2013-2116.patch"; - })]; - - configurePhase = '' - patchShebangs . - - ./configure --prefix="$out" \ - --disable-dependency-tracking --enable-fast-install \ - --with-lzo --with-libtasn1-prefix="${libtasn1}" \ - --without-p11-kit \ - ${if guileBindings - then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""} - ''; - - buildInputs = [ zlib lzo libtasn1 pkgconfig perl ] - ++ stdenv.lib.optional guileBindings guile; - - propagatedBuildInputs = [ nettle ]; - - doCheck = true; - - meta = { - description = "The GNU Transport Layer Security Library"; - - longDescription = '' - GnuTLS is a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. Currently the GnuTLS library implements the proposed - standards by the IETF's TLS working group. - - Quoting from the TLS protocol specification: - - "The TLS protocol provides communications privacy over the - Internet. The protocol allows client/server applications to - communicate in a way that is designed to prevent eavesdropping, - tampering, or message forgery." - ''; - - homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; - - maintainers = [ ]; - broken = true; # CVE-2014-0092 - }; -} From 24cf6afa05d6b6d3a207a928e4baa7588708ca8f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 23 Feb 2014 22:10:14 -0600 Subject: [PATCH 422/449] nixos: add Tarsnap backup service module Signed-off-by: Austin Seipp --- nixos/modules/module-list.nix | 3 +- nixos/modules/services/backup/tarsnap.nix | 200 ++++++++++++++++++++++ 2 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/backup/tarsnap.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 76620f1d02ae..94c1667d39da 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -78,8 +78,9 @@ ./services/backup/bacula.nix ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix - ./services/backup/sitecopy-backup.nix ./services/backup/rsnapshot.nix + ./services/backup/sitecopy-backup.nix + ./services/backup/tarsnap.nix ./services/databases/4store-endpoint.nix ./services/databases/4store.nix ./services/databases/couchdb.nix diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix new file mode 100644 index 000000000000..3395a0b52630 --- /dev/null +++ b/nixos/modules/services/backup/tarsnap.nix @@ -0,0 +1,200 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + cfg = config.services.tarsnap; + + optionalNullStr = e: v: if e == null then "" else v; + + configFile = pkgs.writeText "tarsnap.conf" '' + cachedir ${cfg.cachedir} + keyfile ${cfg.keyfile} + ${optionalString cfg.nodump "nodump"} + ${optionalString cfg.printStats "print-stats"} + ${optionalNullStr cfg.checkpointBytes "checkpoint-bytes "+cfg.checkpointBytes} + ${optionalString cfg.aggressiveNetworking "aggressive-networking"} + ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)} + ${concatStringsSep "\n" (map (v: "include "+v) cfg.includes)} + ${optionalString cfg.lowmem "lowmem"} + ${optionalString cfg.verylowmem "verylowmem"} + ''; +in +{ + options = { + services.tarsnap = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, NixOS will periodically create backups of the + specified directories using the tarsnap + backup service. This installs a systemd + service called tarsnap-backup which is + periodically run by cron, or you may run it on-demand. + ''; + }; + + label = mkOption { + type = types.str; + default = "nixos"; + description = '' + Specifies the label for archives created by Tarsnap. The + full name will be + label-$(date+"%Y%m%d%H%M%S"). For + example, by default your backups will look similar to + nixos-20140301021501. + ''; + }; + + cachedir = mkOption { + type = types.path; + default = "/var/cache/tarsnap"; + description = '' + Tarsnap operations use a "cache directory" which allows + Tarsnap to identify which blocks of data have been + previously stored; this directory is specified via the + cachedir option. If the cache directory + is lost or out of date, tarsnap creation/deletion operations + will exit with an error message instructing you to run + tarsnap --fsck to regenerate the cache + directory. + ''; + }; + + keyfile = mkOption { + type = types.path; + default = "/root/tarsnap.key"; + description = '' + Path to the keyfile which identifies the machine associated + with your Tarsnap account. This file can be created using + the tarsnap-keygen utility, and providing + your Tarsnap login credentials. + ''; + }; + + nodump = mkOption { + type = types.bool; + default = true; + description = '' + If set to true, then don't archive files + which have the nodump flag set. + ''; + }; + + printStats = mkOption { + type = types.bool; + default = true; + description = "Print statistics when creating archives."; + }; + + checkpointBytes = mkOption { + type = types.nullOr types.str; + default = "1G"; + description = '' + Create a checkpoint per a particular amount of uploaded + data. By default, Tarsnap will create checkpoints once per + GB of data uploaded. At minimum, + checkpointBytes must be 1GB. + + Can also be set to null to disable + checkpointing. + ''; + }; + + period = mkOption { + type = types.str; + default = "15 01 * * *"; + description = '' + This option defines (in the format used by cron) when + tarsnap is run for backups. The default is to update at + 01:15 at night every day. + ''; + }; + + aggressiveNetworking = mkOption { + type = types.bool; + default = false; + description = '' + Aggressive network behaviour: Use multiple TCP connections + when writing archives. Use of this option is recommended + only in cases where TCP congestion control is known to be + the limiting factor in upload performance. + ''; + }; + + directories = mkOption { + type = types.listOf types.path; + default = []; + description = "List of filesystem paths to archive."; + }; + + excludes = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Exclude files and directories matching the specified patterns. + ''; + }; + + includes = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Include only files and directories matching the specified patterns. + + Note that exclusions specified via + excludes take precedence over inclusions. + ''; + }; + + lowmem = mkOption { + type = types.bool; + default = false; + description = '' + Attempt to reduce tarsnap memory consumption. This option + will slow down the process of creating archives, but may + help on systems where the average size of files being backed + up is less than 1 MB. + ''; + }; + + verylowmem = mkOption { + type = types.bool; + default = false; + description = '' + Try even harder to reduce tarsnap memory consumption. This + can significantly slow down tarsnap, but reduces its memory + usage by an additional factor of 2 beyond what the + lowmem option does. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.directories != []; + message = "Must specify directories for Tarsnap to back up"; + } + { assertion = cfg.lowmem -> !cfg.verylowmem && (cfg.verylowmem -> !cfg.lowmem); + message = "You cannot set both lowmem and verylowmem"; + } + ]; + + systemd.services.tarsnap-backup = { + description = "Tarsnap Backup process"; + path = [ pkgs.tarsnap pkgs.coreutils ]; + script = '' + mkdir -p -m 0755 $(dirname ${cfg.cachedir}) + mkdir -p -m 0600 ${cfg.cachedir} + exec tarsnap --configfile ${configFile} -c -f ${cfg.label}-$(date +"%Y%m%d%H%M%S") ${concatStringsSep " " cfg.directories} + ''; + }; + + services.cron.systemCronJobs = optional cfg.enable + "${cfg.period} root ${config.systemd.package}/bin/systemctl start tarsnap-backup.service"; + + environment.systemPackages = [ pkgs.tarsnap ]; + }; +} From 10787951ab332f97746bf69750c78ee6b2312027 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 7 Mar 2014 15:37:02 +0100 Subject: [PATCH 423/449] tarsnap: mention getting started page --- nixos/modules/services/backup/tarsnap.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 3395a0b52630..03fbd29a191d 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -32,6 +32,9 @@ in backup service. This installs a systemd service called tarsnap-backup which is periodically run by cron, or you may run it on-demand. + + See Getting Started + Tarsnap page. ''; }; From 8de3d9976cae09eaf45196d17ec02ff82927e47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 7 Mar 2014 16:02:29 +0100 Subject: [PATCH 424/449] Revert "Add nvidiabl kernel module" This reverts commit d1cc2c6c37ecb9eabaa951e195960cd14ddc3a9e. --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd1624c616c9..1715544711cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6880,8 +6880,6 @@ let broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; - nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; From 7047235acbff9ed298c1cd1b3753c5dec01b7336 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 7 Mar 2014 16:08:38 +0100 Subject: [PATCH 425/449] Now properly add nvidiabl. --- pkgs/os-specific/linux/nvidiabl/default.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/linux/nvidiabl/default.nix diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix new file mode 100644 index 000000000000..6260134bf111 --- /dev/null +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, kernel }: + +stdenv.mkDerivation { + name = "nvidiabl-0.85-${kernel.version}"; + + src = fetchurl { + url = "https://github.com/guillaumezin/nvidiabl/archive/v0.85.tar.gz"; + sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj"; + }; + + preConfigure = '' + sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile + ''; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "DESTDIR=$(out)" + ]; + + meta = { + description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU"; + homepage = https://github.com/guillaumezin/nvidiabl; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1715544711cf..bd1624c616c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6880,6 +6880,8 @@ let broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; From 1dd36bc23fed1deb7fa3a066565a6d192804f4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 7 Mar 2014 16:16:07 +0100 Subject: [PATCH 426/449] remove gnutls2 leftovers --- pkgs/top-level/all-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd1624c616c9..6ef01129bf67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4383,10 +4383,6 @@ let gnutls = gnutls32; - gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { - guileBindings = config.gnutls.guile or false; - }; - gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix { guileBindings = config.gnutls.guile or false; }; @@ -4396,7 +4392,6 @@ let }; gnutls_with_guile = lowPrio (gnutls.override { guileBindings = true; }); - gnutls2_with_guile = lowPrio (gnutls2.override { guileBindings = true; }); gpac = callPackage ../applications/video/gpac { }; From eb8cf5427e4e7d4fa6c4be1ac79581e14712b74c Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Fri, 7 Mar 2014 16:43:01 +0100 Subject: [PATCH 427/449] Avoid using a global implicitly defined java binary --- .../applications/networking/instant-messengers/jitsi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 9cefee228c84..e6dd6569a55f 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { mkdir $out/bin cp resources/install/generic/run.sh $out/bin/jitsi chmod +x $out/bin/jitsi + sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi patchShebangs $out ''; From 649e7d6fdb03bb29d477346f6e5466535dc94f1b Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 7 Mar 2014 16:50:40 +0100 Subject: [PATCH 428/449] python wrap.sh: wrap pypy and python shebangs --- pkgs/development/python-modules/generic/wrap.sh | 6 +++--- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index bd1f526900a5..282aeca9ed1c 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -18,11 +18,11 @@ wrapPythonProgramsIn() { for i in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". - if head -n1 "$i" | grep -q '#!.*/env.*python'; then - sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" + if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then + sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - if head -n1 "$i" | grep -q /@executable_name@; then + if head -n1 "$i" | grep -q '/python\|/pypy'; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 544ae1694b90..2c7123a98d4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28,7 +28,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; - substitutions.executable_name = python.executable; substitutions.executable = "${python}/bin/${python.executable}"; } ../development/python-modules/generic/wrap.sh; From fcc6d2812625e0a4189b7988c9a58abf430f78a3 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 7 Mar 2014 17:34:54 +0100 Subject: [PATCH 429/449] garden --- pkgs/tools/cd-dvd/vobsub2srt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index b0918bfb4214..30ae07f9dbd1 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/ruediger/VobSub2SRT; description = "Converts VobSub subtitles into SRT subtitles"; - license = stdenv.lib.libraries.gpl3Plus; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; From df5639183c852614be773a2ec7655556224a3f23 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 7 Mar 2014 11:20:18 -0600 Subject: [PATCH 430/449] Claim maintainership of recently added packages Also set platforms for some packages where it was missing. --- pkgs/applications/audio/clementine/default.nix | 1 + pkgs/applications/misc/pcmanfm/default.nix | 6 ++++-- pkgs/development/libraries/libfm/default.nix | 6 ++++-- pkgs/development/libraries/menu-cache/default.nix | 6 ++++-- pkgs/development/libraries/science/math/arpack/default.nix | 1 + pkgs/misc/themes/qtcurve/default.nix | 7 ++++--- pkgs/tools/misc/kde-gtk-config/default.nix | 7 ++++--- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index cf554f83c8b0..4352e2e133a6 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation { description = "A multiplatform music player"; license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 3700dc34d3df..f71800979619 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation { buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?cat=28/"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; description = "File manager with GTK+ interface"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 2a901d367611..7a005c9fda2a 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation { buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ]; - meta = { + meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?cat=28/"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; description = "A glib-based library for file management"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index b22d1e7669f7..8e2e202f4320 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation { buildInputs = [ glib pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?tag=menu-cache"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; description = "Library to read freedesktop.org menu files"; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 20b24d10fe60..cd56287f6ca0 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 017a47349a9c..ec5feb27c85b 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -28,10 +28,11 @@ stdenv.mkDerivation { -DQTC_QT4_ENABLE_KWIN=ON ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/QtCurve/qtcurve; description = "Widget styles for Qt4/KDE4 and gtk2"; - platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1+"; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix index e9f0af2815a9..873d2adde7f9 100644 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec ''; - meta = { + meta = with stdenv.lib; { homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config; description = "GTK configuration module for KDE System Settings"; longDescription = '' @@ -43,7 +43,8 @@ stdenv.mkDerivation { - Select GTK applications default fonts. - Easily browse and install new GTK2 and GTK3 themes. ''; - platforms = stdenv.lib.platforms.linux; - license = "GPLv3"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.ttuegel ]; }; } From 9af5d4731deb12d87d50ddf6ca3190d2c9da9bd6 Mon Sep 17 00:00:00 2001 From: Ellis Whitehead Date: Fri, 7 Mar 2014 19:39:55 +0100 Subject: [PATCH 431/449] typo: occured -> occurred --- nixos/modules/installer/tools/nixos-option.sh | 2 +- nixos/modules/system/boot/stage-1-init.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 60cee2519da0..edc94d732084 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -228,7 +228,7 @@ else escapeQuotes () { eval echo "$1"; } nixMap escapeQuotes "$names" else - echo 1>&2 "An error occured while looking for attribute names." + echo 1>&2 "An error occurred while looking for attribute names." echo $result fi fi diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 97c688ce5902..d0f4576f8112 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -14,7 +14,7 @@ fail() { # in an interactive shell. cat < Date: Fri, 7 Mar 2014 19:18:30 +0100 Subject: [PATCH 432/449] Add romildo to maintainers list --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6feafbcd3b11..73c288231c88 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -59,6 +59,7 @@ rob = "Rob Vermaas "; roconnor = "Russell O'Connor "; roelof = "Roelof Wobben "; + romildo = "José Romildo Malaquias "; rszibele = "Richard Szibele "; sander = "Sander van der Burg "; shlevy = "Shea Levy "; From 69a3372f3f0e2f869c06a1005c9d4bd5e0337283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 7 Mar 2014 19:42:29 +0100 Subject: [PATCH 433/449] Added hexchat --- .../networking/irc/hexchat/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/irc/hexchat/default.nix diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix new file mode 100644 index 000000000000..f1cc7df19046 --- /dev/null +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, gtk, perl, python, gettext +, libtool, pciutils, dbus_glib, libcanberra, libproxy +, libsexy, enchant, libnotify, openssl +, desktop_file_utils, hicolor_icon_theme +}: + +stdenv.mkDerivation rec { + version = "2.9.6.1"; + name = "hexchat-${version}"; + + src = fetchurl { + url = "http://dl.hexchat.net/hexchat/${name}.tar.xz"; + sha256 = "0w34jr1pqril6r011fwxv40m17bnb88q9cv5hf08mv0a9lygyrv2"; + }; + + buildInputs = [ + pkgconfig gtk perl python gettext + libtool pciutils dbus_glib libcanberra libproxy + libsexy libnotify openssl + desktop_file_utils hicolor_icon_theme + ]; + + configureFlags = [ "--enable-shm" "--enable-textfe" ]; + + meta = { + description = "A popular and easy to use graphical IRC (chat) client"; + homepage = http://hexchat.github.io/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66d7dda7d1a4..9441da57ccd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8204,6 +8204,8 @@ let herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + hexchat = callPackage ../applications/networking/irc/hexchat { }; + hexedit = callPackage ../applications/editors/hexedit { }; hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { }; From 41e0214bb1ecc367190a60a805d36ff1e32d1948 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Mar 2014 22:51:39 +0100 Subject: [PATCH 434/449] R: update to version 3.0.3 --- pkgs/applications/science/math/R/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 6c8ec9e68c53..88f4653cf7b4 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.0.2"; + name = "R-3.0.3"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0jq2vk6bgksbvgmdjvv7vfj6llp091d0nhl5j825aya4c2nhavlm"; + sha256 = "1mp6zp25nycn8bxnnq97gq6n21c6vprm6qc4drwap57j82azsz5r"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt From 51bb0bf69739ed98ca4499a3d6aca82a88b5adfe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Mar 2014 11:29:30 +0100 Subject: [PATCH 435/449] haskell-hsini: add version 0.2 --- .../libraries/haskell/hsini/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hsini/default.nix diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix new file mode 100644 index 000000000000..256b6995af1d --- /dev/null +++ b/pkgs/development/libraries/haskell/hsini/default.nix @@ -0,0 +1,19 @@ +{ cabal, HUnit, mtl, parsec, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "hsini"; + version = "0.2"; + sha256 = "0d9dhzaw2v9r0hb4lywzw4f0inijbcw5brc5dh45zfkalmn3aqam"; + buildDepends = [ mtl parsec ]; + testDepends = [ + HUnit mtl parsec QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh + ]; + meta = { + description = "Package for user configuration files (INI)"; + 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 e006f66938b1..3ff96831c002 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1431,6 +1431,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HSH = callPackage ../development/libraries/haskell/HSH {}; + hsini = callPackage ../development/libraries/haskell/hsini {}; + HsSyck = callPackage ../development/libraries/haskell/HsSyck {}; HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {}; From 21bce30e6c02737d489a2624ee9a6fdab8af6cad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Mar 2014 11:29:35 +0100 Subject: [PATCH 436/449] haskell-esqueleto: update to version 1.3.4.6 --- pkgs/development/libraries/haskell/esqueleto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 3bbd8681ddb0..4d11aeaf700b 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "1.3.4.5"; - sha256 = "0fw57dn67gx5v7drd4g7xbj1z614sr3lxw7gcciypnjc7qkqjgv7"; + version = "1.3.4.6"; + sha256 = "1mqjgc1glnfivrmw77mk6mqr02gp6l3jlvpz5ysiii42c1bp55n0"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers From 97d6b9e9253a6aff22614aa653df23bf25723350 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Mar 2014 11:29:37 +0100 Subject: [PATCH 437/449] haskell-mime-mail: update to version 0.4.4.1 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index e88dee9fa51c..fe8a9a35176f 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.4"; - sha256 = "1y0fss53z1mvykpfkp28zwic2mb7zhf02lwxdr22n34hjzk34g9b"; + version = "0.4.4.1"; + sha256 = "0jzbkrd62alvgyx9bkrzicz88hjjnnavpv6hl22cxnirz41h8hw0"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; From 212fdb0afe429d3ae9bb54201ffe66f0d8557771 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Mar 2014 11:29:39 +0100 Subject: [PATCH 438/449] haskell-postgresql-libpq: update to version 0.9.0.0 --- .../libraries/haskell/postgresql-libpq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 2208955a9d8f..d630f0633913 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.6"; - sha256 = "0n3lqffscwc6pq0rfy4yjild9hcgnkpq9a8icbvgxv4si13ipsgh"; + version = "0.9.0.0"; + sha256 = "09bi0npvly02zjhp463bmzm1n8w1cqsln676z82xi2in86317pv3"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; From 736bda8a0ee65c6aa5119560026aebcce0e4685e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Mar 2014 11:29:40 +0100 Subject: [PATCH 439/449] haskell-LambdaHack: update to version 0.2.12 --- pkgs/games/LambdaHack/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index c9fd9706c0e3..93277eb15a27 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,18 +1,19 @@ -{ cabal, assertFailure, binary, ConfigFile, deepseq, enummapsetTh -, filepath, gtk, hashable, keys, miniutter, mtl, prettyShow, random -, stm, text, transformers, unorderedContainers, zlib +{ cabal, assertFailure, binary, deepseq, enummapsetTh, filepath +, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random +, stm, text, transformers, unorderedContainers, vector +, vectorBinaryInstances, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.10.6"; - sha256 = "19ak0ygw38b51wkm4p10xgdk3h9mh5vvb8c60qhs7cmgzjcph38n"; + version = "0.2.12"; + sha256 = "0ics1z376qyagkzg58mqqw7cbkjpkik57l8570qmk589nkhck86n"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure binary ConfigFile deepseq enummapsetTh filepath gtk - hashable keys miniutter mtl prettyShow random stm text transformers - unorderedContainers zlib + assertFailure binary deepseq enummapsetTh filepath gtk hashable + hsini keys miniutter mtl prettyShow random stm text transformers + unorderedContainers vector vectorBinaryInstances zlib ]; jailbreak = true; meta = { From 757a690e2e17862cf0a7328cd661675eb2ebd21f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Mar 2014 15:14:30 +0100 Subject: [PATCH 440/449] haskell-hsini: disable test suite to avoid build errors caused by a bogus cabal file --- pkgs/development/libraries/haskell/hsini/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix index 256b6995af1d..45e03ad71441 100644 --- a/pkgs/development/libraries/haskell/hsini/default.nix +++ b/pkgs/development/libraries/haskell/hsini/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { HUnit mtl parsec QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh ]; + doCheck = false; meta = { description = "Package for user configuration files (INI)"; license = self.stdenv.lib.licenses.bsd3; From 5446f60e8af7a30c9a13963b01e049cc75d06b57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Mar 2014 15:21:58 +0100 Subject: [PATCH 441/449] haskell-time: update to version 1.4.2 --- .../libraries/haskell/time/{1.4.1.nix => 1.4.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/time/{1.4.1.nix => 1.4.2.nix} (85%) diff --git a/pkgs/development/libraries/haskell/time/1.4.1.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix similarity index 85% rename from pkgs/development/libraries/haskell/time/1.4.1.nix rename to pkgs/development/libraries/haskell/time/1.4.2.nix index 1e6751101908..ff9818a387d6 100644 --- a/pkgs/development/libraries/haskell/time/1.4.1.nix +++ b/pkgs/development/libraries/haskell/time/1.4.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "time"; - version = "1.4.1"; - sha256 = "04ndcp7m1a7mia4by15dqrwl5k0d2477x20s6xcrdb7in8w9ccvp"; + version = "1.4.2"; + sha256 = "1kpsak2wka23c8591ry6i1d7hmd54s7iw5n6hpx48jhcxf1w199h"; buildDepends = [ deepseq ]; testDepends = [ Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3ff96831c002..dd26587f5832 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2432,7 +2432,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {}; time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; - time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {}; + time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. time = null; From f5b3367e927e787ab836019f8d615013faa2ff25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Mar 2014 15:23:36 +0100 Subject: [PATCH 442/449] haskell-Cabal: update to version 1.18.1.3 --- .../haskell/Cabal/{1.18.1.2.nix => 1.18.1.3.nix} | 4 ++-- pkgs/top-level/haskell-defaults.nix | 6 +++--- pkgs/top-level/haskell-packages.nix | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/development/libraries/haskell/Cabal/{1.18.1.2.nix => 1.18.1.3.nix} (89%) diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix similarity index 89% rename from pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix rename to pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix index 024a4d5c1352..0ef09dc49b15 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.18.1.2"; - sha256 = "0pbg9d40lskcps248fdcnm4hnib3vl10mbcdf830zw45q29gfkjr"; + version = "1.18.1.3"; + sha256 = "1m1m6f00sc4w0s5hnqy2z05rnaihaw1jy03bidc5pl6r1llkdi15"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a3c3a10b44c0..3034367c39e9 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -80,7 +80,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; @@ -102,7 +102,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; @@ -126,7 +126,7 @@ cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; prettyShow = self.prettyShow_1_2; binary = self.binary_0_6_0_0; - Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; }; quickcheckIo = self.quickcheckIo.override { HUnit = self.HUnit_1_2_5_2; QuickCheck = self.QuickCheck2; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dd26587f5832..b590eeb206a7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -555,14 +555,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; ariadne = callPackage ../development/libraries/haskell/ariadne { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; haskellPackages = self.haskellPackages.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; }; haskellNames = self.haskellNames.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; haskellPackages = self.haskellPackages.override { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; }; }; }; @@ -709,7 +709,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix { cabal = self.cabal.override { Cabal = null; }; }; + Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; @@ -2863,7 +2863,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; cabalInstall_1_18_0_2 = callPackage ../tools/package-management/cabal-install/1.18.0.2.nix { - Cabal = self.Cabal_1_18_1_2; + Cabal = self.Cabal_1_18_1_3; }; cabalInstall = self.cabalInstall_1_18_0_2; From a9056be563025d8e72afeecec3410701edb0a342 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Mar 2014 15:25:13 +0100 Subject: [PATCH 443/449] persistent-postgresql: jailbrek to fix build with recent postgresql-libpq --- .../libraries/haskell/persistent-postgresql/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 9853969d9f10..acb7b3ce5b5c 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { aeson blazeBuilder conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; From 368ce12cd59ab9c88245ae735111db2346c01c04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Mar 2014 13:49:00 +0100 Subject: [PATCH 444/449] LambdaHack: use consistent versions of the 'binary' package --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b590eeb206a7..5ac472e27dbf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2885,7 +2885,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # Games. - LambdaHack = callPackage ../games/LambdaHack {}; + LambdaHack = callPackage ../games/LambdaHack { + binary = self.binary_0_7_1_0; + vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; }; + }; MazesOfMonad = callPackage ../games/MazesOfMonad {}; From 7b898a1d6a3d0504da6db668f35ca39ec6db55f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Mar 2014 23:16:33 +0100 Subject: [PATCH 445/449] yap: revert update from 6.2.2 to 6.3.3 This reverts commit 41c662dcf68ce41c64ceb73a2f21a8aac09eb41e. The update doesn't compile in i686, and I don't have time to investigate at the moment. --- pkgs/development/compilers/yap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index af604792f83e..a29c0de65b87 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, readline, gmp, zlib }: stdenv.mkDerivation rec { - version = "6.3.3"; + version = "6.2.2"; name = "yap-${version}"; src = fetchurl { url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; - sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; + sha256 = "0l6p0vy667wws64cvwf74ssl6h9gypjzrsl3b2d32hs422186pzi"; }; buildInputs = [ readline gmp zlib ]; From 34caf106da56f631176f44be1501c056f3363175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 7 Mar 2014 23:04:41 +0100 Subject: [PATCH 446/449] swig: add meta.platforms (set to linux) So that Hydra will build swig. This provides binary packages to users and build breakage detection. --- pkgs/development/tools/misc/swig/2.x.nix | 2 ++ pkgs/development/tools/misc/swig/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 2066ead51a14..b51ce0f2d5af 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ urkud ]; }; } diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 1f37fd87f8a8..d489feba4dc5 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ ]; }; } From 084ff142add143e8b622ab1f6d3910cb8a086880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 7 Mar 2014 23:06:15 +0100 Subject: [PATCH 447/449] gnuradio: wrap example programs too Without this the examples don't work. Example: $ /nix/store/HASH-gnuradio-3.7.1/share/gnuradio/examples/uhd/usrp_am_mw_rcv.py Traceback (most recent call last): File "/nix/store/HASH-gnuradio-3.7.1/share/gnuradio/examples/uhd/usrp_am_mw_rcv.py", line 24, in from gnuradio import gr, eng_notation ImportError: No module named gnuradio --- pkgs/applications/misc/gnuradio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 08d2b29a92a8..7ef9fbf351f7 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postInstall = '' printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" - for file in "$out"/bin/*; do + for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do wrapProgram "$file" \ --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") \ --set MATPLOTLIBRC "$out/share/gnuradio" From b0ec4b54e760e70b15d524ef3dfd1991bac817dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 7 Mar 2014 23:41:36 +0100 Subject: [PATCH 448/449] gnuradio: update 3.7.1 -> 3.7.2.1 I verified that gnuradio-companion (the GUI) still starts. --- pkgs/applications/misc/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 7ef9fbf351f7..3fc3e1e8e5f3 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.1"; + version = "3.7.2.1"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "1kfni8vpgr6v9rdiz3zsmwc07qj6zka9x22z2y0y4rak2xnzdxz9"; + sha256 = "101wr19nxfc5x7i4s10vgrypaa0vj2pkg8b2vn5j5s9iv8gpwswc"; }; buildInputs = [ From 5d14048867ccc4a05b86875573e64a66c4382144 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 7 Mar 2014 19:13:54 -0800 Subject: [PATCH 449/449] ImageMagick: update to 6.8.8-7 Fixes CVE-2014-{1947,1958,2030}. --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 66a7f334dbdd..35659cbfe6f1 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,14 +18,14 @@ }: let - version = "6.8.7-6"; + version = "6.8.8-7"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "0cbfhk184kxdxz5czyyqxac29mbfiahygjji6k97z6hp8ngnqlvh"; + sha256 = "1x5jkbrlc10rx7vm344j7xrs74c80xk3n1akqx8w5c194fj56mza"; }; enableParallelBuilding = true;