From 2e4eab1228f2bb390d1948c776e02c68ef49ec0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 30 Dec 2013 21:33:12 +0100 Subject: [PATCH 001/384] llvm: update 3.3 -> 3.4 - Drop a patch that no longer applies: the default limit got tripled, so I hope it's sufficient now anyway. - R600 support is no longer experimental and enabled by default. - A few packages haven't been ported to 3.4 by upstream yet, so I will probably re-introduce 3.3 for them (so we can merge to master sooner). --- pkgs/development/compilers/llvm/default.nix | 8 ++------ .../compilers/llvm/more-memory-for-bugpoint.patch | 15 --------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index bed6bf1fc13b..61798351f9b1 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,18 +1,15 @@ { stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils_gold }: -let version = "3.3"; in +let version = "3.4"; in stdenv.mkDerivation rec { name = "llvm-${version}"; src = fetchurl { url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8"; + sha256 = "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995"; }; - # The default rlimits are too low for shared libraries. - patches = [ ./more-memory-for-bugpoint.patch ]; - # libffi was propagated before, but it wasn't even being used, so # unless something needs it just an input is fine. buildInputs = [ perl groff cmake python libffi ]; # ToDo: polly, libc++; enable cxx11? @@ -25,7 +22,6 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_BINUTILS_INCDIR=${binutils_gold}/include" - "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa ] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch b/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch deleted file mode 100644 index fa19ce4f5871..000000000000 --- a/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp llvm-3.3.src/tools/bugpoint/bugpoint.cpp ---- llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp 2013-01-27 20:35:51.000000000 -0500 -+++ llvm-3.3.src/tools/bugpoint/bugpoint.cpp 2013-06-21 18:29:47.612731499 -0400 -@@ -48,9 +48,9 @@ - "is killed (default is 300s), 0 disables timeout")); - - static cl::opt --MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"), -+MemoryLimit("mlimit", cl::init(0), cl::value_desc("MBytes"), - cl::desc("Maximum amount of memory to use. 0 disables check." -- " Defaults to 100MB (800MB under valgrind).")); -+ " Check disabled by default.")); - - static cl::opt - UseValgrind("enable-valgrind", From 8f0656c2f733298b21804b233c1d82e1decb48bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 30 Dec 2013 21:33:12 +0100 Subject: [PATCH 002/384] mesa: update to 10.0.1, always enable R600 A few TODOs are pending, but of relatively low importance. --- pkgs/development/libraries/mesa/default.nix | 32 +++++++++------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f7ff87b34cc6..3db3f41d588d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoconf, automake, libtool +{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook , python, libxml2Python, file, expat, makedepend , libdrm, xorg, wayland, udev, llvm, libffi -, libvdpau +, libvdpau, libelf , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt -, enableR600LlvmCompiler ? true, libelf , enableExtraFeatures ? false # not maintained }: @@ -24,8 +23,8 @@ else */ let - version = "9.2.5"; - # this is the default search path for DRI drivers (note: X server introduces an overriding env var) + version = "10.0.1"; + # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -35,15 +34,15 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "1w3bxclgwl2hwyxk3za7dbdakb8jsya7afck35cz0v8pxppvjsml"; + sha256 = "0w1jh8pl4gbzazigsqc5pzc076gckb7b9xgw2w633jlrjn7qdprw"; }; prePatch = "patchShebangs ."; - patches = [ + patches = [ # some don't apply -- try without them ATM ./static-gallium.patch - ./dricore-gallium.patch - ./werror-wundef.patch + # ./dricore-gallium.patch + # ./werror-wundef.patch ]; # Change the search path for EGL drivers from $drivers/* to driverLink @@ -54,8 +53,6 @@ stdenv.mkDerivation { outputs = ["out" "drivers" "osmesa"]; - preConfigure = "./autogen.sh"; - configureFlags = [ "--with-dri-driverdir=$(drivers)/lib/dri" "--with-egl-driver-dir=$(drivers)/lib/egl" @@ -72,11 +69,9 @@ stdenv.mkDerivation { "--enable-osmesa" # used by wine "--with-dri-drivers=i965,r200,radeon" - ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" - + optionalString enableR600LlvmCompiler ",radeonsi") + ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi") "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi" ] - ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler" ++ optional enableTextureFloats "--enable-texture-float" ++ optionals enableExtraFeatures [ "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful @@ -90,17 +85,16 @@ stdenv.mkDerivation { ++ optionals stdenv.isLinux [libdrm] ; buildInputs = with xorg; [ - autoconf automake libtool intltool expat libxml2Python llvm + autoreconfHook intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt - libffi wayland libvdpau + libffi wayland libvdpau libelf ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] ++ optional stdenv.isLinux udev - ++ optional enableR600LlvmCompiler libelf ; enableParallelBuilding = true; - #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672 - # TODO: best fix this before merging >=9.2 to master + #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672, + #tests for 10.* fail to link due to some RTTI problem # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; # also move libOSMesa to $osmesa, as it's relatively big From f0419a0bfcd13c7214e6dcb88f540022357dcaac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 30 Dec 2013 22:12:22 +0100 Subject: [PATCH 003/384] xorg: update a few sub-packages --- pkgs/servers/x11/xorg/default.nix | 24 ++++++++++++------------ pkgs/servers/x11/xorg/extra.list | 4 ++-- pkgs/servers/x11/xorg/tarballs-7.7.list | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1be17e623f7d..ade60990d1ad 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -890,11 +890,11 @@ let })) // {inherit ;}; libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) { - name = "libxcb-1.9.1"; + name = "libxcb-1.10"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2; - sha256 = "0brn7vw66widc5mw7gynwy8dln3gmzym2fqqyzk6k58bxgs5yjnl"; + url = http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2; + sha256 = "1dfmyb1zjx6n0zhr4y40mc1crlmj3bfjjhmn0f30ip9nnq2spncq"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -1130,11 +1130,11 @@ let })) // {inherit ;}; xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) { - name = "xcb-proto-1.8"; + name = "xcb-proto-1.10"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2; - sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93"; + url = http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2; + sha256 = "01dgp802i4ic9wkmpa7g1wm50pp547d3b96jjz2hnxavhpfhvx3y"; }; buildInputs = [pkgconfig python ]; })) // {inherit python ;}; @@ -1280,11 +1280,11 @@ let })) // {inherit libX11 xproto libXrandr ;}; xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) { - name = "xextproto-7.2.1"; + name = "xextproto-7.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2; - sha256 = "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"; + url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2; + sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1370,11 +1370,11 @@ let })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.7.1"; + name = "xf86-input-synaptics-1.7.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2; - sha256 = "13mmpcwp1d69w6c458a4fdqgwl24bpvrnq3zd6833chz1rk2an6v"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.2.tar.bz2; + sha256 = "1kbx59zhk3kky0hkklsl8n2lm269am8k5xjpikpn51hdbyjpz5b3"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 2372df2701e8..505f0eafc3a0 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,6 +1,6 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2 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 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4cf9c0362e0f..4a7b72c09fcf 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -108,7 +108,7 @@ mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2 +mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 @@ -116,7 +116,7 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.7.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 From fc2580ad877c94aa603e78f640be3e0229fd0e60 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 2 Jan 2014 11:53:25 +0100 Subject: [PATCH 004/384] 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 adffa870cf9226179bc56e202aeec7f5815bc4c3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 3 Jan 2014 01:20:50 +0100 Subject: [PATCH 005/384] xf86-video-vmware: xatracker2 patch to build with mesa 10 --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 08dc5a92b7d0..200e70644a79 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -168,6 +168,10 @@ in xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker + patches = [( args.fetchurl { + url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xatracker-v2-fixes.patch?h=packages/xf86-video-vmware; + sha256 = "1k5a3zf2bzmw84di31b8zfy51n2mqrr01xjfy5nw7395qv5r5cvs"; + })]; }; xdriinfo = attrs: attrs // { From 8db8ccb40847d44d997ab578e1079bd62648f275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 11 Jan 2014 19:15:58 +0100 Subject: [PATCH 006/384] mesa: bugfix update 10.0.1 -> .2 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3db3f41d588d..aaf158519558 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,7 +23,7 @@ else */ let - version = "10.0.1"; + version = "10.0.2"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "0w1jh8pl4gbzazigsqc5pzc076gckb7b9xgw2w633jlrjn7qdprw"; + sha256 = "0zkayy6gl0nwgqg11ga95vl4z0hldcz1b77qzzc1agm5vziah0j5"; }; prePatch = "patchShebangs ."; From 29a878d1be84b2a15a928de93090b9edb067ac95 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 13 Jan 2014 22:47:17 +0100 Subject: [PATCH 007/384] harfbuzz: update from 0.9.24 to 0.9.25 I see no significant change in the changelog. --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 4cee49bea517..c69a96795d20 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.24"; + name = "harfbuzz-0.9.25"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd"; + sha256 = "1vkbdny880d60j3v6lvpc6p8fvj6cl7hma27h796qlk9lnbmjvnw"; }; configureFlags = [ From 45a3e8580c56af59ca5982cc1d702cd8d9ed30f9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 14 Jan 2014 09:44:39 +0100 Subject: [PATCH 008/384] mesa: keep llvm versioning outside of expression file --- pkgs/development/libraries/mesa/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 40b94e91a118..aaf158519558 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook , python, libxml2Python, file, expat, makedepend -, libdrm, xorg, wayland, udev, llvm_34, libffi +, libdrm, xorg, wayland, udev, llvm, libffi , libvdpau, libelf , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt , enableExtraFeatures ? false # not maintained @@ -85,7 +85,7 @@ stdenv.mkDerivation { ++ optionals stdenv.isLinux [libdrm] ; buildInputs = with xorg; [ - autoreconfHook intltool expat libxml2Python llvm_34 + autoreconfHook intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt libffi wayland libvdpau libelf ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a0ac731cd75..0288d98e11ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5244,7 +5244,9 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa_original = callPackage ../development/libraries/mesa { }; + mesa_original = callPackage ../development/libraries/mesa { + llvm = llvm_34; + }; mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL // { driverLink = mesa_noglu; } else mesa_original; From b187d0e1bdfec635d4e7a3e00abb86b823e3dc27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 23 Jan 2014 22:55:41 +0100 Subject: [PATCH 009/384] libusb1: name it libusbx, so it's more clear --- pkgs/development/libraries/libusb1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index dfb8f1c54a16..3833e5bffa1a 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ let version = "1.0.17"; in stdenv.mkDerivation rec { - name = "libusb-${version}"; + name = "libusbx-${version}"; # it's a fork of original libusb1; should be mostly compatible src = fetchurl { url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2"; From 5674fb556b97311a0f1fbdfafa73b85a3edec4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 23 Jan 2014 23:02:46 +0100 Subject: [PATCH 010/384] mesa: try enabling checkPhase again --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aaf158519558..bd93c41d3541 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation { ; enableParallelBuilding = true; - #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672, + doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672, #tests for 10.* fail to link due to some RTTI problem # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; From 4caef493beea7fd3ab3de9b60ed7590936003b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 24 Jan 2014 00:40:48 +0100 Subject: [PATCH 011/384] Revert "mesa: try enabling checkPhase again" I'm getting something like https://bugs.freedesktop.org/show_bug.cgi?id=52136 This reverts commit 5674fb556b97311a0f1fbdfafa73b85a3edec4cb. --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index bd93c41d3541..aaf158519558 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation { ; enableParallelBuilding = true; - doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672, + #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672, #tests for 10.* fail to link due to some RTTI problem # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; From 4eefe1a779cf953f92ca1ad58e1f4ade9d278cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 24 Jan 2014 11:14:35 +0100 Subject: [PATCH 012/384] mesa: fix build by adding ncurses After stdenv merge it seems needed, and drivers remain linked against it. Tests still don't link. --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aaf158519558..9d720621880d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook , python, libxml2Python, file, expat, makedepend , libdrm, xorg, wayland, udev, llvm, libffi -, libvdpau, libelf +, libvdpau, libelf, ncurses , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt , enableExtraFeatures ? false # not maintained }: @@ -87,7 +87,7 @@ stdenv.mkDerivation { buildInputs = with xorg; [ autoreconfHook intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt - libffi wayland libvdpau libelf + libffi wayland libvdpau libelf ncurses ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] ++ optional stdenv.isLinux udev ; From 5fb366d1e5fca5b7173d3f2ed7388285b8616d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 17 Jan 2014 20:43:54 +0100 Subject: [PATCH 013/384] xorg: move nouveau driver here, some updates of modules It seems that most of the modules is rarely used, but still. Some of the updated modules don't build, just as they didn't before. --- .../linux/xf86-video-nouveau/default.nix | 35 ---------- pkgs/servers/x11/xorg/default.nix | 64 +++++++++++-------- pkgs/servers/x11/xorg/overrides.nix | 4 ++ pkgs/servers/x11/xorg/tarballs-7.7.list | 21 +++--- pkgs/top-level/all-packages.nix | 5 +- 5 files changed, 53 insertions(+), 76 deletions(-) delete mode 100644 pkgs/os-specific/linux/xf86-video-nouveau/default.nix diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix deleted file mode 100644 index 3c9707828b34..000000000000 --- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, fetchurl -, autoconf -, automake -, libtool -, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman -, utilmacros -, libdrm -, pkgconfig }: - -stdenv.mkDerivation rec { - name = "xf86-video-nouveau-1.0.7"; - - src = fetchurl { - url = "mirror://xorg/individual/driver/${name}.tar.bz2"; - sha256 = "0cg1q9dz9ksfp593x707gr10s8p7z00zdws1r4lshg42w5ccd1yi"; - }; - - - buildInputs = [ - xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman - utilmacros - libdrm - pkgconfig - ]; - - - meta = { - homepage = http://nouveau.freedesktop.org/wiki/; - - description = "The xorg driver for nouveau-driven video cards"; - - license = "gplv2"; - }; -} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7965c0592889..580e09642a55 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1330,11 +1330,11 @@ let })) // {inherit ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.7.3"; + name = "xf86-input-evdev-2.8.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2; - sha256 = "01557w1kmsaqdsc42pxyypig10l5r5vh9axz9g22hg9cc09r8f7b"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2; + sha256 = "1cvyg425px92hr5ql1s7v0c7n9jyvg0aaajrf5vyxgc3k9s6213m"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; })) // {inherit inputproto udev xorgserver xproto ;}; @@ -1350,31 +1350,31 @@ let })) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) { - name = "xf86-input-keyboard-1.6.1"; + name = "xf86-input-keyboard-1.8.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2; - sha256 = "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma"; + url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2; + sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) { - name = "xf86-input-mouse-1.7.2"; + name = "xf86-input-mouse-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2; - sha256 = "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark"; + url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2; + sha256 = "12344w0cxac1ld54qqwynxwazbmmpvqh1mzcskmfkmakmr5iwq2x"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.7.2"; + name = "xf86-input-synaptics-1.7.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.2.tar.bz2; - sha256 = "1kbx59zhk3kky0hkklsl8n2lm269am8k5xjpikpn51hdbyjpz5b3"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.3.tar.bz2; + sha256 = "1m9j5shypv3dmxxfxjcmj01glay4gqqlchxqav89a4cn8ch9falb"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1470,21 +1470,21 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) { - name = "xf86-video-geode-2.11.14"; + name = "xf86-video-geode-2.11.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2; - sha256 = "1k6gl1kq2fr0gj6sqrg2rypp59f8b8pr46c902m4z4rjr530nxac"; + url = mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2; + sha256 = "1w4ghr2a41kaw4g9na8ws5fjbmy8zkbxpxa21vmqc8mkjzb3pnq0"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) { - name = "xf86-video-glide-1.2.1"; + name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2; - sha256 = "0vp9izdy7lgx09jfwr4ra9zvrx1hg15a5v2nhx00v31ffkh2aiyp"; + url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2; + sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; buildInputs = [pkgconfig xextproto xorgserver xproto ]; })) // {inherit xextproto xorgserver xproto ;}; @@ -1530,11 +1530,11 @@ let })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) { - name = "xf86-video-mga-1.6.2"; + name = "xf86-video-mga-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2; - sha256 = "0v6agqc9lxg8jgrksc1yksmhnv70j1vnhm09i7gg14za1qjwx29z"; + url = mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2; + sha256 = "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1559,6 +1559,16 @@ let buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; + xf86videonouveau = (stdenv.mkDerivation ((if overrides ? xf86videonouveau then overrides.xf86videonouveau else x: x) { + name = "xf86-video-nouveau-1.0.10"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2; + sha256 = "17fvjplzfx86099sqys0bfl8lfbmjz8li84kzj2x95mf1cbb7fn1"; + }; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) { name = "xf86-video-nv-2.1.20"; builder = ./builder.sh; @@ -1580,21 +1590,21 @@ let })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) { - name = "xf86-video-r128-6.9.1"; + name = "xf86-video-r128-6.9.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2; - sha256 = "0k746kk75h3hg3wmihqlmp14s52fg0svylqay02km7misflbmqwb"; + url = mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2; + sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) { - name = "xf86-video-savage-2.3.6"; + name = "xf86-video-savage-2.3.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2; - sha256 = "1mk3mpwl97clxhwzl990hj31z8qfh7fd4vs6qbl5i250ykc3x0a8"; + url = mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2; + sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8901d7dda54d..0ee3594f6ec0 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -148,6 +148,10 @@ in installFlags = "sdkdir=\${out}/include/xorg"; }; + xf86inputmouse = attrs: attrs // { + installFlags = "sdkdir=\${out}/include/xorg"; + }; + xf86inputjoystick = attrs: attrs // { installFlags = "sdkdir=\${out}/include/xorg"; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 39212bdfcf43..7a997c6c169d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -112,32 +112,33 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.7.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.7.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 -mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2 +mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 275287cfcd95..0de827f9e84b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7103,10 +7103,7 @@ let inherit (xorg) fontsproto renderproto utilmacros xorgserver; }; - xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { - inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto - videoproto utilmacros; - }; + xf86_video_nouveau = xorg.xf86videonouveau; xmoto = builderDefsPackage (import ../games/xmoto) { inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng From 355548449328da95507b5158bbe306b5236916ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 28 Jan 2014 11:34:05 +0100 Subject: [PATCH 014/384] mesa cleanup: remove patches, clean description werror-wundef.patch came from #1082, but now no longer applied, and it seems no longer necessary, as both qt5 and qtCreator build. @bbenoist: was the patch useful for anything else? --- pkgs/development/libraries/mesa/default.nix | 12 +- .../libraries/mesa/dricore-gallium.patch | 216 ------------------ .../libraries/mesa/werror-wundef.patch | 12 - 3 files changed, 6 insertions(+), 234 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/dricore-gallium.patch delete mode 100644 pkgs/development/libraries/mesa/werror-wundef.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9d720621880d..11b1e2bca770 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -12,14 +12,14 @@ else /** Packaging design: - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). - This or the mesa attribute (which also contains GLU) are small (~ 2.2 MB, mostly headers) + This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) and are designed to be the buildInput of other packages. - DRI and EGL drivers are compiled into $drivers output, - which is bigger (~13 MB) and depends on LLVM (~44 MB). + which is much bigger and depends on LLVM. These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*" and so are kind-of impure (given by NixOS). (I suppose on non-NixOS one would create the appropriate symlinks from there.) - - libOSMesa is in $osmesa (~4.2 MB) + - libOSMesa is in $osmesa (~4 MB) */ let @@ -39,10 +39,10 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = [ # some don't apply -- try without them ATM + patches = [ ./static-gallium.patch - # ./dricore-gallium.patch - # ./werror-wundef.patch + # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), + # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog ]; # Change the search path for EGL drivers from $drivers/* to driverLink diff --git a/pkgs/development/libraries/mesa/dricore-gallium.patch b/pkgs/development/libraries/mesa/dricore-gallium.patch deleted file mode 100644 index 9a8b6768277b..000000000000 --- a/pkgs/development/libraries/mesa/dricore-gallium.patch +++ /dev/null @@ -1,216 +0,0 @@ -commit 5208f187c7dade2c33385a56c1a5f1c3cedc8377 (HEAD, nix-patches) -Author: Vladimír Čunát -Date: Mon May 13 11:34:59 2013 +0200 - - 118-dricore-gallium.patch - -diff --git a/configure.ac b/configure.ac -index be89843..08f6761 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -928,6 +928,8 @@ AC_SUBST([GLESv2_LIB_DEPS]) - AC_SUBST([GLESv2_PC_LIB_PRIV]) - - DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la" -+MESAGALLIUM_LIBS="${DRI_LIB_DEPS}" -+AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS}) - - AC_SUBST([HAVE_XF86VIDMODE]) - -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am -index 3cdec83..53ff69b 100644 ---- a/src/gallium/auxiliary/Makefile.am -+++ b/src/gallium/auxiliary/Makefile.am -@@ -34,14 +34,14 @@ if LLVM_NEEDS_FNORTTI - - AM_CXXFLAGS += -fno-rtti - --libgallium_la_LIBADD = $(LLVM_LIBS) -- - endif - - libgallium_la_SOURCES += \ - $(GALLIVM_SOURCES) \ - $(GALLIVM_CPP_SOURCES) - -+libgallium_la_LIBADD = ../../mesa/libdricore/libmesagallium.la $(LLVM_LIBS) $(GALLIUM_DRI_LIB_DEPS) -+ - endif - - indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py -diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am -index f4f9030..e9b9462 100644 ---- a/src/gallium/targets/dri-i915/Makefile.am -+++ b/src/gallium/targets/dri-i915/Makefile.am -@@ -49,7 +49,7 @@ i915_dri_la_SOURCES = \ - i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - i915_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ - $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ -diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am -index 69ccf32..fef4c63 100644 ---- a/src/gallium/targets/dri-nouveau/Makefile.am -+++ b/src/gallium/targets/dri-nouveau/Makefile.am -@@ -48,7 +48,7 @@ nouveau_dri_la_SOURCES = \ - nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - nouveau_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ - $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ -diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am -index 8c0215d..6beb536 100644 ---- a/src/gallium/targets/dri-r300/Makefile.am -+++ b/src/gallium/targets/dri-r300/Makefile.am -@@ -49,7 +49,7 @@ r300_dri_la_SOURCES = \ - r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - r300_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ -diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am -index 2b3524b..d40fb89 100644 ---- a/src/gallium/targets/dri-r600/Makefile.am -+++ b/src/gallium/targets/dri-r600/Makefile.am -@@ -48,7 +48,7 @@ r600_dri_la_SOURCES = \ - r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - r600_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/drivers/r600/libr600.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ -diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am -index f7d87a6..87ab2aa 100644 ---- a/src/gallium/targets/dri-radeonsi/Makefile.am -+++ b/src/gallium/targets/dri-radeonsi/Makefile.am -@@ -49,7 +49,7 @@ radeonsi_dri_la_SOURCES = \ - radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - radeonsi_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ -diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am -index 1104379..72d2401 100644 ---- a/src/gallium/targets/dri-swrast/Makefile.am -+++ b/src/gallium/targets/dri-swrast/Makefile.am -@@ -49,7 +49,7 @@ swrast_dri_la_SOURCES = \ - swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - swrast_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \ - $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ -diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am -index ca7df65..4384976 100644 ---- a/src/gallium/targets/dri-vmwgfx/Makefile.am -+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am -@@ -48,7 +48,7 @@ vmwgfx_dri_la_SOURCES = \ - vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - vmwgfx_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ - $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ -diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am -index 5c40ae8..6922ab2 100644 ---- a/src/gallium/targets/egl-static/Makefile.am -+++ b/src/gallium/targets/egl-static/Makefile.am -@@ -104,7 +104,7 @@ AM_CPPFLAGS += \ - $(API_DEFINES) - - egl_gallium_la_LIBADD += \ -- $(top_builddir)/src/mesa/libmesagallium.la -+ @MESAGALLIUM_LIBS@ - # make st/mesa built-in when there is a single glapi provider - if HAVE_SHARED_GLAPI - egl_gallium_la_LIBADD += \ -diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am -index 41483dd..0045a673 100644 ---- a/src/mesa/Makefile.am -+++ b/src/mesa/Makefile.am -@@ -75,9 +75,6 @@ noinst_LTLIBRARIES += libmesa.la - else - check_LTLIBRARIES = libmesa.la - endif --if HAVE_GALLIUM --noinst_LTLIBRARIES += libmesagallium.la --endif - - SRCDIR = $(top_srcdir)/src/mesa/ - BUILDDIR = $(top_builddir)/src/mesa/ -@@ -119,15 +116,6 @@ libmesa_la_LIBADD = \ - $() - libmesa_la_LDFLAGS = - --libmesagallium_la_SOURCES = \ -- $(MESA_GALLIUM_FILES) \ -- $(MESA_ASM_FILES_FOR_ARCH) -- --libmesagallium_la_LIBADD = \ -- $(top_builddir)/src/glsl/libglsl.la \ -- $(top_builddir)/src/mesa/program/libprogram.la \ -- $() -- - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gl.pc - -diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am -index 753548e..8761418 100644 ---- a/src/mesa/libdricore/Makefile.am -+++ b/src/mesa/libdricore/Makefile.am -@@ -42,6 +42,7 @@ libdricore@VERSION@_la_SOURCES = \ - libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 - libdricore@VERSION@_la_LIBADD = \ - ../program/libdricore_program.la \ -+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la - $() - - if HAVE_X86_ASM -@@ -65,8 +66,10 @@ AM_CPPFLAGS += \ - -I$(top_srcdir)/src/mesa/sparc - endif - -+lib_LTLIBRARIES = -+ - if HAVE_DRI --lib_LTLIBRARIES = libdricore@VERSION@.la -+lib_LTLIBRARIES += libdricore@VERSION@.la - - # Provide compatibility with scripts for the old Mesa build system for - # a while by putting a link to the driver into /lib of the build tree. -@@ -76,6 +79,17 @@ all-local: libdricore@VERSION@.la - ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so - endif - -+libmesagallium_la_SOURCES = \ -+ $(STATETRACKER_FILES) -+libmesagallium_la_CFLAGS = @LLVM_CFLAGS@ -+libmesagallium_la_CXXFLAGS = @LLVM_CXXFLAGS@ -+libmesagallium_la_LIBADD = libdricore@VERSION@.la $(LLVM_LIBS) -+ -+if HAVE_GALLIUM -+noinst_LTLIBRARIES = libmesagallium.la -+endif -+ -+ - CLEANFILES = \ - $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \ - $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so diff --git a/pkgs/development/libraries/mesa/werror-wundef.patch b/pkgs/development/libraries/mesa/werror-wundef.patch deleted file mode 100644 index 4663f68bd7d3..000000000000 --- a/pkgs/development/libraries/mesa/werror-wundef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN Mesa-9.2.0-orig/include/GL/gl.h Mesa-9.2.0/include/GL/gl.h ---- Mesa-9.2.0-orig/include/GL/gl.h 2013-08-14 03:34:42.000000000 +0200 -+++ Mesa-9.2.0/include/GL/gl.h 2013-09-24 19:34:58.319140812 +0200 -@@ -2088,7 +2088,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOO - - - --#if GL_ARB_shader_objects -+#if defined(GL_ARB_shaders_objects) && GL_ARB_shader_objects - - #ifndef GL_MESA_shader_debug - #define GL_MESA_shader_debug 1 From 9b905b97cb152deae8dfc064de53694f17f2887f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 28 Jan 2014 12:06:22 +0100 Subject: [PATCH 015/384] libdrm: minor update 2.4.50 -> .52 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 5aa54582fdc7..0969b51a168c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.50"; + name = "libdrm-2.4.52"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0idh6cwqr2rilig7vygb3gxvivchp0q1iq4md79jq340v96d48rq"; + sha256 = "1h8q0azb5bxqljpi1dlxmh5i30c4wdrncffcpppzrgk13wpkqsgs"; }; nativeBuildInputs = [ pkgconfig ]; From edb1e2996f9bfab788f142b88a48b15b20df6cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 28 Jan 2014 12:11:35 +0100 Subject: [PATCH 016/384] xorg.xtrans: update to 1.3.3 Another forgotten X lib; we had ~2 years without updating it. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.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 580e09642a55..b0ac857948ba 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2010,11 +2010,11 @@ let })) // {inherit libX11 xbitmaps libXcursor libXmu ;}; xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) { - name = "xtrans-1.2.7"; + name = "xtrans-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2; - sha256 = "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz"; + url = mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2; + sha256 = "1gq9i9p1q7wgaj1vm1n5mrw0rp0bpcdk4hdy9yj82i92rsnv8bb2"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 7a997c6c169d..50a4928e3515 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -175,7 +175,7 @@ mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2 +mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2 From 120be164794e0703729fba05643e95158dba9d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 Jan 2014 14:08:23 +0100 Subject: [PATCH 017/384] llvm: propagate ncurses Cf. discussion at https://github.com/NixOS/nixpkgs/commit/4eefe1a7 --- pkgs/development/compilers/llvm/3.4/llvm.nix | 4 +++- pkgs/development/libraries/mesa/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 4947bdca2a96..df0bae3218d0 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { mv compiler-rt-${version} $sourceRoot/projects/compiler-rt ''; - buildInputs = [ perl groff cmake libxml2 python libffi valgrind ncurses ]; + propagatedBuildInputs = [ ncurses ]; # linked against it, e.g. mesa needs it now, too + + buildInputs = [ perl groff cmake libxml2 python libffi valgrind ]; # hacky fix: created binaries need to be run before installation preBuild = '' diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 11b1e2bca770..1eb3258b14b3 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook , python, libxml2Python, file, expat, makedepend , libdrm, xorg, wayland, udev, llvm, libffi -, libvdpau, libelf, ncurses +, libvdpau, libelf , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt , enableExtraFeatures ? false # not maintained }: @@ -87,7 +87,7 @@ stdenv.mkDerivation { buildInputs = with xorg; [ autoreconfHook intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt - libffi wayland libvdpau libelf ncurses + libffi wayland libvdpau libelf ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] ++ optional stdenv.isLinux udev ; From 48811001c405cd33be012831b4d8b73cc52ba3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 Jan 2014 15:13:02 +0100 Subject: [PATCH 018/384] gtk3: change name to gtk+3-3.*, don't lower priority This is to allow alongside installation of gtk2 and gtk3 in user envs. Therefore, decreasing the priority of gtk3 was superfluous now. --- pkgs/development/libraries/gtk+/3.x.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 651ac0d303b9..6360d67cf209 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ let ver_min = "6"; in stdenv.mkDerivation rec { - name = "gtk+-${ver_maj}.${ver_min}"; + name = "gtk+3-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 286e029e08b3..4201f6420d38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4366,9 +4366,9 @@ let cupsSupport = config.gtk2.cups or stdenv.isLinux; }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { inherit (gnome3) at_spi2_atk; - }); + }; gtk = pkgs.gtk2; From b27477054f4a330255afb9003667d33b8e679ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 30 Jan 2014 09:12:51 +0100 Subject: [PATCH 019/384] xorg xcb-util-wm: minor update --- 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 b0ac857948ba..9d27b2d1a384 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.3.9"; + name = "xcb-util-wm-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2; - sha256 = "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3"; + url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2; + sha256 = "07zmlaaqkasihmkfwcac4wclb8zws915inz57y3kr3frywc7ryb6"; }; 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 505f0eafc3a0..90c8e489e1e3 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.3.9.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2 From 546bd7738d35094a8d8067581820056c33a9cd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 30 Jan 2014 13:46:02 +0100 Subject: [PATCH 020/384] xorg xkeyboard-config: update, unify with the other expression --- pkgs/data/misc/xkeyboard-config/default.nix | 25 ----- pkgs/data/misc/xkeyboard-config/eo.patch | 71 -------------- .../xkeyboard-config/level3-deadkeys-us-intl | 95 ------------------- pkgs/servers/x11/xorg/default.nix | 6 +- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- pkgs/top-level/all-packages.nix | 4 +- 7 files changed, 7 insertions(+), 198 deletions(-) delete mode 100644 pkgs/data/misc/xkeyboard-config/default.nix delete mode 100644 pkgs/data/misc/xkeyboard-config/eo.patch delete mode 100644 pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix deleted file mode 100644 index 15574a1dc366..000000000000 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }: - -stdenv.mkDerivation rec { - name = "xkeyboard-config-2.7"; - - src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2"; - sha256 = "08c3mjdgp7c2v6lj5bymaczcazklsd7s1lxslxbngzmh5yhphd74"; - }; - - buildInputs = [ gettext ]; - - nativeBuildInputs = [ perl perlXMLParser intltool xkbcomp ]; - - patches = [ ./eo.patch ]; - - preConfigure = '' - configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86 --disable-runtime-deps" - sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh - ''; - - postInstall = '' - cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us - ''; -} diff --git a/pkgs/data/misc/xkeyboard-config/eo.patch b/pkgs/data/misc/xkeyboard-config/eo.patch deleted file mode 100644 index f288a5c0f6dd..000000000000 --- a/pkgs/data/misc/xkeyboard-config/eo.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/rules/base.xml.in b/rules/base.xml.in -index ec321f8..e9c3546 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -1786,6 +1786,13 @@ - - - -+ eo -+ <_shortDescription>Esp -+ <_description>Esperanto -+ -+ -+ -+ - ir - <_shortDescription>Irn - <_description>Iran -diff --git a/symbols/Makefile.am b/symbols/Makefile.am -index 97c816d..d7e3a4e 100644 ---- a/symbols/Makefile.am -+++ b/symbols/Makefile.am -@@ -10,7 +10,7 @@ bt by braille \ - ca cd \ - ch cn cz \ - de dk \ --ee es et epo \ -+ee eo es et epo \ - fi fo fr \ - gb ge gh gn \ - gr hr hu \ -diff --git a/symbols/Makefile.in b/symbols/Makefile.in -index b5be077..5cddcc7 100644 ---- a/symbols/Makefile.in -+++ b/symbols/Makefile.in -@@ -222,7 +222,7 @@ bt by braille \ - ca cd \ - ch cn cz \ - de dk \ --ee es et epo \ -+ee eo es et epo \ - fi fo fr \ - gb ge gh gn \ - gr hr hu \ -diff --git a/symbols/eo b/symbols/eo -new file mode 100644 -index 0000000..d6358c9 ---- /dev/null -+++ b/symbols/eo -@@ -0,0 +1,21 @@ -+// $XFree86$ -+ -+partial alphanumeric_keys -+xkb_symbols "basic" { -+ -+ // Describes the differences between a very simple en_US -+ // keyboard and a simple Esperanto keyboard -+ // Press AltGr or Windows Menu key together with C, H, J, S, U -+ // to get accented letters. -+ // 2001 by Radovan Garabik -+ -+ key.type = "FOUR_LEVEL"; -+ -+ key { [w,W, ubreve,Ubreve ] }; -+ key { [u,U, ubreve, Ubreve ] }; -+ key { [s,S, scircumflex, Scircumflex ] }; -+ key { [g,G, gcircumflex,Gcircumflex ] }; -+ key { [h,H, hcircumflex,Hcircumflex ] }; -+ key { [j,J, jcircumflex,Jcircumflex ] }; -+ key { [c,C, ccircumflex,Ccircumflex ] }; -+}; diff --git a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl deleted file mode 100644 index 76905b7b77be..000000000000 --- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl +++ /dev/null @@ -1,95 +0,0 @@ - -// Grabbed from http://lists.freedesktop.org/archives/xorg/2007-July/026686.html -// Submitted there by Adriaan van Nijendaal, he says he submitted it to X.org -// for inclusion, so it should be OK to use it as if it were part of X.org - -// The keyboard section in the X-server config file -// (/etc/X11/xorg.conf on my system) looks like this: -// -// Section "InputDevice" -// Driver "kbd" -// Identifier "Keyboard[0]" -// Option "XkbModel" "pc101" -// Option "XkbLayout" "us" -// Option "XkbVariant" "altgr-intl" -// EndSection -// -// To be effective, you need to install this file, change the X config -// file and restart the X-server. Or, alternatively, you can do this -// run-time: -// -// setxkbmap -v -rules xorg -model pc101 -layout us -variant altgr-intl -// -// Once the X-server has loaded the new config, a keyboard can be -// displayed with: (if you change "-ll 1" into "-ll 2", you'll see -// the special keys ONLY.) -// -// xkbcomp -o /tmp/keyboard.xkm -opt cgkst -xkb $DISPLAY -// xkbprint -o /tmp/keyboard.xkm.ps -kc -nkg 2 -ntg 4 -lg 1 -ll 1 \ -// -lc en_US.iso885915 -level2 -mono -label symbols -w 3 $DISPLAY; -// gv -seascape /tmp/keyboard.xkm.ps -// rm -f /tmp/keyboard.xkm.ps /tmp/keyboard.xkm -// - -partial hidden alphanumeric_keys -xkb_symbols "altgr-intl-rich" { - - name[Group1]= "U.S. English - International (AltGr dead keys)"; - - include "us(basic)" - - key { [ grave, asciitilde, dead_grave, dead_tilde ] }; - key { [ 1, exclam, onesuperior, exclamdown ] }; - key { [ 2, at, twosuperior, dead_doubleacute] }; - key { [ 3, numbersign, threesuperior, dead_macron ] }; - key { [ 4, dollar, currency, sterling ] }; - key { [ 5, percent, EuroSign, approxeq ] }; - key { [ 6, asciicircum, dead_circumflex, dead_stroke ] }; - key { [ 7, ampersand, dead_horn ] }; - key { [ 8, asterisk, dead_ogonek, infinity ] }; - key { [ 9, parenleft, leftsinglequotemark,dead_breve ] }; - key { [ 0, parenright,rightsinglequotemark,dead_abovering ] }; - key { [ minus, underscore, yen, dead_belowdot ] }; - key { [ equal, plus, multiply, division ] }; - - key { [ q, Q, adiaeresis, Adiaeresis ] }; - key { [ w, W, aring, Aring ] }; - key { [ e, E, eacute, Eacute ] }; - key { [ r, R, ediaeresis, Ediaeresis ] }; - key { [ t, T, thorn, THORN ] }; - key { [ y, Y, udiaeresis, Udiaeresis ] }; - key { [ u, U, uacute, Uacute ] }; - key { [ i, I, iacute, Iacute ] }; - key { [ o, O, oacute, Oacute ] }; - key { [ p, P, odiaeresis, Odiaeresis ] }; - key { [ bracketleft, braceleft, guillemotleft, lessthanequal ] }; - key { [ bracketright,braceright, guillemotright, greaterthanequal] }; - - key { [ a, A, aacute, Aacute ] }; - key { [ s, S, ssharp, section ] }; - key { [ d, D, eth, ETH ] }; - key { [ f, F, union, intersection ] }; - key { [ g, G, eng, ENG ] }; - key { [ h, H, hyphen, nobreakspace ] }; - key { [ j, J, idiaeresis, Idiaeresis ] }; - key { [ k, K ] }; - key { [ l, L, oslash, Ooblique ] }; - key { [semicolon, colon, paragraph, degree ] }; - key { [apostrophe, quotedbl, dead_acute, dead_diaeresis ] }; - - key { [ z, Z, ae, AE ] }; - key { [ x, X, oe, OE ] }; - key { [ c, C, copyright, cent ] }; - key { [ v, V, registered, trademark ] }; - key { [ b, B, emdash, endash ] }; - key { [ n, N, nu, numerosign ] }; - key { [ m, M, mu, plusminus ] }; - key { [ comma, less, ccedilla, Ccedilla ] }; - key { [ period, greater, dead_abovedot, dead_caron ] }; - key { [ slash, question, questiondown, dead_hook ] }; - key { [backslash, bar, notsign, brokenbar ] }; - - // Let's have free choice - //include "level3(ralt_switch)" -}; - diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9d27b2d1a384..a0cc0c7b148d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1830,11 +1830,11 @@ let })) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) { - name = "xkeyboard-config-2.8"; + name = "xkeyboard-config-2.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2; - sha256 = "1bkq415qw4r3dl139mqgal9v585x7kh3km6z1lraz2j8im3ga72f"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2; + sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7"; }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0ee3594f6ec0..499d78b947e5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -131,7 +131,7 @@ in postInstall = '' mkdir -p $out/share - ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11 + ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11 ''; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 50a4928e3515..2eb08b1831de 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -159,7 +159,7 @@ mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4201f6420d38..e8fd441f9948 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6343,7 +6343,7 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig libxslt expat libdrm libpng zlib perl mesa_drivers - xkeyboard_config dbus libuuid openssl gperf m4 + dbus libuuid openssl gperf m4 autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman; automake = automake110x; mesa = mesa_noglu; @@ -7281,7 +7281,7 @@ let xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; - xkeyboard_config = callPackage ../data/misc/xkeyboard-config { }; + xkeyboard_config = xorg.xkeyboardconfig; ### APPLICATIONS From 5888f27c563427b1771979d3e794806302fe7ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 30 Jan 2014 13:49:08 +0100 Subject: [PATCH 021/384] automake-1.10: remove, probably vulnerable CVE-2012-3386 The only user was xorg ATM, which I would remove from anyway. --- .../tools/misc/automake/automake-1.10.x.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/tools/misc/automake/automake-1.10.x.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix deleted file mode 100644 index 80b033425a13..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix +++ /dev/null @@ -1,41 +0,0 @@ -{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}: - -stdenv.mkDerivation rec { - name = "automake-1.10.3"; - - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.bz2"; - sha256 = "1p0sgv8zl6ah6vwpqf7jkrjr3cw8ydpmnbi0ljb1dhrrp0xv92p9"; - }; - - buildInputs = [perl autoconf makeWrapper]; - - inherit doCheck; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - license = "GPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8fd441f9948..4693d5cf24d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3372,8 +3372,6 @@ let automake = automake112x; - automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; - automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; @@ -6344,8 +6342,7 @@ let inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig libxslt expat libdrm libpng zlib perl mesa_drivers dbus libuuid openssl gperf m4 - autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman; - automake = automake110x; + autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman; mesa = mesa_noglu; }); From fcaa782b6ab7cd18b8ccca82cc6615b0b3c36b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 10:00:56 +0100 Subject: [PATCH 022/384] mesa: revert to 9.2.* until the driver problems are fixed I was unable to make the gallium drivers not to miss some LLVM RTTI stuff. 9.* don't build with llvm-3.4. --- pkgs/development/libraries/mesa/default.nix | 14 +- .../libraries/mesa/dricore-gallium.patch | 216 ++++++++++++++++++ .../libraries/mesa/werror-wundef.patch | 12 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 236 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/mesa/dricore-gallium.patch create mode 100644 pkgs/development/libraries/mesa/werror-wundef.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1eb3258b14b3..68333892fd4c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,8 +23,8 @@ else */ let - version = "10.0.2"; - # this is the default search path for DRI drivers + version = "9.2.5"; + # this is the default search path for DRI drivers (note: X server no longer introduces an overriding env var) driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -34,15 +34,15 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "0zkayy6gl0nwgqg11ga95vl4z0hldcz1b77qzzc1agm5vziah0j5"; + sha256 = "1w3bxclgwl2hwyxk3za7dbdakb8jsya7afck35cz0v8pxppvjsml"; }; prePatch = "patchShebangs ."; patches = [ ./static-gallium.patch - # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), - # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog + ./dricore-gallium.patch + ./werror-wundef.patch ]; # Change the search path for EGL drivers from $drivers/* to driverLink @@ -69,7 +69,7 @@ stdenv.mkDerivation { "--enable-osmesa" # used by wine "--with-dri-drivers=i965,r200,radeon" - ("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi") + "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi" "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi" ] ++ optional enableTextureFloats "--enable-texture-float" @@ -94,7 +94,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672, - #tests for 10.* fail to link due to some RTTI problem + # also, 10.* links bad due to some RTTI problem # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; # also move libOSMesa to $osmesa, as it's relatively big diff --git a/pkgs/development/libraries/mesa/dricore-gallium.patch b/pkgs/development/libraries/mesa/dricore-gallium.patch new file mode 100644 index 000000000000..9a8b6768277b --- /dev/null +++ b/pkgs/development/libraries/mesa/dricore-gallium.patch @@ -0,0 +1,216 @@ +commit 5208f187c7dade2c33385a56c1a5f1c3cedc8377 (HEAD, nix-patches) +Author: Vladimír Čunát +Date: Mon May 13 11:34:59 2013 +0200 + + 118-dricore-gallium.patch + +diff --git a/configure.ac b/configure.ac +index be89843..08f6761 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -928,6 +928,8 @@ AC_SUBST([GLESv2_LIB_DEPS]) + AC_SUBST([GLESv2_PC_LIB_PRIV]) + + DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la" ++MESAGALLIUM_LIBS="${DRI_LIB_DEPS}" ++AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS}) + + AC_SUBST([HAVE_XF86VIDMODE]) + +diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am +index 3cdec83..53ff69b 100644 +--- a/src/gallium/auxiliary/Makefile.am ++++ b/src/gallium/auxiliary/Makefile.am +@@ -34,14 +34,14 @@ if LLVM_NEEDS_FNORTTI + + AM_CXXFLAGS += -fno-rtti + +-libgallium_la_LIBADD = $(LLVM_LIBS) +- + endif + + libgallium_la_SOURCES += \ + $(GALLIVM_SOURCES) \ + $(GALLIVM_CPP_SOURCES) + ++libgallium_la_LIBADD = ../../mesa/libdricore/libmesagallium.la $(LLVM_LIBS) $(GALLIUM_DRI_LIB_DEPS) ++ + endif + + indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py +diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am +index f4f9030..e9b9462 100644 +--- a/src/gallium/targets/dri-i915/Makefile.am ++++ b/src/gallium/targets/dri-i915/Makefile.am +@@ -49,7 +49,7 @@ i915_dri_la_SOURCES = \ + i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + i915_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ +diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am +index 69ccf32..fef4c63 100644 +--- a/src/gallium/targets/dri-nouveau/Makefile.am ++++ b/src/gallium/targets/dri-nouveau/Makefile.am +@@ -48,7 +48,7 @@ nouveau_dri_la_SOURCES = \ + nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + nouveau_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ +diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am +index 8c0215d..6beb536 100644 +--- a/src/gallium/targets/dri-r300/Makefile.am ++++ b/src/gallium/targets/dri-r300/Makefile.am +@@ -49,7 +49,7 @@ r300_dri_la_SOURCES = \ + r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + r300_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ +diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am +index 2b3524b..d40fb89 100644 +--- a/src/gallium/targets/dri-r600/Makefile.am ++++ b/src/gallium/targets/dri-r600/Makefile.am +@@ -48,7 +48,7 @@ r600_dri_la_SOURCES = \ + r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + r600_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/drivers/r600/libr600.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ +diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am +index f7d87a6..87ab2aa 100644 +--- a/src/gallium/targets/dri-radeonsi/Makefile.am ++++ b/src/gallium/targets/dri-radeonsi/Makefile.am +@@ -49,7 +49,7 @@ radeonsi_dri_la_SOURCES = \ + radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + radeonsi_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ +diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am +index 1104379..72d2401 100644 +--- a/src/gallium/targets/dri-swrast/Makefile.am ++++ b/src/gallium/targets/dri-swrast/Makefile.am +@@ -49,7 +49,7 @@ swrast_dri_la_SOURCES = \ + swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + swrast_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \ + $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ +diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am +index ca7df65..4384976 100644 +--- a/src/gallium/targets/dri-vmwgfx/Makefile.am ++++ b/src/gallium/targets/dri-vmwgfx/Makefile.am +@@ -48,7 +48,7 @@ vmwgfx_dri_la_SOURCES = \ + vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + vmwgfx_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ +diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am +index 5c40ae8..6922ab2 100644 +--- a/src/gallium/targets/egl-static/Makefile.am ++++ b/src/gallium/targets/egl-static/Makefile.am +@@ -104,7 +104,7 @@ AM_CPPFLAGS += \ + $(API_DEFINES) + + egl_gallium_la_LIBADD += \ +- $(top_builddir)/src/mesa/libmesagallium.la ++ @MESAGALLIUM_LIBS@ + # make st/mesa built-in when there is a single glapi provider + if HAVE_SHARED_GLAPI + egl_gallium_la_LIBADD += \ +diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am +index 41483dd..0045a673 100644 +--- a/src/mesa/Makefile.am ++++ b/src/mesa/Makefile.am +@@ -75,9 +75,6 @@ noinst_LTLIBRARIES += libmesa.la + else + check_LTLIBRARIES = libmesa.la + endif +-if HAVE_GALLIUM +-noinst_LTLIBRARIES += libmesagallium.la +-endif + + SRCDIR = $(top_srcdir)/src/mesa/ + BUILDDIR = $(top_builddir)/src/mesa/ +@@ -119,15 +116,6 @@ libmesa_la_LIBADD = \ + $() + libmesa_la_LDFLAGS = + +-libmesagallium_la_SOURCES = \ +- $(MESA_GALLIUM_FILES) \ +- $(MESA_ASM_FILES_FOR_ARCH) +- +-libmesagallium_la_LIBADD = \ +- $(top_builddir)/src/glsl/libglsl.la \ +- $(top_builddir)/src/mesa/program/libprogram.la \ +- $() +- + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = gl.pc + +diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am +index 753548e..8761418 100644 +--- a/src/mesa/libdricore/Makefile.am ++++ b/src/mesa/libdricore/Makefile.am +@@ -42,6 +42,7 @@ libdricore@VERSION@_la_SOURCES = \ + libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 + libdricore@VERSION@_la_LIBADD = \ + ../program/libdricore_program.la \ ++ $(top_builddir)/src/mapi/shared-glapi/libglapi.la + $() + + if HAVE_X86_ASM +@@ -65,8 +66,10 @@ AM_CPPFLAGS += \ + -I$(top_srcdir)/src/mesa/sparc + endif + ++lib_LTLIBRARIES = ++ + if HAVE_DRI +-lib_LTLIBRARIES = libdricore@VERSION@.la ++lib_LTLIBRARIES += libdricore@VERSION@.la + + # Provide compatibility with scripts for the old Mesa build system for + # a while by putting a link to the driver into /lib of the build tree. +@@ -76,6 +79,17 @@ all-local: libdricore@VERSION@.la + ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so + endif + ++libmesagallium_la_SOURCES = \ ++ $(STATETRACKER_FILES) ++libmesagallium_la_CFLAGS = @LLVM_CFLAGS@ ++libmesagallium_la_CXXFLAGS = @LLVM_CXXFLAGS@ ++libmesagallium_la_LIBADD = libdricore@VERSION@.la $(LLVM_LIBS) ++ ++if HAVE_GALLIUM ++noinst_LTLIBRARIES = libmesagallium.la ++endif ++ ++ + CLEANFILES = \ + $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \ + $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so diff --git a/pkgs/development/libraries/mesa/werror-wundef.patch b/pkgs/development/libraries/mesa/werror-wundef.patch new file mode 100644 index 000000000000..4663f68bd7d3 --- /dev/null +++ b/pkgs/development/libraries/mesa/werror-wundef.patch @@ -0,0 +1,12 @@ +diff -rupN Mesa-9.2.0-orig/include/GL/gl.h Mesa-9.2.0/include/GL/gl.h +--- Mesa-9.2.0-orig/include/GL/gl.h 2013-08-14 03:34:42.000000000 +0200 ++++ Mesa-9.2.0/include/GL/gl.h 2013-09-24 19:34:58.319140812 +0200 +@@ -2088,7 +2088,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOO + + + +-#if GL_ARB_shader_objects ++#if defined(GL_ARB_shaders_objects) && GL_ARB_shader_objects + + #ifndef GL_MESA_shader_debug + #define GL_MESA_shader_debug 1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4693d5cf24d2..1cfa3a111d96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5104,7 +5104,7 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa_original = callPackage ../development/libraries/mesa { }; + mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; }; mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL // { driverLink = mesa_noglu; } else mesa_original; From fbff019f08394e433fc1099a10eb230858094912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 10:41:00 +0100 Subject: [PATCH 023/384] gtk3: bugfix update 3.10.6 -> .7, fix bad URI The bad URI was introduced by changing the name in 4881100. --- pkgs/development/libraries/gtk+/3.x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 6360d67cf209..9f89fc074f18 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -10,14 +10,15 @@ assert cupsSupport -> cups != null; let ver_maj = "3.10"; - ver_min = "6"; + ver_min = "7"; + version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { - name = "gtk+3-${ver_maj}.${ver_min}"; + name = "gtk+3-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz"; - sha256 = "12i6n2vijglqgc7z5migllhpygg65fqzfgrsknimwynbqmzwa91w"; + url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; + sha256 = "09wlsim4immrws0fyvpk03sspsljcsgybrwp73scycah70axxsdp"; }; enableParallelBuilding = true; From d92f6c19db554318fab12c59e05381990fdc47f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 10:42:53 +0100 Subject: [PATCH 024/384] gdk-pixbuf: bugfix update 2.30.2 -> .3, enable tests Hopefully the tests will succeed on Hydra, too. --- pkgs/development/libraries/gdk-pixbuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 4b92c6470eb1..50bab580ebf5 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.30"; - ver_min = "2"; + ver_min = "3"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "1gzczsv41h28is4rrxjfyj1qx8ifp23fq2ckh0k099m9fnhbzfna"; + sha256 = "1524ayaahni9svn88k8ar0906xyvp6j90dmm22aangjpb4zwaaf2"; }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" ; - doCheck = false; # broken animation tester + doCheck = true; postInstall = "rm -rf $out/share/gtk-doc"; From e116d88694a0143108ef73f5ef1715119deee512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 10:45:30 +0100 Subject: [PATCH 025/384] harfbuzz: minor update 0.9.25 -> .26 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index c69a96795d20..227ac58bda57 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.25"; + name = "harfbuzz-0.9.26"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "1vkbdny880d60j3v6lvpc6p8fvj6cl7hma27h796qlk9lnbmjvnw"; + sha256 = "0mz220qv3xn3lk1v94q1wgykayxnas94n8ks1liwkdazs71pvvax"; }; configureFlags = [ From 32a4081a7f8a162cb10f3afb8cec57165f05e0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 10:46:08 +0100 Subject: [PATCH 026/384] fontconfig: update 2.10.2 -> 2.11.0 Finally. This was blocking pango update for many months. Hopefully the infinality patches still work with this release. --- pkgs/development/libraries/fontconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index b2afc427b4c0..478c9c9bdb93 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, freetype, expat }: stdenv.mkDerivation rec { - name = "fontconfig-2.10.2"; + name = "fontconfig-2.11.0"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; + sha256 = "0rx4q7wcrz4lkpgcmqkwkp49v1fm0yxl0f35jn75dj1vy3v0w3nb"; }; infinality_patch = with freetype.infinality; if useInfinality From 9c4d6561029aebd8e7ad96f24e256d0de7ae8097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 10:57:35 +0100 Subject: [PATCH 027/384] pango: major update 1.32.5 -> 1.36.1, enable tests Also propagate stuff in *.pc dependencies. --- pkgs/development/libraries/pango/default.nix | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index f57ee931fafa..2db977e0f344 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig -, libintlOrEmpty, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz +, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection +}: +let + ver_maj = "1.36"; + ver_min = "1"; +in stdenv.mkDerivation rec { - name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!) + name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz"; - sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; + url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; + sha256 = "1y2r1v4m8g4afggjd1siz0ri175p64myz9d2ks58grlrvhfbbr22"; }; - buildInputs = [ gobjectIntrospection ] - ++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; - - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection ]; - propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty; + propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; + doCheck = true; + postInstall = "rm -rf $out/share/gtk-doc"; meta = { From 07ab75205c8e2bd80258d5dc31e4f7c3dcb3c4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 12:09:58 +0100 Subject: [PATCH 028/384] release: fix automake evaluation, broken in 5888f27c --- pkgs/top-level/release-small.nix | 3 +-- pkgs/top-level/release.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 14812b3e8112..df0480bf82cb 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -22,8 +22,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; aterm25 = all; aterm28 = all; autoconf = all; - automake110x = all; - automake111x = all; + automake = all; avahi = allBut "i686-cygwin"; # Cygwin builds fail bash = all; bashInteractive = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3d7fbd1c57bf..33ecef8b3a21 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -48,8 +48,7 @@ let atlas = linux; audacious = linux; autoconf = all; - automake110x = all; - automake111x = all; + automake = all; avahi = allBut "i686-cygwin"; # Cygwin builds fail bash = all; bashInteractive = all; From 8e4665a634dd2840505919b0bd5df4f3090c137f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 2 Feb 2014 13:31:36 +0100 Subject: [PATCH 029/384] pango: disable tests (fail to find config in chroot) --- pkgs/development/libraries/pango/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 2db977e0f344..bd4e63548954 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + #doCheck = true; # testiter fails to find fontconfig configuration postInstall = "rm -rf $out/share/gtk-doc"; From ab7b06d8c953b81f400f76387a59ae513f2781e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Feb 2014 08:16:33 +0100 Subject: [PATCH 030/384] fontconfig: propagate freetype as *.pc requires; maintain --- pkgs/development/libraries/fontconfig/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 478c9c9bdb93..75e28ffe7486 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { } else null; - buildInputs = [ pkgconfig freetype expat ]; + propagatedBuildInputs = [ freetype ]; + buildInputs = [ pkgconfig expat ]; configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; @@ -38,10 +39,11 @@ stdenv.mkDerivation rec { cd "$out/etc/fonts" && tar xvf ${infinality_patch} ''; - meta = { + meta = with stdenv.lib; { description = "A library for font customization and configuration"; homepage = http://fontconfig.org/; - license = "bsd"; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd2; # custom but very bsd-like + platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; }; } From e43018e0196dd6af57087ecb6aaa3af7b17776ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Feb 2014 08:20:20 +0100 Subject: [PATCH 031/384] spring: disable parallel building, as it breaks on Hydra --- pkgs/games/spring/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 70cffaa192e2..7273b425f9a3 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "which" "type -p" ''; - enableParallelBuilding = true; + #enableParallelBuilding = true; # occasionally missing generated files on Hydra meta = with stdenv.lib; { homepage = http://springrts.com/; From 159144c1e9dfdf98cab00e8756b1f3fbcad5566c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Feb 2014 19:01:37 +0100 Subject: [PATCH 032/384] libpng(_apng): maintenance update 1.6.8 -> .9 --- pkgs/development/libraries/libpng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index f120bca50c62..c1655bf7f2bd 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.8"; - sha256 = "109h2fcjspd792lvh5q4xnkpsv7rjczmrdl15i4ajx0xbs5kvxr4"; + version = "1.6.9"; + sha256 = "0ji7488fp08b3xa6605zzghzpxawkhhg6jbqzrdw2y38zrvadqzx"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "0wysnv0d8h7pyz7gfagnkwra2k7malqga1cn6wbk2l7a8k2r53qi"; + sha256 = "0l61y6b03avyxrx8c72x8m73j3b8mj0wx80wdl6w82wgnr2fw4x1"; }; whenPatched = stdenv.lib.optionalString apngSupport; From 74c34763e77a1c7f7b6729a17e798c123ccd00ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 10 Feb 2014 19:08:42 +0100 Subject: [PATCH 033/384] gdk_pixbuf: bugfix update 2.30.3 -> .4 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 50bab580ebf5..7a06f08aea60 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.30"; - ver_min = "3"; + ver_min = "4"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "1524ayaahni9svn88k8ar0906xyvp6j90dmm22aangjpb4zwaaf2"; + sha256 = "0ldhpdalbyi6q5k1dz498i9hqcsd51yxq0f91ck9p0h4v38blfx1"; }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. From b5d17fe873a1db4109bab1061ab1572cd501de4e Mon Sep 17 00:00:00 2001 From: Thiago Tonelli Bartolomei Date: Thu, 13 Feb 2014 11:11:14 -0500 Subject: [PATCH 034/384] - adding brightness options - setting options to be uniq - using proper systemd exec service --- nixos/modules/services/x11/redshift.nix | 26 +++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index b9ad962d8e46..368403ed8a5a 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -14,24 +14,37 @@ in { services.redshift.latitude = mkOption { description = "Your current latitude"; - type = types.string; + type = types.uniq types.string; }; services.redshift.longitude = mkOption { description = "Your current longitude"; - type = types.string; + type = types.uniq types.string; }; services.redshift.temperature = { day = mkOption { description = "Colour temperature to use during day time"; default = 5500; - type = types.int; + type = types.uniq types.int; }; night = mkOption { description = "Colour temperature to use during night time"; default = 3700; - type = types.int; + type = types.uniq types.int; + }; + }; + + services.redshift.brightness = { + day = mkOption { + description = "Screen brightness to apply during the day (between 0.1 and 1.0)"; + default = 1; + type = types.uniq types.string; + }; + night = mkOption { + description = "Screen brightness to apply during the night (between 0.1 and 1.0)"; + default = 1; + type = types.uniq types.string; }; }; }; @@ -41,10 +54,11 @@ in { description = "Redshift colour temperature adjuster"; requires = [ "display-manager.service" ]; after = [ "display-manager.service" ]; - script = '' + serviceConfig.ExecStart = '' ${pkgs.redshift}/bin/redshift \ -l ${cfg.latitude}:${cfg.longitude} \ - -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} + -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \ + -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} ''; environment = { DISPLAY = ":0"; }; serviceConfig.Restart = "always"; From d8a5ac138cc6f4abc27bb25b2d150c5f47fe46af Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Tue, 11 Feb 2014 10:28:38 +0000 Subject: [PATCH 035/384] haskellPackages.aeson_0_7: No longer depends on attoparsec 0.11 --- pkgs/top-level/haskell-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 04563d1fda11..8dedd487b367 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -527,9 +527,7 @@ 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 { - attoparsec = self.attoparsec_0_11_1_0; - }; + aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {}; aeson = self.aeson_0_6_2_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; From 2dcf9338178bc784c59034fecb32de3de32c1284 Mon Sep 17 00:00:00 2001 From: Thiago Tonelli Bartolomei Date: Fri, 14 Feb 2014 09:48:19 -0500 Subject: [PATCH 036/384] adding wantedBy graphical.target --- nixos/modules/services/x11/redshift.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 368403ed8a5a..332d742a1416 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -54,6 +54,7 @@ in { description = "Redshift colour temperature adjuster"; requires = [ "display-manager.service" ]; after = [ "display-manager.service" ]; + wantedBy = [ "graphical.target" ]; serviceConfig.ExecStart = '' ${pkgs.redshift}/bin/redshift \ -l ${cfg.latitude}:${cfg.longitude} \ From ad4e2bd4995555d1d3b05a47f134046917a4f93c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 16:50:39 +0200 Subject: [PATCH 037/384] linux_3_4: update from 3.4.79 to 3.4.80 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 0e2dade27aa3..6e94cb5807e6 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.79"; + version = "3.4.80"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "07xd01b5vl6gl4p2cs75fsn295jvwmlq2j9jw582b2ii8vsaavvv"; + sha256 = "1vma3bxydryhcg7iimndq4rbpzbpjvnq7qa5md6wm6iill011pil"; }; features.iwlwifi = true; From 699509db149744d1da09a868a6d1ae4a46f4fe3d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 16:54:31 +0200 Subject: [PATCH 038/384] linux_3_10: update from 3.10.29 to 3.10.30 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index f2e8ef355e71..a5c096491c37 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.29"; + version = "3.10.30"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "14g8z5g2xwf0s6r7m9586xdpd56nc810dny70cz6zq8c03kfq594"; + sha256 = "0a9x27g026gvy64w2xkpkdf3kzjfzzgy0kgikdyk604zdz4ha2hm"; }; features.iwlwifi = true; From fc213ccfa8e922be80d5bb3cfcb57c454bd9a7e6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 16:56:34 +0200 Subject: [PATCH 039/384] linux_3_13: update from 3.13.2 to 3.13.3 --- 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 da9f5583d82e..24f10ecb478f 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.2"; + version = "3.13.3"; extraMeta.branch = "3.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1bvxcdzjff514zwk18b9dfkhhk12fjjbb4a1saynqnisdn7b78dl"; + sha256 = "0x277h0ccdjivi16w20aj59ncazr7zs07zprazm0ph4qyffv0r4g"; }; features.iwlwifi = true; From daa2827b99248ba986443b0503000466e27d4b18 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 18:13:05 +0200 Subject: [PATCH 040/384] grsecurity: update patch --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 5ade01014f95..c36779c295f5 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -89,11 +89,11 @@ rec { features.apparmor = true; }; - grsecurity_3_0_3_13_2 = - { name = "grsecurity-3.0-3.13.2"; + grsecurity_3_0_3_13_3 = + { name = "grsecurity-3.0-3.13.3"; patch = fetchurl { - url = https://grsecurity.net/test/grsecurity-3.0-3.13.2-201402062224.patch; - sha256 = "0w42d76bv7yzpr23bicsadf64csbmq988kmpzxg4yv5qwzhhbyh7"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402132113.patch; + sha256 = "143givk7xk54c2f9q7h2v5gdc3sy1kcd8j83vn1jfcyipzqkdqnk"; }; 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 90e59c96c29e..7b4e092f992c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6680,7 +6680,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_2 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_3 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; }; From 5cd0a886fe62ac63b35ad61b75d4b49a9799e441 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 14 Feb 2014 16:24:26 +0000 Subject: [PATCH 041/384] elasticsearch: Update to 1.0.0 close #1746 --- pkgs/servers/search/elasticsearch/default.nix | 4 +- .../search/elasticsearch/es-home.patch | 97 ++++++++----------- 2 files changed, 40 insertions(+), 61 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index f99ecded098b..165a01517b43 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, makeWrapper, jre, utillinux }: stdenv.mkDerivation rec { - name = "elasticsearch-0.90.3"; + name = "elasticsearch-1.0.0"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "1l6rnp4yvlz4z6z4v3af08yd4sl91c4zz20a8yyif2p234lh3n2s"; + sha256 = "06ym7hl47339a5dav2hawnxv820y0lbvh9xxd0lfp1f815vbql01"; }; patches = [ ./es-home.patch ]; diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch index d75a5a8c052f..9b96149e5ad8 100644 --- a/pkgs/servers/search/elasticsearch/es-home.patch +++ b/pkgs/servers/search/elasticsearch/es-home.patch @@ -1,59 +1,38 @@ -diff -rc elasticsearch-0.90.3/bin/elasticsearch elasticsearch-0.90.3-new/bin/elasticsearch -*** elasticsearch-0.90.3/bin/elasticsearch 2013-08-06 15:19:22.000000000 +0200 ---- elasticsearch-0.90.3-new/bin/elasticsearch 2013-08-27 16:42:00.935880011 +0200 -*************** -*** 62,68 **** - done - - # determine elasticsearch home -! ES_HOME=`dirname "$SCRIPT"`/.. - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` ---- 62,71 ---- - done - - # determine elasticsearch home -! if [ -z "$ES_HOME" ]; then -! echo "You must set the ES_HOME var" >&2 -! exit 1 -! fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -diff -rc elasticsearch-0.90.3/bin/plugin elasticsearch-0.90.3-new/bin/plugin -*** elasticsearch-0.90.3/bin/plugin 2013-08-06 15:19:22.000000000 +0200 ---- elasticsearch-0.90.3-new/bin/plugin 2013-08-27 16:49:01.024160295 +0200 -*************** -*** 16,22 **** - done - - # determine elasticsearch home -! ES_HOME=`dirname "$SCRIPT"`/.. - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` ---- 16,25 ---- - done - - # determine elasticsearch home -! if [ -z "$ES_HOME" ]; then -! echo "You must set the ES_HOME var" >&2 -! exit 1 -! fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -*************** -*** 46,50 **** - shift - done - -! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args - ---- 49,53 ---- - shift - done - -! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args - +diff --git a/bin/elasticsearch b/bin/elasticsearch +index c7c9263..0fcecf6 100755 +--- a/bin/elasticsearch ++++ b/bin/elasticsearch +@@ -76,7 +76,10 @@ while [ -h "$SCRIPT" ] ; do + done + + # determine elasticsearch home +-ES_HOME=`dirname "$SCRIPT"`/.. ++if [ -z "$ES_HOME" ]; then ++ echo "You must set the ES_HOME var" >&2 ++ exit 1 ++fi + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` +diff --git a/bin/plugin b/bin/plugin +index a8c796a..daf7b99 100755 +--- a/bin/plugin ++++ b/bin/plugin +@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do + done + + # determine elasticsearch home +-ES_HOME=`dirname "$SCRIPT"`/.. ++if [ -z "$ES_HOME" ]; then ++ echo "You must set the ES_HOME var" >&2 ++ exit 1 ++fi + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` +@@ -45,4 +48,4 @@ while [ $# -gt 0 ]; do + shift + done + +-exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args ++exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args From 47dccc85110f0a83d1b3ac0fe302eda78959a79b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:07:53 +0200 Subject: [PATCH 042/384] oxygen_gtk: update from 1.4.1 to 1.4.3 --- pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index fb51985afd1e..9bee6c81a8af 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -2,12 +2,12 @@ cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.4.3"; name = "oxygen-gtk2-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd"; + sha256 = "1611zkblfy8ahadyz4a1hc0vjfwkh8mdbnwjqm02i30vnhv3iy1j"; }; buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf From 7cc98001dc997879eae554a1f3f3df5a89792cc6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:09:56 +0200 Subject: [PATCH 043/384] perlPackages.Clone: update from 0.34 to 0.36 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1ff077709478..14f402f496ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1289,10 +1289,10 @@ let self = _self // overrides; _self = with self; { }; Clone = buildPerlPackage { - name = "Clone-0.34"; + name = "Clone-0.36"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.34.tar.gz; - sha256 = "0qk32i2ncmn7wm2dbjpwhwa4js079bgfs4ayb90mnxjhwq5358ix"; + url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.36.tar.gz; + sha256 = "1i90l24l46dyadmdz82klyh3y1lhfn75wjjpfmgl1kbr4plgdph3"; }; meta = { description = "Recursively copy Perl datatypes"; From 3d41e4ebdec3c25fa3b2c4aa16ad1893c1277df7 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:11:46 +0200 Subject: [PATCH 044/384] perlPackages.ConvertASN1: update from 0.22 to 0.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 14f402f496ab..0d113277d2a7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1430,10 +1430,10 @@ let self = _self // overrides; _self = with self; { }; ConvertASN1 = buildPerlPackage rec { - name = "Convert-ASN1-0.22"; + name = "Convert-ASN1-0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.22.tar.gz"; - sha256 = "1vpny8smwl23rai1kxngi5i31jhp6s6cdls19gjhcwsxf76daqxy"; + url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.26.tar.gz"; + sha256 = "188wpjnp4j2m1l1zzw9ak9ymiba1g7hzysf8mc6bsdnhl0pvdf2x"; }; }; From 4ac42fcb767923b6561db5c74f5da778b1da706f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:15:15 +0200 Subject: [PATCH 045/384] perlPackages.DateTime: update from 1.04 to 1.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d113277d2a7..8e051e93b2fd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1936,10 +1936,10 @@ let self = _self // overrides; _self = with self; { }; DateTime = buildPerlModule { - name = "DateTime-1.04"; + name = "DateTime-1.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.04.tar.gz; - sha256 = "1krnrp8hv0m4v1lxrvwgc3vvcycld21ygvjy5p7vaf5h1jpjzrwz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.07.tar.gz; + sha256 = "1cm4zsgzz4phigak0nb48l661vkqhz93kfbb9jd83d1hq74myq31"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; From 26dd63e54fb27b34972deca6dcc995d94d3306de Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:16:07 +0200 Subject: [PATCH 046/384] perlPackages.DevelFindPerl: update from 0.006 to 0.012 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e051e93b2fd..8bae4cdffa49 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2369,10 +2369,10 @@ let self = _self // overrides; _self = with self; { }; DevelFindPerl = buildPerlPackage { - name = "Devel-FindPerl-0.006"; + name = "Devel-FindPerl-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.006.tar.gz; - sha256 = "60d5a0fd6880e5cfda381159acd3dbbc21c1121dc44c94ecd323ad5a148e03ff"; + url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.012.tar.gz; + sha256 = "075p340m4pi761sjc3l0ymfsdwy4rrq48sqj38cyy80vg9scljh2"; }; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ ExtUtilsConfig ]; From 24375083e04b41455e514d7ecde9cbceb5f44bbb Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:18:34 +0200 Subject: [PATCH 047/384] perlPackages.TestFailWarnings: update from 0.005 to 0.008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8bae4cdffa49..ec7dc66d5229 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8079,10 +8079,10 @@ let self = _self // overrides; _self = with self; { }; TestFailWarnings = buildPerlPackage { - name = "Test-FailWarnings-0.005"; + name = "Test-FailWarnings-0.008"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.005.tar.gz; - sha256 = "014f909e6c171f77b811139c49c1dca9d0f1e2d1c41b5dca332b6b55b3eb0b4e"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz; + sha256 = "0vx9chcp5x8m0chq574p9fnfckh5gl94j7904rh9v17n568fyd6s"; }; buildInputs = [ CaptureTiny ]; meta = { From e63abf17f42a3a6fac31f3a75d41198d5025d076 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:20:16 +0200 Subject: [PATCH 048/384] perlPackages.TextTabularDisplay: update from 1.22 to 1.35 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ec7dc66d5229..1faede4b8003 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8768,10 +8768,10 @@ let self = _self // overrides; _self = with self; { }; TextTabularDisplay = buildPerlPackage rec { - name = "Text-TabularDisplay-1.22"; + name = "Text-TabularDisplay-1.35"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; - sha256 = "05r3jvdf8av16hgy0i3wnc581ski08q1bnllq5cq1fnc7h2nm1c7"; + sha256 = "0sbyfdiln6q2g66mv64alayfcqnqg17kihdzgpslxdsn14vpvjq5"; }; propagatedBuildInputs = [TextAligner]; }; From ac92b3aebdb4ea058ad8d7a9364bdb5a5d47482f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:21:17 +0200 Subject: [PATCH 049/384] perlPackages.UNIVERSALrequire: update from 0.11 to 0.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1faede4b8003..8411e32bfbf3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9020,10 +9020,10 @@ let self = _self // overrides; _self = with self; { }; UNIVERSALrequire = buildPerlPackage { - name = "UNIVERSAL-require-0.11"; + name = "UNIVERSAL-require-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-0.11.tar.gz; - sha256 = "1rh7i3gva4m96m31g6yfhlqcabszhghbb3k3qwxbgx3mkf5s6x6i"; + url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.16.tar.gz; + sha256 = "0fbx3f39lvck3n4ksqwji5m1hfdagx25jk5kg2h0gkb01jwz3za2"; }; }; From 4d7f525aec26340498c790df7cbb0b9c76411d46 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:22:33 +0200 Subject: [PATCH 050/384] perlPackages.XMLLibXSLT: update from 1.70 to 1.87 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8411e32bfbf3..d0d5f42d7041 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9266,10 +9266,10 @@ let self = _self // overrides; _self = with self; { }; XMLLibXSLT = buildPerlPackage rec { - name = "XML-LibXSLT-1.70"; + name = "XML-LibXSLT-1.87"; src = fetchurl { - url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz"; - sha256 = "0x8lqlxr6xhgwwa6zj4shrwrqlgbgs0piripc1fsnw4z1yl2gf9p"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "18kxa51a0prr8dx0w7q7wa8gdgalswzqa24sjkxmgs0f9yhcixz1"; }; buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; From 1193d8c34d659c1839e8d9750d0fe619f246c95b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:23:34 +0200 Subject: [PATCH 051/384] perlPackages.YAML: update from 0.84 to 0.90 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d0d5f42d7041..c1b772401dc9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9372,10 +9372,10 @@ let self = _self // overrides; _self = with self; { }; YAML = buildPerlPackage { - name = "YAML-0.84"; + name = "YAML-0.90"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/YAML-0.84.tar.gz; - sha256 = "03349n2z32gwjqiq7l3g57avvphl2rw3lmwc8i5cl9hmfw51yd8a"; + url = mirror://cpan/authors/id/I/IN/INGY/YAML-0.90.tar.gz; + sha256 = "0kfsmhv1lmqw2g1038azpxkfb91valwkh4i4gfjvqrj2wsr2hzhq"; }; meta = { homepage = https://github.com/ingydotnet/yaml-pm/tree; From 3777998a3135f545623ba0fe712a011892f0456b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:24:47 +0200 Subject: [PATCH 052/384] perlPackages.YAMLLibYAML: update from 0.38 to 0.41 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c1b772401dc9..6de2d1dd4f3c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9406,10 +9406,10 @@ let self = _self // overrides; _self = with self; { }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.38"; + name = "YAML-LibYAML-0.41"; src = fetchurl { - url = "mirror://cpan/modules/by-module/YAML/${name}.tar.gz"; - sha256 = "eb98f304d14f6557b07adfa24da16e00cfa54a9d9484b6e898e35f919c5eb7ba"; + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "1kj506lpg3fhqq0726p6y2h7pk24l6xihfyhqqsf8gd6lckl8rcs"; }; }; From f1ebc4a0193b01cab01975a8660318cce0aeeb82 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 20:27:41 +0200 Subject: [PATCH 053/384] youtubeDL: update from 2014.02.10 to 2014.02.13 --- 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 a8863da40380..c1b3cd575301 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.10"; + version = "2014.02.13"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0grxdbvzjnxd26c80rr22mjp89y4i6bghmqyp5bpzd53sgkpl0zs"; + sha256 = "0l88n1qrhjj2dvxlpd4hpqrdpxihqv3y9mrf1jgra3jyvb9pbnxq"; }; buildInputs = [ python ]; From 97be6e295cd35f1ad1fd6517484d8ac543ad0af9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 21:16:22 +0200 Subject: [PATCH 054/384] wineUnstable: update from 1.7.11 to 1.7.12 --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index a0f03fa7b99e..b6eb1038f938 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.11"; + version = "1.7.12"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "14sg0kqwawqb5sx4q2kshpb4igjbbr61c7diid15vi4nxmqjfzf0"; + sha256 = "14mkh32lxjmbacz1f5pl5kr31n5dx0rfdqw5v88brhmsz1xzzk9d"; }; gecko = fetchurl { From 8ba1fdef002e5540429cf6e7366065813a74bf29 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 Feb 2014 20:29:19 +0100 Subject: [PATCH 055/384] debian: Update to 7.4 --- pkgs/build-support/vm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 625f93c874f2..0521b12fd590 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1505,22 +1505,22 @@ rec { debian70x86_64 = debian7x86_64; debian7i386 = { - name = "debian-7.3-wheezy-i386"; - fullName = "Debian 7.3 Wheezy (i386)"; + name = "debian-7.4-wheezy-i386"; + fullName = "Debian 7.4 Wheezy (i386)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "037637520ce371a50beb5446fd27a731f30b51bc362c2f4a5dcfce9c7e30ffb6"; + sha256 = "9f19822c82e25cd149f82b0d16fdbc00d1080db7f34e41de456498dc7c54f2b4"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian7x86_64 = { - name = "debian-7.3-wheezy-amd64"; - fullName = "Debian 7.3 Wheezy (amd64)"; + name = "debian-7.4-wheezy-amd64"; + fullName = "Debian 7.4 Wheezy (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "c2ed55a2a263d482826c934b97ad910984fa5695ab1c480841741b828d0590a5"; + sha256 = "160ee0917693bc2e8f69b233c220857f35a70d906540d99d2779def576daf5f7"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From 882721b6d0f349f2915ab3c08501992b963d6d4d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 14 Feb 2014 21:47:57 +0200 Subject: [PATCH 056/384] librecad: update from 1.0.2 to 1.0.4 --- pkgs/applications/misc/librecad/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 59bd4888e4a6..b225519f4868 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, muparser, which}: stdenv.mkDerivation { - name = "librecad-1.0.2"; + name = "librecad-1.0.4"; src = fetchurl { - url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.2; - name = "librecad-1.0.2.tar.gz"; - sha256 = "13ee7e401e4f5fbc68c2e017b7189bec788038f4f6e77f559861ceb8cfb1907d"; + url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.4; + name = "librecad-1.0.4.tar.gz"; + sha256 = "00nzbijw7pn1zkj4256da501xcm6rkcvycpa79y6dr2p6c43yc6m"; }; patchPhase = '' From 25a719033621124578c29f9acc4bc0ad32593c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 14 Feb 2014 23:37:08 +0100 Subject: [PATCH 057/384] Chromedriver: fix download URL, update from 2.0 to 2.9, add a required lib --- .../tools/selenium/chromedriver/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index bccaa70ead7c..bbe213782485 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib , glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip, gconf -, libXrender, libXext +, libXi, libXrender, libXext }: # note: there is a i686 version available as well assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "chromedriver_linux64_2.0"; + name = "chromedriver_linux64"; src = fetchurl { - url = "http://chromedriver.googlecode.com/files/${name}.zip"; - sha256 = "165dq5550fs6262qa2jnjvm9smwjvws2zkkz7z5v4ibfg2j3409m"; + url = "http://chromedriver.storage.googleapis.com/2.9/${name}.zip"; + sha256 = "1m5xl5pz445igvhj31hby97xbizlw05b8fc6w53zq7faw7mzm665"; }; buildInputs = [ unzip makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { From abd80598024eadc6761d4fe5b67bfac8a66bf0fa Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 29 Jan 2014 23:42:11 +0100 Subject: [PATCH 058/384] cmake: Update to latest upstream (2.8.12.2). --- .../development/tools/build-managers/cmake/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index c71592c8ec8f..9ce69374cd88 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "2.8"; - minorVersion = "11.2"; + minorVersion = "12.2"; version = "${majorVersion}.${minorVersion}"; in @@ -18,19 +18,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk"; + sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; }; enableParallelBuilding = true; patches = - # See https://github.com/NixOS/nixpkgs/issues/762 - # and http://public.kitware.com/Bug/view.php?id=13887 - # Remove this patch when a CMake release contains the corresponding fix - [ ./762-13887.patch ] # Don't search in non-Nix locations such as /usr, but do search in # Nixpkgs' Glibc. - ++ optional (stdenv ? glibc) ./search-path.patch; + optional (stdenv ? glibc) ./search-path.patch; buildInputs = [ curl expat zlib bzip2 libarchive ] ++ optional useNcurses ncurses From ae4e0ce73a565bf91c1e40f0febe2b2c296ed081 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 29 Jan 2014 23:43:41 +0100 Subject: [PATCH 059/384] libmpdclient: Update to latest upstream (2.9). --- pkgs/servers/mpd/clientlib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 612ec0456f2a..cd65234855f3 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -5,15 +5,15 @@ stdenv.mkDerivation rec { name = "libmpdclient-${version}"; src = fetchurl { - url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.bz2"; - sha256 = "1qwjkb56rsbk0hwhg7fl15d6sf580a19gh778zcdg374j4yym3hh"; + url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.xz"; + sha256 = "1jlrfqxqq3gscwrppr2h0xqxd5abl1ypwpwpwnpxs6p9c2jppjbw"; }; buildInputs = [ doxygen ]; passthru = { majorVersion = "2"; - minorVersion = "8"; + minorVersion = "9"; }; meta = { From a03a0337e9d9ec5f554f75769054c71c1fcf82d2 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 12 Feb 2014 22:09:39 +0100 Subject: [PATCH 060/384] telepathy-qt: Fix build (broken by cmake 2.8.12 and farstream 0.2). --- .../libraries/telepathy/qt/cmake-2.8.12.diff | 25 +++++++++++++++++ .../libraries/telepathy/qt/default.nix | 1 + .../libraries/telepathy/qt/farstream-0.2.diff | 28 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff create mode 100644 pkgs/development/libraries/telepathy/qt/farstream-0.2.diff diff --git a/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff b/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff new file mode 100644 index 000000000000..f6e57c626c30 --- /dev/null +++ b/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff @@ -0,0 +1,25 @@ +diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake +index c2eac76..b3131f0 100644 +--- a/cmake/modules/FindQt.cmake ++++ b/cmake/modules/FindQt.cmake +@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS) + + MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) + IF(QT_VERSION_MAJOR MATCHES 4) +- QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") ++ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ++ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") ++ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ++ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") ++ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + ELSE(QT_VERSION_MAJOR MATCHES 4) + IF(QT_VERSION_MAJOR MATCHES 5) +- QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") ++ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ++ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") ++ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ++ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") ++ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + ENDIF(QT_VERSION_MAJOR MATCHES 5) + ENDIF(QT_VERSION_MAJOR MATCHES 4) + ENDMACRO(QT_CREATE_MOC_COMMAND) diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index b535961357b0..f2e0d1945620 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig python libxslt ]; propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; + patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ]; preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" ''; diff --git a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff new file mode 100644 index 000000000000..86d392fe1ac8 --- /dev/null +++ b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff @@ -0,0 +1,28 @@ +diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake +--- telepathy-qt/cmake/modules/FindFarstream.cmake 2012-04-25 22:14:22.275967164 +0200 ++++ new/cmake/modules/FindFarstream.cmake 2012-10-07 12:19:46.543103512 +0200 +@@ -23,9 +23,9 @@ + # in the find_path() and find_library() calls + find_package(PkgConfig) + if (FARSTREAM_MIN_VERSION) +- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION}) ++ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION}) + else (FARSTREAM_MIN_VERSION) +- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1) ++ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2) + endif (FARSTREAM_MIN_VERSION) + set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER}) + endif (NOT WIN32) +@@ -34,10 +34,10 @@ + PATHS + ${PC_FARSTREAM_INCLUDEDIR} + ${PC_FARSTREAM_INCLUDE_DIRS} +- PATH_SUFFIXES farstream-0.1 ++ PATH_SUFFIXES farstream-0.2 + ) + +-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1 ++find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2 + PATHS + ${PC_FARSTREAM_LIBDIR} + ${PC_FARSTREAM_LIBRARY_DIRS} From d2758ce017c569d0146a5aa5e1ebf4dacb5292ee Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 15 Feb 2014 10:23:56 +0100 Subject: [PATCH 061/384] freecad: Fix build with current cmake. --- pkgs/applications/graphics/freecad/cmake.patch | 12 ++++++++++++ pkgs/applications/graphics/freecad/default.nix | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/graphics/freecad/cmake.patch diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch new file mode 100644 index 000000000000..e54e16da9775 --- /dev/null +++ b/pkgs/applications/graphics/freecad/cmake.patch @@ -0,0 +1,12 @@ +diff -ru freecad-0.13.1830.orig/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt +--- freecad-0.13.1830.orig/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 ++++ freecad-0.13.1830/CMakeLists.txt 2014-02-15 10:16:00.939725500 +0100 +@@ -321,7 +321,7 @@ + foreach(it ${moc_files}) + get_filename_component(it ${it} ABSOLUTE) + QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) +- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}") ++ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "") + set(${outfiles} ${${outfiles}} ${outfile}) + add_file_dependencies(${it} ${outfile}) + endforeach(it) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 37265c954e83..770a7ee8212b 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; - patches = [ ./pythonpath.patch ]; + patches = [ ./pythonpath.patch ./cmake.patch ]; meta = { homepage = http://free-cad.sourceforge.net/; From 38c59c97b332b5c52f0b1cd656dcb15d5c474f97 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 15 Feb 2014 10:24:22 +0100 Subject: [PATCH 062/384] kadu: Fix build with current cmake. --- .../networking/instant-messengers/kadu/cmake.patch | 13 +++++++++++++ .../networking/instant-messengers/kadu/default.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/kadu/cmake.patch diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch new file mode 100644 index 000000000000..bb2d2d39d25a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch @@ -0,0 +1,13 @@ +diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt +--- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-08-30 16:13:17.000000000 +0200 ++++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-15 10:20:33.368716013 +0100 +@@ -26,7 +26,7 @@ + get_filename_component (_basename ${_current_MOC} NAME_WE) + set (_header ${_abs_FILE}) + set (_moc ${_abs_PATH}/${_current_MOC}) +- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "") ++ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "") + MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc}) + endforeach (_current_MOC_INC) + endif (_match) +Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~ diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 03cbb1ce0737..4e176ec56dcb 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation { sed -i -e '/mpd_mediaplayer/d' \ -e '/encryption_ng/d' \ -e '/encryption_ng_simlite/d' Plugins.cmake + patch -p1 < ${./cmake.patch} ''; NIX_LDFLAGS="-lX11"; From 68b3fd33a78ce51268f0eec31386a056d760ffc1 Mon Sep 17 00:00:00 2001 From: Linquize Date: Sat, 15 Feb 2014 08:03:20 +0800 Subject: [PATCH 063/384] git: Update to 1.9.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d9d09def5caa..0e067a649288 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.5.4"; + version = "1.9.0"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "062z4j4hfhfdlvkxs2mzarsyvbqvfy4kv8j5h4c75ymb5yp8iklk"; + sha256 = "10lq71vrg1zbqm923wb0p36ily6y5x057f2bryk4wqkdqgyrfc6y"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; From 99f5d2edb423194540a2bf83365e7b78b1ffccc9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 31 Jan 2014 03:25:49 -0600 Subject: [PATCH 064/384] db: Reorganize Berkeley Database Packaging Currently, the berkeley databases resuses a lot of the same code for the expressions of each version. This consolidates all of the build routines similar to that of the linux kernel. This patch also adds version 6 of BDB. --- .../libraries/{db4 => db}/cygwin-4.4.patch | 0 .../libraries/{db4 => db}/cygwin-4.5.patch | 0 pkgs/development/libraries/db/db-4.4.nix | 7 ++++ pkgs/development/libraries/db/db-4.5.nix | 7 ++++ pkgs/development/libraries/db/db-4.7.nix | 6 +++ pkgs/development/libraries/db/db-4.8.nix | 6 +++ pkgs/development/libraries/db/db-5.3.nix | 36 +++------------- pkgs/development/libraries/db/db-6.0.nix | 7 ++++ pkgs/development/libraries/db/generic.nix | 41 +++++++++++++++++++ .../{db4 => db}/register-race-fix.patch | 0 pkgs/development/libraries/db4/builder.sh | 12 ------ pkgs/development/libraries/db4/db4-4.4.nix | 22 ---------- pkgs/development/libraries/db4/db4-4.5.nix | 19 --------- pkgs/development/libraries/db4/db4-4.7.nix | 18 -------- pkgs/development/libraries/db4/db4-4.8.nix | 18 -------- pkgs/top-level/all-packages.nix | 19 ++++----- 16 files changed, 88 insertions(+), 130 deletions(-) rename pkgs/development/libraries/{db4 => db}/cygwin-4.4.patch (100%) rename pkgs/development/libraries/{db4 => db}/cygwin-4.5.patch (100%) create mode 100644 pkgs/development/libraries/db/db-4.4.nix create mode 100644 pkgs/development/libraries/db/db-4.5.nix create mode 100644 pkgs/development/libraries/db/db-4.7.nix create mode 100644 pkgs/development/libraries/db/db-4.8.nix create mode 100644 pkgs/development/libraries/db/db-6.0.nix create mode 100644 pkgs/development/libraries/db/generic.nix rename pkgs/development/libraries/{db4 => db}/register-race-fix.patch (100%) delete mode 100644 pkgs/development/libraries/db4/builder.sh delete mode 100644 pkgs/development/libraries/db4/db4-4.4.nix delete mode 100644 pkgs/development/libraries/db4/db4-4.5.nix delete mode 100644 pkgs/development/libraries/db4/db4-4.7.nix delete mode 100644 pkgs/development/libraries/db4/db4-4.8.nix diff --git a/pkgs/development/libraries/db4/cygwin-4.4.patch b/pkgs/development/libraries/db/cygwin-4.4.patch similarity index 100% rename from pkgs/development/libraries/db4/cygwin-4.4.patch rename to pkgs/development/libraries/db/cygwin-4.4.patch diff --git a/pkgs/development/libraries/db4/cygwin-4.5.patch b/pkgs/development/libraries/db/cygwin-4.5.patch similarity index 100% rename from pkgs/development/libraries/db4/cygwin-4.5.patch rename to pkgs/development/libraries/db/cygwin-4.5.patch diff --git a/pkgs/development/libraries/db/db-4.4.nix b/pkgs/development/libraries/db/db-4.4.nix new file mode 100644 index 000000000000..4a182353f25f --- /dev/null +++ b/pkgs/development/libraries/db/db-4.4.nix @@ -0,0 +1,7 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.4.20"; + extraPatches = [ ./cygwin-4.4.patch ]; + sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9"; +}) diff --git a/pkgs/development/libraries/db/db-4.5.nix b/pkgs/development/libraries/db/db-4.5.nix new file mode 100644 index 000000000000..6a0a921d8de6 --- /dev/null +++ b/pkgs/development/libraries/db/db-4.5.nix @@ -0,0 +1,7 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.5.20"; + extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ]; + sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m"; +}) diff --git a/pkgs/development/libraries/db/db-4.7.nix b/pkgs/development/libraries/db/db-4.7.nix new file mode 100644 index 000000000000..62ccfd7d3a56 --- /dev/null +++ b/pkgs/development/libraries/db/db-4.7.nix @@ -0,0 +1,6 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.7.25"; + sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi"; +}) diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix new file mode 100644 index 000000000000..e77307d6fa5a --- /dev/null +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -0,0 +1,6 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.8.30"; + sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; +}) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index a59d28ba9630..af16f1ddf549 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,32 +1,6 @@ -{ stdenv, fetchurl -, cxxSupport ? true -}: +{ stdenv, fetchurl, ... } @ args: -stdenv.mkDerivation rec { - name = "db-5.3.28"; - - src = fetchurl { - url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; - sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - }; - - configureFlags = [ - (if cxxSupport then "--enable-cxx" else "--disable-cxx") - ]; - - preConfigure = '' - cd build_unix - configureScript=../dist/configure - ''; - - postInstall = '' - rm -rf $out/docs - ''; - - meta = with stdenv.lib; { - homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; - description = "Berkeley DB"; - license = "Berkeley Database License"; - platforms = platforms.unix; - }; -} +import ./generic.nix (args // rec { + version = "5.3.28"; + sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; +}) diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix new file mode 100644 index 000000000000..22e858a9d180 --- /dev/null +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -0,0 +1,7 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "6.0.20"; + sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; + license = stdenv.lib.licenses.agpl3; +}) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix new file mode 100644 index 000000000000..de9fb27b4ec2 --- /dev/null +++ b/pkgs/development/libraries/db/generic.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl +, cxxSupport ? true +, compat185 ? true + +# Options from inherited versions +, version, sha256 +, extraPatches ? [ ] +, license ? "Berkeley Database License" +}: + +stdenv.mkDerivation rec { + name = "db-${version}"; + + src = fetchurl { + url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; + sha256 = sha256; + }; + + patches = extraPatches; + + configureFlags = [ + (if cxxSupport then "--enable-cxx" else "--disable-cxx") + (if compat185 then "--enable-compat185" else "--disable-compat185") + ]; + + preConfigure = '' + cd build_unix + configureScript=../dist/configure + ''; + + postInstall = '' + rm -rf $out/docs + ''; + + meta = with stdenv.lib; { + homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; + description = "Berkeley DB"; + license = license; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/db4/register-race-fix.patch b/pkgs/development/libraries/db/register-race-fix.patch similarity index 100% rename from pkgs/development/libraries/db4/register-race-fix.patch rename to pkgs/development/libraries/db/register-race-fix.patch diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh deleted file mode 100644 index b9d48b608032..000000000000 --- a/pkgs/development/libraries/db4/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -preConfigure() { - cd build_unix - configureScript=../dist/configure -} - -postInstall() { - rm -rf $out/docs -} - -genericBuild diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix deleted file mode 100644 index ab3ffa85cf27..000000000000 --- a/pkgs/development/libraries/db4/db4-4.4.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: - -stdenv.mkDerivation { - name = "db4-4.4.20"; - - builder = ./builder.sh; - - src = fetchurl { - urls = [ - http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz - http://tarballs.nixos.org/db-4.4.20.NC.tar.gz - ]; - md5 = "afd9243ea353bbaa04421488d3b37900"; - }; - - configureFlags = [ - (if cxxSupport then "--enable-cxx" else "--disable-cxx") - (if compat185 then "--enable-compat185" else "--disable-compat185") - ]; - - patches = [ ./cygwin-4.4.patch ]; -} diff --git a/pkgs/development/libraries/db4/db4-4.5.nix b/pkgs/development/libraries/db4/db4-4.5.nix deleted file mode 100644 index e5cf6f35a01f..000000000000 --- a/pkgs/development/libraries/db4/db4-4.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: - -stdenv.mkDerivation { - name = "db4-4.5.20"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz; - md5 = "b0f1c777708cb8e9d37fb47e7ed3312d"; - }; - - configureFlags = [ - (if cxxSupport then "--enable-cxx" else "--disable-cxx") - (if compat185 then "--enable-compat185" else "--disable-compat185") - ]; - - patches = [./cygwin-4.5.patch ./register-race-fix.patch]; -} diff --git a/pkgs/development/libraries/db4/db4-4.7.nix b/pkgs/development/libraries/db4/db4-4.7.nix deleted file mode 100644 index 9fb0d6587c0f..000000000000 --- a/pkgs/development/libraries/db4/db4-4.7.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: - -stdenv.mkDerivation { - name = "db4-4.7.25"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://download-east.oracle.com/berkeley-db/db-4.7.25.tar.gz; - sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi"; - }; - - configureFlags = [ - (if cxxSupport then "--enable-cxx" else "--disable-cxx") - (if compat185 then "--enable-compat185" else "--disable-compat185") - ]; - -} diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix deleted file mode 100644 index a56a42f22ae5..000000000000 --- a/pkgs/development/libraries/db4/db4-4.8.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: - -stdenv.mkDerivation { - name = "db4-4.8.30"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz; - sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; - }; - - configureFlags = [ - (if cxxSupport then "--enable-cxx" else "--disable-cxx") - (if compat185 then "--enable-compat185" else "--disable-compat185") - ]; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b4e092f992c..b38f408d9678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3997,19 +3997,18 @@ let cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { }; + # Make bdb5 the default as it is the last release under the custom + # bsd-like license + db = db5; db4 = db48; - - db44 = callPackage ../development/libraries/db4/db4-4.4.nix { }; - - db45 = callPackage ../development/libraries/db4/db4-4.5.nix { }; - - db47 = callPackage ../development/libraries/db4/db4-4.7.nix { }; - - db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - + db44 = callPackage ../development/libraries/db/db-4.4.nix { }; + db45 = callPackage ../development/libraries/db/db-4.5.nix { }; + db47 = callPackage ../development/libraries/db/db-4.7.nix { }; + db48 = callPackage ../development/libraries/db/db-4.8.nix { }; db5 = db53; - db53 = callPackage ../development/libraries/db/db-5.3.nix { }; + db6 = db60; + db60 = callPackage ../development/libraries/db/db-6.0.nix { }; dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; From bdb842d5ebb8fd5aea400312373eaeb0126b726c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 31 Jan 2014 14:05:37 -0600 Subject: [PATCH 065/384] Move all db4 packages to the default db5 --- doc/language-support.xml | 6 +++--- pkgs/applications/audio/moc/default.nix | 4 ++-- pkgs/applications/misc/bitcoin/default.nix | 4 ++-- pkgs/applications/misc/freicoin/default.nix | 4 ++-- pkgs/applications/misc/jigdo/default.nix | 4 ++-- .../networking/instant-messengers/ekiga/default.nix | 2 +- pkgs/applications/office/libreoffice/default.nix | 4 ++-- .../version-management/codeville/0.8.0.nix | 2 +- .../applications/version-management/kdesvn/default.nix | 4 ++-- .../gnome-3/core/evolution-data-server/default.nix | 4 ++-- pkgs/development/interpreters/python/2.6/default.nix | 4 ++-- pkgs/development/interpreters/python/2.7/default.nix | 4 ++-- pkgs/development/interpreters/python/3.2/default.nix | 6 +++--- pkgs/development/interpreters/python/3.3/default.nix | 6 +++--- pkgs/development/libraries/apr-util/default.nix | 8 ++++---- pkgs/development/libraries/cyrus-sasl/default.nix | 4 ++-- pkgs/development/libraries/kerberos/heimdal.nix | 4 ++-- pkgs/development/libraries/libchop/default.nix | 4 ++-- pkgs/development/libraries/librdf/redland.nix | 6 +++--- pkgs/development/libraries/log4cxx/default.nix | 4 ++-- pkgs/development/libraries/openldap/default.nix | 4 ++-- pkgs/development/perl-modules/BerkeleyDB/default.nix | 6 +++--- pkgs/development/perl-modules/DB_File/default.nix | 6 +++--- pkgs/development/python-modules/bsddb3/default.nix | 4 ++-- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- pkgs/servers/mail/opensmtpd/default.nix | 4 ++-- pkgs/servers/mail/postfix/default.nix | 4 ++-- pkgs/servers/prayer/default.nix | 4 ++-- pkgs/servers/squid/squids.nix | 2 +- pkgs/tools/filesystems/netatalk/default.nix | 6 +++--- pkgs/tools/misc/bogofilter/default.nix | 4 ++-- pkgs/tools/misc/man-db/default.nix | 4 ++-- pkgs/tools/networking/isync/default.nix | 4 ++-- pkgs/tools/networking/webalizer/default.nix | 4 ++-- pkgs/tools/package-management/rpm/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 +++------- pkgs/top-level/perl-packages.nix | 4 ++-- 37 files changed, 81 insertions(+), 85 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 69361e3be6c3..f5e89df57fcc 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -108,7 +108,7 @@ a preConfigure hook to generate a configuration file used by Makefile.PL: -{buildPerlPackage, fetchurl, db4}: +{buildPerlPackage, fetchurl, db}: buildPerlPackage rec { name = "BerkeleyDB-0.36"; @@ -119,8 +119,8 @@ buildPerlPackage rec { }; preConfigure = '' - echo "LIB = ${db4}/lib" > config.in - echo "INCLUDE = ${db4}/include" >> config.in + echo "LIB = ${db}/lib" > config.in + echo "INCLUDE = ${db}/include" >> config.in ''; } diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 74ae3dcf22bb..5356d4ce298a 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }: +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: stdenv.mkDerivation rec { name = "moc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; meta = { description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 9e20be0dcbcd..1785526d14a9 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }: +{ fetchurl, stdenv, openssl, db, boost, zlib, miniupnpc, qt4 }: stdenv.mkDerivation rec { version = "0.8.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk"; }; - buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; + buildInputs = [ openssl db boost zlib miniupnpc qt4 ]; configurePhase = '' cd src diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index d5ed057f56b8..33d8585bb2dd 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }: +{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, unzip }: stdenv.mkDerivation rec { version = "0.8.3-1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # I think that openssl and zlib are required, but come through other # packages - buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ]; + buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ]; configurePhase = "qmake"; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 24edc0e128a7..fe4c0287fdd2 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db4, gtk, bzip2 }: +{ stdenv, fetchurl, db, gtk, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; }; - buildInputs = [ db4 gtk bzip2 ]; + buildInputs = [ db gtk bzip2 ]; configureFlags = "--without-libdb"; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 276df1ae7a15..9de14cae6f0f 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -2,7 +2,7 @@ x@{builderDefsPackage , cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake - , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib + , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle , ...}: builderDefsPackage diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 67cbd7996ffc..58e657f8b2e7 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd -, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon +, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler @@ -248,7 +248,7 @@ stdenv.mkDerivation rec { buildInputs = [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/version-management/codeville/0.8.0.nix b/pkgs/applications/version-management/codeville/0.8.0.nix index 5c1910d6c6f6..0c0f3c4c19c0 100644 --- a/pkgs/applications/version-management/codeville/0.8.0.nix +++ b/pkgs/applications/version-management/codeville/0.8.0.nix @@ -1,6 +1,6 @@ args : with args; -if (! python ? db4Support) || (! python.db4Support) then +if (! python ? dbSupport) || (! python.dbSupport) then throw ''Python DB4 support is required for codeville.'' else diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 6373eb9f7f97..60f5d8bb9e08 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: +{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }: # the homepage mentions this is the final release. # from now on, kdesvn will be part of the official kde software distribution @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; + buildInputs = [ apr aprutil subversion db kdelibs expat ]; nativeBuildInputs = [ gettext ]; 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 cb3db8432b62..d0c15bd96ffa 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, db4, nspr, nss, libical, gperf }: +, p11_kit, db, nspr, nss, libical, gperf }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret - gcr p11_kit db4 nspr nss libgweather libical libgdata gperf ]; + gcr p11_kit db nspr nss libgweather libical libgdata gperf ]; # uoa irrelevant for now configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss"; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 7c6516fe668c..0302513e6fc5 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db45, ncurses, gdbm +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm }: assert zlibSupport -> zlib != null; @@ -146,7 +146,7 @@ let bsddb = buildInternalPythonModule { moduleName = "bsddb"; - deps = [ db45 ]; + deps = [ db ]; }; crypt = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 043094c03036..4897c0a5141e 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }: +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }: assert zlibSupport -> zlib != null; @@ -156,7 +156,7 @@ let bsddb = buildInternalPythonModule { moduleName = "bsddb"; - deps = [ db4 ]; + deps = [ db ]; }; curses = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index e09602e7381e..03f2d392bd11 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , bzip2 -, db4 +, db , gdbm , libX11, xproto , ncurses @@ -20,7 +20,7 @@ let version = "${majorVersion}.5"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto + zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { @@ -57,7 +57,7 @@ stdenv.mkDerivation { passthru = { zlibSupport = zlib != null; sqliteSupport = sqlite != null; - db4Support = db4 != null; + dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 84cb9dd141ab..18af6487e558 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , bzip2 -, db4 +, db , gdbm , libX11, xproto , ncurses @@ -20,7 +20,7 @@ let version = "${majorVersion}.3"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto + zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { @@ -57,7 +57,7 @@ stdenv.mkDerivation { passthru = { zlibSupport = zlib != null; sqliteSupport = sqlite != null; - db4Support = db4 != null; + dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index e2d72fc7d6b0..229529f08cec 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl -, bdbSupport ? false, db4 +, bdbSupport ? false, db , ldapSupport ? true, openldap }: assert sslSupport -> openssl != null; -assert bdbSupport -> db4 != null; +assert bdbSupport -> db != null; assert ldapSupport -> openldap != null; let @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { --with-apr=${apr} --with-expat=${expat} --with-crypto ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"} - ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"} + ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"} ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; propagatedBuildInputs = [ makeWrapper apr expat ] ++ optional sslSupport openssl - ++ optional bdbSupport db4 + ++ optional bdbSupport db ++ optional ldapSupport openldap; # Give apr1 access to sed for runtime invocations diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index e90ec4226619..712f05b8d651 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, db4, gettext, pam }: +{ stdenv, fetchurl, openssl, db, gettext, pam }: stdenv.mkDerivation rec { name = "cyrus-sasl-2.1.26"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g"; }; - buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam; + buildInputs = [ openssl db gettext ] ++ stdenv.lib.optional stdenv.isLinux pam; patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519 patchFlags = "-p0"; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index d4728273d34c..8f4138282f0f 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} : +{ stdenv, fetchurl, openldap, readline, db, openssl, cyrus_sasl, sqlite} : stdenv.mkDerivation rec { name = "heimdal-1.5.3"; @@ -23,5 +23,5 @@ stdenv.mkDerivation rec { rmdir $out/libexec ''; - propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite]; + propagatedBuildInputs = [ readline db openssl openldap cyrus_sasl sqlite]; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 9a1b4122365a..1b16d361c6dc 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4 +{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db , libuuid, lzo, pkgconfig, guile }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 lzo libgcrypt - gdbm db4 tdb + gdbm db tdb gnutls libuuid guile ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 26b3de70dcdc..4863c928988a 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -3,7 +3,7 @@ , mysql, withMysql ? false , postgresql, withPostgresql ? false , sqlite, withSqlite ? true -, db4, withBdb ? false +, db, withBdb ? false }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withMysql mysql ++ stdenv.lib.optional withSqlite sqlite ++ stdenv.lib.optional withPostgresql postgresql - ++ stdenv.lib.optional withBdb db4; + ++ stdenv.lib.optional withBdb db; propagatedBuildInputs = [ librdf_rasqal ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-threads" ] - ++ stdenv.lib.optional withBdb "--with-bdb=${db4}"; + ++ stdenv.lib.optional withBdb "--with-bdb=${db}"; meta = { homepage = http://librdf.org/; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index e62fa2fa1c5f..b2e13a1e9ab8 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost -, apr, aprutil, db4, expat +, apr, aprutil, db, expat }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src/main/cpp/socketoutputstream.cpp ''; - buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat]; + buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat]; meta = { homepage = http://logging.apache.org/log4cxx/index.html; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 8f26f29c3774..c4be3358049f 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: +{stdenv, fetchurl, openssl, cyrus_sasl, db, groff}: stdenv.mkDerivation rec { name = "openldap-2.4.38"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848"; }; - buildInputs = [ openssl cyrus_sasl db4 groff ]; + buildInputs = [ openssl cyrus_sasl db groff ]; configureFlags = [ "--enable-overlays" diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index 01f698da2326..a6af84a6581d 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,4 +1,4 @@ -{buildPerlPackage, fetchurl, db4}: +{buildPerlPackage, fetchurl, db}: buildPerlPackage rec { name = "BerkeleyDB-0.54"; @@ -9,7 +9,7 @@ buildPerlPackage rec { }; preConfigure = '' - echo "LIB = ${db4}/lib" > config.in - echo "INCLUDE = ${db4}/include" >> config.in + echo "LIB = ${db}/lib" > config.in + echo "INCLUDE = ${db}/include" >> config.in ''; } diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index 4017d8f5ca53..4195f8d613e7 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -1,4 +1,4 @@ -{fetchurl, buildPerlPackage, db4}: +{fetchurl, buildPerlPackage, db}: buildPerlPackage rec { name = "DB_File-1.831"; @@ -12,8 +12,8 @@ buildPerlPackage rec { cat > config.in < Date: Sat, 15 Feb 2014 12:04:10 +0100 Subject: [PATCH 066/384] git: fix typos in comments --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 0e067a649288..c14eb36acf9e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { mkdir -p $out/etc/bash_completion.d ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/ - # grep is a runtime dependence, need to patch so that it's found + # grep is a runtime dependency, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ --replace ' grep' ' ${gnugrep}/bin/grep' \ --replace ' egrep' ' ${gnugrep}/bin/egrep' @@ -77,7 +77,7 @@ stdenv.mkDerivation { -e 's| perl -e| ${perl}/bin/perl -e|g' \ $out/libexec/git-core/{git-am,git-submodule} - # gzip (and optionally bzip2, xz, zip) are a runtime dependencies for + # gzip (and optionally bzip2, xz, zip) are runtime dependencies for # gitweb.cgi, need to patch so that it's found sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi From e5a21b7bed721a8f5a2f932775a94ba44af3aa88 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 4 Feb 2014 16:33:54 -0600 Subject: [PATCH 067/384] libpipeline: Add package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn Forsman: modify meta.description so that it doesn't include the package name and doesn't end in a period.] --- .../libraries/libpipeline/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/libpipeline/default.nix diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix new file mode 100644 index 000000000000..e56a45c92fce --- /dev/null +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libpipeline-1.2.6"; + + src = fetchurl { + url = "mirror://savannah/libpipeline/${name}.tar.gz"; + sha256 = "0wjsigim422ilzs46hxzv98l10zprpbk53gq3jzj6s9kn9n1wljc"; + }; + + meta = with stdenv.lib; { + homepage = "http://libpipeline.nongnu.org"; + description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way"; + platforms = platforms.unix; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc23af3b6b7..d67ec187d2b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4948,6 +4948,8 @@ let libpcap = callPackage ../development/libraries/libpcap { }; + libpipeline = callPackage ../development/libraries/libpipeline { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; From 42358f0cd02d48e88a79c86406820afb7bd4f24f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 4 Feb 2014 16:34:31 -0600 Subject: [PATCH 068/384] man-db: Upgrade package from 2.5.1 -> 2.6.6 Additionally, remove the uneeded share.patch since share/man is now searched within upstream code. --- pkgs/tools/misc/man-db/default.nix | 29 +++----- pkgs/tools/misc/man-db/share.patch | 110 ----------------------------- 2 files changed, 10 insertions(+), 129 deletions(-) delete mode 100644 pkgs/tools/misc/man-db/share.patch diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 121a92b845d6..f664bcc6917d 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,32 +1,23 @@ -{stdenv, fetchurl, db, groff}: +{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }: -stdenv.mkDerivation { - name = "man-db-2.5.1"; +stdenv.mkDerivation rec { + name = "man-db-2.6.6"; src = fetchurl { - url = mirror://savannah/man-db/man-db-2.5.1.tar.gz; - sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3"; + url = "mirror://savannah/man-db/${name}.tar.xz"; + sha256 = "1hv6byj6sg6cp3jyf08gbmdm4pwhvd5hzmb94xl0w7prin6hzabx"; }; - buildInputs = [db groff]; + buildInputs = [ pkgconfig libpipeline db groff ]; configureFlags = '' --disable-setuid - --with-nroff=${groff}/bin/nroff - --with-tbl=${groff}/bin/tbl - --with-eqn=${groff}/bin/eqn - --with-neqn=${groff}/bin/neqn ''; - troff = "${groff}/bin/troff"; - - patches = [ - # Search in "share/man" relative to each path in $PATH (in addition to "man"). - ./share.patch - ]; - - meta = { - homepage = http://www.nongnu.org/man-db/; + meta = with stdenv.lib; { + homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/man-db/share.patch b/pkgs/tools/misc/man-db/share.patch deleted file mode 100644 index 95582a50269d..000000000000 --- a/pkgs/tools/misc/man-db/share.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -rc man-db-2.5.1-orig/src/manp.c man-db-2.5.1/src/manp.c -*** man-db-2.5.1-orig/src/manp.c 2008-01-07 03:23:11.000000000 +0100 ---- man-db-2.5.1/src/manp.c 2008-02-07 14:20:20.000000000 +0100 -*************** -*** 96,102 **** - - static void mkcatdirs (const char *mandir, const char *catdir); - static inline char *get_manpath_from_path (const char *path); -! static inline char *has_mandir (const char *p); - static inline char *fsstnd (const char *path); - static char *def_path (int flag); - static void add_dir_to_list (char **lp, const char *dir); ---- 96,102 ---- - - static void mkcatdirs (const char *mandir, const char *catdir); - static inline char *get_manpath_from_path (const char *path); -! static inline char *has_mandir (const char *p, const char *mandir); - static inline char *fsstnd (const char *path); - static char *def_path (int flag); - static void add_dir_to_list (char **lp, const char *dir); -*************** -*** 928,934 **** - } else { - debug ("is not in the config file\n"); - -! t = has_mandir (p); - if (t) { - debug ("but does have a ../man or man " - "subdirectory\n"); ---- 928,934 ---- - } else { - debug ("is not in the config file\n"); - -! t = has_mandir (p, "man"); - if (t) { - debug ("but does have a ../man or man " - "subdirectory\n"); -*************** -*** 938,943 **** ---- 938,952 ---- - } else - debug ("and doesn't have ../man or man " - "subdirectories\n"); -+ -+ t = has_mandir (p, "share/man"); -+ if (t) { -+ debug ("but does have a ../share/man or share/man subdirectory\n"); -+ -+ add_dir_to_list (tmplist, t); -+ free (t); -+ } else -+ debug ("and doesn't have ../share/man or share/man subdirectories\n"); - } - } - -*************** -*** 1013,1019 **** - - /* path does not exist in config file: check to see if path/../man or - path/man exist. If so return it, if not return NULL. */ -! static inline char *has_mandir (const char *path) - { - char *newpath = NULL; - ---- 1022,1028 ---- - - /* path does not exist in config file: check to see if path/../man or - path/man exist. If so return it, if not return NULL. */ -! static inline char *has_mandir (const char *path, const char *mandir) - { - char *newpath = NULL; - -*************** -*** 1023,1031 **** - char *subdir = strrchr (path, '/'); - if (subdir) { - const int prefix_len = subdir + 1 - path; -! newpath = xmalloc (prefix_len + sizeof ("man") + 1); - strncpy (newpath, path, prefix_len); -! strcpy (newpath + prefix_len, "man"); - - if (is_directory (newpath) == 1) - return newpath; ---- 1032,1040 ---- - char *subdir = strrchr (path, '/'); - if (subdir) { - const int prefix_len = subdir + 1 - path; -! newpath = xmalloc (prefix_len + strlen (mandir) + 2); - strncpy (newpath, path, prefix_len); -! strcpy (newpath + prefix_len, mandir); - - if (is_directory (newpath) == 1) - return newpath; -*************** -*** 1033,1039 **** - *newpath = '\0'; - } - -! newpath = appendstr (newpath, path, "/man", NULL); - - if (is_directory (newpath) == 1) - return newpath; ---- 1042,1048 ---- - *newpath = '\0'; - } - -! newpath = appendstr (newpath, path, "/", mandir, NULL); - - if (is_directory (newpath) == 1) - return newpath; From bf3ca4cb484cdd9d1767f5cd6ef41704e8998009 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 4 Feb 2014 17:12:39 -0600 Subject: [PATCH 069/384] fish: Fix propagatedBuildInputs and other assorted changes Currently, fish does not depend on python27 which is necessary for many of the built in commands such as the manpage completion generator and the web configuration sevice. This patch adds support for python27 as well as man_db for the manpage completion generator. It also attempts to replace more shell functions with binaries contained in the nix store. --- pkgs/shells/fish/default.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 27f2b032476e..7b70e98d2cd4 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,34 +1,35 @@ -{ stdenv, fetchurl, autoconf, ncurses, which, groff, gettext }: +{ stdenv, fetchurl, ncurses, python27, which, groff, gettext, man_db, bc }: stdenv.mkDerivation rec { - name = "fish-2.1.0"; + name = "fish-${version}"; + version = "2.1.0"; src = fetchurl { - url = http://fishshell.com/files/2.1.0/fish-2.1.0.tar.gz; - sha1 = "b1764cba540055cb8e2a96a7ea4c844b04a32522"; + url = "http://fishshell.com/files/${version}/${name}.tar.gz"; + sha256 = "0i7h3hx8iszli3d4kphw79sz9m07f2lc2c9hr9smdps5s7wpllmg"; }; - nativeBuildInputs = [ autoconf ]; + buildInputs = [ ncurses ]; - buildInputs = [ ncurses which ]; - - preConfigure = '' - autoconf - ''; + # Required binaries during execution + # Python27: Autocompletion generated from manpages and config editing + propagatedBuildInputs = [ python27 which groff gettext man_db bc ]; postInstall = '' - sed -i "s|which |command -v |" "$out/share/fish/functions/type.fish" + sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" + sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish" sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|gettext |${gettext}/bin/gettext |" \ - -e "s|which |command -v |" \ + -e "s|which |${which}/bin/which |" \ -i "$out/share/fish/functions/_.fish" + sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py" ''; meta = with stdenv.lib; { description = "Smart and user-friendly command line shell"; - homepage = http://fishshell.com/; + homepage = "http://fishshell.com/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + maintainers = with maintainers; [ ocharles ]; }; } From a4e3f362feacb421d3f15dc3b75e44d6a8a11df3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 9 Feb 2014 21:47:20 -0600 Subject: [PATCH 070/384] znc: Update from 1.0 -> 1.2 --- pkgs/applications/networking/znc/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index a43d8fa9d11d..dbf886de9786 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, pkgconfig +{ stdenv, fetchurl, openssl, pkgconfig , withPerl ? false, perl , withPython ? false, python3 , withTcl ? false, tcl @@ -7,10 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "znc-1.0"; + name = "znc-1.2"; + src = fetchurl { url = "http://znc.in/releases/${name}.tar.gz"; - sha256 = "0ah6890ngvj97kah3x7fd8yzi6dpdgrxw1b2skj2cyv98bd3jmd8"; + sha256 = "07bh306wl5494sqsgz4a526wvyrylkc8vpnbr5pkxwjg90mcv8nr"; }; buildInputs = [ openssl pkgconfig ] @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib " + optionalString withCyrus "--enable-cyrus "; - meta = { + meta = with stdenv.lib; { description = "Advanced IRC bouncer"; homepage = http://wiki.znc.in/ZNC; - maintainers = [ stdenv.lib.maintainers.viric ]; - license = "ASL2.0"; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ viric ]; + license = licenses.asl20; + platforms = platforms.unix; }; } From 42ce480a52c52ad5c3d5744830e7871483147a04 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Mon, 3 Feb 2014 23:25:24 +0100 Subject: [PATCH 071/384] nixos: Try harder to get LVM-hosted filesystems up in stage1. --- nixos/modules/system/boot/stage-1-init.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 1f65026b5def..97c688ce5902 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -320,6 +320,10 @@ while read -u 3 mountPoint; do echo -n "waiting for device $device to appear..." for try in $(seq 1 20); do sleep 1 + # also re-try lvm activation now that new block devices might have appeared + lvm vgchange -ay + # and tell udev to create nodes for the new LVs + udevadm trigger --action=add if test -e $device; then break; fi echo -n "." done From 97721af469383c389960a8a8a8e6b880ca9bdc84 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Thu, 16 May 2013 16:28:39 +0200 Subject: [PATCH 072/384] VMs: Add Fedora 17 to the list of distros (only had 16 and 18). --- pkgs/build-support/vm/default.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 0521b12fd590..c6b774fc06cd 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -924,6 +924,32 @@ rec { packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; }; + fedora17i386 = { + name = "fedora-17-i386"; + fullName = "Fedora 17 (i386)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/17/Everything/i386/os/repodata/82dc1ea6d26e53a367dc6e7472113c4454c9a8ac7c98d4bfb11fd0b6f311450f-primary.xml.gz; + sha256 = "03s527rvdl0zn6zx963wmjlcjm247h8p4x3fviks6lvfsak1xp42"; + }; + urlPrefix = mirror://fedora/linux/releases/17/Everything/i386/os; + archs = ["noarch" "i386" "i586" "i686"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + fedora17x86_64 = { + name = "fedora-17-x86_64"; + fullName = "Fedora 17 (x86_64)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/17/Everything/x86_64/os/repodata/7009de56f1a1c399930fa72094a310a40d38153c96d0b5af443914d3d6a7d811-primary.xml.gz; + sha256 = "04fqlzbd651r8jpvbl4n7hakh3d422ir88571y9rkhx1y5bdw2bh"; + }; + urlPrefix = mirror://fedora/linux/releases/17/Everything/x86_64/os; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + fedora18i386 = { name = "fedora-18-i386"; fullName = "Fedora 18 (i386)"; From 01d7e79eafc48c92997e5cd3d5e60d5706279bb4 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Mon, 3 Feb 2014 23:20:41 +0100 Subject: [PATCH 073/384] nixos: Make serial agetty's bitrates configurable. --- nixos/modules/services/ttys/agetty.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index ae4fa87d4b7b..211008fa7e41 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -28,6 +28,17 @@ with pkgs.lib; ''; }; + serialSpeed = mkOption { + type = types.listOf types.int; + default = [ 115200 57600 38400 9600 ]; + example = [ 38400 9600 ]; + description = '' + Bitrates to allow for agetty's listening on serial ports. Listing more + bitrates gives more interoperability but at the cost of long delays + for getting a sync on the line. + ''; + }; + }; }; @@ -78,8 +89,9 @@ with pkgs.lib; X-RestartIfChanged=false ''; - systemd.units."serial-getty@.service".text = - '' + systemd.units."serial-getty@.service".text = let + speeds = with pkgs.lib; concatStringsSep "," (map toString config.services.mingetty.serialSpeed); + in '' [Unit] Description=Serial Getty on %I Documentation=man:agetty(8) man:systemd-getty-generator(8) @@ -95,7 +107,7 @@ with pkgs.lib; [Service] Environment=TERM=linux Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive - ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I 115200,57600,38400,9600 + ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds} Type=idle Restart=always RestartSec=0 From 2c37c23fcec2c24f4f5a954acd8741ab521464bf Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 12 Feb 2014 23:47:05 +0100 Subject: [PATCH 074/384] qca2: Update the source of qca-ossl.cpp to qca's git (anonsvn.kde.org no longer serves it), and bump it to a latest version that builds with our qca version. --- pkgs/development/libraries/qca2/ossl.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qca2/ossl.nix b/pkgs/development/libraries/qca2/ossl.nix index 153d3ba57467..d2b8778aa142 100644 --- a/pkgs/development/libraries/qca2/ossl.nix +++ b/pkgs/development/libraries/qca2/ossl.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl, which}: +{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}: stdenv.mkDerivation rec { version = "2.0.0-beta3"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { }; # SVN version has stabilized and has a lot of fixes for fresh OpenSSL # Take the main source from there - svn_src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/plugins/qca-ossl ; - rev = 1115936; - sha256 = "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b"; + git_src = fetchgit { + url = git://anongit.kde.org/qca; + rev = "0a8b9db6613f2282fe492ff454412f502a6be410"; + sha256 = "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1"; }; buildInputs = [ qt4 qca2 openssl ]; nativeBuildInputs = [ which ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags="--no-separate-debug-info --with-qca=${qca2} --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; preConfigure='' - cp ${svn_src}/qca-ossl.cpp . + cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp . configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins" ''; From e2151230ab4da530b9843d4a6b3ca9de38c6bd25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 15 Feb 2014 18:49:18 +0100 Subject: [PATCH 075/384] darktable: update from 1.2.3 to 1.4.1 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 766696265812..d4983ca04d83 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.4.1"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz"; - sha256 = "05kkkz13a5rhb246rq1nxv7h91pcvm15filvik8n8gn143h64sv8"; + sha256 = "1pkixhiyyjx5wx4dlkvabga9glcx374f1ic2kxmzzdprfm6kkqfd"; }; buildInputs = From 6a2ac21602b11c016d8311a9bc1269c745d65a08 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 15 Feb 2014 19:00:27 +0100 Subject: [PATCH 076/384] rpm: Revert to using db4, fails to build with db5. --- pkgs/tools/package-management/rpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 4b1b8aeb28dc..9a96baf5fe00 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db, xz, python }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz, python }: stdenv.mkDerivation rec { name = "rpm-4.7.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0"; }; - buildInputs = [ cpio zlib bzip2 file nspr nss popt db xz python ]; + buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz python ]; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. From 93f7b7706768a2b9c9c167df447cfa4751c7dadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 15 Feb 2014 20:45:10 +0100 Subject: [PATCH 077/384] xf86_input_wacom: update from 0.20.0 to 0.23.0 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 4350694c13a6..e59fd695f780 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.20.0"; + name = "xf86-input-wacom-0.23.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1408zjqsakcyx6v81qwh4q7m49cc6vcaad54jaw8ycw4i832jvjq"; + sha256 = "13capyywk4k3z0va8dawvvdbyschwid0075ji67kyabz1y431h6v"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender From 402c1d582ed230f4ad02e42385471983a9df25b2 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 15 Feb 2014 22:21:06 +0100 Subject: [PATCH 078/384] baobab: new package Graphical application to analyse disk usage in any Gnome environment. https://wiki.gnome.org/Apps/Baobab --- lib/maintainers.nix | 1 + pkgs/desktops/gnome-3/core/baobab/default.nix | 45 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + pkgs/top-level/all-packages.nix | 2 + 4 files changed, 50 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/baobab/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d859728c9f8c..fa004c859b41 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -34,6 +34,7 @@ jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; ktosiek = "Tomasz Kontusz "; + lethalman = "Luca Bruno "; linquize = "Linquize "; lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix new file mode 100644 index 000000000000..b905a05474d3 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -0,0 +1,45 @@ +{ 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.mkDerivation rec { + name = "baobab-3.10.1"; + + src = fetchurl { + url = "https://download.gnome.org/sources/baobab/3.10/${name}.tar.xz"; + sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9"; + }; + + configureFlags = [ "--disable-static" ]; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 + gnome3.gsettings_desktop_schemas makeWrapper ]; + + installFlags = "gsettingsschemadir=\${out}/share/${name}/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}" + ''; + + preFixup = '' + rm $out/share/icons/hicolor/icon-theme.cache + rm $out/share/icons/HighContrast/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Baobab; + description = "Graphical application to analyse disk usage in any Gnome environment"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 197a135dcaaf..204a7600cf17 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -14,6 +14,8 @@ rec { at_spi2_core = callPackage ./core/at-spi2-core { }; + baobab = callPackage ./core/baobab { }; + caribou = callPackage ./core/caribou { }; dconf = callPackage ./core/dconf { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88feaa120916..5f1728b599f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7447,6 +7447,8 @@ let }; awesome = awesome-3-5; + inherit (gnome3) baobab; + baresip = callPackage ../applications/networking/instant-messengers/baresip { ffmpeg = ffmpeg_1; }; From 85d830334a7c4957f0c2718135ac5bc19f3f9c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 15 Feb 2014 22:52:22 +0100 Subject: [PATCH 079/384] duply: update 1.5.11 -> 1.6.0 --- pkgs/tools/backup/duply/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index b184dff11cd2..91718fc02f7b 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation { - name = "duply-1.5.11"; + name = "duply-1.6.0"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.5.x/duply_1.5.11.tgz"; - sha256 = "07z4wl75z227v8y9xwc2pfdp307a5jzx4sif598vprqync0g6mmk"; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.6.x/duply_1.6.0.tgz"; + sha256 = "1i1yy4z6fcf3lq2k72cqcyqspm7pa1m949f8l9yscjm47bwp5g8f"; }; buildInputs = [ txt2man makeWrapper ]; From 3250375f20f5f1d87ce29719182ba3c689226e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 16 Feb 2014 01:19:16 +0100 Subject: [PATCH 080/384] Remove dvswitch: I don't use it, and it's broken --- pkgs/applications/video/dvswitch/default.nix | 29 -------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/applications/video/dvswitch/default.nix diff --git a/pkgs/applications/video/dvswitch/default.nix b/pkgs/applications/video/dvswitch/default.nix deleted file mode 100644 index 8803fe0a7868..000000000000 --- a/pkgs/applications/video/dvswitch/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp -, libXv, libav, pixman, libpthreadstubs, pkgconfig -}: - -stdenv.mkDerivation rec { - name = "dvswitch-${version}"; - version = "0.8.3.6"; - - src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/3615/${name}.tar.gz"; - sha256 = "7bd196389f9913ae08e12a29e168d79324c508bb545eab114df77b0375cd87f0"; - }; - - buildInputs = [ - alsaLib boost cmake gtkmm libXau libXdmcp libXv libav - libpthreadstubs pixman pkgconfig - ]; - - patchPhase = '' - sed -e "s@prefix /usr/local@prefix $out@" -i CMakeLists.txt - ''; - - meta = with stdenv.lib; { - description = "interactive live video mixer for DV streams"; - homepage = "http://dvswitch.alioth.debian.org"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dba884a2c07..09597b9dbc2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7632,8 +7632,6 @@ let dvdauthor = callPackage ../applications/video/dvdauthor { }; - dvswitch = callPackage ../applications/video/dvswitch { }; - dwb = callPackage ../applications/networking/browsers/dwb { }; dwm = callPackage ../applications/window-managers/dwm { From 180e5ca0db96e28721b523527e59e251f35aa344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 16 Feb 2014 09:53:15 +0100 Subject: [PATCH 081/384] nvidia driver: fix eval with older kernels (e.g. 3.10) --- pkgs/os-specific/linux/nvidia-x11/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 98bbaef87707..6d3bdd908494 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,6 +8,8 @@ with stdenv.lib; +assert (!libsOnly) -> kernel != null; + let versionNumber = "331.38"; @@ -19,7 +21,7 @@ stdenv.mkDerivation { builder = ./builder.sh; - patches = optional (versionAtLeast kernel.version "3.13") ./kernel-3.13.patch ; + patches = optional (kernel ? version && versionAtLeast kernel.version "3.13") ./kernel-3.13.patch ; src = if stdenv.system == "i686-linux" then From 57240400cb1f5ed8a0637e1198001d66f5d93b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 16 Feb 2014 10:00:56 +0100 Subject: [PATCH 082/384] nvidia driver: allow building on Hydra, maintain The stuff is unfree, but distribution in any form *is* encouraged, c.f. http://metadata.ftp-master.debian.org/changelogs//non-free/n/nvidia-graphics-drivers/nvidia-graphics-drivers_319.82-1_copyright --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 6d3bdd908494..1632f4f4ecbf 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -53,11 +53,11 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - meta = { + meta = with stdenv.lib.meta; { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; }; } From 47ead60c031445d374136dfad35884f77637cbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 15 Feb 2014 23:08:18 +0100 Subject: [PATCH 083/384] plantuml: update 7982 -> 7991 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 10886e969a2c..6ba3d9a4f59f 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "7982"; + version = "7991"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "0hxs0whjgx36j5azdcna40rw2c7smhg0qm3kzld9vx88m0c51dgl"; + sha256 = "0afhgiq2165ahj8ww0pmk69nqgpibllp9nhpk8wapg3zknh2hx5r"; }; # It's only a .jar file and a shell wrapper From 9a86ad2f7f3c4fd37b90cba98b935e2f64902bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 16 Feb 2014 11:25:49 +0100 Subject: [PATCH 084/384] xorg.xkeyboard-config: commit forgotten fixups Without these there was also a mysterious collision in nixos etc generation. --- pkgs/servers/x11/xorg/overrides.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 499d78b947e5..8b2617f06216 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -197,7 +197,16 @@ in }; xkeyboardconfig = attrs: attrs // { + #TODO: resurrect patches for US_intl and Esperanto? + buildInputs = attrs.buildInputs ++ [args.intltool]; + + # 1: compatibility for X11/xkb location + # 2: I think pkgconfig/ is supposed to be in /lib/ + postInstall = '' + ln -s share "$out/etc" + mkdir "$out/lib" && ln -s ../share/pkgconfig "$out/lib/" + ''; }; xmodmap = attrs: attrs // { From 26d7645b6bccbf91fc74060bae47899d12f639f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 16 Feb 2014 11:23:26 +0100 Subject: [PATCH 085/384] python26: unbreak build (revert from db5 to db44) The bsddb module is apparently not compatible with db5 (or db48), so switch back to db44. Fixes the following build error: $ nix-build -A python26.modules these derivations will be built: /nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv building path(s) `/nix/store/qpsjyx7nmxhm9zq40674wr67dx8w6ycl-python-bsddb-2.6.8' building /nix/store/qpsjyx7nmxhm9zq40674wr67dx8w6ycl-python-bsddb-2.6.8 unpacking sources unpacking source archive /nix/store/2qwc1kd8allnaljm1z360lv9jsf8cfqy-Python-2.6.8.tar.bz2 source root is Python-2.6.8 patching sources applying patch /nix/store/cfk04ans56xql9l6waqhqzzd60g9rzxi-search-path.patch patching file setup.py Hunk #1 succeeded at 424 (offset 145 lines). applying patch /nix/store/dxscwf37hgq0xafs54h0c8xx47vg6d5g-nix-store-mtime.patch patching file Python/import.c Hunk #1 succeeded at 747 (offset -4 lines). configuring building running build_ext INFO: Can't locate Tcl/Tk libs and/or headers Traceback (most recent call last): File "./setup.py", line 2037, in main() File "./setup.py", line 2032, in main 'Lib/smtpd.py'] File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/core.py", line 152, in setup dist.run_commands() File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/dist.py", line 975, in run_commands self.run_command(cmd) File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/dist.py", line 995, in run_command cmd_obj.run() File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/command/build_ext.py", line 340, in run self.build_extensions() File "./setup.py", line 249, in build_extensions longest = max([len(e.name) for e in self.extensions]) ValueError: max() arg is an empty sequence builder for `/nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv' failed with exit code 1 error: build of `/nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv' failed --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09597b9dbc2d..cfeb49bc6bdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3231,7 +3231,9 @@ let python32 = callPackage ../development/interpreters/python/3.2 { }; python = python27; - python26 = callPackage ../development/interpreters/python/2.6 { }; + python26 = callPackage ../development/interpreters/python/2.6 { + db = db44; + }; python27 = callPackage ../development/interpreters/python/2.7 { libX11 = xlibs.libX11; }; From 923681d576009ca9a18a18d8494e778cb8e568ae Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 16 Feb 2014 11:25:25 +0100 Subject: [PATCH 086/384] yelp-xsl: new package Yelp's universal stylesheets for Mallard and DocBook. https://wiki.gnome.org/Apps/Yelp --- .../gnome-3/core/yelp-xsl/default.nix | 23 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix new file mode 100644 index 000000000000..708a8ff32d6c --- /dev/null +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -0,0 +1,23 @@ +{ stdenv, intltool, fetchurl, pkgconfig, bash +, itstool, libxml2, libxslt }: + +stdenv.mkDerivation rec { + name = "yelp-xsl-3.10.1"; + + src = fetchurl { + url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz"; + sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887"; + }; + + doCheck = true; + + buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "Yelp's universal stylesheets for Mallard and DocBook"; + 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 204a7600cf17..343f110aedcc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -84,6 +84,8 @@ rec { vte = callPackage ./core/vte { }; + yelp_xsl = callPackage ./core/yelp-xsl { }; + zenity = callPackage ./core/zenity { }; From da36d7d2207cda0413deeee9af0f42c071dc6d60 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 16 Feb 2014 11:42:22 +0100 Subject: [PATCH 087/384] yelp: new package Yelp is the help viewer in Gnome. https://wiki.gnome.org/Apps/Yelp --- pkgs/desktops/gnome-3/core/yelp/default.nix | 43 +++++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 47 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/yelp/default.nix diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix new file mode 100644 index 000000000000..b5f6600fb60d --- /dev/null +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -0,0 +1,43 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib, file +, bash, makeWrapper, itstool, libxml2, libxslt, gnome3, icu }: + +# TODO: icons and theme still does not work +# use packaged gnome3.gnome_icon_theme_symbolic + +stdenv.mkDerivation rec { + name = "yelp-3.10.1"; + + src = fetchurl { + url = "https://download.gnome.org/sources/yelp/3.10/${name}.tar.xz"; + sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816"; + }; + + configureFlags = [ "--disable-static" ]; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool libxml2 libxslt icu file + gnome3.gsettings_desktop_schemas makeWrapper gnome3.yelp_xsl ]; + + installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; + + postInstall = '' + wrapProgram "$out/bin/yelp" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" + ''; + + preFixup = '' + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "Yelp is the help viewer in Gnome."; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 343f110aedcc..07e1a8bf841a 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -84,6 +84,8 @@ rec { vte = callPackage ./core/vte { }; + yelp = callPackage ./core/yelp { }; + yelp_xsl = callPackage ./core/yelp-xsl { }; zenity = callPackage ./core/zenity { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f1728b599f3..3be72edb2408 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9235,6 +9235,8 @@ let yate = callPackage ../applications/misc/yate { }; + inherit (gnome3) yelp; + qgis = callPackage ../applications/misc/qgis {}; ykpers = callPackage ../applications/misc/ykpers {}; From bb8a8914121ff966ed0ec6c883899dcfd9488197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 16 Feb 2014 12:01:14 +0100 Subject: [PATCH 088/384] python26: update dependency 'db44' to 'db47' I downgraded too aggressively from db5 to db4. db48 doesn't work but db47 does, so there is no need to downgrade further. --- 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 cfeb49bc6bdf..4b1605240b24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3232,7 +3232,7 @@ let python = python27; python26 = callPackage ../development/interpreters/python/2.6 { - db = db44; + db = db47; }; python27 = callPackage ../development/interpreters/python/2.7 { libX11 = xlibs.libX11; From abf901484c67e385a99f9fcdf4f7a2abfe208ba6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 16 Feb 2014 07:33:07 -0500 Subject: [PATCH 089/384] Allow directly setting hashedPassword for root --- nixos/modules/config/users-groups.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index a0fd99732bd3..2d9b941a2cae 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -369,7 +369,7 @@ in home = "/root"; shell = cfg.defaultUserShell; group = "root"; - hashedPassword = config.security.initialRootPassword; + hashedPassword = mkDefault config.security.initialRootPassword; }; nobody = { uid = ids.uids.nobody; From d34f77fd1fdbb781ef2e70874b09e234c2768991 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 16 Feb 2014 14:08:48 +0100 Subject: [PATCH 090/384] feh: add jpeg image manipulation support --- pkgs/applications/graphics/feh/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 53c8fa5bf761..1e920ff65c5f 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib +{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng, giblib , libXinerama, curl }: stdenv.mkDerivation rec { @@ -9,12 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1wlhfbglzc1jzsh80s4s1fawclgzyjy2105ffzx2mw9s0c1xds5l"; }; - buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ]; + buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ]; preBuild = '' makeFlags="PREFIX=$out" ''; + postInstall = '' + wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin" + ''; + meta = { description = "A light-weight image viewer"; homepage = https://derf.homelinux.org/projects/feh/; From 52248aa7a20f707afdd42cdb3973a5df2d5807ae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 13 Feb 2014 22:04:07 -0600 Subject: [PATCH 091/384] kernel: 3.12.10 -> 3.12.11 (close #1743) --- 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 cd2e5cdae872..352b3cc483dd 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.10"; + version = "3.12.11"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0p30mfrf3jfp353k0fbfpbmz3sfkhlyzcispqg22dc0lzcj76aj7"; + sha256 = "1zqwfzb0hmx69caw54np6if2nybmin4mhxj9milfflc6z40fn06r"; }; features.iwlwifi = true; From 0b5d523b84aa87221fe6b52ad25c055f0e2dfe56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 16 Feb 2014 14:22:24 +0100 Subject: [PATCH 092/384] redshift: default to string type for option brightness --- nixos/modules/services/x11/redshift.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 332d742a1416..02416f5ef129 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -38,12 +38,12 @@ in { services.redshift.brightness = { day = mkOption { description = "Screen brightness to apply during the day (between 0.1 and 1.0)"; - default = 1; + default = "1"; type = types.uniq types.string; }; night = mkOption { description = "Screen brightness to apply during the night (between 0.1 and 1.0)"; - default = 1; + default = "1"; type = types.uniq types.string; }; }; From efa7adcca1a4108887c8cd8ccd993ed9de7e76b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 16 Feb 2014 14:23:56 +0100 Subject: [PATCH 093/384] xulrunner: disable parallel builds (until fixed) cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282 --- 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 3b2911a97acd..c0cfb60420b7 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -82,7 +82,7 @@ rec { "--disable-javaxpcom" ] ++ commonConfigureFlags; - enableParallelBuilding = true; + #enableParallelBuilding = true; # cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282 preConfigure = '' From a345912b65dbb5b337a7e3db1528bffaf70792c0 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 16 Feb 2014 15:48:06 +0100 Subject: [PATCH 094/384] pngcrush: update from 1.7.70 to 1.7.71 --- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 2abc84e78e41..e5c7fbeb0d7c 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.70"; + name = "pngcrush-1.7.71"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "04zgnqdfq7mcsgml719wb552v8cfg52d8knbhqv55kwgw7y822jh"; + sha256 = "095al1l86h55aiig3y1aqlwkxcwwf215lq3f29z1hdgz4a0sbcyd"; }; configurePhase = '' From 5228c2b94ee49da542c15deefda15ca60a7c2247 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 16 Feb 2014 15:50:24 +0100 Subject: [PATCH 095/384] elixir: update from 0.12.3 to 0.12.4 --- pkgs/development/interpreters/elixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 56fc15b0511c..698c75cfd165 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }: let - version = "0.12.3"; + version = "0.12.4"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "1im00cki38ldsig93djlsap8zbgwv74kpgw7xg9l6ik2cbpk0131"; + sha256 = "0f9jbijby8alwn9yv1fncr2yn0pghdqsvixkdcd6s8yvjyhylm1l"; }; buildInputs = [ erlang rebar makeWrapper ]; From c7eb4982f35b1a798fce8151afe4a5c39c9a59cd Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 16 Feb 2014 16:30:30 +0100 Subject: [PATCH 096/384] vlc: update from 2.1.2 to 2.1.3 --- pkgs/applications/video/vlc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index d75cca14b3a0..c38e4dea443b 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.2"; + version = "2.1.3"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1i4fzjv2x8mzx0bg52mgh1rrlircmb81jr58z90blbmww4mq36r1"; + sha256 = "04d1lr7lxrq2767rjy4j0wr3sirx5sf1s9wdl3p4x500r7z64dp0"; }; buildInputs = @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { description = "Cross-platform media player and streaming server"; homepage = http://www.videolan.org/vlc/; platforms = platforms.linux; + license = licenses.lgpl21Plus; }; } From 4fab99a1959f92816d932c8a1e72ebc8766f253a Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 16 Feb 2014 14:34:39 +0100 Subject: [PATCH 097/384] perl.Finance::Quote 1.19 (close #1759) This restores access to Yahoo. It is not available on CPAN yet, so the download refers to Sourceforge directly. --- .../perl-modules/finance-quote-yahoo.patch | 12 ------------ pkgs/top-level/perl-packages.nix | 9 ++++----- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/perl-modules/finance-quote-yahoo.patch diff --git a/pkgs/development/perl-modules/finance-quote-yahoo.patch b/pkgs/development/perl-modules/finance-quote-yahoo.patch deleted file mode 100644 index 213d96c31c84..000000000000 --- a/pkgs/development/perl-modules/finance-quote-yahoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru Finance-Quote-1.18-orig/lib/Finance/Quote/Yahoo/USA.pm Finance-Quote-1.18/lib/Finance/Quote/Yahoo/USA.pm ---- Finance-Quote-1.18-orig/lib/Finance/Quote/Yahoo/USA.pm 2012-09-30 13:37:20.000000000 +0000 -+++ Finance-Quote-1.18/lib/Finance/Quote/Yahoo/USA.pm 2014-02-13 22:02:53.538698928 +0000 -@@ -41,7 +41,7 @@ - - # URLs of where to obtain information. - --$YAHOO_URL = ("http://finance.yahoo.com/d"); -+$YAHOO_URL = ("http://finance.yahoo.com/d/quotes.csv"); - - sub methods {return (canada => \&yahoo, - usa => \&yahoo, diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a42af7720460..55243cb7371c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3552,13 +3552,12 @@ let self = _self // overrides; _self = with self; { }; FinanceQuote = buildPerlPackage { - name = "Finance-Quote-1.18"; + name = "Finance-Quote-1.19"; src = fetchurl { - url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.18.tar.gz; - sha256 = "4240faabe0646defd4ec76ca9e111977b9e8060eaec41adeb284eb422a428393"; + url = mirror://sourceforge/finance-quote/1.19/Finance-Quote-1.19.tar.gz; + sha256 = "0z1dqxw4by7rkwm113qp2mlhl5r0znr22kzinvr1p82svn0zvm2d"; }; - propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP ]; - patches = [ ../development/perl-modules/finance-quote-yahoo.patch ]; + propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ]; meta = { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; From 5fefa65747b573775733ccd8f4520634f12b0b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 16 Feb 2014 18:16:33 +0100 Subject: [PATCH 098/384] gnome-terminator: update 0.96 -> 0.97 --- pkgs/applications/misc/gnome_terminator/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix index b394719611de..c445c2b13d63 100644 --- a/pkgs/applications/misc/gnome_terminator/default.nix +++ b/pkgs/applications/misc/gnome_terminator/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }: stdenv.mkDerivation rec { - name = "gnome-terminator-0.96"; + name = "gnome-terminator-${version}"; + version = "0.97"; src = fetchurl { - url = "https://launchpad.net/terminator/trunk/0.96/+download/terminator_0.96.tar.gz"; - sha256 = "d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201"; + url = "https://launchpad.net/terminator/trunk/${version}/+download/terminator-${version}.tar.gz"; + sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci"; }; buildInputs = From 351951f315d3f57d53668052b761c432b44b7928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 16 Feb 2014 18:26:06 +0100 Subject: [PATCH 099/384] gnome-terminal: clean up a bit and add/update meta attributes * No need to set 'phases', the default works. * Use shell globbing instead of running 'ls' in a subshell. * Quote shell variables. * The project has got a new homepage; the old one points users to the new one (or the launchpad page) * Make it available in the channel (meta.platforms = linux) --- .../misc/gnome_terminator/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix index c445c2b13d63..c9c53430bb50 100644 --- a/pkgs/applications/misc/gnome_terminator/default.nix +++ b/pkgs/applications/misc/gnome_terminator/default.nix @@ -9,23 +9,28 @@ stdenv.mkDerivation rec { sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci"; }; - buildInputs = - [ python pygtk vte gettext intltool makeWrapper - ]; - - phases = "unpackPhase installPhase"; + buildInputs = [ python pygtk vte gettext intltool makeWrapper ]; installPhase = '' - python setup.py --without-icon-cache install --prefix=$out - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ + python setup.py --without-icon-cache install --prefix="$out" + + for file in "$out"/bin/*; do + wrapProgram "$file" \ --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" done ''; - meta = { - description = "Gnome terminal emulator with support for tiling and tabs"; - homepage = http://www.tenshu.net/p/terminator.html; - license = "GPLv2"; + meta = with stdenv.lib; { + description = "Terminal emulator with support for tiling and tabs"; + longDescription = '' + The goal of this project is to produce a useful tool for arranging + terminals. It is inspired by programs such as gnome-multi-term, + quadkonsole, etc. in that the main focus is arranging terminals in grids + (tabs is the most common default method, which Terminator also supports). + ''; + homepage = http://gnometerminator.blogspot.no/p/introduction.html; + license = licenses.gpl2; + maintainers = [ maintainers.bjornfor ]; + platforms = platforms.linux; }; } From 89f710f18e3bc86e6feec6661a3910ea32bb662c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 16 Feb 2014 20:36:31 +0100 Subject: [PATCH 100/384] upgrade video-intel stack to 2.99.906 --- pkgs/development/libraries/libva/default.nix | 4 ++-- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 5b35d2b24ad4..b0dbf1f8970d 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { - name = "libva-1.1.1"; + name = "libva-1.2.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0"; + sha256 = "0fx8ivaghpq8g099bzwy5dm3bqnkbbhjq3qhgrpk390c4s5hy23h"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f05c01bf58df..1bb0b5732cbe 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -2,11 +2,11 @@ , intelgen4asm }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.0.20"; + name = "libva-intel-driver-1.2.2"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj"; + sha256 = "0i3h9g8flnxf8gmag65xkvz7rib51dvx841ym3am5v3p51w79i0r"; }; buildInputs = [ pkgconfig libdrm libva libX11 ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 13c17cebde3c..2b5e2629e252 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1510,14 +1510,14 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.21.15"; + name = "xf86-video-intel-2.99.906"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2; - sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2; + sha256 = "1miwyv20q8bz5wml9n16l9vbrcnwpy7a3d3cmc92dy2p0b7474rd"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.9.4"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 175c98946943..8c193600833e 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 From e24b01f6152c50090c96cdba8bcbee667124a300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 16 Feb 2014 21:37:18 +0100 Subject: [PATCH 101/384] desktop-manager.gnome3: add dconf support --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index ecb6706544af..0507d2981103 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -46,6 +46,7 @@ in { environment.systemPackages = [ gnome3.evince gnome3.eog + gnome3.dconf pkgs.ibus gnome3.gnome_shell gnome3.gnome_settings_daemon @@ -56,4 +57,6 @@ in { ]; }; + environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules"; + } From 1c18c001b9bafcb22abf331ede3be7043afc1e11 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 16 Feb 2014 11:02:30 +0100 Subject: [PATCH 102/384] gnome3.gnome-common: new package --- pkgs/desktops/gnome-3/core/gnome-common/default.nix | 12 ++++++++++++ pkgs/desktops/gnome-3/default.nix | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/core/gnome-common/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix new file mode 100644 index 000000000000..991630c72e13 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, which }: + +stdenv.mkDerivation rec { + name = "gnome-common-3.10.0"; + + src = fetchurl { + url = "https://download.gnome.org/sources/gnome-common/3.10/${name}.tar.xz"; + sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3"; + }; + + propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 07e1a8bf841a..b0c0f6c7f785 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -4,7 +4,7 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gtk = gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure - inherit (pkgs.gnome2) gnome_common ORBit2; + inherit (pkgs.gnome2) ORBit2; orbit = ORBit2; inherit (pkgs) libsoup; @@ -36,6 +36,8 @@ rec { gnome_control_center = callPackage ./core/gnome-control-center { }; + gnome_common = callPackage ./core/gnome-common { }; + gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; gnome-menus = callPackage ./core/gnome-menus { }; From e80b520a9deca97d8bea6e415c09263545f8ae1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 16 Feb 2014 23:45:47 +0100 Subject: [PATCH 103/384] gnome3.gnome_common: patch ACLOCAL like for gnome2 --- pkgs/desktops/gnome-3/core/gnome-common/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index 991630c72e13..5ae7ece6864a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -8,5 +8,10 @@ stdenv.mkDerivation rec { sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3"; }; + patches = [(fetchurl { + url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; + sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; + })]; + propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which } From 4b201b27bfb34d9494a517e34e1e81bf7b17b6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 17 Feb 2014 00:24:13 +0100 Subject: [PATCH 104/384] gnome3: correctly place GIO_EXTRA_MODULES --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 0507d2981103..063c9bb03bc3 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -43,6 +43,7 @@ in { ''; }; + environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules"; environment.systemPackages = [ gnome3.evince gnome3.eog @@ -57,6 +58,5 @@ in { ]; }; - environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules"; } From cc0bc747e27f23bad23e599a48ecfc5b4a2c0f64 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 17 Feb 2014 10:36:26 +0800 Subject: [PATCH 105/384] gstreamer: update from 1.2.2 to 1.2.3 --- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 5e7548627fe2..85730c1bf259 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.2.2"; + name = "gstreamer-1.2.3"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "b9f12137ab663edc6c37429b38ca7911074b9c2a829267fe855d4e57d916a0b6"; + sha256 = "1syqn0kki5disx01q3y0z6p5qhr2a5g388wc6s649cw4lcbri6hg"; }; nativeBuildInputs = [ From bc304449675a1dd4aeb80ae23f3479c5a0e9c71e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 17 Feb 2014 10:37:29 +0800 Subject: [PATCH 106/384] gst-plugins-base: update from 1.2.2 to 1.2.3 --- pkgs/development/libraries/gstreamer/base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 01a75ce52112..0c8dbb21cfb0 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.2.2"; + name = "gst-plugins-base-1.2.3"; meta = { description = "Base plugins and helper libraries"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "fa90cf21eac0a77f9393100356aef99ae42072c31dc218d3ae2e7f86cd5ced69"; + sha256 = "1qfs4lv91ggcck61pw0ybn3gzvx4kl2vsd6lp8l6ky3hq8syrvb1"; }; nativeBuildInputs = [ From 396b9d760fc5b1332d8a1af9d218ed2dfa51cf49 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 17 Feb 2014 10:37:35 +0800 Subject: [PATCH 107/384] gst-plugins-good: update from 1.2.2 to 1.2.3 --- pkgs/development/libraries/gstreamer/good/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 616f63d7da7f..71151c4e559c 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-1.2.2"; + name = "gst-plugins-good-1.2.3"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81"; + sha256 = "0w74hms2zg0rnhilj9cbhx9wfiryrkcvhr1g90scrg8mllv3bcxz"; }; nativeBuildInputs = [ pkgconfig python ]; From a96f3e2e8d07e5ff9c839aea96db85f5c29fcd61 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 17 Feb 2014 10:37:42 +0800 Subject: [PATCH 108/384] gst-plugins-bad: update from 1.2.2 to 1.2.3 --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 81207155625a..a9137ad46a77 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.2.2"; + name = "gst-plugins-bad-1.2.3"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c"; + sha256 = "1317hik9fdmy300p7c2y3aw43y6v9dr8f1906zm7s876m48pjpar"; }; nativeBuildInputs = [ pkgconfig python ]; From 7814a08a1ed9efdce9d96beb8ca2e8776fa3cf66 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 17 Feb 2014 10:37:45 +0800 Subject: [PATCH 109/384] gst-plugins-ugly: update from 1.2.2 to 1.2.3 --- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 8dafbf013f37..50005004135a 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.2.2"; + name = "gst-plugins-ugly-1.2.3"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3"; + sha256 = "0fzbazgqrbyckbh2xqlzslzmm638bddp1fw8cc19kr7f0xv0lysk"; }; nativeBuildInputs = [ pkgconfig python ]; From aab0ccaa931e0e7fe1c2cf6c46591b41c3c504a0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 17 Feb 2014 10:37:48 +0800 Subject: [PATCH 110/384] gst-libav: update from 1.2.2 to 1.2.3 --- pkgs/development/libraries/gstreamer/libav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 47be4c8f4a05..ee2cb8830b00 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -6,7 +6,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.2.2"; + name = "gst-libav-1.2.3"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418"; + sha256 = "1mmwyp6wahrx73zxiv67bwh9dqp7fn86igy4rkv0vx2m17hzpizb"; }; configureFlags = stdenv.lib.optionalString withSystemLibav From 2eedf210d300168d2a90103732007f8472f360a6 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 16 Feb 2014 18:18:35 +0100 Subject: [PATCH 111/384] celestia: fix install location --- pkgs/applications/science/astronomy/celestia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 6f9de9d981f6..d4da5c113c99 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { ) ''; - installPhase = ''make DESTDIR="$out" MKDIR_P="mkdir -p" install''; + installPhase = ''make MKDIR_P="mkdir -p" install''; enableParallelBuilding = true; From 72cf0e2280024b69b4ea73a7a53d17e1cbaba8b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 17 Feb 2014 12:32:43 +0100 Subject: [PATCH 112/384] gnome3.yelp-tools: add --- .../gnome-3/core/yelp-tools/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/yelp-tools/default.nix diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix new file mode 100644 index 000000000000..39ff3838f4a8 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: + +stdenv.mkDerivation rec { + name = "yelp-tools-3.10.0"; + + src = fetchurl { + url = "https://download.gnome.org/sources/yelp-tools/3.10/${name}.tar.xz"; + sha256 = "0496xyx1657db22ks3k92al64fp6236y5bgh7s7b0j8hcc112ppz"; + }; + + buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp/Tools; + description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; + maintainers = with maintainers; [ iElectric ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} From d8dd998ff0bc1d3ee6c7d897d12124c1a948190a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Feb 2014 12:35:02 +0100 Subject: [PATCH 113/384] gnome3: Add missing yelp_tools in gnome-3/default.nix --- pkgs/desktops/gnome-3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b0c0f6c7f785..bc6a2ff68425 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -90,6 +90,8 @@ rec { yelp_xsl = callPackage ./core/yelp-xsl { }; + yelp_tools = callPackage ./core/yelp-tools { }; + zenity = callPackage ./core/zenity { }; From 9d34103a57c835380b6b9c10ba55b7d94cd467fb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Feb 2014 12:20:01 +0100 Subject: [PATCH 114/384] gucharmap: new package GNOME Character Map, based on the Unicode Character Database https://wiki.gnome.org/Apps/Gucharmap --- .../gnome-3/core/gucharmap/default.nix | 42 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 46 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/gucharmap/default.nix diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix new file mode 100644 index 000000000000..bf630e1947de --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -0,0 +1,42 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3 +, glib, desktop_file_utils, bash +, makeWrapper, gnome3, file, itstool, libxml2 }: + +# TODO: icons and theme still does not work +# use packaged gnome3.gnome_icon_theme_symbolic + +stdenv.mkDerivation rec { + name = "gucharmap-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gucharmap/3.10/${name}.tar.xz"; + sha256 = "04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78"; + }; + + configureFlags = [ "--disable-static" ]; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 intltool itstool glib + gnome3.yelp_tools libxml2 file desktop_file_utils + gnome3.gsettings_desktop_schemas makeWrapper ]; + + installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; + + postInstall = '' + wrapProgram "$out/bin/gucharmap" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Gucharmap; + description = "GNOME Character Map, based on the Unicode Character Database"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index bc6a2ff68425..bb37d2fa2dad 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -60,6 +60,8 @@ rec { gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; + gucharmap = callPackage ./core/gucharmap { }; + gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; }; eog = callPackage ./core/eog { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2592799d1b8..ba46fff4df08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7880,6 +7880,8 @@ let gtimelog = pythonPackages.gtimelog; + inherit (gnome3) gucharmap; + guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; From 8e349e721cb17619c202aeadb3fbd3b6998bae40 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 17 Feb 2014 07:25:06 -0600 Subject: [PATCH 115/384] linux: 3.2.54 -> 3.2.55 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index f9135ea3e11d..cee4bf31dfe9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.54"; + version = "3.2.55"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "15mr1mrsldvs3jx9nc25pfmmdbz2ykiaxnqc26chn6k425l4kn67"; + sha256 = "15fj7kd3ba52in1siqbdq45i7xzb53yy88l9k4bgfgds3j8wxj9m"; }; features.iwlwifi = true; From c13701532843024e8cb1be070a9b293c6d527fa0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 17 Feb 2014 04:09:17 -0600 Subject: [PATCH 116/384] grsecurity updates. - stable: 3.0-3.2.54-201402062221 -> 3.0-3.2.55-201402152203 - testing: 3.0-3.13.3-201402132113 -> 3.0-3.13.3-201402152204 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 c36779c295f5..2480936b08cd 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -78,11 +78,11 @@ rec { }; - grsecurity_3_0_3_2_54 = - { name = "grsecurity-3.0-3.2.54"; + grsecurity_3_0_3_2_55 = + { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201402062221.patch; - sha256 = "14x887xibl7d50a1pxmi0snnwcnh27z8bnidhxg2xfasxxp248m5"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402152203.patch; + sha256 = "1600hydfq2dwyqqzfmsvy50kcicdm2lq44yiiwgnbiykq2135fwx"; }; 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_3 = { name = "grsecurity-3.0-3.13.3"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402132113.patch; - sha256 = "143givk7xk54c2f9q7h2v5gdc3sy1kcd8j83vn1jfcyipzqkdqnk"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402152204.patch; + sha256 = "0c4mswka95zivil3a28ipsbnv2nhrmqwj4l4dig3n8pr6d2vgwc9"; }; 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 ba46fff4df08..c094bb2b9a7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6674,7 +6674,7 @@ let # config options you need (e.g. by overriding extraConfig). See list of options here: # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_2.modDirVersion}-grsec"; }; From f3a3119bd07e00c64bab7ac9631f259dc7e832ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:47:45 +0100 Subject: [PATCH 117/384] haskell-chunked-data: add version 0.1.0.0 --- .../haskell/chunked-data/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/chunked-data/default.nix diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix new file mode 100644 index 000000000000..95b52d50b4d8 --- /dev/null +++ b/pkgs/development/libraries/haskell/chunked-data/default.nix @@ -0,0 +1,19 @@ +{ cabal, blazeBuilder, monoTraversable, semigroups, systemFilepath +, text, transformers, vector +}: + +cabal.mkDerivation (self: { + pname = "chunked-data"; + version = "0.1.0.0"; + sha256 = "1wdgvhf170rv557dwsiqy6nhys965xhs6w24ays273fv8hn3yk9l"; + buildDepends = [ + blazeBuilder monoTraversable semigroups systemFilepath text + transformers vector + ]; + meta = { + homepage = "https://github.com/fpco/chunked-data"; + description = "Typeclasses for dealing with various chunked data representations"; + 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 2c3fc2d4d7c3..2539b7fe917b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -754,6 +754,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x checkers = callPackage ../development/libraries/haskell/checkers {}; + chunkedData = callPackage ../development/libraries/haskell/chunked-data {}; + citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; From ba53ddcbb52ec0fd04a602cc0a9547d53aa1f229 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:02 +0100 Subject: [PATCH 118/384] haskell-conduit-combinators: add version 0.1.0.0 --- .../haskell/conduit-combinators/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/haskell/conduit-combinators/default.nix diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix new file mode 100644 index 000000000000..8425c4653314 --- /dev/null +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -0,0 +1,24 @@ +{ cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable +, primitive, silently, systemFileio, systemFilepath, text +, transformers, transformersBase, vector +}: + +cabal.mkDerivation (self: { + pname = "conduit-combinators"; + version = "0.1.0.0"; + sha256 = "0m4qfcm66likasvsvfriw8xiz5ibqhq5sk1wiwx0gk2d1qcnb3wx"; + buildDepends = [ + chunkedData conduit monoTraversable primitive systemFileio + systemFilepath text transformers transformersBase vector + ]; + testDepends = [ + basicPrelude chunkedData hspec monoTraversable silently text + transformers vector + ]; + meta = { + homepage = "https://github.com/fpco/conduit-combinators"; + description = "Commonly used conduit functions, for both chunked and unchunked data"; + 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 2539b7fe917b..99fd4ebdd55c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -806,6 +806,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x conduit = callPackage ../development/libraries/haskell/conduit {}; + conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {}; + ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; configurator = callPackage ../development/libraries/haskell/configurator {}; From aaa4d951dd0c03452e53b932171b427737eddb15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:17 +0100 Subject: [PATCH 119/384] haskell-enclosed-exceptions: add version 1.0.0.1 --- .../haskell/enclosed-exceptions/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/enclosed-exceptions/default.nix diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix new file mode 100644 index 000000000000..113c454d6db1 --- /dev/null +++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix @@ -0,0 +1,21 @@ +{ cabal, async, deepseq, hspec, liftedBase, monadControl +, QuickCheck, transformers +}: + +cabal.mkDerivation (self: { + pname = "enclosed-exceptions"; + version = "1.0.0.1"; + sha256 = "0imq5kp45yfkhkz51ld869pf9hnlkbh92nk0aig1z8cc6akjnjw0"; + buildDepends = [ + async deepseq liftedBase monadControl transformers + ]; + testDepends = [ + async deepseq hspec liftedBase monadControl QuickCheck transformers + ]; + meta = { + homepage = "https://github.com/jcristovao/enclosed-exceptions"; + description = "Catching all exceptions from within an enclosed computation"; + 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 99fd4ebdd55c..c20afcd92752 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1019,6 +1019,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x emailValidate = callPackage ../development/libraries/haskell/email-validate {}; + enclosedExceptions = callPackage ../development/libraries/haskell/enclosed-exceptions {}; + encoding = callPackage ../development/libraries/haskell/encoding {}; enumerator = callPackage ../development/libraries/haskell/enumerator {}; From 6e28b6ebb8471f12765096c0b6af0eb0664a62f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:28 +0100 Subject: [PATCH 120/384] haskell-text-stream-decode: add version 0.1.0.3 --- .../haskell/text-stream-decode/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/text-stream-decode/default.nix diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix new file mode 100644 index 000000000000..9954dc4f6a22 --- /dev/null +++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq, hspec, text }: + +cabal.mkDerivation (self: { + pname = "text-stream-decode"; + version = "0.1.0.3"; + sha256 = "0gz5w7n7yb6z5mfzlg3yg9s89wsqnmmk4j94invj2da0rw7d03xv"; + buildDepends = [ text ]; + testDepends = [ deepseq hspec text ]; + meta = { + homepage = "http://github.com/fpco/text-stream-decode"; + description = "Streaming decoding functions for UTF encodings"; + 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 c20afcd92752..c95fbfb0ad0e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2371,6 +2371,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x textIcu = callPackage ../development/libraries/haskell/text-icu {}; + textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {}; + thespian = callPackage ../development/libraries/haskell/thespian {}; thExtras = callPackage ../development/libraries/haskell/th-extras {}; From e1993d4c922805479e8e6369215c7988da454465 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:35 +0100 Subject: [PATCH 121/384] haskell-JuicyPixels: update to version 3.1.3.3 --- 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 57c37139d4f4..be9c67f797e7 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.2"; - sha256 = "0c0vavqisljsl8v8hvmxj8q3hmjq5layanbbyp0zcbj6yxv8s62a"; + version = "3.1.3.3"; + sha256 = "1j1kdr6x7rhpa45is04haxgf4i2jghcgak4km0f2i0k3pyiv647x"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; From 4379ea19298ff556e5a3c089e8ab05350ad26873 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:37 +0100 Subject: [PATCH 122/384] haskell-classy-prelude-conduit: update to version 0.8.0 --- .../haskell/classy-prelude-conduit/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index af740197765f..eec5677a89fa 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -1,14 +1,15 @@ -{ cabal, classyPrelude, conduit, hspec, monadControl, QuickCheck -, resourcet, systemFileio, transformers, void +{ cabal, classyPrelude, conduit, conduitCombinators, hspec +, monadControl, QuickCheck, resourcet, systemFileio, transformers +, void }: cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.7.0"; - sha256 = "0njhfqbcbsy1rv61fc4xqzqlb68hzqg9cr31f8bs6h7pa12n38zq"; + version = "0.8.0"; + sha256 = "1br2gjzafxgq6ksxl895m5acaffnswd1dhcjppx6gnyfa6i3fq1m"; buildDepends = [ - classyPrelude conduit monadControl resourcet systemFileio - transformers void + classyPrelude conduit conduitCombinators monadControl resourcet + systemFileio transformers void ]; testDepends = [ conduit hspec QuickCheck transformers ]; meta = { From c6855fc5a9c304901a5e677d28c68621c50901a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:39 +0100 Subject: [PATCH 123/384] haskell-classy-prelude: update to version 0.8.0 --- .../libraries/haskell/classy-prelude/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index d2c0ccaf652e..f5429fb024dd 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,15 +1,15 @@ -{ cabal, async, basicPrelude, deepseq, hashable, hspec, liftedBase -, monadControl, monoTraversable, QuickCheck, semigroups +{ cabal, basicPrelude, chunkedData, enclosedExceptions, hashable +, hspec, liftedBase, monoTraversable, QuickCheck, semigroups , systemFilepath, text, time, transformers, unorderedContainers , vector, vectorInstances }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.7.0"; - sha256 = "19n2kzzskrdwyacq14y8gf1avcy7clp7gzqh36dhw7pypy3x0k9n"; + version = "0.8.0"; + sha256 = "02zf6v7a6bjf9z391bravx10mw0w4m4p5b78zap08z2i6fk5h91g"; buildDepends = [ - async basicPrelude deepseq hashable liftedBase monadControl + basicPrelude chunkedData enclosedExceptions hashable liftedBase monoTraversable semigroups systemFilepath text time transformers unorderedContainers vector vectorInstances ]; From 58b51c95bdb92d77a7f6c72c7d348ee1a6bf18bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:40 +0100 Subject: [PATCH 124/384] haskell-conduit: update to version 1.0.15 --- .../development/libraries/haskell/conduit/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index d2d221177c85..bf28c20e714c 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,14 +1,15 @@ { cabal, hspec, liftedBase, mmorph, monadControl, mtl, QuickCheck -, resourcet, text, transformers, transformersBase, void +, resourcet, text, textStreamDecode, transformers, transformersBase +, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.13.1"; - sha256 = "0kxfck6d72fdnymf2rj6m7h97svq1d2fq1ss5mlhsrks5fflia9y"; + version = "1.0.15"; + sha256 = "1ciys2b7a6n5k0ld66wpjxnrs5ys5dvg9n5k8282bc5zsd54mb59"; buildDepends = [ - liftedBase mmorph monadControl mtl resourcet text transformers - transformersBase void + liftedBase mmorph monadControl mtl resourcet text textStreamDecode + transformers transformersBase void ]; testDepends = [ hspec mtl QuickCheck resourcet text transformers void From b5ec3460b2c1f3a28d6aeab600f9ccfc231ec801 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:42 +0100 Subject: [PATCH 125/384] haskell-dbus: update to version 0.10.6 --- pkgs/development/libraries/haskell/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index a96f1499f974..304b9e84942e 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.5"; - sha256 = "1wblqkwlwv3bxhz2n4qm0w0npawng86y2hyacjxmx8cw25gkw41x"; + version = "0.10.6"; + sha256 = "0jbysa7czhp7yl3fb6sxiqppg8yb3cdk4v8hcs4y8yzwjj0lm7mf"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes From 663e179856f898f02a603f8efe55a745990cba1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:44 +0100 Subject: [PATCH 126/384] haskell-dns: update to version 1.1.1 --- 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 9dd35804f430..5434db270875 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.0.0"; - sha256 = "16h7c332qdj77dw8kvrdn1jzhzsnrcybbbm5x7pxvgpnn0wzz8si"; + version = "1.1.1"; + sha256 = "1vyi0rqddaqpnh87gjracp0j3f7ai18qzr6zl6rjkszw3zfngww9"; buildDepends = [ attoparsec attoparsecConduit binary blazeBuilder conduit iproute mtl network networkConduit random From 87ddf3963a22226f9f9113316b0f0c854ca17700 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:46 +0100 Subject: [PATCH 127/384] haskell-hit: update to version 0.5.5 --- pkgs/development/libraries/haskell/hit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix index 4dc73996cd13..abfe150c1637 100644 --- a/pkgs/development/libraries/haskell/hit/default.nix +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hit"; - version = "0.5.4"; - sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz"; + version = "0.5.5"; + sha256 = "18k2fgwflzs2lpkhxg2xvni3l9cdn3hk9ajrd4flz12j7vp0ga4c"; isLibrary = true; isExecutable = true; buildDepends = [ From 1683378b3a1d1139c21d25e8a12a315dd3dcec25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:48 +0100 Subject: [PATCH 128/384] haskell-irc: update to version 0.6.0.0 --- pkgs/development/libraries/haskell/irc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index 89d277d1f406..524c2de1f734 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec }: +{ cabal, attoparsec }: cabal.mkDerivation (self: { pname = "irc"; - version = "0.5.1.0"; - sha256 = "1xkgqcjxlxqg60qlv26ypmvf9x288sjz1n47rb7zfvjhdimws8gj"; - buildDepends = [ parsec ]; + version = "0.6.0.0"; + sha256 = "037hpdb4b6nb5w62w34alwybchzybz0bq2cgp0mv4xlw7bks2nqv"; + buildDepends = [ attoparsec ]; meta = { description = "A small library for parsing IRC messages"; license = self.stdenv.lib.licenses.bsd3; From f5fb0e043d1d3216db96dea37590d907be7de1f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:49 +0100 Subject: [PATCH 129/384] haskell-language-javascript: update to version 0.5.9 --- .../libraries/haskell/language-javascript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index abf8df4f5569..d2cc342c4774 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.5.8"; - sha256 = "0slwj2bi9v7qjr6ai5dwql7fqgsh8k9k2bzlsq407iacsv0w3b9h"; + version = "0.5.9"; + sha256 = "1m1fs2vaw3yn9ryd49aprxc5l10xkr86mlxxf5bk6qp51wnp9xqh"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; testDepends = [ blazeBuilder Cabal HUnit mtl QuickCheck testFramework From 2a25467ece3be2f06e18c74d1f4f0ebf89e2b8fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:51 +0100 Subject: [PATCH 130/384] haskell-libxml-sax: update to version 0.7.5 --- pkgs/development/libraries/haskell/libxml-sax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix index afdd782fe094..320a6f20699d 100644 --- a/pkgs/development/libraries/haskell/libxml-sax/default.nix +++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libxml-sax"; - version = "0.7.4"; - sha256 = "1vbxrmxxb6a58hd6dd81kz8fh198jkvwv4gxzbbfw44170946c0z"; + version = "0.7.5"; + sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r"; buildDepends = [ text xmlTypes ]; extraLibraries = [ libxml2 ]; pkgconfigDepends = [ libxml2 ]; From 669c336164d5c8cdf6a849bd42d25d5c02dab79c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:53 +0100 Subject: [PATCH 131/384] haskell-mono-traversable: update to version 0.3.0.1 --- .../haskell/mono-traversable/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index ed88e24ffa94..03eb64da753f 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -1,16 +1,20 @@ -{ cabal, comonad, hashable, hspec, semigroupoids, semigroups, text -, transformers, unorderedContainers, vector +{ cabal, comonad, hashable, hspec, QuickCheck, semigroupoids +, semigroups, text, transformers, unorderedContainers, vector +, vectorInstances }: cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.2.0.0"; - sha256 = "1wg0yzim3ql73w5rsxjnglwlg8r2hqliddmdk8vwsbvg02kgwxvz"; + version = "0.3.0.1"; + sha256 = "14vh6qhl6v46r857pfwkyhn8g8dh7q7vbm6z64zq1lhdw91ywn4f"; buildDepends = [ comonad hashable semigroupoids semigroups text transformers - unorderedContainers vector + unorderedContainers vector vectorInstances + ]; + testDepends = [ + hspec QuickCheck semigroups text transformers unorderedContainers + vector ]; - testDepends = [ hspec text ]; meta = { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; From 641891a7c4749a82dc93668eb89e3168e83201d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:55 +0100 Subject: [PATCH 132/384] haskell-network-conduit: update to version 1.0.2.2 --- .../development/libraries/haskell/network-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 024cf9b1d412..b859858b8be4 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "1.0.2.1"; - sha256 = "1dq7pwimjkr0wpyjphbvjy3klkcjl8jin76am5jbz3cxk1dr20jk"; + version = "1.0.2.2"; + sha256 = "1l7r40raqbhfgwgp5knkqfg2b7pqm4h23c9slbx55r829if8c54h"; buildDepends = [ conduit liftedBase monadControl network transformers ]; From 95b1e11618d127a95f74c8e4482d63b5f5c2bd68 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:56 +0100 Subject: [PATCH 133/384] haskell-network-protocol-xmpp: update to version 0.4.6 --- .../libraries/haskell/network-protocol-xmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix index 910d2cc6774b..cd56082d8b54 100644 --- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix +++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network-protocol-xmpp"; - version = "0.4.5"; - sha256 = "1phnd9nygpc8gmyriwaqjnvygxi5zg4nx2i1m3vwwxql221420gg"; + version = "0.4.6"; + sha256 = "0xmafjz11v2dlbyg2ny90ycz315s23yprdpxz3l06igjxw6h3v6n"; buildDepends = [ gnuidn gnutls gsasl libxmlSax monadsTf network text transformers xmlTypes From 641e37519b42bd5fe5118cc8e1f573c04aae80bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:48:58 +0100 Subject: [PATCH 134/384] haskell-pipes-attoparsec: update to version 0.4.0.1 --- .../libraries/haskell/pipes-attoparsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix index 27f9d8a0b87c..7204286671e1 100644 --- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-attoparsec"; - version = "0.4.0"; - sha256 = "0xffqxsh8yvfdk39mdgkf0l2v284fr31nz5k16dq752p63fnczkw"; + version = "0.4.0.1"; + sha256 = "0f536x0l135b5pd14l6lri7kinwh2m4p7qw054lacw362y7004zf"; buildDepends = [ attoparsec pipes pipesParse text transformers ]; testDepends = [ attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text From 9e15812d400bc1ef57d59ac7b0823137d0f70aca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:49:00 +0100 Subject: [PATCH 135/384] haskell-quickcheck-instances: update to version 0.3.7 --- .../libraries/haskell/quickcheck-instances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index 44e912514fc7..3260fd17e9e5 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "quickcheck-instances"; - version = "0.3.6"; - sha256 = "1vaqwsdgi2mirplzg66zysc1ivjjr0qxyiibsh6j771hxs9qk2pr"; + version = "0.3.7"; + sha256 = "0zf2b2zisfx7j7i4jnb79w5hhk5dy53w23fi876flx3vl6mfvszw"; buildDepends = [ hashable QuickCheck text time unorderedContainers ]; From be4b35eb15e4bb885ae546fdd7766da0889232e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:49:02 +0100 Subject: [PATCH 136/384] haskell-timezone-olson: update to version 0.1.3 --- pkgs/development/libraries/haskell/timezone-olson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix index c46090cda9b1..4cce59f61658 100644 --- a/pkgs/development/libraries/haskell/timezone-olson/default.nix +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "timezone-olson"; - version = "0.1.2"; - sha256 = "1dp0nppvx732c27pybbyqw6jkx4kdgfc6vnc539m0xv005afpq9y"; + version = "0.1.3"; + sha256 = "02x3wq03h2zjhxrcv6vnq9hrzggdvpnj7zj8rcrq4scf67q6h8gc"; buildDepends = [ binary extensibleExceptions time timezoneSeries ]; meta = { homepage = "http://projects.haskell.org/time-ng/"; From 2668493a14637f43dcfabaeb3279e061bbddaaa9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 12:49:04 +0100 Subject: [PATCH 137/384] haskell-websockets: update to version 0.8.2.0 --- pkgs/development/libraries/haskell/websockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 24b0554ea012..c0d500ace719 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.8.1.3"; - sha256 = "16iq2grgafshjwhjxwb0qdxiawr6z6hxaksix52nr8l4wm9ibhjv"; + version = "0.8.2.0"; + sha256 = "1gphlil7n0g9y6vqwyn9fc4sl2ccninznc59p11052j8q6yb34ia"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy ioStreams mtl network random SHA text From ba9cc84ad0e72666cc3abac8f398f768ac3675a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Feb 2014 17:11:58 +0100 Subject: [PATCH 138/384] gnulib: update to version 0.1-83-g8008cac --- pkgs/development/tools/gnulib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 0d298558e5ee..2e5701375a47 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnulib-0.0-8015-gf0aab22"; + name = "gnulib-0.1-83-g8008cac"; src = fetchgit { url = "http://git.savannah.gnu.org/r/gnulib.git"; - rev = "f0aab227265173908ecaa2353de6cf791cec3304"; - sha256 = "162i39wvrmjhkg8w07i92vg9l0f0lk57zl1ynf0lvs70rkdd8a82"; + rev = "8008cac0568ee76a4a9b7002f839e1abbad78af6"; + sha256 = "1w8wh5ljh1qpssnj2lxizf45ggd7fgk5ggwhrnzjxxhn9m7rdvwm"; }; buildPhase = ":"; From 1d1667b7b0e34a4ef361386cb58dfc2ca3e1eb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 17 Feb 2014 20:37:55 +0100 Subject: [PATCH 139/384] keybinder: new package keybinder is a library for registering global keyboard shortcuts. keybinder works with GTK-based applications using the X Window System. https://github.com/engla/keybinder/ --- .../libraries/keybinder/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/keybinder/default.nix diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix new file mode 100644 index 000000000000..20e2cd2218ff --- /dev/null +++ b/pkgs/development/libraries/keybinder/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome_common +, gtk_doc, gtk2, python, pygtk, pygobject, lua +}: + +stdenv.mkDerivation rec { + name = "keybinder-${version}"; + version = "0.3.0"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz"; + sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; + }; + + buildInputs = [ + autoconf automake libtool pkgconfig gnome_common gtk_doc gtk2 + python pygtk pygobject lua + ]; + + preConfigure = '' + ./autogen.sh --prefix="$out" + ''; + + meta = with stdenv.lib; { + description = "Library for registering global key bindings"; + longDescription = '' + keybinder is a library for registering global keyboard shortcuts. + Keybinder works with GTK-based applications using the X Window System. + + The library contains: + + * A C library, ``libkeybinder`` + * Gobject-Introspection (gir) generated bindings + * Lua bindings, ``lua-keybinder`` + * Python bindings, ``python-keybinder`` + * An ``examples`` directory with programs in C, Lua, Python and Vala. + ''; + homepage = https://github.com/engla/keybinder/; + license = licenses.gpl2Plus; + platform = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c094bb2b9a7e..03c313b21b6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4547,6 +4547,12 @@ let judy = callPackage ../development/libraries/judy { }; + keybinder = callPackage ../development/libraries/keybinder { + inherit (gnome2) gnome_common; + automake = automake111x; + lua = lua5_1; + }; + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; lcms = lcms1; From 0fa9dca3624e6971babf57a00a284e50b8fe31ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 17 Feb 2014 20:39:38 +0100 Subject: [PATCH 140/384] gnome-terminator: add missing dependencies (for extra features) Add 'keybinder' and 'python-notify' as dependencies. Fixes this: $ terminator [...] Warning: python-keybinder is not installed. This means the hide_window shortcut will be unavailable [...] ActivityWatch plugin unavailable: please install python-notify --- pkgs/applications/misc/gnome_terminator/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix index c9c53430bb50..71d8bbfd8e7e 100644 --- a/pkgs/applications/misc/gnome_terminator/default.nix +++ b/pkgs/applications/misc/gnome_terminator/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }: +{ stdenv, fetchurl, python, pygtk, notify, keybinder, vte, gettext, intltool +, makeWrapper +}: stdenv.mkDerivation rec { name = "gnome-terminator-${version}"; @@ -9,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci"; }; - buildInputs = [ python pygtk vte gettext intltool makeWrapper ]; + buildInputs = [ + python pygtk notify keybinder vte gettext intltool makeWrapper + ]; installPhase = '' python setup.py --without-icon-cache install --prefix="$out" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03c313b21b6b..d20cee5501fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8109,6 +8109,7 @@ let gnome_terminator = callPackage ../applications/misc/gnome_terminator { vte = gnome.vte.override { pythonSupport = true; }; + inherit (pythonPackages) notify; }; googleearth = callPackage_i686 ../applications/misc/googleearth { }; From 493adc9227e5e2649e71756679b2527c144a8441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 17 Feb 2014 20:43:35 +0100 Subject: [PATCH 141/384] Rename 'gnome-terminator' to 'terminator' Align the package name with what other distros call it. Other distros: Fedora, Debian, Archlinux, OpenSUSE, Mageia, Slackware (and probably more). --- .../misc/{gnome_terminator => terminator}/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/applications/misc/{gnome_terminator => terminator}/default.nix (94%) diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/terminator/default.nix similarity index 94% rename from pkgs/applications/misc/gnome_terminator/default.nix rename to pkgs/applications/misc/terminator/default.nix index 71d8bbfd8e7e..c337cd329c92 100644 --- a/pkgs/applications/misc/gnome_terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-terminator-${version}"; + name = "terminator-${version}"; version = "0.97"; src = fetchurl { - url = "https://launchpad.net/terminator/trunk/${version}/+download/terminator-${version}.tar.gz"; + url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz"; sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d20cee5501fe..c7b554de6e1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8107,11 +8107,6 @@ let inherit (gnome) GConf; }; - gnome_terminator = callPackage ../applications/misc/gnome_terminator { - vte = gnome.vte.override { pythonSupport = true; }; - inherit (pythonPackages) notify; - }; - googleearth = callPackage_i686 ../applications/misc/googleearth { }; google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { @@ -8912,6 +8907,11 @@ let telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; + terminator = callPackage ../applications/misc/terminator { + vte = gnome.vte.override { pythonSupport = true; }; + inherit (pythonPackages) notify; + }; + tesseract = callPackage ../applications/graphics/tesseract { }; thinkingRock = callPackage ../applications/misc/thinking-rock { }; From 668e81ad5a1824f80348904761662d41aefeaf4c Mon Sep 17 00:00:00 2001 From: Mihaly Barasz Date: Mon, 17 Feb 2014 23:04:13 +0100 Subject: [PATCH 142/384] Add nc-indicators-0.1 Haskell package --- pkgs/applications/misc/nc-indicators/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/misc/nc-indicators/default.nix diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix new file mode 100644 index 000000000000..dec605daf58c --- /dev/null +++ b/pkgs/applications/misc/nc-indicators/default.nix @@ -0,0 +1,16 @@ +{ cabal, attoparsec, gtk, hflags, lens, pipes, stm }: + +cabal.mkDerivation (self: { + pname = "nc-indicators"; + version = "0.1"; + sha256 = "19amwfcbwfxcj0gr7w0vgxl427l43q3l2s3n3zsxhqwkfblxmfy5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ attoparsec gtk hflags lens pipes stm ]; + meta = { + homepage = "https://github.com/nilcons/nc-indicators"; + description = "CPU load and memory usage indicators for i3bar"; + license = self.stdenv.lib.licenses.asl20; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c95fbfb0ad0e..dd996a0d5760 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2793,6 +2793,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck = self.QuickCheck2; }; + nc-indicators = callPackage ../applications/misc/nc-indicators {}; + taffybar = callPackage ../applications/misc/taffybar {}; yi = callPackage ../applications/editors/yi/yi.nix {}; From e1801a83f0f08619f7f0303787f314b13b91be20 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 18 Feb 2014 00:09:53 +0100 Subject: [PATCH 143/384] gnome-common: Propagate autoconf and automake build inputs --- pkgs/desktops/gnome-3/core/gnome-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index 5ae7ece6864a..12b2510dc436 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which }: +{ stdenv, fetchurl, which, autoconf, automake }: stdenv.mkDerivation rec { name = "gnome-common-3.10.0"; @@ -13,5 +13,5 @@ stdenv.mkDerivation rec { sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; })]; - propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which } From 92f9949e09163226da041865544ca9cde399fee1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 15 Feb 2014 23:27:29 +0100 Subject: [PATCH 144/384] epiphany: new package WebKit based web browser for GNOME https://wiki.gnome.org/Apps/Epiphany --- .../gnome-3/core/epiphany/default.nix | 49 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/epiphany/default.nix diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix new file mode 100644 index 000000000000..7da49dbc7384 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -0,0 +1,49 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu +, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool +, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, sqlite, gcr, avahi, nss, isocodes, itstool, file }: + +# TODO: icons and theme still does not work +# use packaged gnome3.gnome_icon_theme_symbolic + +stdenv.mkDerivation rec { + name = "epiphany-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz"; + sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7"; + }; + + # Tests need an X display + configureFlags = [ "--disable-static --disable-tests" ]; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + nativeBuildInputs = [ pkgconfig file ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file + webkitgtk libsoup libsecret gnome_desktop libnotify libtool + sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools + gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; + + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + + installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram "$out/bin/epiphany" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Epiphany; + description = "WebKit based web browser for GNOME"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index bb37d2fa2dad..b8832f6207a3 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -20,6 +20,8 @@ rec { dconf = callPackage ./core/dconf { }; + epiphany = callPackage ./core/epiphany { }; + evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests evolution_data_server = callPackage ./core/evolution-data-server { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba46fff4df08..7c1160107038 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7806,6 +7806,8 @@ let epdfview = callPackage ../applications/misc/epdfview { }; + inherit (gnome3) epiphany; + espeak = callPackage ../applications/audio/espeak { }; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; From 8b4003c102673438a22a1519cfb6de0a8c56d74c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 18 Feb 2014 00:33:29 +0100 Subject: [PATCH 145/384] libgee: Update to 0.13.90 and enable checks --- pkgs/desktops/gnome-3/core/libgee/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index 2775e87720cc..039227786522 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "libgee-0.13.4"; + name = "libgee-0.13.90"; src = fetchurl { url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz"; - sha256 = "1gzyx8gy5m6r8km3xbb1kszz0v3p9vsbzwb78pf3fw122gwbjj4k"; + sha256 = "9496f8fb249f7850db32b50e8675998db8b5276d4568cbf043faa7e745d7b7d6"; }; + doCheck = true; + patches = [ ./fix_introspection_paths.patch ]; buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; From 53b6744646ecf850de545da5bdb2192b0a911883 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 18 Feb 2014 01:02:47 +0100 Subject: [PATCH 146/384] teensy-loader: New package Firmware uploader for the teensy microcontroller board family. --- .../development/tools/misc/teensy/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/misc/teensy/default.nix diff --git a/pkgs/development/tools/misc/teensy/default.nix b/pkgs/development/tools/misc/teensy/default.nix new file mode 100644 index 000000000000..9902cd034539 --- /dev/null +++ b/pkgs/development/tools/misc/teensy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip, libusb }: +let + version = "2.1"; +in +stdenv.mkDerivation { + name = "teensy-loader-${version}"; + src = fetchurl { + url = "http://www.pjrc.com/teensy/teensy_loader_cli.2.1.zip"; + sha256 = "0iidj3q0l2hds1gaadnwgni4qdgk6r0nv101986jxda8cw6h9zfs"; + }; + + buildInputs = [ unzip libusb ]; + + installPhase = '' + mkdir -p $out/bin + cp -v teensy_loader_cli $out/bin/ + ''; + + meta = with stdenv.lib; { + license = licenses.gpl3; + description = "Firmware uploader for the Teensy microcontroller board"; + homepage = http://www.pjrc.com/teensy/; + maintainers = with maintainers; [ the-kenny ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7b554de6e1c..4f781502e3da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3771,6 +3771,8 @@ let tcptrack = callPackage ../development/tools/misc/tcptrack { }; + teensy-loader = callPackage ../development/tools/misc/teensy { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo4 = texinfo413; From 5174a694006ef1bf338e53163273088da3e12a41 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 18 Feb 2014 02:58:56 +0200 Subject: [PATCH 147/384] KDE 4.10: add branch info --- pkgs/desktops/kde-4.10/default.nix | 5 +++-- pkgs/desktops/kde-4.10/kde-package/default.nix | 3 ++- pkgs/desktops/kde-4.10/l10n/default.nix | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix index f56e64e2d158..feb6ed21409d 100644 --- a/pkgs/desktops/kde-4.10/default.nix +++ b/pkgs/desktops/kde-4.10/default.nix @@ -1,9 +1,10 @@ { callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }: let + branch = "4.10"; # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { - inherit release ignoreList extraSubpkgs callPackage; + inherit release branch ignoreList extraSubpkgs callPackage; }; # The list of igored individual modules @@ -64,7 +65,7 @@ kde.modules // kde.individual // full = stdenv.lib.attrValues kde.modules; l10n = callPackage ./l10n { - inherit release; + inherit release branch; inherit (kde.manifest) stable; }; } diff --git a/pkgs/desktops/kde-4.10/kde-package/default.nix b/pkgs/desktops/kde-4.10/kde-package/default.nix index 8a6e8e167517..9424a762c8f2 100644 --- a/pkgs/desktops/kde-4.10/kde-package/default.nix +++ b/pkgs/desktops/kde-4.10/kde-package/default.nix @@ -1,5 +1,5 @@ { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 -, release, ignoreList, extraSubpkgs +, release, branch, ignoreList, extraSubpkgs }: let @@ -19,6 +19,7 @@ rec { # Default meta attribute defMeta = { homepage = http://www.kde.org; + inherit branch; platforms = stdenv.lib.platforms.linux; inherit (qt4.meta) maintainers; }; diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix index c9fab80bffb4..fa6406043b1b 100644 --- a/pkgs/desktops/kde-4.10/l10n/default.nix +++ b/pkgs/desktops/kde-4.10/l10n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, stable }: +{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }: let @@ -22,6 +22,7 @@ let meta = { description = "KDE translation for ${lang}"; + inherit branch; license = "GPL"; platforms = stdenv.lib.platforms.linux; inherit (kdelibs.meta) maintainers homepage; From 586188fa7d0bd4851a8c3ef30603a0efeaaa9430 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 18 Feb 2014 03:10:25 +0200 Subject: [PATCH 148/384] KDE 4.11: add branch meta --- pkgs/desktops/kde-4.11/default.nix | 6 ++++-- pkgs/desktops/kde-4.11/kde-package/default.nix | 3 ++- pkgs/desktops/kde-4.11/l10n/default.nix | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix index 95bf4b512c77..269bdc0d3a72 100644 --- a/pkgs/desktops/kde-4.11/default.nix +++ b/pkgs/desktops/kde-4.11/default.nix @@ -1,9 +1,11 @@ { callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }: let + branch = "4.11"; + # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { - inherit release ignoreList extraSubpkgs callPackage; + inherit release branch ignoreList extraSubpkgs callPackage; }; # The list of igored individual modules @@ -36,7 +38,7 @@ kde.modules // kde.individual // full = stdenv.lib.attrValues kde.modules; l10n = callPackage ./l10n { - inherit release; + inherit release branch; inherit (kde.manifest) stable; }; } diff --git a/pkgs/desktops/kde-4.11/kde-package/default.nix b/pkgs/desktops/kde-4.11/kde-package/default.nix index 8a6e8e167517..9424a762c8f2 100644 --- a/pkgs/desktops/kde-4.11/kde-package/default.nix +++ b/pkgs/desktops/kde-4.11/kde-package/default.nix @@ -1,5 +1,5 @@ { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 -, release, ignoreList, extraSubpkgs +, release, branch, ignoreList, extraSubpkgs }: let @@ -19,6 +19,7 @@ rec { # Default meta attribute defMeta = { homepage = http://www.kde.org; + inherit branch; platforms = stdenv.lib.platforms.linux; inherit (qt4.meta) maintainers; }; diff --git a/pkgs/desktops/kde-4.11/l10n/default.nix b/pkgs/desktops/kde-4.11/l10n/default.nix index c9fab80bffb4..fa6406043b1b 100644 --- a/pkgs/desktops/kde-4.11/l10n/default.nix +++ b/pkgs/desktops/kde-4.11/l10n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, stable }: +{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }: let @@ -22,6 +22,7 @@ let meta = { description = "KDE translation for ${lang}"; + inherit branch; license = "GPL"; platforms = stdenv.lib.platforms.linux; inherit (kdelibs.meta) maintainers homepage; From 952fa02b9075f8d2bb7783e1cda3df491261fc6c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 18 Feb 2014 03:18:02 +0200 Subject: [PATCH 149/384] KDE 4.12: add branch meta --- pkgs/desktops/kde-4.12/default.nix | 6 ++++-- pkgs/desktops/kde-4.12/kde-package/default.nix | 3 ++- pkgs/desktops/kde-4.12/l10n/default.nix | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.12/default.nix b/pkgs/desktops/kde-4.12/default.nix index b8e0a828a888..6d3dd46df354 100644 --- a/pkgs/desktops/kde-4.12/default.nix +++ b/pkgs/desktops/kde-4.12/default.nix @@ -1,9 +1,11 @@ { callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }: let + branch = "4.12"; + # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { - inherit release ignoreList extraSubpkgs callPackage; + inherit release branch ignoreList extraSubpkgs callPackage; }; # The list of igored individual modules @@ -36,7 +38,7 @@ kde.modules // kde.individual // full = stdenv.lib.attrValues kde.modules; l10n = callPackage ./l10n { - inherit release; + inherit release branch; inherit (kde.manifest) stable; }; } diff --git a/pkgs/desktops/kde-4.12/kde-package/default.nix b/pkgs/desktops/kde-4.12/kde-package/default.nix index 04f798c233a1..6b4e1ba0ad87 100644 --- a/pkgs/desktops/kde-4.12/kde-package/default.nix +++ b/pkgs/desktops/kde-4.12/kde-package/default.nix @@ -1,5 +1,5 @@ { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 -, release, ignoreList, extraSubpkgs +, release, branch, ignoreList, extraSubpkgs }: let @@ -19,6 +19,7 @@ rec { # Default meta attribute defMeta = { homepage = http://www.kde.org; + inherit branch; platforms = stdenv.lib.platforms.linux; inherit (qt4.meta) maintainers; }; diff --git a/pkgs/desktops/kde-4.12/l10n/default.nix b/pkgs/desktops/kde-4.12/l10n/default.nix index c9fab80bffb4..fa6406043b1b 100644 --- a/pkgs/desktops/kde-4.12/l10n/default.nix +++ b/pkgs/desktops/kde-4.12/l10n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, stable }: +{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }: let @@ -22,6 +22,7 @@ let meta = { description = "KDE translation for ${lang}"; + inherit branch; license = "GPL"; platforms = stdenv.lib.platforms.linux; inherit (kdelibs.meta) maintainers homepage; From c67f562d5e46808b0581c4368e3755819daa12ec Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 18 Feb 2014 04:13:45 +0200 Subject: [PATCH 150/384] add branch info --- pkgs/applications/audio/ardour/default.nix | 1 + pkgs/development/tools/misc/autoconf/2.13.nix | 1 + pkgs/servers/http/apache-httpd/2.2.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 3ed650d4ae73..08cecfea064d 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { Also read "The importance of Paying Something" on their homepage, please! ''; homepage = http://ardour.org/; + branch = "2"; license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 2d8169d408fe..f6793e3aeec0 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/autoconf/; description = "Part of the GNU Build System"; + branch = "2.13"; longDescription = '' GNU Autoconf is an extensible package of M4 macros that produce diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index f6b31177157c..64dd15be3df7 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "Apache HTTPD, the world's most popular web server"; + branch = "2.2"; homepage = http://httpd.apache.org/; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; From f10280fc1984603f6d0093d8dfdbef5b4208454f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 18 Feb 2014 04:14:05 +0200 Subject: [PATCH 151/384] youtubeDL: update from 2014.02.13 to 2014.02.17 --- 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 c1b3cd575301..c769645edc3d 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.13"; + version = "2014.02.17"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0l88n1qrhjj2dvxlpd4hpqrdpxihqv3y9mrf1jgra3jyvb9pbnxq"; + sha256 = "0yv13k8cqrv3i8zv5ad286niwxk5a4ggngcx6b0d6kg7c03rkgkq"; }; buildInputs = [ python ]; From 64ddd8671444d603213724d817ac00f7c87dfad0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 18 Feb 2014 04:22:27 +0200 Subject: [PATCH 152/384] perlPackages.ExceptionClass: update from 1.30 to 1.37 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55243cb7371c..902d28c685fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3053,10 +3053,10 @@ let self = _self // overrides; _self = with self; { }; ExceptionClass = buildPerlPackage rec { - name = "Exception-Class-1.30"; + name = "Exception-Class-1.37"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "54e256fdb317c1736c2c257fa63d5b87cfb382870711b24937c36eb5171b3154"; + sha256 = "1p6f20fi82mr5bz7d2c7nqh0322r8n2kszfw37c77g8b1b4r72w3"; }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; }; From 68d8f67c0418702ec013bafa4f5d4227a677cf96 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 17 Feb 2014 08:23:49 +0100 Subject: [PATCH 153/384] e17/terminology: upgrade to 0.4.0 --- pkgs/desktops/e17/terminology/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix index f060d81bd00e..25dd95c7f19c 100644 --- a/pkgs/desktops/e17/terminology/default.nix +++ b/pkgs/desktops/e17/terminology/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1dn5bjswqgnqza7bngc6afqza47yh27xfwf5qg2kzfgs008hp1bp"; + url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; + sha256 = "1ing9l19h7f1f843rcabbjaynps1as4mpc31xz2adkafb3xd3wk3"; }; buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ]; From fb2d903a630035a4eab157cbaac966a9f67c6769 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 18 Feb 2014 04:36:00 -0600 Subject: [PATCH 154/384] Add myself to the maintainers list. Signed-off-by: Austin Seipp --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index fa004c859b41..ee3830e6d352 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -65,6 +65,7 @@ sprock = "Roger Mason "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; + thoughtpolice = "Austin Seipp "; tomberek = "Thomas Bereknyei "; urkud = "Yury G. Kudryashov "; vcunat = "Vladimír Čunát "; From 5181cbd7c6b9449b78ef859d473a13b7a7101971 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 18 Feb 2014 13:22:02 +0100 Subject: [PATCH 155/384] libgit2-glib: Fix build after gnome3.gnome_common changes --- pkgs/desktops/gnome-3/default.nix | 2 +- pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b0c0f6c7f785..1cb990b726bc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -113,6 +113,6 @@ rec { gitg = callPackage ./misc/gitg { }; - libgit2-glib = callPackage ./misc/libgit2-glib { automake = pkgs.automake111x; }; + libgit2-glib = callPackage ./misc/libgit2-glib { }; } diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index 12d37ab5db50..17c3b4fa0a8c 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, gnome3, autoconf, automake, libtool, pkgconfig +{ stdenv, fetchurl, gnome3, libtool, pkgconfig , gtk_doc, gobjectIntrospection, libgit2, glib }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { configureScript = "sh ./autogen.sh"; - buildInputs = [ which gnome3.gnome_common autoconf automake libtool - pkgconfig gtk_doc gobjectIntrospection libgit2 glib ]; + buildInputs = [ gnome3.gnome_common libtool pkgconfig + gtk_doc gobjectIntrospection libgit2 glib ]; meta = with stdenv.lib; { platforms = platforms.linux; From 70798243a221c4cf1e9a30135d5ea7f326a7c8b2 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 18 Feb 2014 16:34:34 +0100 Subject: [PATCH 156/384] titaniumsdk: Add 3.2 SDK option --- .../mobile/titaniumenv/build-app.nix | 11 +- .../mobile/titaniumenv/default.nix | 15 +- .../mobile/titaniumenv/examples/default.nix | 13 +- .../examples/kitchensink/default.nix | 8 +- .../{titaniumsdk.nix => titaniumsdk-3.1.nix} | 0 .../mobile/titaniumenv/titaniumsdk-3.2.nix | 78 + pkgs/top-level/node-packages-generated.nix | 1356 ++++++++++------- pkgs/top-level/node-packages.json | 2 +- 8 files changed, 954 insertions(+), 529 deletions(-) rename pkgs/development/mobile/titaniumenv/{titaniumsdk.nix => titaniumsdk-3.1.nix} (100%) create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 55e9d63d727a..8c46033152f0 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,4 +1,4 @@ -{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python}: +{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which}: { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null @@ -20,7 +20,7 @@ stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - buildInputs = [ titanium jdk python ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + buildInputs = [ titanium jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' export HOME=$TMPDIR @@ -38,16 +38,21 @@ stdenv.mkDerivation { echo "{}" > $TMPDIR/config.json titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk} - + + titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk} + mkdir -p $out ${if target == "android" then '' + cat $TMPDIR/config.json + titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-* ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out'' else + # /run/current-system/sw/bin/strace -f -y ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''} '' else if target == "iphone" then diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index b77468a09536..6c80cdae3e26 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "5.0"}: +{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.1.GA"}: let # We have to use Oracle's JDK. On Darwin, just simply expose the host system's @@ -27,12 +27,17 @@ rec { version = xcodeVersion; } else null; - titaniumsdk = import ./titaniumsdk.nix { - inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk; - }; + titaniumsdk = let + titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix + else if tiVersion == "3.2.1.GA" then ./titaniumsdk-3.2.nix + else throw "Titanium version not supported: "+tiVersion; + in + import titaniumSdkFile { + inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk; + }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv python; + inherit (pkgs) stdenv python which; jdk = if pkgs.stdenv.isLinux then pkgs.oraclejdk7 else if pkgs.stdenv.isDarwin then jdkWrapper else throw "Platform not supported: ${pkgs.stdenv.system}"; diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index e955a1d8865a..c9f32f8bb6b1 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,6 +1,7 @@ { nixpkgs ? , systems ? [ "x86_64-linux" "x86_64-darwin" ] , xcodeVersion ? "5.0" +, tiVersion ? "3.2.1.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" }: @@ -15,7 +16,8 @@ rec { in import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + inherit tiVersion; target = "android"; }); @@ -25,7 +27,8 @@ rec { in import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + inherit tiVersion; target = "android"; release = true; }); @@ -55,7 +58,8 @@ rec { rec { kitchensink_ios_development = import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + inherit tiVersion; target = "iphone"; }; @@ -79,8 +83,9 @@ rec { { kitchensink_ipa = import ./kitchensink { inherit (pkgs) stdenv fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; target = "iphone"; + inherit tiVersion; release = true; rename = true; inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index a5cd156a8ffd..95dd09be30dc 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,4 +1,4 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], release ? false +{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], tiVersion ? "3.2.1.GA", release ? false , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null }: @@ -7,8 +7,8 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning let src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; - rev = "d9f39950c0137a1dd67c925ef9e8046a9f0644ff"; - sha256 = "0aj42ac262hw9n9blzhfibg61kkbp3wky69rp2yhd11vwjlcq1qc"; + rev = "0b8175f20f0aa71f93921025dec5d0f3299960ae"; + sha256 = "0b2p4wbnlp46wpanqj5h3yfb2hdbh20nxbis8zscj4qlgrnyjdjz"; }; # Rename the bundle id to something else @@ -28,7 +28,7 @@ in titaniumenv.buildApp { name = "KitchenSink-${target}-${if release then "release" else "debug"}"; src = if rename then renamedSrc else src; - tiVersion = "3.1.4.GA"; + inherit tiVersion; inherit target androidPlatformVersions release; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix similarity index 100% rename from pkgs/development/mobile/titaniumenv/titaniumsdk.nix rename to pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix new file mode 100644 index 000000000000..96428f4a99bc --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix @@ -0,0 +1,78 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-3.2.1.v20140206170116"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.1.v20140206170116-linux.zip; + sha1 = "89955d31d48875aca64dd0131baac5ed82abcfc9"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.1.v20140206170116-osx.zip; + sha1 = "06d9338c619b787be83baf3c0d93748b0e430182"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + yes y | unzip $src + + # Fix shebang header for python scripts + + find . -name \*.py | while read i + do + sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + done + + # Rename ugly version number + cd mobilesdk/* + mv 3.2.1.v20140206170116 3.2.1.GA + cd 3.2.1.GA + + # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that + # Yes, I know it's nasty :-) + + cd android + + sed -i -f ${./fixtiverify.sed} builder.py + sed -i -f ${./fixtiprofiler.sed} builder.py + sed -i -f ${./fixso.sed} builder.py + sed -i -f ${./fixnativelibs.sed} builder.py + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + '' + else ""} + + # Wrap builder script + + mv builder.py .builder.py + cat > builder.py <= 0.0.1" = self.by-version."jade"."1.1.5"; by-spec."jade"."~0.35.0" = @@ -7300,6 +7460,8 @@ ]; passthru.names = [ "js-yaml" ]; }; + by-spec."js-yaml"."3.0.1" = + self.by-version."js-yaml"."3.0.1"; by-spec."js-yaml"."3.x" = self.by-version."js-yaml"."3.0.1"; by-spec."js-yaml"."~2.0.5" = @@ -7344,6 +7506,8 @@ ]; passthru.names = [ "js-yaml" ]; }; + by-spec."js-yaml"."~3.0.1" = + self.by-version."js-yaml"."3.0.1"; by-spec."jsesc"."0.4.3" = self.by-version."jsesc"."0.4.3"; by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage { @@ -7557,11 +7721,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.9" + self.by-version."log4js"."0.6.10" self.by-version."useragent"."2.0.7" - self.by-version."graceful-fs"."2.0.1" + self.by-version."graceful-fs"."2.0.2" self.by-version."connect"."2.12.0" - self.by-version."source-map"."0.1.31" + self.by-version."source-map"."0.1.32" ]; peerDependencies = [ ]; @@ -7598,14 +7762,14 @@ }; "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.2"; by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.1.5"; - by-version."karma-coverage"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "node-karma-coverage-0.1.5"; + self.by-version."karma-coverage"."0.2.0"; + by-version."karma-coverage"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-karma-coverage-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.5.tgz"; - name = "karma-coverage-0.1.5.tgz"; - sha1 = "a4dcbe87d4a7765456ca64218b5f0601018e1371"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.0.tgz"; + name = "karma-coverage-0.2.0.tgz"; + sha1 = "d8edc429c35ab7c68fa90a5cd2f2ecb3aa31fde8"; }) ]; buildInputs = @@ -7620,7 +7784,7 @@ ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.1.5"; + "karma-coverage" = self.by-version."karma-coverage"."0.2.0"; by-spec."karma-junit-reporter"."*" = self.by-version."karma-junit-reporter"."0.2.1"; by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -7682,7 +7846,7 @@ ]; peerDependencies = [ self.by-version."karma"."0.11.14" - self.by-version."requirejs"."2.1.10" + self.by-version."requirejs"."2.1.11" ]; passthru.names = [ "karma-requirejs" ]; }; @@ -7850,14 +8014,14 @@ passthru.names = [ "knockout" ]; }; by-spec."knox"."*" = - self.by-version."knox"."0.8.8"; - by-version."knox"."0.8.8" = lib.makeOverridable self.buildNodePackage { - name = "node-knox-0.8.8"; + self.by-version."knox"."0.8.9"; + by-version."knox"."0.8.9" = lib.makeOverridable self.buildNodePackage { + name = "node-knox-0.8.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz"; - name = "knox-0.8.8.tgz"; - sha1 = "aeeadd22b0a4b1e4d858a15174af2da060ab6774"; + url = "http://registry.npmjs.org/knox/-/knox-0.8.9.tgz"; + name = "knox-0.8.9.tgz"; + sha1 = "b96ec0b4ec1be75d8006f80cb302bfa818d7001c"; }) ]; buildInputs = @@ -7872,25 +8036,25 @@ ]; passthru.names = [ "knox" ]; }; - "knox" = self.by-version."knox"."0.8.8"; + "knox" = self.by-version."knox"."0.8.9"; by-spec."kue"."*" = - self.by-version."kue"."0.7.4"; - by-version."kue"."0.7.4" = lib.makeOverridable self.buildNodePackage { - name = "node-kue-0.7.4"; + self.by-version."kue"."0.7.5"; + by-version."kue"."0.7.5" = lib.makeOverridable self.buildNodePackage { + name = "node-kue-0.7.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/kue/-/kue-0.7.4.tgz"; - name = "kue-0.7.4.tgz"; - sha1 = "bb3315580bbf4ec8663ce4203aec92e560a044ef"; + url = "http://registry.npmjs.org/kue/-/kue-0.7.5.tgz"; + name = "kue-0.7.5.tgz"; + sha1 = "d815a8a35b22dd28df3f54f0b874403a257dc807"; }) ]; buildInputs = (self.nativeDeps."kue" or []); deps = [ - self.by-version."redis"."0.10.0" + self.by-version."redis"."0.10.1" self.by-version."express"."3.1.2" - self.by-version."jade"."0.26.3" - self.by-version."stylus"."0.27.2" + self.by-version."jade"."1.1.5" + self.by-version."stylus"."0.42.2" self.by-version."nib"."0.5.0" self.by-version."reds"."0.2.4" ]; @@ -7898,7 +8062,7 @@ ]; passthru.names = [ "kue" ]; }; - "kue" = self.by-version."kue"."0.7.4"; + "kue" = self.by-version."kue"."0.7.5"; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -7938,15 +8102,15 @@ ]; passthru.names = [ "lazystream" ]; }; - by-spec."lcov-parse"."0.0.4" = - self.by-version."lcov-parse"."0.0.4"; - by-version."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-lcov-parse-0.0.4"; + by-spec."lcov-parse"."0.0.6" = + self.by-version."lcov-parse"."0.0.6"; + by-version."lcov-parse"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-lcov-parse-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.4.tgz"; - name = "lcov-parse-0.0.4.tgz"; - sha1 = "3853a4f132f04581db0e74c180542d90f0d1c66b"; + url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz"; + name = "lcov-parse-0.0.6.tgz"; + sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175"; }) ]; buildInputs = @@ -7979,14 +8143,14 @@ }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; by-spec."less"."~1.6.0" = - self.by-version."less"."1.6.2"; - by-version."less"."1.6.2" = lib.makeOverridable self.buildNodePackage { - name = "less-1.6.2"; + self.by-version."less"."1.6.3"; + by-version."less"."1.6.3" = lib.makeOverridable self.buildNodePackage { + name = "less-1.6.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.6.2.tgz"; - name = "less-1.6.2.tgz"; - sha1 = "86556e6ab8f9af4d8b853db16c5f262e94fc98a0"; + url = "http://registry.npmjs.org/less/-/less-1.6.3.tgz"; + name = "less-1.6.3.tgz"; + sha1 = "71ce89ec30b774b3567f254c67958f2f2c193bde"; }) ]; buildInputs = @@ -7995,8 +8159,8 @@ self.by-version."mime"."1.2.11" self.by-version."request"."2.33.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."2.0.7" - self.by-version."source-map"."0.1.31" + self.by-version."clean-css"."2.0.8" + self.by-version."source-map"."0.1.32" ]; peerDependencies = [ ]; @@ -8273,6 +8437,28 @@ ]; passthru.names = [ "lodash._shimkeys" ]; }; + by-spec."lodash.debounce"."~2.4.1" = + self.by-version."lodash.debounce"."2.4.1"; + by-version."lodash.debounce"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash.debounce-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz"; + name = "lodash.debounce-2.4.1.tgz"; + sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.debounce" or []); + deps = [ + self.by-version."lodash.isfunction"."2.4.1" + self.by-version."lodash.isobject"."2.4.1" + self.by-version."lodash.now"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash.debounce" ]; + }; by-spec."lodash.defaults"."~2.4.1" = self.by-version."lodash.defaults"."2.4.1"; by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -8294,6 +8480,25 @@ ]; passthru.names = [ "lodash.defaults" ]; }; + by-spec."lodash.isfunction"."~2.4.1" = + self.by-version."lodash.isfunction"."2.4.1"; + by-version."lodash.isfunction"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash.isfunction-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"; + name = "lodash.isfunction-2.4.1.tgz"; + sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.isfunction" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash.isfunction" ]; + }; by-spec."lodash.isobject"."~2.4.1" = self.by-version."lodash.isobject"."2.4.1"; by-version."lodash.isobject"."2.4.1" = lib.makeOverridable self.buildNodePackage { @@ -8336,6 +8541,26 @@ ]; passthru.names = [ "lodash.keys" ]; }; + by-spec."lodash.now"."~2.4.1" = + self.by-version."lodash.now"."2.4.1"; + by-version."lodash.now"."2.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-lodash.now-2.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz"; + name = "lodash.now-2.4.1.tgz"; + sha1 = "6872156500525185faf96785bb7fe7fe15b562c6"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash.now" or []); + deps = [ + self.by-version."lodash._isnative"."2.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash.now" ]; + }; by-spec."log-driver"."1.2.1" = self.by-version."log-driver"."1.2.1"; by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage { @@ -8356,14 +8581,14 @@ passthru.names = [ "log-driver" ]; }; by-spec."log4js"."~0.6.3" = - self.by-version."log4js"."0.6.9"; - by-version."log4js"."0.6.9" = lib.makeOverridable self.buildNodePackage { - name = "node-log4js-0.6.9"; + self.by-version."log4js"."0.6.10"; + by-version."log4js"."0.6.10" = lib.makeOverridable self.buildNodePackage { + name = "node-log4js-0.6.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/log4js/-/log4js-0.6.9.tgz"; - name = "log4js-0.6.9.tgz"; - sha1 = "2e327189c1c0dec17448ec5255f58cd0fddf4596"; + url = "http://registry.npmjs.org/log4js/-/log4js-0.6.10.tgz"; + name = "log4js-0.6.10.tgz"; + sha1 = "3a47a2551dc6362672901b73f7f47aee6310f785"; }) ]; buildInputs = @@ -8531,15 +8756,15 @@ }; by-spec."lru-cache"."~2.5.0" = self.by-version."lru-cache"."2.5.0"; - by-spec."lsmod"."0.0.2" = - self.by-version."lsmod"."0.0.2"; - by-version."lsmod"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-lsmod-0.0.2"; + by-spec."lsmod"."~0.0.3" = + self.by-version."lsmod"."0.0.3"; + by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-lsmod-0.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.2.tgz"; - name = "lsmod-0.0.2.tgz"; - sha1 = "ebfe765bbfcbe85006eb315862445158b7baf613"; + url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz"; + name = "lsmod-0.0.3.tgz"; + sha1 = "17e13d4e1ae91750ea5653548cd89e7147ad0244"; }) ]; buildInputs = @@ -8567,7 +8792,7 @@ self.by-version."mimelib"."0.2.14" self.by-version."mime"."1.2.9" self.by-version."he"."0.3.6" - self.by-version."punycode"."1.2.3" + self.by-version."punycode"."1.2.4" self.by-version."follow-redirects"."0.0.3" self.by-version."dkim-signer"."0.1.0" ]; @@ -8802,7 +9027,7 @@ (self.nativeDeps."mimelib" or []); deps = [ self.by-version."encoding"."0.1.7" - self.by-version."addressparser"."0.2.0" + self.by-version."addressparser"."0.2.1" ]; peerDependencies = [ ]; @@ -8870,14 +9095,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.5"; - by-version."minimist"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.5"; + self.by-version."minimist"."0.0.7"; + by-version."minimist"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz"; - name = "minimist-0.0.5.tgz"; - sha1 = "d7aa327bcecf518f9106ac6b8f003fa3bcea8566"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.7.tgz"; + name = "minimist-0.0.7.tgz"; + sha1 = "dc4c620253c542eda0d2eb91c3c6a971a11e63e7"; }) ]; buildInputs = @@ -9110,27 +9335,27 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.4.0-rc6"; - by-version."mongodb"."1.4.0-rc6" = lib.makeOverridable self.buildNodePackage { - name = "node-mongodb-1.4.0-rc6"; + 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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc6.tgz"; - name = "mongodb-1.4.0-rc6.tgz"; - sha1 = "dd2f6a03d9e9da019d6aa5da66c4d5de7993aedd"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc7.tgz"; + name = "mongodb-1.4.0-rc7.tgz"; + sha1 = "efa6da4ef5d1bf0fdf48b4f0e369e3d2186d3401"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = [ - self.by-version."bson"."0.2.5" + self.by-version."bson"."0.2.6" self.by-version."kerberos"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.4.0-rc6"; + "mongodb" = self.by-version."mongodb"."1.4.0-rc7"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -9196,14 +9421,14 @@ by-spec."mongodb"."1.3.x" = self.by-version."mongodb"."1.3.23"; by-spec."mongoose"."*" = - self.by-version."mongoose"."3.8.6"; - by-version."mongoose"."3.8.6" = lib.makeOverridable self.buildNodePackage { - name = "node-mongoose-3.8.6"; + self.by-version."mongoose"."3.8.7"; + by-version."mongoose"."3.8.7" = lib.makeOverridable self.buildNodePackage { + name = "node-mongoose-3.8.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.6.tgz"; - name = "mongoose-3.8.6.tgz"; - sha1 = "c8a282d3c74915864b6ed1e01884388c6e91d146"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.7.tgz"; + name = "mongoose-3.8.7.tgz"; + sha1 = "0ce98a491097944c25b9d0d1bfe2899198284a00"; }) ]; buildInputs = @@ -9650,6 +9875,25 @@ ]; passthru.names = [ "nan" ]; }; + by-spec."nan"."~0.8.0" = + self.by-version."nan"."0.8.0"; + by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-nan-0.8.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-0.8.0.tgz"; + name = "nan-0.8.0.tgz"; + sha1 = "022a8fa5e9fe8420964ac1fb3dc94e17f449f5fd"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; by-spec."natural"."0.1.17" = self.by-version."natural"."0.1.17"; by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage { @@ -9666,7 +9910,7 @@ deps = [ self.by-version."sylvester"."0.0.21" self.by-version."apparatus"."0.0.8" - self.by-version."underscore"."1.5.2" + self.by-version."underscore"."1.6.0" ]; peerDependencies = [ ]; @@ -9884,7 +10128,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.6" + self.by-version."wrench"."1.5.7" self.by-version."uglify-js"."2.3.6" self.by-version."xmldom"."0.1.19" ]; @@ -9928,11 +10172,11 @@ (self.nativeDeps."node-gyp" or []); deps = [ self.by-version."glob"."3.2.8" - self.by-version."graceful-fs"."2.0.1" + 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.1.2" + 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" @@ -10185,7 +10429,7 @@ (self.nativeDeps."nodemailer" or []); deps = [ self.by-version."mailcomposer"."0.2.8" - self.by-version."simplesmtp"."0.3.20" + self.by-version."simplesmtp"."0.3.21" self.by-version."optimist"."0.6.1" ]; peerDependencies = [ @@ -10236,14 +10480,14 @@ passthru.names = [ "nomnom" ]; }; by-spec."nopt"."2" = - self.by-version."nopt"."2.1.2"; - by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.1.2"; + self.by-version."nopt"."2.2.0"; + by-version."nopt"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "nopt-2.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; - name = "nopt-2.1.2.tgz"; - sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; + url = "http://registry.npmjs.org/nopt/-/nopt-2.2.0.tgz"; + name = "nopt-2.2.0.tgz"; + sha1 = "3d106676f3607ac466af9bf82bd707b1501d3bd5"; }) ]; buildInputs = @@ -10277,6 +10521,26 @@ }; by-spec."nopt"."2.1.x" = self.by-version."nopt"."2.1.2"; + by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage { + name = "nopt-2.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; + name = "nopt-2.1.2.tgz"; + sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; + }) + ]; + buildInputs = + (self.nativeDeps."nopt" or []); + deps = [ + self.by-version."abbrev"."1.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "nopt" ]; + }; + by-spec."nopt"."^2.2.0" = + self.by-version."nopt"."2.2.0"; by-spec."nopt"."https://github.com/Filirom1/nopt/tarball/master#pull-request-in-progress" = self.by-version."nopt"."1.0.10"; by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage { @@ -10303,15 +10567,15 @@ self.by-version."nopt"."2.1.2"; by-spec."nopt"."~2.1.2" = self.by-version."nopt"."2.1.2"; - by-spec."normalize-package-data"."~0.2.7" = - self.by-version."normalize-package-data"."0.2.8"; - by-version."normalize-package-data"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "node-normalize-package-data-0.2.8"; + 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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.8.tgz"; - name = "normalize-package-data-0.2.8.tgz"; - sha1 = "95dc1bcb54c8d46b3be345c05afbab27e48e2f69"; + 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"; }) ]; buildInputs = @@ -10326,14 +10590,14 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.3.26"; - by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.26"; + self.by-version."npm"."1.4.3"; + by-version."npm"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz"; - name = "npm-1.3.26.tgz"; - sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d"; + url = "http://registry.npmjs.org/npm/-/npm-1.4.3.tgz"; + name = "npm-1.4.3.tgz"; + sha1 = "c0b18a662731d93cfdac37df5c2b3a0cda39613c"; }) ]; buildInputs = @@ -10343,9 +10607,9 @@ self.by-version."ini"."1.1.0" self.by-version."slide"."1.1.5" self.by-version."abbrev"."1.0.4" - self.by-version."graceful-fs"."2.0.1" + self.by-version."graceful-fs"."2.0.2" self.by-version."minimatch"."0.2.14" - self.by-version."nopt"."2.1.2" + self.by-version."nopt"."2.2.0" self.by-version."rimraf"."2.2.6" self.by-version."request"."2.30.0" self.by-version."which"."1.0.5" @@ -10357,15 +10621,15 @@ self.by-version."lru-cache"."2.5.0" self.by-version."node-gyp"."0.12.2" self.by-version."fstream-npm"."0.1.6" - self.by-version."uid-number"."0.0.3" + self.by-version."uid-number"."0.0.4" self.by-version."archy"."0.0.2" self.by-version."chownr"."0.0.1" self.by-version."npmlog"."0.0.6" self.by-version."ansi"."0.2.1" - self.by-version."npm-registry-client"."0.3.5" - self.by-version."read-package-json"."1.1.6" - self.by-version."read-installed"."0.2.5" - self.by-version."glob"."3.2.8" + self.by-version."npm-registry-client"."0.4.4" + self.by-version."read-package-json"."1.1.7" + self.by-version."read-installed"."1.0.0" + self.by-version."glob"."3.2.7" self.by-version."init-package-json"."0.0.14" self.by-version."osenv"."0.0.3" self.by-version."lockfile"."0.4.2" @@ -10386,12 +10650,34 @@ self.by-version."ansistyles"."0.1.3" self.by-version."path-is-inside"."1.0.0" self.by-version."columnify"."0.1.2" + self.by-version."npm-install-checks"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.3.26"; + "npm" = self.by-version."npm"."1.4.3"; + 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 { + name = "node-npm-install-checks-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.0.tgz"; + name = "npm-install-checks-1.0.0.tgz"; + sha1 = "7e1469b5e0c693b2ae2a8830b5fc4e7bf76c88fd"; + }) + ]; + buildInputs = + (self.nativeDeps."npm-install-checks" or []); + deps = [ + self.by-version."npmlog"."0.0.6" + self.by-version."semver"."2.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "npm-install-checks" ]; + }; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { @@ -10407,7 +10693,7 @@ (self.nativeDeps."npm-registry-client" or []); deps = [ self.by-version."request"."2.33.0" - self.by-version."graceful-fs"."2.0.1" + self.by-version."graceful-fs"."2.0.2" self.by-version."semver"."2.0.11" self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" @@ -10421,37 +10707,62 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.3.3" = - self.by-version."npm-registry-client"."0.3.5"; - by-version."npm-registry-client"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "node-npm-registry-client-0.3.5"; + by-spec."npm-registry-client"."^0.4.4" = + self.by-version."npm-registry-client"."0.4.4"; + by-version."npm-registry-client"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-npm-registry-client-0.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.5.tgz"; - name = "npm-registry-client-0.3.5.tgz"; - sha1 = "98ba1ac851a3939a3fb9917c28fa8da522dc635f"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.4.tgz"; + name = "npm-registry-client-0.4.4.tgz"; + sha1 = "f9dbc383a49069d8c7f67755a3ff6e424aff584f"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = [ self.by-version."request"."2.33.0" - self.by-version."graceful-fs"."2.0.1" + 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.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.33.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."couch-login"."0.1.20" self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.3.5" = - self.by-version."npm-registry-client"."0.3.5"; 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 { @@ -10472,14 +10783,14 @@ passthru.names = [ "npm-user-validate" ]; }; by-spec."npm2nix"."*" = - self.by-version."npm2nix"."5.5.0"; - by-version."npm2nix"."5.5.0" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.5.0"; + self.by-version."npm2nix"."5.6.0"; + by-version."npm2nix"."5.6.0" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.5.0.tgz"; - name = "npm2nix-5.5.0.tgz"; - sha1 = "79729928cc4d2f4e765797491eeb4ced2b1d9e9e"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.6.0.tgz"; + name = "npm2nix-5.6.0.tgz"; + sha1 = "75680a36a24fe7f434a18199552cd3e7a576e875"; }) ]; buildInputs = @@ -10498,7 +10809,7 @@ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.by-version."npm2nix"."5.5.0"; + "npm2nix" = self.by-version."npm2nix"."5.6.0"; by-spec."npmconf"."0.0.24" = self.by-version."npmconf"."0.0.24"; by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { @@ -10518,7 +10829,7 @@ self.by-version."once"."1.1.1" self.by-version."mkdirp"."0.3.5" self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.1.2" + self.by-version."nopt"."2.2.0" self.by-version."semver"."1.1.4" self.by-version."ini"."1.1.0" ]; @@ -10545,7 +10856,7 @@ self.by-version."once"."1.1.1" self.by-version."mkdirp"."0.3.5" self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.1.2" + self.by-version."nopt"."2.2.0" self.by-version."semver"."2.2.1" self.by-version."ini"."1.1.0" ]; @@ -10572,7 +10883,7 @@ self.by-version."once"."1.3.0" self.by-version."mkdirp"."0.3.5" self.by-version."osenv"."0.0.3" - self.by-version."nopt"."2.1.2" + self.by-version."nopt"."2.2.0" self.by-version."semver"."2.2.1" self.by-version."ini"."1.1.0" ]; @@ -10627,6 +10938,26 @@ ]; passthru.names = [ "nssocket" ]; }; + by-spec."nth-check"."~1.0.0" = + self.by-version."nth-check"."1.0.0"; + by-version."nth-check"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-nth-check-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nth-check/-/nth-check-1.0.0.tgz"; + name = "nth-check-1.0.0.tgz"; + sha1 = "02fc1277aa2bf8e6083be456104d6a646101a49d"; + }) + ]; + buildInputs = + (self.nativeDeps."nth-check" or []); + deps = [ + self.by-version."boolbase"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "nth-check" ]; + }; by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" = self.by-version."oauth"."0.9.11"; by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage { @@ -10703,6 +11034,27 @@ ]; passthru.names = [ "object-additions" ]; }; + by-spec."object-assign"."~0.1.1" = + self.by-version."object-assign"."0.1.2"; + by-version."object-assign"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-object-assign-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/object-assign/-/object-assign-0.1.2.tgz"; + name = "object-assign-0.1.2.tgz"; + sha1 = "036992f073aff7b2db83d06b3fb3155a5ccac37f"; + }) + ]; + buildInputs = + (self.nativeDeps."object-assign" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "object-assign" ]; + }; + by-spec."object-assign"."~0.1.2" = + self.by-version."object-assign"."0.1.2"; by-spec."object-keys"."~0.4.0" = self.by-version."object-keys"."0.4.0"; by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -10857,7 +11209,7 @@ (self.nativeDeps."optimist" or []); deps = [ self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.5" + self.by-version."minimist"."0.0.7" ]; peerDependencies = [ ]; @@ -10919,7 +11271,7 @@ (self.nativeDeps."optimist" or []); deps = [ self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.5" + self.by-version."minimist"."0.0.7" ]; peerDependencies = [ ]; @@ -11459,14 +11811,14 @@ passthru.names = [ "proto-list" ]; }; by-spec."protobufjs".">= 1.1.4" = - self.by-version."protobufjs"."2.0.4"; - by-version."protobufjs"."2.0.4" = lib.makeOverridable self.buildNodePackage { - name = "protobufjs-2.0.4"; + self.by-version."protobufjs"."2.0.5"; + by-version."protobufjs"."2.0.5" = lib.makeOverridable self.buildNodePackage { + name = "protobufjs-2.0.5"; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.4.tgz"; - name = "protobufjs-2.0.4.tgz"; - sha1 = "109de55527459ce5bc91d72f1fd86b5a9c7f1058"; + url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz"; + name = "protobufjs-2.0.5.tgz"; + sha1 = "7f351178c959b333d2327b773325ca4b2627a242"; }) ]; buildInputs = @@ -11500,14 +11852,14 @@ passthru.names = [ "ps-tree" ]; }; by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.2.3"; - by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-punycode-1.2.3"; + self.by-version."punycode"."1.2.4"; + by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz"; - name = "punycode-1.2.3.tgz"; - sha1 = "b4e304471082d783c73b3bafabf2fd9b6a486266"; + url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"; + name = "punycode-1.2.4.tgz"; + sha1 = "54008ac972aec74175def9cba6df7fa9d3918740"; }) ]; buildInputs = @@ -11519,7 +11871,7 @@ passthru.names = [ "punycode" ]; }; by-spec."punycode"."~1.2.3" = - self.by-version."punycode"."1.2.3"; + self.by-version."punycode"."1.2.4"; by-spec."q".">= 0.0.1" = self.by-version."q"."1.0.0"; by-version."q"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -11763,14 +12115,14 @@ passthru.names = [ "range-parser" ]; }; by-spec."raven"."~0.6.0" = - self.by-version."raven"."0.6.1"; - by-version."raven"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-raven-0.6.1"; + self.by-version."raven"."0.6.2"; + by-version."raven"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "raven-0.6.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/raven/-/raven-0.6.1.tgz"; - name = "raven-0.6.1.tgz"; - sha1 = "2c307e90295517ce2d45354b0c2d905311f66a5d"; + url = "http://registry.npmjs.org/raven/-/raven-0.6.2.tgz"; + name = "raven-0.6.2.tgz"; + sha1 = "391a7395b6088518a01697f639f21ce6ea9841a3"; }) ]; buildInputs = @@ -11778,7 +12130,7 @@ deps = [ self.by-version."node-uuid"."1.4.1" self.by-version."stack-trace"."0.0.7" - self.by-version."lsmod"."0.0.2" + self.by-version."lsmod"."0.0.3" self.by-version."cookie"."0.1.0" ]; peerDependencies = [ @@ -11929,22 +12281,22 @@ deps = [ self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" - self.by-version."read-package-json"."1.1.6" + self.by-version."read-package-json"."1.1.7" self.by-version."graceful-fs"."1.2.3" ]; peerDependencies = [ ]; passthru.names = [ "read-installed" ]; }; - by-spec."read-installed"."~0.2.2" = - self.by-version."read-installed"."0.2.5"; - by-version."read-installed"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "node-read-installed-0.2.5"; + by-spec."read-installed"."~1.0.0" = + self.by-version."read-installed"."1.0.0"; + by-version."read-installed"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-read-installed-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz"; - name = "read-installed-0.2.5.tgz"; - sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86"; + url = "http://registry.npmjs.org/read-installed/-/read-installed-1.0.0.tgz"; + name = "read-installed-1.0.0.tgz"; + sha1 = "4db88d5a363f9c68eaa07e1626974bc2e0a1b3a5"; }) ]; buildInputs = @@ -11952,22 +12304,22 @@ deps = [ self.by-version."semver"."2.2.1" self.by-version."slide"."1.1.5" - self.by-version."read-package-json"."1.1.6" - self.by-version."graceful-fs"."2.0.1" + self.by-version."read-package-json"."1.1.7" + self.by-version."graceful-fs"."2.0.2" ]; peerDependencies = [ ]; passthru.names = [ "read-installed" ]; }; by-spec."read-package-json"."1" = - self.by-version."read-package-json"."1.1.6"; - by-version."read-package-json"."1.1.6" = lib.makeOverridable self.buildNodePackage { - name = "node-read-package-json-1.1.6"; + self.by-version."read-package-json"."1.1.7"; + by-version."read-package-json"."1.1.7" = lib.makeOverridable self.buildNodePackage { + name = "node-read-package-json-1.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.6.tgz"; - name = "read-package-json-1.1.6.tgz"; - sha1 = "a851dbbaca48ff78a87f890f0a9fdf43b1759d5a"; + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.7.tgz"; + name = "read-package-json-1.1.7.tgz"; + sha1 = "a28da23cb4330106a0d45e86065e0fc3b79d263e"; }) ]; buildInputs = @@ -11975,15 +12327,15 @@ deps = [ self.by-version."glob"."3.2.8" self.by-version."lru-cache"."2.5.0" - self.by-version."normalize-package-data"."0.2.8" - self.by-version."graceful-fs"."2.0.1" + self.by-version."normalize-package-data"."0.2.9" + self.by-version."graceful-fs"."2.0.2" ]; peerDependencies = [ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."~1.1.6" = - self.by-version."read-package-json"."1.1.6"; + 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 { @@ -12077,14 +12429,14 @@ passthru.names = [ "redeyed" ]; }; by-spec."redis"."*" = - self.by-version."redis"."0.10.0"; - by-version."redis"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-redis-0.10.0"; + self.by-version."redis"."0.10.1"; + by-version."redis"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "node-redis-0.10.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.10.0.tgz"; - name = "redis-0.10.0.tgz"; - sha1 = "76864475f71a745cbc3bbb27d794a6d01a96505c"; + url = "http://registry.npmjs.org/redis/-/redis-0.10.1.tgz"; + name = "redis-0.10.1.tgz"; + sha1 = "4f09258931d961377239fdbd495e1d99a263a8ec"; }) ]; buildInputs = @@ -12095,7 +12447,7 @@ ]; passthru.names = [ "redis" ]; }; - "redis" = self.by-version."redis"."0.10.0"; + "redis" = self.by-version."redis"."0.10.1"; by-spec."redis"."0.7.2" = self.by-version."redis"."0.7.2"; by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -12155,7 +12507,7 @@ passthru.names = [ "redis" ]; }; by-spec."redis"."~0.10.0" = - self.by-version."redis"."0.10.0"; + self.by-version."redis"."0.10.1"; by-spec."reds"."~0.2.4" = self.by-version."reds"."0.2.4"; by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -12522,14 +12874,14 @@ passthru.names = [ "request-replay" ]; }; by-spec."requirejs"."~2.1" = - self.by-version."requirejs"."2.1.10"; - by-version."requirejs"."2.1.10" = lib.makeOverridable self.buildNodePackage { - name = "requirejs-2.1.10"; + self.by-version."requirejs"."2.1.11"; + by-version."requirejs"."2.1.11" = lib.makeOverridable self.buildNodePackage { + name = "requirejs-2.1.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.10.tgz"; - name = "requirejs-2.1.10.tgz"; - sha1 = "1e1d7f608790e532a422c6199dad2abe15484b54"; + url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.11.tgz"; + name = "requirejs-2.1.11.tgz"; + sha1 = "0eafaa6b46ca9b5b1e13406f119c020190a24442"; }) ]; buildInputs = @@ -12541,7 +12893,7 @@ passthru.names = [ "requirejs" ]; }; by-spec."requirejs"."~2.1.0" = - self.by-version."requirejs"."2.1.10"; + self.by-version."requirejs"."2.1.11"; by-spec."resolve"."0.5.x" = self.by-version."resolve"."0.5.1"; by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -12649,7 +13001,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = [ - self.by-version."protobufjs"."2.0.4" + self.by-version."protobufjs"."2.0.5" ]; peerDependencies = [ ]; @@ -13152,7 +13504,7 @@ buildInputs = (self.nativeDeps."sha" or []); deps = [ - self.by-version."graceful-fs"."2.0.1" + self.by-version."graceful-fs"."2.0.2" self.by-version."readable-stream"."1.0.25" ]; peerDependencies = [ @@ -13281,14 +13633,14 @@ passthru.names = [ "simple-lru-cache" ]; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.20"; - by-version."simplesmtp"."0.3.20" = lib.makeOverridable self.buildNodePackage { - name = "node-simplesmtp-0.3.20"; + self.by-version."simplesmtp"."0.3.21"; + by-version."simplesmtp"."0.3.21" = lib.makeOverridable self.buildNodePackage { + name = "node-simplesmtp-0.3.21"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.20.tgz"; - name = "simplesmtp-0.3.20.tgz"; - sha1 = "9de032acd3f4dfee69aed80ea9843b09419bd001"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.21.tgz"; + name = "simplesmtp-0.3.21.tgz"; + sha1 = "79aa14d72a915bb5853ff53a8a44b0823fbe1a8f"; }) ]; buildInputs = @@ -13589,14 +13941,14 @@ }; "sockjs" = self.by-version."sockjs"."0.3.8"; by-spec."source-map"."*" = - self.by-version."source-map"."0.1.31"; - by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "node-source-map-0.1.31"; + 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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; - name = "source-map-0.1.31.tgz"; - sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; + name = "source-map-0.1.32.tgz"; + sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; }) ]; buildInputs = @@ -13608,17 +13960,17 @@ ]; passthru.names = [ "source-map" ]; }; - "source-map" = self.by-version."source-map"."0.1.31"; + "source-map" = self.by-version."source-map"."0.1.32"; by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.31"; + self.by-version."source-map"."0.1.32"; by-spec."source-map".">= 0.1.2" = - self.by-version."source-map"."0.1.31"; + self.by-version."source-map"."0.1.32"; by-spec."source-map"."~0.1.30" = - self.by-version."source-map"."0.1.31"; + self.by-version."source-map"."0.1.32"; by-spec."source-map"."~0.1.31" = - self.by-version."source-map"."0.1.31"; + self.by-version."source-map"."0.1.32"; by-spec."source-map"."~0.1.7" = - self.by-version."source-map"."0.1.31"; + self.by-version."source-map"."0.1.32"; by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { @@ -13983,28 +14335,8 @@ passthru.names = [ "stylus" ]; }; "stylus" = self.by-version."stylus"."0.42.2"; - by-spec."stylus"."0.27.2" = - self.by-version."stylus"."0.27.2"; - by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.27.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz"; - name = "stylus-0.27.2.tgz"; - sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117"; - }) - ]; - buildInputs = - (self.nativeDeps."stylus" or []); - deps = [ - self.by-version."cssom"."0.2.5" - self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.7.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "stylus" ]; - }; + by-spec."stylus"."0.42.2" = + self.by-version."stylus"."0.42.2"; 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 { @@ -14135,7 +14467,7 @@ buildInputs = (self.nativeDeps."swig" or []); deps = [ - self.by-version."underscore"."1.5.2" + self.by-version."underscore"."1.6.0" ]; peerDependencies = [ ]; @@ -14399,14 +14731,14 @@ passthru.names = [ "timespan" ]; }; by-spec."timezone"."*" = - self.by-version."timezone"."0.0.23"; - by-version."timezone"."0.0.23" = lib.makeOverridable self.buildNodePackage { - name = "node-timezone-0.0.23"; + self.by-version."timezone"."0.0.28"; + by-version."timezone"."0.0.28" = lib.makeOverridable self.buildNodePackage { + name = "node-timezone-0.0.28"; src = [ (fetchurl { - url = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz"; - name = "timezone-0.0.23.tgz"; - sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac"; + url = "http://registry.npmjs.org/timezone/-/timezone-0.0.28.tgz"; + name = "timezone-0.0.28.tgz"; + sha1 = "a3fb234b48093c8edd36de5662e92ece6477a88c"; }) ]; buildInputs = @@ -14417,7 +14749,7 @@ ]; passthru.names = [ "timezone" ]; }; - "timezone" = self.by-version."timezone"."0.0.23"; + "timezone" = self.by-version."timezone"."0.0.28"; by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -14437,15 +14769,15 @@ ]; passthru.names = [ "tinycolor" ]; }; - by-spec."titanium"."3.2.0" = - self.by-version."titanium"."3.2.0"; - by-version."titanium"."3.2.0" = lib.makeOverridable self.buildNodePackage { - name = "titanium-3.2.0"; + by-spec."titanium"."3.2.1" = + self.by-version."titanium"."3.2.1"; + by-version."titanium"."3.2.1" = lib.makeOverridable self.buildNodePackage { + name = "titanium-3.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/titanium/-/titanium-3.2.0.tgz"; - name = "titanium-3.2.0.tgz"; - sha1 = "97b25af99e99d4543f5cc2c7025b2c2f6199de6e"; + url = "http://registry.npmjs.org/titanium/-/titanium-3.2.1.tgz"; + name = "titanium-3.2.1.tgz"; + sha1 = "b1d432c6c853c22096fb3ed03626e8263b27e39e"; }) ]; buildInputs = @@ -14465,13 +14797,13 @@ 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.6" + self.by-version."wrench"."1.5.7" ]; peerDependencies = [ ]; passthru.names = [ "titanium" ]; }; - "titanium" = self.by-version."titanium"."3.2.0"; + "titanium" = self.by-version."titanium"."3.2.1"; by-spec."tmp"."~0.0.20" = self.by-version."tmp"."0.0.23"; by-version."tmp"."0.0.23" = lib.makeOverridable self.buildNodePackage { @@ -14525,7 +14857,7 @@ buildInputs = (self.nativeDeps."tough-cookie" or []); deps = [ - self.by-version."punycode"."1.2.3" + self.by-version."punycode"."1.2.4" ]; peerDependencies = [ ]; @@ -14545,7 +14877,7 @@ buildInputs = (self.nativeDeps."tough-cookie" or []); deps = [ - self.by-version."punycode"."1.2.3" + self.by-version."punycode"."1.2.4" ]; peerDependencies = [ ]; @@ -14721,7 +15053,7 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.31" + self.by-version."source-map"."0.1.32" self.by-version."optimist"."0.3.7" self.by-version."uglify-to-browserify"."1.0.2" ]; @@ -14762,7 +15094,7 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = [ - self.by-version."source-map"."0.1.31" + self.by-version."source-map"."0.1.32" self.by-version."optimist"."0.3.7" ]; peerDependencies = [ @@ -14784,7 +15116,7 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.31" + self.by-version."source-map"."0.1.32" self.by-version."optimist"."0.3.7" ]; peerDependencies = [ @@ -14808,7 +15140,7 @@ (self.nativeDeps."uglify-js" or []); deps = [ self.by-version."async"."0.2.10" - self.by-version."source-map"."0.1.31" + self.by-version."source-map"."0.1.32" self.by-version."optimist"."0.3.7" self.by-version."uglify-to-browserify"."1.0.2" ]; @@ -14836,14 +15168,14 @@ passthru.names = [ "uglify-to-browserify" ]; }; by-spec."uid-number"."0" = - self.by-version."uid-number"."0.0.3"; - by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-uid-number-0.0.3"; + 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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; - name = "uid-number-0.0.3.tgz"; - sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.4.tgz"; + name = "uid-number-0.0.4.tgz"; + sha1 = "5ea1d068b8c0dd1866c13aa0b76fa6e4f240cbdf"; }) ]; buildInputs = @@ -14874,14 +15206,14 @@ passthru.names = [ "uid2" ]; }; by-spec."underscore"."*" = - self.by-version."underscore"."1.5.2"; - by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-underscore-1.5.2"; + self.by-version."underscore"."1.6.0"; + by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-underscore-1.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - name = "underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + name = "underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }) ]; buildInputs = @@ -14892,7 +15224,7 @@ ]; passthru.names = [ "underscore" ]; }; - "underscore" = self.by-version."underscore"."1.5.2"; + "underscore" = self.by-version."underscore"."1.6.0"; by-spec."underscore"."1.4.x" = self.by-version."underscore"."1.4.4"; by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { @@ -14913,13 +15245,13 @@ passthru.names = [ "underscore" ]; }; by-spec."underscore".">=1.1.7" = - self.by-version."underscore"."1.5.2"; + self.by-version."underscore"."1.6.0"; by-spec."underscore".">=1.3.1" = - self.by-version."underscore"."1.5.2"; - by-spec."underscore".">=1.4.3" = - self.by-version."underscore"."1.5.2"; + self.by-version."underscore"."1.6.0"; + by-spec."underscore".">=1.5.0" = + self.by-version."underscore"."1.6.0"; by-spec."underscore".">=1.5.x" = - self.by-version."underscore"."1.5.2"; + self.by-version."underscore"."1.6.0"; by-spec."underscore"."~1.4" = self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.4.3" = @@ -14928,6 +15260,23 @@ self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.5" = self.by-version."underscore"."1.5.2"; + by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-underscore-1.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + name = "underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; by-spec."underscore"."~1.5.2" = self.by-version."underscore"."1.5.2"; by-spec."underscore.string"."~2.2.1" = @@ -14993,14 +15342,14 @@ passthru.names = [ "unfunk-diff" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.6.1"; - by-version."ungit"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.6.1"; + self.by-version."ungit"."0.6.2"; + by-version."ungit"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.6.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.6.1.tgz"; - name = "ungit-0.6.1.tgz"; - sha1 = "7fc1527eb183acf65eb72752b9c54324184d6fff"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.6.2.tgz"; + name = "ungit-0.6.2.tgz"; + sha1 = "e1a01531bdd987c27bd9890d973c0a8549f1e191"; }) ]; buildInputs = @@ -15031,9 +15380,9 @@ self.by-version."keen.io"."0.0.4" self.by-version."getmac"."1.0.6" self.by-version."deep-extend"."0.2.8" - self.by-version."raven"."0.6.1" + self.by-version."raven"."0.6.2" self.by-version."knockout"."3.0.0" - self.by-version."npm-registry-client"."0.3.5" + self.by-version."npm-registry-client"."0.3.6" self.by-version."npmconf"."0.1.12" self.by-version."mkdirp"."0.3.5" ]; @@ -15041,7 +15390,7 @@ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.6.1"; + "ungit" = self.by-version."ungit"."0.6.2"; 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 { @@ -15223,6 +15572,8 @@ }; by-spec."uuid"."~1.4.0" = self.by-version."uuid"."1.4.1"; + by-spec."uuid"."~1.4.1" = + self.by-version."uuid"."1.4.1"; by-spec."validator"."0.4.x" = self.by-version."validator"."0.4.28"; by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage { @@ -15489,14 +15840,14 @@ passthru.names = [ "wd" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.38.0-0"; - by-version."webdrvr"."2.38.0-0" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.38.0-0"; + 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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.38.0-0.tgz"; - name = "webdrvr-2.38.0-0.tgz"; - sha1 = "b5388a672ac512e09df24d00f80b3d619dc15e5c"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.39.0-0.tgz"; + name = "webdrvr-2.39.0-0.tgz"; + sha1 = "07b4867993c2d3e35869269cb8fe096e81571e0f"; }) ]; buildInputs = @@ -15514,7 +15865,7 @@ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.38.0-0"; + "webdrvr" = self.by-version."webdrvr"."2.39.0-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 { @@ -15764,14 +16115,14 @@ passthru.names = [ "wrench" ]; }; by-spec."wrench"."~1.5.0" = - self.by-version."wrench"."1.5.6"; - by-version."wrench"."1.5.6" = lib.makeOverridable self.buildNodePackage { - name = "node-wrench-1.5.6"; + self.by-version."wrench"."1.5.7"; + by-version."wrench"."1.5.7" = lib.makeOverridable self.buildNodePackage { + name = "node-wrench-1.5.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/wrench/-/wrench-1.5.6.tgz"; - name = "wrench-1.5.6.tgz"; - sha1 = "247b7dfe5d7d4374d5e449761fba634190d9b871"; + url = "http://registry.npmjs.org/wrench/-/wrench-1.5.7.tgz"; + name = "wrench-1.5.7.tgz"; + sha1 = "95fcbb5a35b748ba8e29d755c9490ba69f033819"; }) ]; buildInputs = @@ -15783,7 +16134,7 @@ passthru.names = [ "wrench" ]; }; by-spec."wrench"."~1.5.4" = - self.by-version."wrench"."1.5.6"; + self.by-version."wrench"."1.5.7"; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { @@ -15943,7 +16294,7 @@ buildInputs = (self.nativeDeps."xmlbuilder" or []); deps = [ - self.by-version."underscore"."1.5.2" + self.by-version."underscore"."1.6.0" ]; peerDependencies = [ ]; @@ -16026,25 +16377,6 @@ ]; passthru.names = [ "xtend" ]; }; - by-spec."yaml"."0.2.3" = - self.by-version."yaml"."0.2.3"; - by-version."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-yaml-0.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yaml/-/yaml-0.2.3.tgz"; - name = "yaml-0.2.3.tgz"; - sha1 = "b5450e92e76ef36b5dd24e3660091ebaeef3e5c7"; - }) - ]; - buildInputs = - (self.nativeDeps."yaml" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "yaml" ]; - }; 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 { @@ -16183,7 +16515,7 @@ self.by-version."nopt"."2.1.2" self.by-version."lodash"."2.4.1" self.by-version."update-notifier"."0.1.7" - self.by-version."insight"."0.3.0" + self.by-version."insight"."0.3.1" self.by-version."sudo-block"."0.3.0" self.by-version."async"."0.2.10" self.by-version."open"."0.0.4" @@ -16222,20 +16554,20 @@ passthru.names = [ "zeparser" ]; }; by-spec."zip-stream"."~0.1.0" = - self.by-version."zip-stream"."0.1.3"; - by-version."zip-stream"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-zip-stream-0.1.3"; + self.by-version."zip-stream"."0.1.4"; + by-version."zip-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-zip-stream-0.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.3.tgz"; - name = "zip-stream-0.1.3.tgz"; - sha1 = "06d8787133ab397ab60ef6ee688d76dd5fb10de1"; + url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz"; + name = "zip-stream-0.1.4.tgz"; + sha1 = "fe5b565bc366b8d73d5d4c1606e07c8947de1654"; }) ]; buildInputs = (self.nativeDeps."zip-stream" or []); deps = [ - self.by-version."readable-stream"."1.1.10" + self.by-version."readable-stream"."1.0.25" 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 e2adc137aa92..c7660c7a0a2f 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -114,6 +114,6 @@ , "rethinkdb" , "bower2nix" , "fetch-bower" -, { "titanium": "3.2.0" } +, { "titanium": "3.2.1" } , "gh" ] From c3126080fd6393718b67f1e2d63d1cee094807de Mon Sep 17 00:00:00 2001 From: David Guibert Date: Mon, 17 Feb 2014 20:15:01 +0100 Subject: [PATCH 157/384] vaapi-vdpau: apply a patch to delete dropped types from VA API Close #1766. --- pkgs/development/libraries/vaapi-vdpau/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index fb24ba98b450..9a81b840b35d 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -8,13 +8,18 @@ stdenv.mkDerivation rec { sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; }; + patches = [ ./glext85.patch + (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch?revision=1.1"; + name = "libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch"; + sha256 = "166svcav6axkrlb3i4rbf6dkwjnqdf69xw339az1f5yabj72pqqs"; + }) ]; + buildInputs = [ libvdpau mesa libva pkgconfig ]; preConfigure = '' sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; - patches = [ ./glext85.patch ]; meta = { homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; From 44a9ebac4743b5bc6fd7cb34161a056537159a98 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 18 Feb 2014 18:07:04 +0100 Subject: [PATCH 158/384] axis2: bump to version 1.6.2 --- pkgs/servers/http/tomcat/axis2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 0208420d1328..f263c8c2e7e9 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, apacheAnt, jdk, unzip}: stdenv.mkDerivation { - name = "axis2-1.6.1"; + name = "axis2-1.6.2"; src = fetchurl { - url = http://apache.mirror.versatel.nl//axis/axis2/java/core/1.6.1/axis2-1.6.1-bin.zip; - sha256 = "1a0p85qh9924dv3y7zivf62hy1jzdaxnndqh93g6lndmacfhkk64"; + url = http://apache.proserve.nl//axis/axis2/java/core/1.6.2/axis2-1.6.2-bin.zip; + sha256 = "02i6fv11ksd5ql81i501bcb11ib5gyhq3zxwrz5jm4ic80r097fp"; }; buildInputs = [ unzip apacheAnt jdk ]; From d2aa2ac494fc7eda18ce1316201015c6603e23b6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Feb 2014 17:05:19 +0100 Subject: [PATCH 159/384] memtest.nix: Use toString --- nixos/modules/system/boot/loader/grub/memtest.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix index 2461d1f80c78..afe194e672ae 100644 --- a/nixos/modules/system/boot/loader/grub/memtest.nix +++ b/nixos/modules/system/boot/loader/grub/memtest.nix @@ -7,7 +7,6 @@ with pkgs.lib; let memtest86 = pkgs.memtest86plus; cfg = config.boot.loader.grub.memtest86; - params = concatStringsSep " " cfg.params; in { @@ -82,7 +81,7 @@ in if config.boot.loader.grub.version == 2 then '' menuentry "Memtest86+" { - linux16 @bootRoot@/memtest.bin ${params} + linux16 @bootRoot@/memtest.bin ${toString cfg.params} } '' else From ca70ccb5c1c19dd945419e8c5b2e319570585f7e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Feb 2014 17:05:34 +0100 Subject: [PATCH 160/384] Start of 14.02 release notes --- nixos/doc/manual/installation.xml | 19 ++++++++++--------- nixos/doc/manual/manual.xml | 7 +++++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml index 92e7625555b0..6ccb12b115e7 100644 --- a/nixos/doc/manual/installation.xml +++ b/nixos/doc/manual/installation.xml @@ -295,7 +295,7 @@ $ reboot } -
+
UEFI Installation @@ -305,14 +305,15 @@ changes: - You should boot the livecd in UEFI mode (consult your specific - hardware's documentation for instructions how). + You should boot the live CD in UEFI mode (consult your + specific hardware's documentation for instructions). - Instead of fdisk, you should use - gdisk to partition your disks. You will need to have a - separate partition for /boot with partition code - EF00, and it should be formatted with a vfat filesystem. + Instead of fdisk, you should use + gdisk to partition your disks. You will need to + have a separate partition for /boot with + partition code EF00, and it should be formatted as a + vfat filesystem. You must set to @@ -327,8 +328,8 @@ changes: as well. - To see console messages during early boot, put "fbcon" - in your + To see console messages during early boot, add "fbcon" + to your . diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 6e13281cbd94..f9775f4f0170 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -55,9 +55,12 @@ - + + + + List of options - + From 3c7aa5aa8f8eee82671a2fcb47eb28553115acbc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Feb 2014 19:05:59 +0100 Subject: [PATCH 161/384] cjdns: Don't include "-git" in the package name --- pkgs/tools/networking/cjdns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index ffe22a93d0d4..b42f202099b1 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -4,7 +4,7 @@ let rev = "f7b02ac0cc"; in stdenv.mkDerivation { - name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}"; + name = "cjdns-20130620-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/cjdelisle/cjdns.git"; From a8ded9d5d36ddbf7200a1693c74bd83d1403a8c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Feb 2014 19:11:57 +0100 Subject: [PATCH 162/384] fetchgit: Require a content hash Without this, the result will not be a fixed-output derivation and won't work in general. --- pkgs/build-support/fetchgit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 01424bae30b2..b22bdc88f83b 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -23,6 +23,8 @@ server admins start using the new version? */ +assert md5 != "" || sha256 != ""; + stdenv.mkDerivation { name = "git-export"; builder = ./builder.sh; From 623627f097f2d52d3b1f72281b2d7c2c43cffb31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Feb 2014 12:05:58 +0100 Subject: [PATCH 163/384] haskell-charset: update to version 0.3.7 --- pkgs/development/libraries/haskell/charset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix index 6907a33744ff..8a0f1e62179c 100644 --- a/pkgs/development/libraries/haskell/charset/default.nix +++ b/pkgs/development/libraries/haskell/charset/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "charset"; - version = "0.3.6"; - sha256 = "1g8m8nd5f100jlhvs6hbny96wy8iaggmp1lv36a5jxc54gmyxjd1"; + version = "0.3.7"; + sha256 = "1x912dx5650x8ql3ivhpiwmxd6kv7zghark3s8ljvl1g3qr1pxd6"; buildDepends = [ semigroups unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/charset"; From eab179c39f3d6c5860eb93c6fed1ea7b95d1752a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Feb 2014 12:06:00 +0100 Subject: [PATCH 164/384] haskell-hamlet: update to version 1.1.8 --- pkgs/development/libraries/haskell/hamlet/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 739b800e28dc..b393aed07d5f 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,13 +1,15 @@ { cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, hspec -, HUnit, parsec, shakespeare, text +, HUnit, parsec, shakespeare, systemFileio, systemFilepath, text +, time }: cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.7.7"; - sha256 = "1qwx0gn367gp2a4kb1q3xc23addjyawr9gvs7bzv8vfx5xnkxglx"; + version = "1.1.8"; + sha256 = "093igcaycg2d29ncj9l8qbzi21drynjk8kvqfl70zqvgsm8nai7x"; buildDepends = [ - blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text + blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare + systemFileio systemFilepath text time ]; testDepends = [ blazeHtml blazeMarkup hspec HUnit parsec text ]; meta = { From c13ececdc529882942662f50ae0bbdc38c534a9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Feb 2014 12:06:01 +0100 Subject: [PATCH 165/384] haskell-iteratee: update to version 0.8.9.5 --- pkgs/development/libraries/haskell/iteratee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index c4438d973644..62bc3f7a2a41 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.9.4"; - sha256 = "0j8q5i3kf1ld7630z65hj55p2jlhl23f6qjag4zwrhrh38bfr531"; + version = "0.8.9.5"; + sha256 = "0akv7zcyb3c213f8qz1xv1qyq04wa427a4mh8rmz1jlmcwiznk7z"; buildDepends = [ ListLike MonadCatchIOTransformers monadControl parallel transformers transformersBase From dd49144d4484ea78a8a9d6166b3910fe25e8145b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Feb 2014 12:06:03 +0100 Subject: [PATCH 166/384] haskell-shakespeare-css: update to version 1.0.7 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 853a6294131f..f96819955137 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.6"; - sha256 = "1xjavlw88nj5ila2b4m44zj0qgkpq147b30x1arwv0ik8szgml9k"; + version = "1.0.7"; + sha256 = "108vlxbis8g7pkldsd6r2b8il7fdqb98n64idc4l2lvkwz3lnr36"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From 9dce1a82e8e673ca4629358cdc64a4dc68a50a49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Feb 2014 12:06:05 +0100 Subject: [PATCH 167/384] haskell-shakespeare-js: update to version 1.2.0.4 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 36d3443c9585..12dcea223a90 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.2.0.3"; - sha256 = "1zcqq8880rsdx3xwf1czl4vn5l9igw181snbfv5k1gxpif6myhp1"; + version = "1.2.0.4"; + sha256 = "1y7bqv3yrlzbhd5s8w36z6vcc9jk5b9i8chhsqda5qay85rd0ipz"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { From cba685279d0487805fd5c9c81b3e8b3d1d207087 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Feb 2014 12:06:07 +0100 Subject: [PATCH 168/384] haskell-shakespeare: update to version 1.2.1.1 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 444eae235600..0a0a8f18b03e 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.2.0.4"; - sha256 = "0pgh4sxy5plhmm55mqbcmicn28vlplk4pasgfnyy5wjaz28n6z97"; + version = "1.2.1.1"; + sha256 = "1if3mfkcdfls17pcfgn8grxykq8ia91i7qr4q6m1gy6q4gqs6fkg"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time From e68b54eda89eef7aeede125130e793c430ba83d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Feb 2014 12:06:08 +0100 Subject: [PATCH 169/384] haskell-warp: update to version 2.0.3.2 --- 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 84f653cde168..d3c1bdbd4c7e 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.1"; - sha256 = "0rbl9p1kdgvya2ah2bpaqfv73hlvhsd46nk5f5wgx244pm714kc5"; + version = "2.0.3.2"; + sha256 = "1aapwhgqn693cvdhj4zafyww2xrpjn8wzdgrwxz8k6mq0f2lh599"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpDate httpTypes liftedBase network networkConduit simpleSendfile From 029967dca63a94e69b6044ee220961d382aec189 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Feb 2014 12:06:10 +0100 Subject: [PATCH 170/384] haskell-cpphs: update to version 1.18.1 --- pkgs/development/tools/misc/cpphs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 4ec9358a388c..fca4efc8661a 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18"; - sha256 = "0b5hpqbzvw5dzkbjxqyc2d7ll2c6zf9wd8k182zhvz3kyxmkvs2s"; + version = "1.18.1"; + sha256 = "1fshsd1dzmrl3qbpwf7r2c30d08l77080j9cfchcgy1lijjr9vhm"; isLibrary = true; isExecutable = true; meta = { - homepage = "http://haskell.org/cpphs/"; + homepage = "http://projects.haskell.org/cpphs/"; description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; platforms = self.ghc.meta.platforms; From dcf6cbf5b383eb66bafbdbaaf972eb1c7264c35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Feb 2014 20:03:03 +0100 Subject: [PATCH 171/384] glib: add -tested variant, also to the unstable job Replaces #1753. --- pkgs/development/libraries/glib/default.nix | 38 +++++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/release.nix | 2 ++ 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index de0a02c56e25..6fa77b233c67 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, python, autoconf, automake, libtool -, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf, dbus }: +{ stdenv, fetchurl, pkgconfig, gettext, perl, python +, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf + +# this is just for tests (not in closure of any regular package) +, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false +}: # TODO: # * Add gio-module-fam @@ -17,7 +21,6 @@ https://wiki.gnome.org/GnomeGoals/InstalledTests * Support org.freedesktop.Application, including D-Bus activation from desktop files */ - let # Some packages don't get "Cflags" from pkgconfig correctly # and then fail to build when directly including like . @@ -35,7 +38,7 @@ let ver_maj = "2.38"; ver_min = "2"; in -with { inherit (stdenv.lib) optional optionalString; }; +with { inherit (stdenv.lib) optional optionals optionalString; }; stdenv.mkDerivation rec { name = "glib-${ver_maj}.${ver_min}"; @@ -45,28 +48,33 @@ stdenv.mkDerivation rec { sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5"; }; - # configure script looks for d-bus but it is (probably) only needed for tests - buildInputs = [ libelf ]; + buildInputs = [ libelf ] + ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; - # I don't know why the autotools are needed now, even without modifying configure scripts - nativeBuildInputs = [ pkgconfig gettext perl python ] ++ [ autoconf automake libtool ]; + nativeBuildInputs = [ pkgconfig gettext perl python ]; propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty; - preConfigure = "autoreconf -fi"; - configureFlags = optional stdenv.isDarwin "--disable-compile-warnings" ++ optional stdenv.isSunOS "--disable-modular-tests"; - CPPFLAGS = optionalString stdenv.isSunOS "-DBSD_COMP"; - - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl"; + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" + + optionalString stdenv.isSunOS " -DBSD_COMP"; enableParallelBuilding = true; - doCheck = false; # ToDo: fix the remaining problems, so we have checked glib by default - LD_LIBRARY_PATH = optionalString doCheck "${stdenv.gcc.gcc}/lib"; + inherit doCheck; + preCheck = optionalString doCheck + # libgcc_s.so.1 must be installed for pthread_cancel to work + # also point to the glib/.libs path + '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + export TZDIR="${tzdata}/share/zoneinfo" + export XDG_CACHE_HOME="$TMP" + export XDG_RUNTIME_HOME="$TMP" + export HOME="$TMP" + export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" + ''; postInstall = ''rm -rvf $out/share/gtk-doc''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62fcfaca5f42..a87a68ae3663 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4388,8 +4388,8 @@ let stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv; - automake = automake113x; }; + glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 33ecef8b3a21..84ae44ec449c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -35,6 +35,8 @@ let # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux + jobs.glib-tested.x86_64-linux # standard glib doesn't do checks + jobs.glib-tested.i686-linux ]; }; From 2539acf351537b34ce3c7ba7ba7e7e3c45ea1f1e Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 18 Feb 2014 20:08:48 +0100 Subject: [PATCH 172/384] manpages: Update from 3.54 -> 3.60. --- 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 1b3454c8ce5a..4a177327e0e5 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.54"; + name = "man-pages-3.60"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "0rb75dl9hh4v2s95bcssy12j8qrbd2dmlzry68gphyxk5c7yipbl"; + sha256 = "0h4wzjcrz1hqbzwn1g0q11byzss7l4f1ynj7vzgbxar7z10gr5b6"; }; preBuild = From 134e65b15054ede94f30f78dd811a530633f2c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 17 Feb 2014 23:43:11 +0100 Subject: [PATCH 173/384] aubio: update from 0.3.2 to 0.4.0 --- pkgs/development/libraries/aubio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index abfb3985f261..d0a95b5d7733 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -2,11 +2,11 @@ , python, alsaLib, jackaudio }: stdenv.mkDerivation rec { - name = "aubio-0.3.2"; + name = "aubio-0.4.0"; src = fetchurl { - url = "http://aubio.org/pub/${name}.tar.gz"; - sha256 = "1k8j2m8wdpa54hvrqy6nqfcx42x6nwa77hi3ym0n22k192q8f4yw"; + url = "http://aubio.org/pub/${name}.tar.bz2"; + sha256 = "18ik5nn8n984f0wnrwdfhc06b8blqgm9b2hrm7hc9m0rr039mpj9"; }; buildInputs = From 78f961e217494d9c290c406f2fd4c7beeadd3276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Feb 2014 21:24:33 +0100 Subject: [PATCH 174/384] aubio: Fix the build, tidy up and add myself as a maintainer --- pkgs/development/libraries/aubio/default.nix | 27 ++++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index d0a95b5d7733..180de0e0bd52 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, fftw, libsndfile, libsamplerate -, python, alsaLib, jackaudio }: +{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate +, libsndfile, pkgconfig, python +}: stdenv.mkDerivation rec { name = "aubio-0.4.0"; @@ -9,17 +10,21 @@ stdenv.mkDerivation rec { sha256 = "18ik5nn8n984f0wnrwdfhc06b8blqgm9b2hrm7hc9m0rr039mpj9"; }; - buildInputs = - [ pkgconfig fftw libsndfile libsamplerate python - # optional: - alsaLib jackaudio - ]; + buildInputs = [ + alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python + ]; - meta = { + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { description = "Library for audio labelling"; homepage = http://aubio.org/; - license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + platforms = platforms.linux; }; } From b532c03fbe2e597a98e78c23488fed3a6d7e8872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Feb 2014 21:26:06 +0100 Subject: [PATCH 175/384] ardour3: update from 3.0 to 3.5.308 --- pkgs/applications/audio/ardour/ardour3.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index bf2ee04cbce9..4d725b43aae6 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -6,17 +6,18 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - # Ardour 3.0 tag - rev = "79db9422"; + # Ardour 3.5.308 tag + rev = "40d8c5ae"; in -stdenv.mkDerivation { - name = "ardour-3.0"; +stdenv.mkDerivation rec { + name = "ardour-${version}"; + version = "3.5.308"; src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; inherit rev; - sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096"; + sha256 = "7473c19c2aeb68bd93d512c2d4e976b23dd36d2453c877c859ad37a76f50dc8a"; }; buildInputs = @@ -28,13 +29,16 @@ stdenv.mkDerivation { ]; patchPhase = '' - printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc + # 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 + # Note the different version number + sed -i '33i rev = \"3.5-308-g40d8c5a\"' 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 - sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript ''; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "python waf configure --optimize --prefix=$out"; buildPhase = "python waf"; @@ -43,7 +47,7 @@ stdenv.mkDerivation { installPhase = '' python waf install mkdir -pv $out/gtk2/engines - mv $out/lib/ardour3/libclearlooks.so $out/gtk2/engines/ + cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2 ''; From 8c83ae965fc81bc7c647ffbe705d4d5e7d2fbfe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Feb 2014 22:11:39 +0100 Subject: [PATCH 176/384] blender: upgrade from 2.67 to 2.69 and add myself as maintainter --- pkgs/applications/misc/blender/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 0951340ee945..683c4242a9c1 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "blender-2.67"; + name = "blender-2.69"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "066lwrm85455gs187bxr3jhqidc2f6f0791b4216jkagbszd9a8l"; + sha256 = "02ffakkbax1kl4ycakxq20yp9hmw1qj1qndjjqxnhhhdxifpyjn9"; }; buildInputs = [ @@ -35,11 +35,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; homepage = http://www.blender.org; # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." - license = "GPLv2+"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; } From 516cdc25a46bfd42638a032123be5eb9c6f0b39b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 18 Feb 2014 23:11:49 +0100 Subject: [PATCH 177/384] Renamed obsolete option services.xserver.videoDrivers to hardware.opengl.videoDrivers --- nixos/doc/manual/configuration.xml | 4 ++-- nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 2 +- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- nixos/modules/installer/virtualbox-demo.nix | 2 +- nixos/modules/services/x11/terminal-server.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index da08098ddda0..307719d2cd2e 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -1183,7 +1183,7 @@ driver from a set of X.org drivers (such as vesa and intel). You can also specify a driver manually, e.g. -services.xserver.videoDrivers = [ "r128" ]; +hardware.opengl.videoDrivers = [ "r128" ]; to enable X.org’s xf86-video-r128 driver. @@ -1226,7 +1226,7 @@ $ systemctl start display-manager.service has better 3D performance than the X.org drivers. It is not enabled by default because it’s not free software. You can enable it as follows: -services.xserver.videoDrivers = [ "nvidia" ]; +hardware.opengl.videoDrivers = [ "nvidia" ]; You may need to reboot after enabling this driver to prevent a clash with other kernel modules. diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 7f253d595dc3..fa1be17436b0 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -139,7 +139,7 @@ in # Setting vesa, we don't get the nvidia driver, which can't work in arm. services.xserver.videoDriver = "vesa"; - services.xserver.videoDrivers = []; + hardware.opengl.videoDrivers = [ "vesa" ]; services.nixosManual.enable = false; # Include the firmware for various wireless cards. diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 1365f3b93961..b6bc04584770 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -163,7 +163,7 @@ foreach my $path (glob "/sys/bus/pci/devices/*") { pciCheck $path; } -push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver; +push @attrs, "hardware.opengl.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver; # Idem for USB devices. diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 76cc29a1facd..9ef41e470747 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -15,5 +15,5 @@ with pkgs.lib; # Add some more video drivers to give X11 a shot at working in # VMware and QEMU. - services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ]; + hardware.opengl.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ]; } diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index bf9c3435503d..f16a424b4573 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -27,7 +27,7 @@ in config = { services.xserver.enable = true; - services.xserver.videoDrivers = []; + hardware.opengl.videoDrivers = []; # Enable KDM. Any display manager will do as long as it supports XDMCP. services.xserver.displayManager.kdm.enable = true; From ff7e234fb40701b94398b0938038b915dc958b25 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 18 Feb 2014 23:13:00 +0100 Subject: [PATCH 178/384] Removed obsolete option services.xserver.videoDriver --- nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 1 - nixos/modules/virtualisation/qemu-vm.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index fa1be17436b0..c3ced8490014 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -138,7 +138,6 @@ in }; # Setting vesa, we don't get the nvidia driver, which can't work in arm. - services.xserver.videoDriver = "vesa"; hardware.opengl.videoDrivers = [ "vesa" ]; services.nixosManual.enable = false; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 4f7f6ae8f2b9..a866b513f0f2 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -386,7 +386,6 @@ in # When building a regular system configuration, override whatever # video driver the host uses. - services.xserver.videoDriver = mkVMOverride null; hardware.opengl.videoDrivers = mkVMOverride [ "vesa" ]; services.xserver.defaultDepth = mkVMOverride 0; services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ]; From 6af0b814f5cc468c0f7d1056fda96c8c9056dc63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Feb 2014 23:41:15 +0100 Subject: [PATCH 179/384] kde_wacomtablet: upgrade from 1.3.5 to 2.0 --- pkgs/applications/misc/kde-wacomtablet/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 22587a1bae04..3e652c717ec4 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, kdelibs, gettext }: +{ stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: stdenv.mkDerivation rec { - name = "wacomtablet-1.3.5"; + name = "wacomtablet-2.0"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2"; - sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2"; + sha256 = "1vqdmkfl0awsjxl6p8bihz198hlc75d3zn7xwwryc674l76s25ax"; }; - buildInputs = [ kdelibs ]; + buildInputs = [ kdelibs xf86_input_wacom ]; nativeBuildInputs = [ gettext ]; From 2f08652ccecf4233971f9296369cfc243685cecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Feb 2014 00:32:45 +0100 Subject: [PATCH 180/384] rubberband: update from 1.7.0 to 1.8.1 Tidy up, and add myself to the maintainers. Tested that qtractor and sonic_visualiser compile and run with this version of rubberband. --- pkgs/development/libraries/rubberband/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 9e606967ab11..b0707ad15f06 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -2,20 +2,21 @@ , vampSDK, ladspaH }: stdenv.mkDerivation { - name = "rubberband-1.7.0"; + name = "rubberband-1.8.1"; src = fetchurl { - url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.7.0.tar.bz2; - sha256 = "10pnfzaiws6bi17qlyj3r0alj2nvm11pkd14nms6yxas8c7gwdw0"; + url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.8.1.tar.bz2; + sha256 = "0x9bm2nqd6w2f35w2sqcp7h5z34i4w7mdg53m0vzjhffnnq6637z"; }; buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ]; - meta = { + meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; homepage = http://www.breakfastquay.com/rubberband/index.html; - license = ["GPL"]; # commercial license availible as well, see homepage. You'll get some more optimized routines - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + # commercial license available as well, see homepage. You'll get some more optimized routines + license = licenses.gpl2Plus; + maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + platforms = platforms.linux; }; } From c7aedd58050daa7ecab58851af2ee8281ec623e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Feb 2014 10:37:57 +0100 Subject: [PATCH 181/384] Add missing file --- nixos/doc/manual/release-notes.xml | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 nixos/doc/manual/release-notes.xml diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml new file mode 100644 index 000000000000..4a0fc6a52e4c --- /dev/null +++ b/nixos/doc/manual/release-notes.xml @@ -0,0 +1,53 @@ + + +Release notes + + + +
+ +Release 14.02 (“Baboon”, 2014/02/??) + +This is the second stable release branch of NixOS. The main +enhancements are the following: + + + + Installation on UEFI systems is now supported. See + for + details. + + NixOS is now based on Glibc 2.18 and GCC + 4.8. + + + + + +When upgrading from a previous release, please be aware of the +following incompatible changes: + + + + The option + has been renamed to + . + + + + + +
+ + + +
+ +Release 13.10 (“Aardvark”, 2013/10/31) + +This is the first stable release branch of NixOS. + +
+ + From aea043aec0d716b87b4901c6fa977cb3d603460e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 19 Feb 2014 12:35:52 +0100 Subject: [PATCH 182/384] Revert "upgrade video-intel stack to 2.99.906" This reverts commit 89f710f18e3bc86e6feec6661a3910ea32bb662c. Reported by others for xorg-server to crash on different kernel versions. --- pkgs/development/libraries/libva/default.nix | 4 ++-- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index b0dbf1f8970d..5b35d2b24ad4 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { - name = "libva-1.2.1"; + name = "libva-1.1.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "0fx8ivaghpq8g099bzwy5dm3bqnkbbhjq3qhgrpk390c4s5hy23h"; + sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 1bb0b5732cbe..f05c01bf58df 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -2,11 +2,11 @@ , intelgen4asm }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.2.2"; + name = "libva-intel-driver-1.0.20"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "0i3h9g8flnxf8gmag65xkvz7rib51dvx841ym3am5v3p51w79i0r"; + sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj"; }; buildInputs = [ pkgconfig libdrm libva libX11 ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2b5e2629e252..13c17cebde3c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1510,14 +1510,14 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.99.906"; + name = "xf86-video-intel-2.21.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2; - sha256 = "1miwyv20q8bz5wml9n16l9vbrcnwpy7a3d3cmc92dy2p0b7474rd"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2; + sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.9.4"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8c193600833e..175c98946943 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 From 7a51e17775a42388930cd19e1d037812b07a0f37 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Feb 2014 13:01:33 +0100 Subject: [PATCH 183/384] Fix updating of the tarball mirror --- maintainers/scripts/copy-tarball.sh | 45 ------------- maintainers/scripts/copy-tarballs.pl | 95 +++++++++++++++++++++++++++ maintainers/scripts/copy-tarballs.sh | 27 -------- maintainers/scripts/find-tarballs.nix | 45 +++++++++++++ pkgs/top-level/make-tarball.nix | 4 ++ 5 files changed, 144 insertions(+), 72 deletions(-) delete mode 100755 maintainers/scripts/copy-tarball.sh create mode 100755 maintainers/scripts/copy-tarballs.pl delete mode 100755 maintainers/scripts/copy-tarballs.sh create mode 100644 maintainers/scripts/find-tarballs.nix diff --git a/maintainers/scripts/copy-tarball.sh b/maintainers/scripts/copy-tarball.sh deleted file mode 100755 index 792071c129b9..000000000000 --- a/maintainers/scripts/copy-tarball.sh +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh -e - -distDir=${NIX_TARBALLS_CACHE:-/tarballs} - -url="$1" -file="$2" -if [ -z "$url" ]; then echo "syntax: $0 URL"; exit 0; fi - -base="$(basename "$url")" -if [ -z "$base" ]; then echo "bad URL"; exit 1; fi -dstPath="$distDir/$base" - -if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi - -if [ -z "$file" ]; then - - echo "downloading $url to $dstPath" - - if [ -n "$DRY_RUN" ]; then exit 0; fi - - declare -a res - if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then - exit - fi - - storePath=${res[1]} - -else - storePath="$file" -fi - -cp $storePath "$dstPath.tmp.$$" -mv -f "$dstPath.tmp.$$" "$dstPath" - -echo "hashing $dstPath" - -md5=$(nix-hash --flat --type md5 "$dstPath") -ln -sfn "../$base" $distDir/md5/$md5 - -sha1=$(nix-hash --flat --type sha1 "$dstPath") -ln -sfn "../$base" $distDir/sha1/$sha1 - -sha256=$(nix-hash --flat --type sha256 "$dstPath") -ln -sfn "../$base" $distDir/sha256/$sha256 -ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256") diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl new file mode 100755 index 000000000000..0746fb21069d --- /dev/null +++ b/maintainers/scripts/copy-tarballs.pl @@ -0,0 +1,95 @@ +#! /run/current-system/sw/bin/perl -w + +use strict; +use XML::Simple; +use File::Basename; +use File::Path; +use File::Copy 'cp'; +use IPC::Open2; +use Nix::Store; + +my $myDir = dirname($0); + +my $tarballsCache = $ENV{'NIX_TARBALLS_CACHE'} // "/tarballs"; + +my $xml = `nix-instantiate --eval-only --xml --strict ''`; +die "$0: evaluation failed\n" if $? != 0; + +my $data = XMLin($xml) or die; + +mkpath($tarballsCache); +mkpath("$tarballsCache/md5"); +mkpath("$tarballsCache/sha1"); +mkpath("$tarballsCache/sha256"); + +foreach my $file (@{$data->{list}->{attrs}}) { + my $url = $file->{attr}->{url}->{string}->{value}; + my $algo = $file->{attr}->{type}->{string}->{value}; + my $hash = $file->{attr}->{hash}->{string}->{value}; + + if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { + print STDERR "skipping $url (unsupported scheme)\n"; + next; + } + + $url =~ /([^\/]+)$/; + my $fn = $1; + + if (!defined $fn) { + print STDERR "skipping $url (no file name)\n"; + next; + } + + if ($fn =~ /[&?=%]/ || $fn =~ /^\./) { + print STDERR "skipping $url (bad character in file name)\n"; + next; + } + + if ($fn !~ /[a-zA-Z]/) { + print STDERR "skipping $url (no letter in file name)\n"; + next; + } + + if ($fn !~ /[0-9]/) { + print STDERR "skipping $url (no digit in file name)\n"; + next; + } + + if ($fn !~ /[-_\.]/) { + print STDERR "skipping $url (no dash/dot/underscore in file name)\n"; + next; + } + + my $dstPath = "$tarballsCache/$fn"; + + next if -e $dstPath; + + print "downloading $url to $dstPath...\n"; + + next if $ENV{DRY_RUN}; + + $ENV{QUIET} = 1; + $ENV{PRINT_PATH} = 1; + my $fh; + my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; + waitpid($pid, 0) or die; + if ($? != 0) { + print STDERR "failed to fetch $url: $?\n"; + last if $? >> 8 == 255; + next; + } + <$fh>; my $storePath = <$fh>; chomp $storePath; + + die unless -e $storePath; + + cp($storePath, $dstPath) or die; + + my $md5 = hashFile("md5", 0, $storePath) or die; + symlink("../$fn", "$tarballsCache/md5/$md5"); + + my $sha1 = hashFile("sha1", 0, $storePath) or die; + symlink("../$fn", "$tarballsCache/sha1/$sha1"); + + my $sha256 = hashFile("sha256", 0, $storePath) or die; + symlink("../$fn", "$tarballsCache/sha256/$sha256"); +} diff --git a/maintainers/scripts/copy-tarballs.sh b/maintainers/scripts/copy-tarballs.sh deleted file mode 100755 index a261f8175859..000000000000 --- a/maintainers/scripts/copy-tarballs.sh +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -e - -urls=$(nix-instantiate --eval-only --xml --strict '' \ - | grep -A2 'name="urls"' \ - | grep ' /dev/null stopNest + + header "checking find-tarballs.nix" + nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/find-tarballs.nix > /dev/null + stopNest ''; distPhase = '' From 83ca2c272a8952828f17c5aa8f918561ca798f8a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Feb 2014 13:36:39 +0100 Subject: [PATCH 184/384] =?UTF-8?q?fetchurl:=20Ensure=20that=20=E2=80=98ur?= =?UTF-8?q?ls=E2=80=99=20is=20a=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/build-support/fetchurl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 294d9a43ef7d..af4a6700153c 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -66,6 +66,7 @@ in showURLs ? false }: +assert builtins.isList urls; assert urls != [] -> url == ""; assert url != "" -> urls == []; From 6aef8266f06deb676593493c117b1f4495c30a5b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 19 Feb 2014 14:25:27 +0100 Subject: [PATCH 185/384] gnome-icon-theme-symbolic: new package --- .../gnome-icon-theme-symbolic/default.nix | 24 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix 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 new file mode 100644 index 000000000000..0d2d406876b2 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }: + +stdenv.mkDerivation rec { + name = "gnome-icon-theme-symbolic-3.10.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/${name}.tar.xz"; + sha256 = "344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412"; + }; + + configureFlags = "--enable-icon-mapping"; + + # Avoid postinstall make hooks + installPhase = '' + make install-exec-am install-data-local install-pkgconfigDATA + make -C src install + ''; + + buildInputs = [ pkgconfig iconnamingutils gtk]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b8832f6207a3..3ba51f94eba9 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -42,6 +42,8 @@ rec { gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; + gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { }; + gnome-menus = callPackage ./core/gnome-menus { }; gnome_keyring = callPackage ./core/gnome-keyring { }; From df2661953ee36a37721d9410fbeaf4392cafb0a1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 19 Feb 2014 14:29:07 +0100 Subject: [PATCH 186/384] yelp: Show icons in the application --- pkgs/desktops/gnome-3/core/yelp/default.nix | 28 +++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index b5f6600fb60d..e6779abcffa4 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,8 +1,6 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib, file -, bash, makeWrapper, itstool, libxml2, libxslt, gnome3, icu }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf +, bash, makeWrapper, itstool, libxml2, libxslt, icu }: stdenv.mkDerivation rec { name = "yelp-3.10.1"; @@ -12,25 +10,23 @@ stdenv.mkDerivation rec { sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816"; }; - configureFlags = [ "--disable-static" ]; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard + gnome3.gnome_icon_theme hicolor_icon_theme + gnome3.gnome_icon_theme_symbolic ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool libxml2 libxslt icu file - gnome3.gsettings_desktop_schemas makeWrapper gnome3.yelp_xsl ]; + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool + libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl + gnome3.gsettings_desktop_schemas ]; 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 wrapProgram "$out/bin/yelp" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" - ''; - - preFixup = '' + --set GDK_PIXBUF_MODULE_FILE `readlink -e $out/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}" ''; meta = with stdenv.lib; { From a52f17e4e1a305a85cd1b52a7ad48832ff0d7103 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 19 Feb 2014 15:56:13 +0200 Subject: [PATCH 187/384] youtubeDL: update from 2014.02.17 to 2014.02.19.1 --- 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 c769645edc3d..ef4bc68b1c80 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.17"; + version = "2014.02.19.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0yv13k8cqrv3i8zv5ad286niwxk5a4ggngcx6b0d6kg7c03rkgkq"; + sha256 = "0bilardg46xikw4gl4n50bg9wrmarmnzhrhhwhdcyrx0p0idl4fn"; }; buildInputs = [ python ]; From 40debd63cad078775cccdcfaded72d6a4fcb4d0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:10:54 +0100 Subject: [PATCH 188/384] nc-indicators: re-generate with cabal2nix --- pkgs/applications/misc/nc-indicators/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix index dec605daf58c..a33cfbdf159a 100644 --- a/pkgs/applications/misc/nc-indicators/default.nix +++ b/pkgs/applications/misc/nc-indicators/default.nix @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ attoparsec gtk hflags lens pipes stm ]; meta = { - homepage = "https://github.com/nilcons/nc-indicators"; + homepage = "https://github.com/nilcons/nc-indicators/issues"; description = "CPU load and memory usage indicators for i3bar"; license = self.stdenv.lib.licenses.asl20; platforms = self.ghc.meta.platforms; From 0c008eb857210e6b675a86f4a415bd0c945047d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:11:26 +0100 Subject: [PATCH 189/384] haskell-bert: update to version 1.2.2.1 --- pkgs/development/libraries/haskell/bert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix index 2857a21a8d98..e2d482b364ec 100644 --- a/pkgs/development/libraries/haskell/bert/default.nix +++ b/pkgs/development/libraries/haskell/bert/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "bert"; - version = "1.2.2"; - sha256 = "1dlq9fl5d2adprcybs4d4cyhj9q2c1l4kcc6vnnyhbyn201gxgpn"; + version = "1.2.2.1"; + sha256 = "1x23grykamyclx6a5jzyqwp3hwr2ma61zvmz89f3cj06sa49cgs0"; buildDepends = [ binary binaryConduit conduit mtl network networkConduit parsec time void From 65972a572432ff6ca052392395feb8fa2159f4f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:11:28 +0100 Subject: [PATCH 190/384] haskell-css-text: update to version 0.1.2.0.1 --- pkgs/development/libraries/haskell/css-text/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index f59a80b2b65a..2cb78af7ba9c 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -1,11 +1,11 @@ -{ cabal, attoparsec, hspec, HUnit, QuickCheck, text }: +{ cabal, attoparsec, hspec, QuickCheck, text }: cabal.mkDerivation (self: { pname = "css-text"; - version = "0.1.1"; - sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y"; + version = "0.1.2.0.1"; + sha256 = "0j8d9kfs9j01gqlapaahyziphkx0f55g9bbz2wwix1si7954xxhp"; buildDepends = [ attoparsec text ]; - testDepends = [ attoparsec hspec HUnit QuickCheck text ]; + testDepends = [ attoparsec hspec QuickCheck text ]; meta = { homepage = "http://www.yesodweb.com/"; description = "CSS parser and renderer"; From 8a81d2c20017b560cbb9413ef92ba3f9257719c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:11:30 +0100 Subject: [PATCH 191/384] haskell-http-conduit: update to version 2.0.0.6 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 04c88c257c1d..8719028bf3d1 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.5"; - sha256 = "1vgfg2jgr7gavfbys33rd2l0dxyqk7ig7v357jhy8imxsm0xykp9"; + version = "2.0.0.6"; + sha256 = "0jgv17cxf8javcy4vcaayw9ajbr7dj43pba23xr6416hs6cv21hl"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers From fe92d6bbed63bd42e022520ef927d8822fa0df4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:11:31 +0100 Subject: [PATCH 192/384] haskell-multiarg: update to version 0.24.0.2 --- 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 3c5239b4737e..737ddbda5d63 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.0"; - sha256 = "0vdhrsqwa2wq9cvf96x3hqml2vbjcvik9mpz1kbbhb61f9lbhas6"; + version = "0.24.0.2"; + sha256 = "0jqkqw0v9dzby6cm0ijj1ff5dpps8hbjnhrscf2qwja9x974686s"; buildDepends = [ utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; From 9f7aa5e224c9ef79a355db164175a63715ce564b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:11:33 +0100 Subject: [PATCH 193/384] haskell-shake: update to version 0.11.2 --- 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 d0c5f2200994..f3ec1471cbe9 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.1"; - sha256 = "0fk3b4c9r4ybdv7x533afy91dcyf3ji2xsyfpi72z7637vmgv202"; + version = "0.11.2"; + sha256 = "1mhll4h6za67pjcm4amdcibfd7ny2kfx4mfws0lrd903j1p5b00q"; isLibrary = true; isExecutable = true; buildDepends = [ From baffeb2b6604830ae939519a7618c2c6e208f4b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:11:35 +0100 Subject: [PATCH 194/384] haskell-shakespeare-css: update to version 1.0.7.1 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index f96819955137..4a2305cce2a4 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.7"; - sha256 = "108vlxbis8g7pkldsd6r2b8il7fdqb98n64idc4l2lvkwz3lnr36"; + version = "1.0.7.1"; + sha256 = "1qw8hlldzdijp0vgikrbj83q4wmx6i1vswn4314dwjxcihljl8ls"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From 731e3c186ebea338e6d410c0b56b9eda954493e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:11:37 +0100 Subject: [PATCH 195/384] haskell-skein: update to version 1.0.9 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index bb7a3a7bc7af..2824c1c8f1c8 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.8.1"; - sha256 = "1xh8hx1d8hk3kqg07pb2ikc814037bw1xhawskrpxq3x37xff4q4"; + version = "1.0.9"; + sha256 = "08hy40c0gzlalrpmgcvhc1v51a44idipamjjbh7zzwsvbxmp1cbb"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; jailbreak = true; From 2a1f4c82b20624fc6bdd41e110f63f67991162df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Feb 2014 11:15:37 +0100 Subject: [PATCH 196/384] haskell-cabal2nix: update to version 1.60 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 342eb3ecfd11..9dc8536a4c09 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.59"; - sha256 = "1prm07mnnasfn042635kc6h6mymvninic0y9zimii7k4rqblf598"; + version = "1.60"; + sha256 = "1jp4rq8gfdz5knm9cbralhjyw2a391cck49422bskl7c23p94y3l"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 189273af3898bf4961df8f52d7f4e4f21858dd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 19 Feb 2014 16:36:58 +0100 Subject: [PATCH 197/384] add gnome3.vino --- .../services/x11/desktop-managers/gnome3.nix | 1 + pkgs/desktops/gnome-3/core/vino/default.nix | 31 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/vino/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 063c9bb03bc3..154130e793ec 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -48,6 +48,7 @@ in { [ gnome3.evince gnome3.eog gnome3.dconf + gnome3.vino pkgs.ibus gnome3.gnome_shell gnome3.gnome_settings_daemon diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix new file mode 100644 index 000000000000..b431a199bf72 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper +, libnotify, file }: + +stdenv.mkDerivation rec { + name = "vino-${versionMajor}.${versionMinor}"; + versionMajor = "3.10"; + versionMinor = "1"; + + src = fetchurl { + url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz"; + sha256 = "0imyvz96b7kikikwxn1r5sfxwmi40523nd66gp9hrl23gik0vwgs"; + }; + + doCheck = true; + + buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ]; + + postInstall = '' + for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do + wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share" + done + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Projects/Vino; + description = "GNOME desktop sharing server"; + maintainers = with maintainers; [ lethalman iElectric ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 114f58beb21f..1c26c6949ca2 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -92,6 +92,8 @@ rec { vte = callPackage ./core/vte { }; + vino = callPackage ./core/vino { }; + yelp = callPackage ./core/yelp { }; yelp_xsl = callPackage ./core/yelp-xsl { }; From 746c42d10f1a13ef7e3b48fcbafed6c35ed95912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 19 Feb 2014 16:38:17 +0100 Subject: [PATCH 198/384] gnome3: add some default core packages to be installed --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 154130e793ec..5e31247843e8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -49,6 +49,11 @@ in { gnome3.eog gnome3.dconf gnome3.vino + gnome3.epiphany + gnome3.baobab + gnome3.gucharmap + gnome3.nautilus + gnome3.yelp pkgs.ibus gnome3.gnome_shell gnome3.gnome_settings_daemon From 5caaa5e0bade258ac0856f10a99a76eeeb31fe9e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 19 Feb 2014 10:44:58 +0100 Subject: [PATCH 199/384] pythonPackages: fix and upate graphite, carbon and whisper Twisted needed downgrade for carbon to start --- pkgs/top-level/python-packages.nix | 40 ++++++++++++++++-------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1afadd1a2760..2958120f9078 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7104,11 +7104,13 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); twisted = buildPythonPackage rec { - name = "twisted-13.2.0"; + # NOTE: When updating please check if new versions still cause issues + # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) + name = "Twisted-11.1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/T/Twisted/Twisted-13.2.0.tar.bz2"; - sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; + url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2"; + sha256 = "05agfp17cndhv2w0p559lvknl7nv0xqkg10apc47fm53m8llbfvz"; }; propagatedBuildInputs = [ zope_interface ]; @@ -8251,30 +8253,30 @@ pythonPackages = modules // import ./python-packages-generated.nix { whisper = buildPythonPackage rec { name = "whisper-${version}"; - version = "0.9.10"; + version = "0.9.12"; - src = fetchurl rec { - url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz"; - sha256 = "1zy4z4hrbiqj4ipcv2m9197hf03d4xphllqav9w4c8i6fn8zmd9n"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/w/whisper/${name}.tar.gz"; + md5 = "5fac757cc4822ab0678dbe0d781d904e"; }; # error: invalid command 'test' doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Fixed size round-robin style database"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils offline ]; }; }; carbon = buildPythonPackage rec { name = "carbon-${version}"; - version = "0.9.10"; + version = "0.9.12"; - src = fetchurl rec { - url = "https://launchpad.net/graphite/0.9/${version}/+download/${name}.tar.gz"; - sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/carbon/${name}.tar.gz"; + md5 = "66967d5a622fd29973838fcd10eb34f3"; }; propagatedBuildInputs = [ whisper txamqp zope_interface twisted ]; @@ -8282,10 +8284,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { # error: invalid command 'test' doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Backend data caching and persistence daemon for Graphite"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils offline ]; }; }; @@ -8326,11 +8328,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { graphite_web = buildPythonPackage rec { name = "graphite-web-${version}"; - version = "0.9.11"; + version = "0.9.12"; src = fetchurl rec { url = "https://pypi.python.org/packages/source/g/graphite-web/${name}.tar.gz"; - md5 = "1499b5dded3d1054d598760fd450a6f9"; + md5 = "8edbb61f1ffe11c181bd2cb9ec977c72"; }; propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; @@ -8350,10 +8352,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { # error: invalid command 'test' doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = http://graphite.wikidot.com/; description = "Enterprise scalable realtime graphing"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils offline ]; }; }; From ad0732313d1d512f0cc504e7a5b354236ced49f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 19 Feb 2014 16:53:08 +0100 Subject: [PATCH 200/384] gnome3: typo --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 5e31247843e8..456975015a22 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -34,7 +34,7 @@ in { export GTK_DATA_PREFIX=${config.system.path} # find theme engines - export GTK_PATH=${config.system.path}/lib/gtk-3.0:{config.system.path}/lib/gtk-2.0 + export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 export XDG_MENU_PREFIX=gnome From 484403bf0e229f857cafb67ec2e516ed7dfdc2d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Feb 2014 18:47:48 +0100 Subject: [PATCH 201/384] =?UTF-8?q?Add=20a=20constant=20=E2=80=98nixpkgsVe?= =?UTF-8?q?rsion=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it a bit easier to find out the current Nixpkgs version, e.g. $ nix-instantiate --eval '' -A lib.nixpkgsVersion "14.02.35657.66f51a9" --- lib/trivial.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/trivial.nix b/lib/trivial.nix index 760a74ce6664..190cda6abd67 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -41,4 +41,10 @@ rec { pathExists readFile isBool isFunction isInt add sub lessThan; + # Return the Nixpkgs version number. + nixpkgsVersion = + let suffixFile = ../.version-suffix; in + readFile ../.version + + (if pathExists suffixFile then readFile suffixFile else "pre-git"); + } From 4a91cfd32b44fede17f135b47ff0f035652f203e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Feb 2014 19:00:51 +0100 Subject: [PATCH 202/384] =?UTF-8?q?Add=20a=20global=20variable=20=E2=80=98?= =?UTF-8?q?inNixShell=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is primarily useful in Nix expressions that are also intended to be used by nix-shell. It allows saying things like: buildInputs = [ ... ] ++ (if inNixShell then [ emacs ] else [ ]); This should not be used in Nixpkgs (since the question of what constitutes a useful nix-shell environment is very subjective). --- lib/trivial.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/trivial.nix b/lib/trivial.nix index 190cda6abd67..e073da4900cc 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -47,4 +47,7 @@ rec { readFile ../.version + (if pathExists suffixFile then readFile suffixFile else "pre-git"); + # Whether we're being called by nix-shell. This is useful to + inNixShell = builtins.getEnv "IN_NIX_SHELL" == "1"; + } From 058ed07fb80bfeeec8c7623c1cc145a8d92aec8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 19 Feb 2014 20:12:19 +0100 Subject: [PATCH 203/384] vamp-sdk: update from 2.2.1 to 2.5 Tested with mixxx, qtractor, rubberband and sonic-visualiser --- .../development/libraries/audio/vamp/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index bfca4a523046..f4c4220a8792 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -6,21 +6,21 @@ rec { vampSDK = stdenv.mkDerivation { - name = "vamp-sdk-2.2.1"; + name = "vamp-sdk-2.5"; src = fetchurl { - url = mirror://sourceforge/vamp/vamp-plugin-sdk-2.2.1.tar.gz; - sha256 = "09iw6gv8aqq5v322fhi872mrhjp0a2w63966g0mks4vhh84q252p"; + url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz; + sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv"; }; - buildInputs = [pkgconfig libsndfile]; + buildInputs = [ pkgconfig libsndfile ]; - meta = { + meta = with stdenv.lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; homepage = http://sourceforge.net/projects/vamp; - license = "BSD"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + platforms = platforms.linux; }; }; From 845f30aa6a994b084f36928ad6fcb734c70daa08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 19 Feb 2014 00:13:26 +0100 Subject: [PATCH 204/384] sonic-visualiser: upgrade from 1.9 to 2.3 remove obsolete patch, add new inputs --- .../audio/sonic-visualiser/default.nix | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 6e15478ff630..7704397e6d0a 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,27 +2,25 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland -, rubberband, vampSDK +, libsndfile, pkgconfig, pulseaudio, qt5, redland +, rubberband, serd, sord, vampSDK }: stdenv.mkDerivation rec { name = "sonic-visualiser-${version}"; - version = "1.9"; + version = "2.3"; src = fetchurl { - url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz"; - sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq"; + + url = "http://code.soundsoftware.ac.uk/attachments/download/918/${name}.tar.gz"; + sha256 = "1f06w2rin4r2mbi00bg3nmqdi2xdy9vq4jcmfanxzj3ld66ik40c"; }; - patches = [(fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch; - sha256 = "0dhh111crvjvhcjqp7j9jqnvs8zmd6xrcirmzqrrnca1h0vbpkay"; - name = "gcc47.patch"; - })]; buildInputs = - [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband + [ libsndfile qt5 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland + serd + sord pkgconfig # optional jackaudio @@ -33,11 +31,10 @@ stdenv.mkDerivation rec { # fishsound liblo libX11 - makeWrapper ]; buildPhase = '' - for i in sonic-visualiser svapp svcore svgui; + for i in sonic-visualiser svapp svcore svgui; do cd $i && qmake -makefile PREFIX=$out && cd ..; done make @@ -45,19 +42,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,share/sonic-visualiser} - cp sonic-visualiser/sonic-visualiser $out/bin - cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples - wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib + cp sonic-visualiser $out/bin/ + cp -r samples $out/share/sonic-visualiser/ ''; - meta = { + meta = with stdenv.lib; { description = "View and analyse contents of music audio files"; homepage = http://www.sonicvisualiser.org/; - license = "GPLv2"; - maintainers = - [ stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.goibhniu - ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + platforms = platforms.linux; }; } From 68f9e604352407ebabd55365d8955c8dbd97cbf1 Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Tue, 18 Feb 2014 11:15:17 -0500 Subject: [PATCH 205/384] gnutls: fix linking on Darwin (close #1779) --- pkgs/development/libraries/gnutls/3.2.nix | 13 +++- ...gnutls_x86_cpuid_s_multi_definitions.patch | 59 +++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) create 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 03a0c0019790..e256dc44aced 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -70,4 +70,15 @@ stdenv.mkDerivation (rec { (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/fix_gnutls_x86_cpuid_s_multi_definitions.patch b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch new file mode 100644 index 000000000000..1bc3086faeb2 --- /dev/null +++ b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch @@ -0,0 +1,59 @@ +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 048a85f952b31502dc41b0e1783fe11dd0517a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Feb 2014 20:42:51 +0100 Subject: [PATCH 206/384] gnutls: add platforms for the default version --- pkgs/development/libraries/gnutls/3.2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index e256dc44aced..ad873b3eae85 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/gnutls/; license = "LGPLv2.1+"; maintainers = [ ]; + platforms = platforms.all; }; } From a629aaee7203aa6540d8c84068f700e72f0ff695 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Wed, 19 Feb 2014 11:16:03 +0400 Subject: [PATCH 207/384] viewnior: version bump (1.4) (close #1781) --- pkgs/applications/graphics/viewnior/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 99e1ec1c169b..aa09fb705f1c 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -2,11 +2,11 @@ , intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}: stdenv.mkDerivation rec { - name = "viewnior-1.3"; + name = "viewnior-1.4"; src = fetchurl { - url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz"; - sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10"; + url = "https://www.dropbox.com/s/zytq0suabesv933/${name}.tar.gz"; + sha256 = "0vv1133phgfzm92md6bbccmcvfiqb4kz28z1572c0qj971yz457a"; }; buildInputs = @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { shared_mime_info glib gdk_pixbuf perl ]; + preFixup = '' + rm $out/share/icons/*/icon-theme.cache + ''; + meta = { description = "Viewnior is a fast and simple image viewer for GNU/Linux"; longDescription = From 2142d7542bf6d6ccce4b965fda0dbcac1ccb129b Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Wed, 19 Feb 2014 12:20:21 +0400 Subject: [PATCH 208/384] zathura: version bump (0.2.6 -> 0.2.7) (close #1782) --- pkgs/applications/misc/girara/default.nix | 4 ++-- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- pkgs/applications/misc/zathura/pdf-poppler/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 7af8cbeccc63..4db4e4b10916 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.1.9"; + name = "girara-0.2.0"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "1kd20dalnpy07hajv0rkmkbsym4bpfxh0gby7j2mvkvl5qr3vx70"; + sha256 = "0k8p5sgazqw7r78ssqh8bm2hn98xjml5w76l9awa66yq0k5m8jyi"; }; buildInputs = [ pkgconfig gtk gettext ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 00e1e6cd28a1..b86107890d86 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }: stdenv.mkDerivation rec { - version = "0.2.6"; + version = "0.2.7"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha1 = "d84878388969d523027a1661f49fd29638bd460b"; + sha256 = "ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf"; }; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 71c418f168c4..ce4894e6c0f1 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }: stdenv.mkDerivation rec { - version = "0.2.4"; + version = "0.2.5"; name = "zathura-pdf-poppler-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1x1n21naixb87g1knznjfjfibazzwbn1cv7d42kxgwlnf1p1wbzm"; + sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0"; }; buildInputs = [ pkgconfig poppler gettext zathura_core girara ]; From 927ed152f437ab14b8966cf2d5f1b906dab6b75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 19 Feb 2014 21:53:49 +0100 Subject: [PATCH 209/384] minixml: upgrade from 2.6 to 2.8 Tested with yoshimi and zynaddsubfx --- pkgs/development/libraries/minixml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 33b713239c85..f3b1c2c72a77 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mxml-${version}"; - version = "2.6"; + version = "2.8"; src = fetchurl { - url = "http://ftp.easysw.com/pub/mxml/${version}/${name}.tar.gz"; - sha256 = "15cpqr43cwvy1ms67rfav8l9fjgybkaqfq7nhag8qnhd3bd4glxh"; + url = "http://www.msweet.org/files/project3/${name}.tar.gz"; + sha256 = "1m8i62dfmgfc1v8y3zx0r4i2hr5n86yw01xh5kiq53bi3bwnk4qc"; }; meta = with stdenv.lib; { From f2b59904e5fe1e7d6a18b66572fe2c5b730a13d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 19 Feb 2014 22:00:54 +0100 Subject: [PATCH 210/384] opencolorio: update from 1.0.8 to 1.0.9 --- pkgs/development/libraries/opencolorio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 513b340e132a..28d361ea7b8d 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocio-${version}"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.8.zip"; - sha256 = "1l70bf40dz2znm9rh3r6xs9d6kp719y1djayb7dc89khfqqbx2di"; + url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.9.zip"; + sha256 = "14j80dgbb6f09z63aqh2874vhzpga6zksz8jmqnj1zh87x15pqnr"; }; buildInputs = [ cmake unzip ]; From 30fb0365df8223d4769dd0ff6825a2d97dd21f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 19 Feb 2014 22:02:54 +0100 Subject: [PATCH 211/384] openimageio: update from 1.1.12 to 1.3.12 --- pkgs/applications/graphics/openimageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 8748c808dc07..f63f41a8ed10 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "oiio-${version}"; - version = "1.1.12"; + version = "1.3.12"; src = fetchurl { url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6"; + sha256 = "114jx4pcqhzdchzpxbwrfzqmnxr2bm8cw13g4akz1hg8pvr1dhsb"; }; buildInputs = [ From 77041cbf4514eea42322b02ef4135cfbecd64321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 19 Feb 2014 23:50:24 +0100 Subject: [PATCH 212/384] linuxsampler: fix the build by using bison2 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed811f549ce0..056d80b7bdaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8344,7 +8344,9 @@ let libosip = libosip_3; }; - linuxsampler = callPackage ../applications/audio/linuxsampler { }; + linuxsampler = callPackage ../applications/audio/linuxsampler { + bison = bison2; + }; lmms = callPackage ../applications/audio/lmms { }; From 0441bb1b7a5ba6c4c84cafee38ce052173f0b13e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 18 Feb 2014 20:39:27 -0600 Subject: [PATCH 213/384] virtualbox: 4.2.18 -> 4.2.22 This is needed to compile the Virtual Box guest additions with the 3.13 kernel (and thus the grsecurity testing kernel). Signed-off-by: Austin Seipp --- .../applications/virtualization/virtualbox/default.nix | 10 +++++----- .../virtualbox/guest-additions/default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 2ce134090fe5..79a208fa54c5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "4.2.18"; # changes ./guest-additions as well + version = "4.2.22"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +31,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "88780"; + extpackRevision = "91556"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.18/SHA256SUMS - sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba"; + # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.22/SHA256SUMS + sha256 = "79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -56,7 +56,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74"; + sha256 = "4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 805e0b867d97..595698abcaa5 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767"; + sha256 = "222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; From 342ed631a46ac1efe093dce624b6aa17cb8432f6 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 20 Feb 2014 00:23:05 +0100 Subject: [PATCH 214/384] speedtest_cli: update from 0.2.4 to 0.2.5 --- pkgs/tools/networking/speedtest-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 26b4b680a6e9..4f54404b713a 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonPackage rec { name = "speedtest-cli-${version}"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; - sha256 = "1mz9lx0sdgjz5w3w2lrfh4g7mdyas0ywqfvwh7hwmmpg0fvqiq5q"; + sha256 = "0a19kyn6064jbxda4yq1rfrlqlh8ha40fgwkj4rckdzk9bnxkhdn"; }; meta = with stdenv.lib; { From 67cc87a35af2bb6e915e5845f25a25ef63da7183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 20 Feb 2014 00:44:08 +0100 Subject: [PATCH 215/384] python2.6: 2.6.8 -> 2.6.9 --- pkgs/development/interpreters/python/2.6/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 0302513e6fc5..d51838af5ad5 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -9,13 +9,12 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.8"; + version = "${majorVersion}.9"; - # http://www.python.org/download/releases/2.6.8/ - # md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013 + # python 2.6 will receive security fixes until Oct 2013 src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - md5 = "c6e0420a21d8b23dee8b0195c9b9a125"; + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya"; }; patches = From 31949ead32b6deec59c859577d38378c3bda9c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 20 Feb 2014 00:44:27 +0100 Subject: [PATCH 216/384] python2.7: 2.7.5 -> 2.7.6 --- pkgs/development/interpreters/python/2.7/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 4897c0a5141e..e9277ce2dafb 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.5"; + version = "${majorVersion}.6"; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0nc091f19sllibvxm6n3qw5pflcphkwwxmz43q26lqafhra7airv"; + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + sha256 = "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz"; }; patches = From a0ff8f687f95c7eb2ff6716d77cc889dfce4a370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 20 Feb 2014 00:44:51 +0100 Subject: [PATCH 217/384] python3.3: 3.3.3 -> 3.3.4 --- pkgs/development/interpreters/python/3.3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 18af6487e558..af37b4372b76 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let majorVersion = "3.3"; - version = "${majorVersion}.3"; + version = "${majorVersion}.4"; buildInputs = filter (p: p != null) [ zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto @@ -28,8 +28,8 @@ stdenv.mkDerivation { inherit majorVersion version; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "1jwd9pw7vx6xpjyi7iv5j3rwwkf3vzrwj36kcj1qh8zn2avfj9p5"; + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + sha256 = "12ank7in8xyncim3yyn3mi84wkc4g9nx7yrci1406kn0j5ni5k66"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; 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 218/384] 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 219/384] 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 220/384] 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 221/384] 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 222/384] 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 223/384] 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 224/384] 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 225/384] 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 226/384] 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 227/384] 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 228/384] 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 229/384] 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 230/384] 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 231/384] 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 232/384] 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 21d1e7deb1ac64bbb49a6b0e6d777b6a6e6975e6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 19 Feb 2014 20:03:30 -0500 Subject: [PATCH 233/384] libev: bump --- pkgs/development/libraries/libev/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix index 49624fc6bd27..3e4f58a5ce0f 100644 --- a/pkgs/development/libraries/libev/src-for-default.nix +++ b/pkgs/development/libraries/libev/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="4.11"; - name="libev-4.11"; - hash="1pwcjch21xc7cfmjldkw1n7lcs4pyqm9dx573wdhmmp4yrpz2mcz"; + version="4.15"; + name="libev-4.15"; + hash="1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj"; url="http://dist.schmorp.de/libev/Attic/libev-${version}.tar.gz"; - advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.11.tar.gz"; + advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz"; } From f6ba040bdce29da6072d1a0a86387ebe5d79869d Mon Sep 17 00:00:00 2001 From: Tom Hinton Date: Wed, 19 Feb 2014 15:38:44 +0000 Subject: [PATCH 234/384] 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 7411fabd3e19de6820db71dd0dbc1ce2b267bdbd Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 19 Feb 2014 05:48:46 -0600 Subject: [PATCH 235/384] checksec: version 1.5 Signed-off-by: Austin Seipp --- ...dprobe-config-before-checking-kernel.patch | 27 ++++++++++++ pkgs/os-specific/linux/checksec/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 70 insertions(+) create mode 100644 pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch create mode 100644 pkgs/os-specific/linux/checksec/default.nix diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch new file mode 100644 index 000000000000..2caf52f3c0a3 --- /dev/null +++ b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch @@ -0,0 +1,27 @@ +From 6503848d9e0eb009e5f462116a963beacb208930 Mon Sep 17 00:00:00 2001 +From: Austin Seipp +Date: Thu, 20 Feb 2014 00:11:44 -0600 +Subject: [PATCH] attempt to 'modprobe config' before checking kernel + +Signed-off-by: Austin Seipp +--- + checksec.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/checksec.sh b/checksec.sh +index dd1f72e..63acc29 100644 +--- a/checksec.sh ++++ b/checksec.sh +@@ -337,7 +337,8 @@ kernelcheck() { + printf " userspace processes, this option lists the status of kernel configuration\n" + printf " options that harden the kernel itself against attack.\n\n" + printf " Kernel config: " +- ++ ++ modprobe configs 2> /dev/null + if [ -f /proc/config.gz ] ; then + kconfig="zcat /proc/config.gz" + printf "\033[32m/proc/config.gz\033[m\n\n" +-- +1.8.3.2 + diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix new file mode 100644 index 000000000000..5e5ed6da1c92 --- /dev/null +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, file, findutils, elfutils, glibc }: + +stdenv.mkDerivation rec { + name = "checksec-${version}"; + version = "1.5"; + src = fetchurl { + url = "http://www.trapkit.de/tools/checksec.sh"; + sha256 = "0iq9v568mk7g7ksa1939g5f5sx7ffq8s8n2ncvphvlckjgysgf3p"; + }; + + patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; + + unpackPhase = '' + mkdir ${name}-${version} + cp $src ${name}-${version}/checksec.sh + cd ${name}-${version} + ''; + + installPhase = '' + mkdir -p $out/bin + cp checksec.sh $out/bin/checksec + chmod +x $out/bin/checksec + substituteInPlace $out/bin/checksec --replace /bin/bash ${stdenv.shell} + substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc}/lib/libc.so.6 + substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find + substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $" + substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file" + substituteInPlace $out/bin/checksec --replace " readelf -" " ${elfutils}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "(readelf -" "(${elfutils}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${elfutils}/bin/readelf" + ''; + + phases = "unpackPhase patchPhase installPhase"; + + meta = { + description = "A tool for checking security bits on executables"; + platforms = stdenv.lib.platforms.linux; + 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 ed811f549ce0..4c01bd892c16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6504,6 +6504,8 @@ let checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; + checksec = callPackage ../os-specific/linux/checksec { }; + cifs_utils = callPackage ../os-specific/linux/cifs-utils { }; conky = callPackage ../os-specific/linux/conky { }; From 58e08a1a4f1a7f70d436ded3197e600ba08a9296 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Feb 2014 04:53:16 -0600 Subject: [PATCH 236/384] grsecurity: stable/testing updates - stable: 3.0-3.2.55-201402152203 -> 3.0-3.2.55-201402192249 - testing: 3.0-3.13.3-201402152204 -> 3.0-3.13.3-201402192252 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 2480936b08cd..d14a124dd050 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-201402152203.patch; - sha256 = "1600hydfq2dwyqqzfmsvy50kcicdm2lq44yiiwgnbiykq2135fwx"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201402192249.patch; + sha256 = "16q531j9gphqgqw6v0g45l9hzpz6gnsmh72b9435xs3pjwz1wp44"; }; 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_3 = { name = "grsecurity-3.0-3.13.3"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402152204.patch; - sha256 = "0c4mswka95zivil3a28ipsbnv2nhrmqwj4l4dig3n8pr6d2vgwc9"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402192252.patch; + sha256 = "09f2ym9hyfff83yvaflj7zzk78c2xw4xvn70bj1x3ybawv3sw83k"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2 From 2b92e90f91c8c50ccb1d9a7a84c71aee6e51be60 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Feb 2014 06:17:15 -0500 Subject: [PATCH 237/384] opensmtpd: Add sendmail to systemPackages --- nixos/modules/services/mail/opensmtpd.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 2732fd602004..0c18c464520d 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -79,5 +79,10 @@ in { preStart = "mkdir -p /var/spool"; serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; }; + + environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} '' + mkdir -p $out/bin + ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail + '') ]; }; } From 94591762fed83447e68548bd4da281070ae2f865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 20 Feb 2014 12:27:38 +0100 Subject: [PATCH 238/384] Updating rdesktop to 1.8.1. --- .../networking/remote/rdesktop/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index c8c72160b341..9ba9e3aa3fc4 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.7.1"; + version = "1.8.1"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0yc4xz95w40m8ailpjgqp9h7bkc758vp0dlq4nj1pvr3xfnl7sni"; + sha256 = "0il248cdsxvwjsl4bswf27ld9r1a7d48jf6bycr86kf3i55q7k3n"; }; buildInputs = [openssl libX11]; - configureFlags = [ "--with-openssl=${openssl}" ]; + configureFlags = [ + "--with-openssl=${openssl}" + "--disable-credssp" + "--disable-smartcard" + ]; meta = { description = "rdesktop is an open source client for Windows Terminal Services"; From cf00cd5e36920533f213d5087b7658d292dad428 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 20 Feb 2014 12:30:49 +0100 Subject: [PATCH 239/384] Add support for printing qr code for google-authenticator. --- pkgs/os-specific/linux/google-authenticator/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index d7acc6778b4d..a9278f0c7ce0 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam }: +{ stdenv, fetchurl, pam, qrencode }: stdenv.mkDerivation rec { name = "google-authenticator-1.0"; @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ pam ]; + preConfigure = '' + sed -i 's|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|' google-authenticator.c + ''; + installPhase = '' ensureDir $out/bin $out/lib/security cp pam_google_authenticator.so $out/lib/security From f5a9e5188d654f8a0102a5dcdd00fc5e0d9fdeac Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 20 Feb 2014 14:19:11 +0100 Subject: [PATCH 240/384] titaniumsdk: remove some obsolete debugging stuff --- pkgs/development/mobile/titaniumenv/build-app.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 8c46033152f0..8a0a8f460dec 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -45,14 +45,11 @@ stdenv.mkDerivation { ${if target == "android" then '' - cat $TMPDIR/config.json - titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-* ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out'' else - # /run/current-system/sw/bin/strace -f -y ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''} '' else if target == "iphone" then From 3c871ccbc9f588a7b70f9aaf276b7e7183e3360e Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 20 Feb 2014 13:24:06 +0000 Subject: [PATCH 241/384] chromium: Update all channels stable: 32.0.1700.107 -> 33.0.1750.115 beta: 33.0.1750.46 -> 33.0.1750.115 dev: 34.0.1809.0 -> 34.0.1847.3 --- .../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 ffce71ef09fa..64866243261b 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.1809.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz"; - sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88"; + version = "34.0.1847.3"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz"; + sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg"; }; beta = { - version = "33.0.1750.46"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz"; - sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h"; + version = "33.0.1750.115"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz"; + sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp"; }; stable = { - version = "32.0.1700.107"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.107.tar.xz"; - sha256 = "1bf1gbjf4r9nf3xdn7zgq0ny1ihak21ka4rkkiadxsg8aq9vdsqz"; + version = "33.0.1750.115"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz"; + sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp"; }; } From 83c98e4dd6c264b480550c6ae90d4038d99b317d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Feb 2014 10:40:49 -0500 Subject: [PATCH 242/384] loaOf: Allow merging definitions from a list into other definitions IFF there is a name attribute --- lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index afc8f80eb0ea..9bce56bf8073 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -132,7 +132,7 @@ rec { { inherit (def) file; value = listToAttrs ( imap (elemIdx: elem: - { name = "${elem.name or "unnamed"}-${toString defIdx}.${toString elemIdx}"; + { name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}"; value = elem; }) def.value); } From fefc0d9917aebab210a62fd80b09af8622c64e94 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Feb 2014 12:34:54 -0500 Subject: [PATCH 243/384] Add module to enable the server for the ssh substituter --- nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/nix-ssh-serve.nix | 45 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 nixos/modules/services/misc/nix-ssh-serve.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 6d8335516049..7e4c9b9b948a 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -112,6 +112,7 @@ cgminer = 101; munin = 102; logcheck = 103; + nix-ssh = 104; # When adding a uid, make sure it doesn't match an existing gid. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c66cccb3975a..391cc2503bd2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -125,6 +125,7 @@ ./services/misc/gpsd.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix + ./services/misc/nix-ssh-serve.nix ./services/misc/nixos-manual.nix ./services/misc/rogue.nix ./services/misc/svnserve.nix diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix new file mode 100644 index 000000000000..80e7961b1f82 --- /dev/null +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +let + serveOnly = pkgs.writeScript "nix-store-serve" '' + #!${pkgs.stdenv.shell} + if [ "$SSH_ORIGINAL_COMMAND" != "nix-store --serve" ]; then + echo 'Error: You are only allowed to run `nix-store --serve'\'''!' >&2 + exit 1 + fi + exec /run/current-system/sw/bin/nix-store --serve + ''; + + inherit (lib) mkIf mkOption types; +in { + options = { + nix.sshServe = { + enable = mkOption { + description = "Whether to enable serving the nix store over ssh."; + default = false; + type = types.bool; + }; + }; + }; + + config = mkIf config.nix.sshServe.enable { + users.extraUsers.nix-ssh = { + description = "User for running nix-store --serve."; + uid = config.ids.uids.nix-ssh; + shell = pkgs.stdenv.shell; + }; + + services.openssh.enable = true; + + services.openssh.extraConfig = '' + Match User nix-ssh + AllowAgentForwarding no + AllowTcpForwarding no + PermitTTY no + PermitTunnel no + X11Forwarding no + ForceCommand ${serveOnly} + Match All + ''; + }; +} From 17f88453f67bc1c54f5900a771c47d883a4a6c54 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Feb 2014 13:34:12 -0500 Subject: [PATCH 244/384] Don't complain if HOME isn't writable --- nixos/modules/programs/shell.nix | 52 +++++++++++++++++--------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index 8052502c21ea..226105a0c979 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -28,34 +28,36 @@ in echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2 fi - if ! test -L $HOME/.nix-profile; then - if test "$USER" != root; then - ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile - else - # Root installs in the system-wide profile by default. - ln -s /nix/var/nix/profiles/default $HOME/.nix-profile - fi - fi + if test -w $HOME; then + if ! test -L $HOME/.nix-profile; then + if test "$USER" != root; then + ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile + else + # Root installs in the system-wide profile by default. + ln -s /nix/var/nix/profiles/default $HOME/.nix-profile + fi + fi - # Subscribe the root user to the NixOS channel by default. - if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then - echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels - fi + # Subscribe the root user to the NixOS channel by default. + if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then + echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels + fi - # Create the per-user garbage collector roots directory. - NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER - mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR - if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then - echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2 - fi + # Create the per-user garbage collector roots directory. + NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER + mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR + if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then + echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2 + fi - # Set up a default Nix expression from which to install stuff. - if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then - rm -f $HOME/.nix-defexpr - mkdir $HOME/.nix-defexpr - if [ "$USER" != root ]; then - ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root - fi + # Set up a default Nix expression from which to install stuff. + if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then + rm -f $HOME/.nix-defexpr + mkdir $HOME/.nix-defexpr + if [ "$USER" != root ]; then + ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root + fi + fi fi ''; From 95a77ea39fa5870955e5fbb6414640f7b1ec62c6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Feb 2014 14:17:30 -0500 Subject: [PATCH 245/384] Unconditionally add ssh to nix-daemon's path for the ssh substitituer --- nixos/modules/services/misc/nix-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index cca42aa11009..1a957993f98f 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -286,8 +286,8 @@ in systemd.services."nix-daemon" = { description = "Nix Daemon"; - path = [ nix pkgs.openssl pkgs.utillinux ] - ++ optionals cfg.distributedBuilds [ pkgs.openssh pkgs.gzip ]; + path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ] + ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; environment = cfg.envVars // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; }; From e40a059714c3ac438f0a9108f55bde1f3931b14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Feb 2014 20:52:27 +0100 Subject: [PATCH 246/384] Revert "fontconfig: update 2.10.2 -> 2.11.0" This reverts commit 32a4081a7f8a162cb10f3afb8cec57165f05e0b2. After ec985c8ff the apps linked to 2.11 fontconfig run fine on nixos with older /etc/fonts/, but the other way won't work. Unfortunately, I see no easy work-around ATM. --- pkgs/development/libraries/fontconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 75e28ffe7486..89feb3df8d5a 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, freetype, expat }: stdenv.mkDerivation rec { - name = "fontconfig-2.11.0"; + name = "fontconfig-2.10.2"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "0rx4q7wcrz4lkpgcmqkwkp49v1fm0yxl0f35jn75dj1vy3v0w3nb"; + sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; }; infinality_patch = with freetype.infinality; if useInfinality From 8534fdf3fe555f1fd392b534da38e87003f05cb8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Feb 2014 03:36:11 -0600 Subject: [PATCH 247/384] dbus: Update from 1.6.12 -> 1.8.0 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 794128d054a7..2101f99bbb90 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,8 +3,8 @@ , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: let - version = "1.6.16"; # 1.7.* isn't recommended, even for gnome 3.8 - sha256 = "0wrmh5azszb54zpy7d0zjsy456khcv8yc19ivqrygkdg7a3l4gs6"; + version = "1.8.0"; + sha256 = "04qbsyw92279hfkwic5h6jc5999p87qsaqqgc6zcqddmh9r8r7vn"; inherit (stdenv) lib; From 2cf1f0b2298edb2831d56c232681239c669258b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Feb 2014 21:35:42 +0100 Subject: [PATCH 248/384] Revert "pango: major update 1.32.5 -> 1.36.1" This reverts commit 9c4d6561029aebd8e7ad96f24e256d0de7ae8097 (modified). We can't have newer pango with fontconfig-2.10.* --- pkgs/development/libraries/pango/default.nix | 27 +++++++++----------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index bd4e63548954..b94a00b1b541 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,28 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz -, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection -}: +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig +, libintlOrEmpty, gobjectIntrospection }: -let - ver_maj = "1.36"; - ver_min = "1"; -in stdenv.mkDerivation rec { - name = "pango-${ver_maj}.${ver_min}"; + name = "pango-1.32.5"; #.6 and higher need fontconfig-2.11.* which is troublesome src = fetchurl { - url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "1y2r1v4m8g4afggjd1siz0ri175p64myz9d2ks58grlrvhfbbr22"; + url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz"; + sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobjectIntrospection ]; + buildInputs = [ gobjectIntrospection ] + ++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; + + nativeBuildInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; - #doCheck = true; # testiter fails to find fontconfig configuration - + doCheck = true; postInstall = "rm -rf $out/share/gtk-doc"; meta = { 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 249/384] 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 250/384] 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 251/384] 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 252/384] 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 253/384] 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 254/384] 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 255/384] 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 256/384] 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 257/384] 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 258/384] 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 259/384] 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 260/384] 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 261/384] 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 262/384] 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 263/384] 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 264/384] 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 265/384] 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 266/384] 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 267/384] 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 268/384] 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 269/384] 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 270/384] 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 271/384] 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 272/384] 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 273/384] 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 274/384] 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 275/384] 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 276/384] 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 277/384] 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 278/384] 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 279/384] 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 280/384] 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 281/384] 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 282/384] 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 283/384] 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 284/384] 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 285/384] 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 286/384] 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 287/384] 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 288/384] 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 289/384] 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 290/384] 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 291/384] 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 292/384] 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 293/384] 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 294/384] 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 295/384] 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 296/384] 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 297/384] 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 298/384] 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 299/384] 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 300/384] 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 301/384] 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 302/384] 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 303/384] 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 304/384] 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 305/384] 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 306/384] 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 307/384] 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 308/384] 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 309/384] 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 310/384] 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 311/384] 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 312/384] 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 313/384] 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 314/384] 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 315/384] 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 3f95f39baba418b04bc56f979edb263005942ba6 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 13 Feb 2014 18:49:30 +0000 Subject: [PATCH 316/384] 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 317/384] 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 318/384] 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 319/384] 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 320/384] 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 aa23a9943679dc3977e7d18f486d96646d24931f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 24 Feb 2014 12:02:21 +0100 Subject: [PATCH 321/384] 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 322/384] 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 323/384] 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 324/384] 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 325/384] 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 326/384] 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 327/384] 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 328/384] 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 329/384] 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 330/384] 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 331/384] 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 332/384] 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 333/384] 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 334/384] 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 335/384] 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 336/384] 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 337/384] 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 338/384] 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 339/384] 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 340/384] 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 341/384] 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 342/384] 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 343/384] 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 344/384] 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 345/384] 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 346/384] 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 347/384] 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 348/384] 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 349/384] 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 350/384] 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 351/384] 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 352/384] 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 353/384] 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 354/384] 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 355/384] 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 356/384] 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 0d4a9e3aa68da5f82fff724baee9168b50a485c8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Feb 2014 07:44:45 -0500 Subject: [PATCH 357/384] 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 358/384] 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 359/384] 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 360/384] 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 361/384] 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 362/384] 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 363/384] 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 364/384] 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 365/384] 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 366/384] 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 367/384] 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 368/384] 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 369/384] 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 370/384] 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 371/384] 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 372/384] 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 373/384] 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 374/384] 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 375/384] 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 376/384] 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 377/384] 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 378/384] 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 379/384] 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 380/384] 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 381/384] 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 382/384] 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 383/384] 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 384/384] 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