Merge remote-tracking branch 'origin/master' into staging

doc/language-support.xml

@@ -741,7 +741,7 @@ the following arguments are of special significance to the function:
     </para>
     <para>
       In this example only <literal>code.google.com/p/go.net/ipv4</literal> and
-      <literal>code.google.com/p/go.net/ipv4</literal> will be built.
+      <literal>code.google.com/p/go.net/ipv6</literal> will be built.
     </para>
   </callout>
 
@@ -764,7 +764,7 @@ the following arguments are of special significance to the function:
     <para>
       <varname>propagatedBuildInputs</varname> is where the dependencies of a Go library are
       listed. Only libraries should list <varname>propagatedBuildInputs</varname>. If a standalone
-      program is being build instead, use <varname>buildInputs</varname>. If a library's tests require
+      program is being built instead, use <varname>buildInputs</varname>. If a library's tests require
       additional dependencies that are not propagated, they should be listed in <varname>buildInputs</varname>.
     </para>
   </callout>

lib/maintainers.nix

@@ -103,6 +103,7 @@
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
   forkk = "Andrew Okin <forkk@forkk.net>";
+  fornever = "Friedrich von Never <friedrich@fornever.me>";
   fpletz = "Franz Pletz <fpletz@fnordicwalking.de>";
   fps = "Florian Paul Schmidt <mista.tapas@gmx.net>";
   fridh = "Frederik Rietdijk <fridh@fridh.nl>";

nixos/default.nix

@@ -1,12 +1,20 @@
 { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
 , system ? builtins.currentSystem
+, extraModules ? []
+  # This attribute is used to specify a different nixos version, a different
+  # system or additional modules which might be set conditionally.
+, reEnter ? false
 }:
 
 let
+  reEnterModule = {
+    config.nixos.path = with (import ../lib); mkIf reEnter (mkForce null);
+    config.nixos.configuration = configuration;
+  };
 
   eval = import ./lib/eval-config.nix {
     inherit system;
-    modules = [ configuration ];
+    modules = [ configuration reEnterModule ] ++ extraModules;
   };
 
   inherit (eval) pkgs;
@@ -14,14 +22,14 @@ let
   # This is for `nixos-rebuild build-vm'.
   vmConfig = (import ./lib/eval-config.nix {
     inherit system;
-    modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
+    modules = [ configuration reEnterModule ./modules/virtualisation/qemu-vm.nix ] ++ extraModules;
   }).config;
 
   # This is for `nixos-rebuild build-vm-with-bootloader'.
   vmWithBootLoaderConfig = (import ./lib/eval-config.nix {
     inherit system;
     modules =
-      [ configuration
+      [ configuration reEnterModule
         ./modules/virtualisation/qemu-vm.nix
         { virtualisation.useBootLoader = true; }
       ];
@@ -30,7 +38,7 @@ let
 in
 
 {
-  inherit (eval) config options;
+  inherit (eval.config.nixos.reflect) config options;
 
   system = eval.config.system.build.toplevel;
 

nixos/doc/manual/configuration/configuration.xml

@@ -26,6 +26,7 @@ effect after you run <command>nixos-rebuild</command>.</para>
 
 <!-- FIXME: auto-include NixOS module docs -->
 <xi:include href="postgresql.xml" />
+<xi:include href="nixos.xml" />
 
 <!-- Apache; libvirtd virtualisation -->
 

nixos/doc/manual/default.nix

@@ -55,6 +55,7 @@ let
       cp -prd $sources/* . # */
       chmod -R u+w .
       cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml
+      cp ${../../modules/misc/nixos.xml} configuration/nixos.xml
       ln -s ${optionsDocBook} options-db.xml
       echo "${version}" > version
     '';

nixos/doc/manual/release-notes/rl-unstable.xml

@@ -6,6 +6,26 @@
 
 <title>Unstable</title>
 
+<para>In addition to numerous new and upgraded packages, this release
+has the following highlights:</para>
+
+<itemizedlist>
+
+  <listitem>
+    <para>You can now pin a specific version of NixOS in your <filename>configuration.nix</filename>
+    by setting:
+
+<programlisting>
+nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;
+</programlisting>
+
+    This will make NixOS re-evaluate your configuration with the modules of
+    the specified NixOS version at the given path.  For more details, see
+    <xref linkend="module-misc-nixos" /></para>
+  </listitem>
+
+</itemizedlist>
+
 <para>When upgrading from a previous release, please be aware of the
 following incompatible changes:</para>
 

nixos/modules/misc/nixos.nix

@@ -0,0 +1,82 @@
+{ config, options, lib, ... }:
+
+# This modules is used to inject a different NixOS version as well as its
+# argument such that one can pin a specific version with the versionning
+# system of the configuration.
+let
+  nixosReentry = import config.nixos.path {
+    inherit (config.nixos) configuration extraModules;
+    inherit (config.nixpkgs) system;
+    reEnter = true;
+  };
+in
+
+with lib;
+
+{
+  options = {
+    nixos.path = mkOption {
+      default = null;
+      example = literalExample "./nixpkgs-15.09/nixos";
+      type = types.nullOr types.path;
+      description = ''
+        This option give the ability to evaluate the current set of modules
+        with a different version of NixOS. This option can be used version
+        the version of NixOS with the configuration without relying on the
+        <literal>NIX_PATH</literal> environment variable.
+      '';
+    };
+
+    nixos.system = mkOption {
+      example = "i686-linux";
+      type = types.uniq types.str;
+      description = ''
+        Name of the system used to compile NixOS.
+      '';
+    };
+
+    nixos.extraModules = mkOption {
+      default = [];
+      example = literalExample "mkIf config.services.openssh.enable [ ./sshd-config.nix ]";
+      type = types.listOf types.unspecified;
+      description = ''
+        Define additional modules which would be loaded to evaluate the
+        configuration.
+      '';
+    };
+
+    nixos.configuration = mkOption {
+      type = types.unspecified;
+      internal = true;
+      description = ''
+        Option used by <filename>nixos/default.nix</filename> to re-inject
+        the same configuration module as the one used for the current
+        execution.
+      '';
+    };
+
+    nixos.reflect = mkOption {
+      default = { inherit config options; };
+      type = types.unspecified;
+      internal = true;
+      description = ''
+        Provides <literal>config</literal> and <literal>options</literal>
+        computed by the module system and given as argument to all
+        modules. These are used for introspection of options and
+        configuration by tools such as <literal>nixos-option</literal>.
+      '';
+    };
+  };
+
+  config = mkMerge [
+    (mkIf (config.nixos.path != null) (mkForce {
+      system.build.toplevel = nixosReentry.system;
+      system.build.vm = nixosReentry.vm;
+      nixos.reflect = { inherit (nixosReentry) config options; };
+    }))
+
+    { meta.maintainers = singleton lib.maintainers.pierron;
+      meta.doc = ./nixos.xml;
+    }
+  ];
+}

nixos/modules/misc/nixos.xml

@@ -0,0 +1,84 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-misc-nixos">
+
+<title>NixOS Reentry</title>
+
+<!-- FIXME: render nicely -->
+
+<!-- FIXME: source can be added automatically -->
+<para><emphasis>Source:</emphasis> <filename>modules/misc/nixos.nix</filename></para>
+
+<!-- FIXME: more stuff, like maintainer? -->
+
+<para>NixOS reentry can be used for both pinning the evaluation to a
+specific version of NixOS, and to dynamically add additional modules into
+the Module evaluation.</para>
+
+<section><title>NixOS Version Pinning</title>
+
+<para>To pin a specific version of NixOS, you need a version that you can
+either clone localy, or that you can fetch remotely.</para>
+
+<para>If you already have a cloned version of NixOS in the directory
+<filename>/etc/nixos/nixpkgs-16-03</filename>, then you can specify the
+<option>nixos.path</option> with either the path or the relative path of
+your NixOS clone. For example, you can add the following to your
+<filename>/etc/nixos/configuration.nix</filename> file:
+
+<programlisting>
+nixos.path = ./nixpkgs-16-03/nixos;
+</programlisting>
+</para>
+
+<para>Another option is to fetch a specific version of NixOS, with either
+the <literal>fetchTarball</literal> builtin, or the
+<literal>pkgs.fetchFromGithub</literal> function and use the result as an
+input.
+
+<programlisting>
+nixos.path = "${builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/1f27976e03c15183191d1b4aa1a40d1f14666cd2.tar.gz}/nixos";
+</programlisting>
+</para>
+
+</section>
+
+
+<section><title>Adding Module Dynamically</title>
+
+<para>To add additional module, the recommended way is to use statically
+known modules in the list of imported arguments as described in <xref
+linkend="sec-modularity" />.  Unfortunately, this recommended method has
+limitation, such that the list of imported files cannot be selected based on
+the content of the configuration.
+
+Fortunately, NixOS reentry system can be used as an alternative to register
+new imported modules based on the content of the configuration. To do so,
+one should define both <option>nixos.path</option> and
+<option>nixos.extraModules</option> options.
+
+<programlisting>
+nixos.path = &lt;nixos&gt;;
+nixos.extraModules =
+  if config.networking.hostName == "server" then
+    [ ./server.nix ] else [ ./client.nix ];
+</programlisting>
+
+Also note, that the above can be reimplemented in a different way which is
+not as expensive, by using <literal>mkIf</literal> at the top each
+configuration if both modules are present on the file system (see <xref
+linkend="sec-option-definitions" />) and by always inmporting both
+modules.</para>
+
+</section>
+
+<section><title>Options</title>
+
+<para>FIXME: auto-generated list of module options.</para>
+
+</section>
+
+
+</chapter>

nixos/modules/module-list.nix

@@ -52,6 +52,7 @@
   ./misc/lib.nix
   ./misc/locate.nix
   ./misc/meta.nix
+  ./misc/nixos.nix
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix

nixos/modules/virtualisation/docker.nix

@@ -31,16 +31,11 @@ in
     socketActivation =
       mkOption {
         type = types.bool;
-        default = false;
+        default = true;
         description =
           ''
             This option enables docker with socket activation. I.e. docker will
             start when first called by client.
-
-            Note: This is false by default because systemd lower than 214 that
-            nixos uses so far, doesn't support SocketGroup option, so socket
-            created by docker has root group now. This will likely be changed
-            in future.  So set this option explicitly to false if you wish.
           '';
       };
     storageDriver =

nixos/release.nix

@@ -276,6 +276,7 @@ in rec {
   tests.networkingProxy = callTest tests/networking-proxy.nix {};
   tests.nfs3 = callTest tests/nfs.nix { version = 3; };
   tests.nfs4 = callTest tests/nfs.nix { version = 4; };
+  tests.nixosPinVersion = callTest tests/nixos-pin-version.nix {};
   tests.nsd = callTest tests/nsd.nix {};
   tests.openssh = callTest tests/openssh.nix {};
   tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });

nixos/tests/nixos-pin-version.nix

@@ -0,0 +1,57 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+let
+in
+
+pkgs.stdenv.mkDerivation rec {
+  name = "nixos-pin-version";
+  src = ../..;
+  buildInputs = with pkgs; [ nix gnugrep ];
+
+    withoutPath = pkgs.writeText "configuration.nix" ''
+    {
+      nixos.extraModules = [ ({lib, ...}: { system.nixosRevision = lib.mkForce "ABCDEF"; }) ];
+    }
+  '';
+
+  withPath = pkgs.writeText "configuration.nix" ''
+    {
+      nixos.path = ${src}/nixos ;
+      nixos.extraModules = [ ({lib, ...}: { system.nixosRevision = lib.mkForce "ABCDEF"; }) ];
+    }
+  '';
+
+  phases = "buildPhase";
+  buildPhase = ''
+    datadir="${pkgs.nix}/share"
+    export TEST_ROOT=$(pwd)/test-tmp
+    export NIX_STORE_DIR=$TEST_ROOT/store
+    export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
+    export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
+    export NIX_STATE_DIR=$TEST_ROOT/var/nix
+    export NIX_DB_DIR=$TEST_ROOT/db
+    export NIX_CONF_DIR=$TEST_ROOT/etc
+    export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
+    export NIX_BUILD_HOOK=
+    export PAGER=cat
+    cacheDir=$TEST_ROOT/binary-cache
+    nix-store --init
+
+    export NIX_PATH="nixpkgs=$src:nixos=$src/nixos:nixos-config=${withoutPath}" ;
+    if test $(nix-instantiate $src/nixos -A config.system.nixosRevision --eval-only) != '"ABCDEF"' ; then :;
+    else
+      echo "Unexpected re-entry without the nixos.path option defined.";
+      exit 1;
+    fi;
+
+    export NIX_PATH="nixpkgs=$src:nixos=$src/nixos:nixos-config=${withPath}" ;
+    if test $(nix-instantiate $src/nixos -A config.system.nixosRevision --eval-only) = '"ABCDEF"' ; then :;
+    else
+      echo "Expected a re-entry when the nixos.path option is defined.";
+      exit 1;
+    fi;
+
+    touch $out;
+  '';
+}

pkgs/applications/misc/pdfpc/default.nix

@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee, poppler
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
-, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }:
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.0.0";
+  version = "4.0.1";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/pdfpc/pdfpc/releases/download/v${version}/${product}-v${version}.tar.gz";
+    repo = "pdfpc";
-    sha256 = "0qksci11pgvabfdnynkpj2av0iww8m9m41a0vwsqgvg3yiacb4f0";
+    owner = "pdfpc";
+    rev = "v${version}";
+    sha256 = "06m30xz9jzfj6ljnsgqqg1myj13nqpc7ria9wr8aa62kp4n7bcfp";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

pkgs/applications/office/pinpoint/default.nix

@@ -1,15 +1,15 @@
 { fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst
-, gdk_pixbuf, cairo }:
+, gdk_pixbuf, cairo, clutter_gtk }:
 
 stdenv.mkDerivation rec {
   name = "pinpoint-${version}";
-  version = "0.1.6";
+  version = "0.1.8";
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz";
-    sha256 = "0jzkf74w75paflnvsil2y6qsyaqgxf6akz97176xdg6qri4nwal1";
+    sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
   };
   buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf
-                  cairo ];
+                  cairo clutter_gtk ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint;

pkgs/data/fonts/hack/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip }:
 
-let version = "2.017"; in
+let version = "2.018"; in
 stdenv.mkDerivation {
   name = "hack-font-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     version_ = with stdenv.lib;
       concatStringsSep "_" (splitString "." version);
   in fetchurl {
-    sha256 = "1bspjdllmwbb7bs5rcdghyvvl4xf3pw5nss1z3zxc805pysxyy0c";
+    sha256 = "0k1k6pi9znrdc8a4kv0gkdnyzi2w932m2zi27dvb1ignn7lzmfkx";
     url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
   };
 

pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix

@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
+    broken = true;
   };
 }

pkgs/desktops/gnome-3/3.16/default.nix

@@ -31,7 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
+    gnome-characters gnome-calendar accerciser gnome-nettool
     gnome-getting-started-docs
   ];
 

pkgs/desktops/kde-4.14/kde-package/default.nix

@@ -1,10 +1,11 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4, perl, pkgconfig
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake-2_8, automoc4, perl, pkgconfig
 , release, branch, ignoreList, extraSubpkgs
 }:
 
 let
   inherit (stdenv.lib) filter fold;
   inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
+  cmake = cmake-2_8;
 in
 rec {
   manifest = import (./. + "/${release}.nix");

pkgs/desktops/kde-4.14/kdemultimedia/juk.nix

@@ -1,9 +1,9 @@
-{ kde, kdelibs, taglib, libtunepimp }:
+{ kde, kdelibs, taglib_1_9, libtunepimp }:
 kde {
 
 # TODO: opusfile
 
-  buildInputs = [ kdelibs taglib libtunepimp ];
+  buildInputs = [ kdelibs taglib_1_9 libtunepimp ];
   meta = {
     description = "an audio jukebox application";
   };

pkgs/development/coq-modules/coq-ext-lib/default.nix

@@ -3,7 +3,7 @@
 let param =
   if coq.coq-version == "8.4"
   then { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; }
-  else { version = "1.0.0-beta2"; sha256 = "0rdh6jsag174576nvra6m2g44fvmlbz4am5wcashj45bq30021sa"; };
+  else { version = "0.9.0-beta3"; sha256 = "1dya0sqp5jjb2cl7cv2ry4gvcr359bkzzqcz0plknf3f1c5zrv0s"; };
 in
 
 stdenv.mkDerivation rec {

pkgs/development/interpreters/nix-exec/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "4.1.2";
+  version = "4.1.3";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
 
-    sha256 = "03dphdkf33zi2wm92wghfvadghljh6q1a9zdj9rcbx2jh7fp3k8y";
+    sha256 = "0zhydidxj7dvgvszrlzwb0wj4s7xb42kdmn0fv5c7jz3nvnhdykp";
   };
 
   buildInputs = [ pkgconfig nix git ];

pkgs/development/libraries/mediastreamer/default.nix

@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
     "--enable-glx"
   ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   meta = with stdenv.lib; {
     description = "a powerful and lightweight streaming engine specialized for voice/video telephony applications";
     homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;

pkgs/development/libraries/taglib/1.9.nix

@@ -0,0 +1,24 @@
+{stdenv, fetchurl, zlib, cmake}:
+
+stdenv.mkDerivation rec {
+  name = "taglib-1.9.1";
+
+  src = fetchurl {
+    url = http://taglib.github.io/releases/taglib-1.9.1.tar.gz;
+    sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
+  };
+
+  cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
+
+  buildInputs = [ zlib ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = http://developer.kde.org/~wheeler/taglib.html;
+    repositories.git = git://github.com/taglib/taglib.git;
+
+    description = "A library for reading and editing the meta-data of several popular audio formats";
+    inherit (cmake.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}

pkgs/development/tools/misc/trv/default.nix

@@ -0,0 +1,39 @@
+{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core, async, async_unix, re2,
+  async_extra, sexplib, async_shell, core_extended, async_find, cohttp, uri, tzdata}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  version = "0.1.3";
+in
+
+assert stdenv.lib.versionOlder "4.02" ocaml_version;
+
+stdenv.mkDerivation {
+  name = "trv-${version}";
+
+  src = fetchFromGitHub {
+    owner = "afiniate";
+    repo = "trv";
+    rev = "${version}";
+    sha256 = "0fv0zh76djqhkzfzwv6k60rnky50pw9gn01lwhijrggrcxrrphz1";
+  };
+
+
+  buildInputs = [ ocaml findlib camlp4 ];
+  propagatedBuildInputs = [ core async async_unix
+                            async_extra sexplib async_shell core_extended
+                            async_find cohttp uri re2 ];
+
+  createFindlibDestdir = true;
+  dontStrip = true;
+
+  installFlags = "SEMVER=${version} PREFIX=$out";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/afiniate/trv;
+    description = "Shim for vrt to enable bootstrapping";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+    platforms = ocaml.meta.platforms;
+  };
+}

pkgs/development/web/nodejs/default.nix

@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.havvy ];
+    maintainers = [ maintainers.havvy ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

pkgs/development/web/nodejs/v0_10.nix

@@ -69,7 +69,6 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

pkgs/games/crawl/default.nix

@@ -3,7 +3,7 @@
 , tileMode ? true
 }:
 
-let version = "0.16.2";
+let version = "0.17.0";
 in
 stdenv.mkDerivation rec {
   name = "crawl-${version}" + (if tileMode then "-tiles" else "");
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "crawl-ref";
     repo = "crawl-ref";
     rev = version;
-    sha256 = "08ns49if8941vsg6abywgw3mnjafgj5sga0cdvvvviq0qqzprhw9";
+    sha256 = "0igvgi3dgf73da4gznc2dcbiix79hn08qk9yalrc92d2c1xxdawh";
   };
 
   patches = [ ./crawl_purify.patch ];

pkgs/misc/drivers/hplip/default.nix

@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, automake, pkgconfig
+{ stdenv, fetchurl, substituteAll
+, pkgconfig
 , cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils
-, polkit, qtSupport ? true, qt4, pyqt4, net_snmp
+, net_snmp, polkit
-, withPlugin ? false, substituteAll, makeWrapper
+, qtSupport ? true, qt4, pyqt4
+, withPlugin ? false
 }:
 
 let
@@ -20,25 +22,31 @@ let
     sha256 = "1ahalw83xm8x0h6hljhnkknry1hny9flkrlzcymv8nmwgic0kjgs";
   };
 
-  hplip_state =
+  hplipState =
     substituteAll
       {
         inherit version;
         src = ./hplip.state;
       };
 
-  hplip_arch =
+  hplipPlatforms =
     {
       "i686-linux"   = "x86_32";
       "x86_64-linux" = "x86_64";
-      "arm6l-linux" = "arm32";
+      "armv6l-linux" = "arm32";
-      "arm7l-linux" = "arm32";
+      "armv7l-linux" = "arm32";
-    }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}");
+    };
 
-    platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
+  hplipArch = hplipPlatforms."${stdenv.system}"
+    or (abort "HPLIP not supported on ${stdenv.system}");
+
+  pluginArches = [ "x86_32" "x86_64" ];
 
 in
 
+assert withPlugin -> builtins.elem hplipArch pluginArches
+  || abort "HPLIP plugin not supported on ${stdenv.system}";
+
 stdenv.mkDerivation {
   inherit name src;
 
@@ -51,7 +59,10 @@ stdenv.mkDerivation {
     saneBackends
     dbus
     net_snmp
-  ] ++ stdenv.lib.optional qtSupport qt4;
+  ] ++ stdenv.lib.optionals qtSupport [
+    qt4
+  ];
+
   nativeBuildInputs = [
     pkgconfig
   ];
@@ -63,7 +74,9 @@ stdenv.mkDerivation {
     recursivePthLoader
     reportlab
     usbutils
-  ] ++ stdenv.lib.optional qtSupport pyqt4;
+  ] ++ stdenv.lib.optionals qtSupport [
+    pyqt4
+  ];
 
   prePatch = ''
     # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
@@ -100,13 +113,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  postInstall =
+  postInstall = stdenv.lib.optionalString withPlugin
-    (stdenv.lib.optionalString (withPlugin && builtins.elem stdenv.system platforms)
-    (let hplip_arch =
-          if stdenv.system == "i686-linux" then "x86_32"
-          else if stdenv.system == "x86_64-linux" then "x86_64"
-          else abort "Plugin platform must be i686-linux or x86_64-linux!";
-    in
     ''
     sh ${plugin} --noexec --keep
     cd plugin_tmp
@@ -121,26 +128,26 @@ stdenv.mkDerivation {
 
     mkdir -p $out/share/hplip/prnt/plugins
     for plugin in lj hbpl1; do
-      cp $plugin-${hplip_arch}.so $out/share/hplip/prnt/plugins
+      cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins
-      ln -s $out/share/hplip/prnt/plugins/$plugin-${hplip_arch}.so \
+      ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \
         $out/share/hplip/prnt/plugins/$plugin.so
     done
 
     mkdir -p $out/share/hplip/scan/plugins
     for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do
-      cp $plugin-${hplip_arch}.so $out/share/hplip/scan/plugins
+      cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins
-      ln -s $out/share/hplip/scan/plugins/$plugin-${hplip_arch}.so \
+      ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \
         $out/share/hplip/scan/plugins/$plugin.so
     done
 
     mkdir -p $out/var/lib/hp
-    cp ${hplip_state} $out/var/lib/hp/hplip.state
+    cp ${hplipState} $out/var/lib/hp/hplip.state
 
     mkdir -p $out/etc/sane.d/dll.d
     mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf
 
     rm $out/etc/udev/rules.d/56-hpmud.rules
-  ''));
+  '';
 
   fixupPhase = ''
     # Wrap the user-facing Python scripts in $out/bin without turning the

pkgs/misc/emulators/retroarch/cores.nix

@@ -9,7 +9,7 @@ let
   stdenv.lib.makeOverridable stdenv.mkDerivation rec {
 
     name = "libretro-${core}-${version}";
-    version = "20141224";
+    version = "2015-11-20";
     inherit src;
 
     buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or [];
@@ -33,7 +33,7 @@ let
       inherit description;
       homepage = "http://www.libretro.com/";
       license = licenses.gpl3Plus;
-      maintainers = [ maintainers.edwtjo maintainers.MP2E ];
+      maintainers = with maintainers; [ edwtjo MP2E ];
       platforms = platforms.linux;
     };
   } // a);
@@ -53,20 +53,20 @@ in
     core = "4do";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "47fee1687d8946e84af2ef4d28a693f5f14199d3";
+      rev = "cbd700e2bb95f08f241ca24330fa732aa6af8018";
-      sha256 = "0bhn761akcb5623yvbndm79pbfackbhaqcaqhrqwvk0ja13pry4l";
+      sha256 = "1118iadkznppygq0mppirx1ycndmjp3fqlj8sshiby47j8sgly6h";
     };
     description = "Port of 4DO/libfreedo to libretro";
   }).override {
     buildPhase = "make";
   };
 
-  bsnes-mercury = (mkLibRetroCore rec {
+  bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec {
-    core = "bsnes-mercury";
+    core = bname + "-accuracy";
     src = fetchRetro {
-      repo = core;
+      repo = bname;
-      rev = "6e08947a3eeee4c3ac0c33a5e6739cde02dbda3c";
+      rev = "0bfe7f4f895af0927cec1c06dcae096b59416159";
-      sha256 = "1dkbjhm99r26fagypqlgdrp6v4dhs554cspzp1maryl3nrr57wf8";
+      sha256 = "0xsf10zkx7pnjpdb9n605663i0vqgnshdfjmb472hg84l9dr4gr5";
     };
     description = "Fork of bsnes with HLE DSP emulation restored";
   }).override {
@@ -77,30 +77,20 @@ in
     core = "desmume";
     src = fetchRetro {
       repo = core;
-      rev = "362fee2cc242082d73cd0f7260554e202dd80d78";
+      rev = "cae5945149a72b1dc0b130d6e60e2690b88a925a";
-      sha256 = "0n27kgjqam81q0cbmnmlq1dslyg9wbnz96r8pwjlbv7pp97rp7br";
+      sha256 = "1z4gzixkvxn2s5x5pn179ddwwh3blw7phdkp33qxv40kcv6g3h79";
     };
     description = "libretro wrapper for desmume NDS emulator";
   }).override {
     configurePhase = "cd desmume";
   };
 
-  fceumm = mkLibRetroCore rec {
-    core = "fceumm";
-    src = fetchRetro {
-      repo = "libretro-" + core;
-      rev = "b10d6d4600bfe6b0f2d793785d19a46479a4e7ef";
-      sha256 = "1nrs8hb5yb0iigz1nhzzamlmybjyhjcb41y07ckwx9kzx0w72sjz";
-    };
-    description = "FCEUmm libretro port";
-  };
-
   fba = (mkLibRetroCore rec {
     core = "fba";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "55023b0466465f9d50ad82fd6f1549a89234bcab";
+      rev = "b642e054a1f581fbac16c08f4b8df9ab6c474203";
-      sha256 = "147a9if99mnv12fp70r4h3171m95gzmiq6rlf9axf4693h6kzb02";
+      sha256 = "0h2bk8m1hn2z76hachdmalgh2nv51jgfhmiqqhfkghf00rabinlx";
     };
     description = "Port of Final Burn Alpha to libretro";
   }).override {
@@ -111,12 +101,22 @@ in
     '';
   };
 
+  fceumm = mkLibRetroCore rec {
+    core = "fceumm";
+    src = fetchRetro {
+      repo = "libretro-" + core;
+      rev = "eb19d48804ebeb381b20e74db7033c321f6b6d04";
+      sha256 = "18wm6yzwshqfkd75kkcv035p1s2yhnchn98bcn9aj15aw5qyhvd4";
+    };
+    description = "FCEUmm libretro port";
+  };
+
   gambatte = (mkLibRetroCore rec {
     core = "gambatte";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "6aa6a514b58671106352a525cbc9c39ce8633cdd";
+      rev = "59fb6a652e0de3c3a3b29e58af5ac035958da37e";
-      sha256 = "0ai0l8wwi61rsq4cm3h5n039s78xrhrxvxn4nbav1mn70ynzijx7";
+      sha256 = "0vgnn4dnxbw258s3vs1wzgy29cvcywlbfdrzddiwxbp7anclzxkv";
     };
     description = "Gambatte libretro port";
   }).override {
@@ -127,8 +127,8 @@ in
     core = "genesis-plus-gx";
     src = fetchRetro {
       repo = "Genesis-Plus-GX";
-      rev = "3b3eae18e742b99142ea2a412e80b9152933ab59";
+      rev = "7d8d5f1026af8cfd00cdf32c67a999bd1e454a09";
-      sha256 = "01mn2m1wg026wy1ffcv36wv0pvm18xnin27v681vd7bma96dl7p0";
+      sha256 = "16jm97h66bb2sqlimjlks31sapb23x4q8sr16wdqn1xgi670xw3c";
     };
     description = "Enhanced Genesis Plus libretro port";
   };
@@ -137,8 +137,8 @@ in
     core = "mednafen-pce-fast";
     src = fetchRetro {
       repo = "beetle-pce-fast-libretro";
-      rev = "0a389287025c0166e7b89bf0320ab1c6f8a5a561";
+      rev = "6e2eaf75da2eb3dfcf2fd64413f471c8c90cf885";
-      sha256 = "1s8l3pddgw060wb177wx6ysa040k45wy5vlvbjjvq1rj3352izk4";
+      sha256 = "1mxlvd3bcc6grryby2xn4k2gia3s49ngkwcvgxlj1fg3hkr5kcp8";
     };
     description = "Port of Mednafen's PC Engine core to libretro";
   }).override {
@@ -149,8 +149,8 @@ in
     core = "mupen64plus";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "b97ce52e49d255cd3e87fd6dc44ddd9a596d0be4";
+      rev = "7db9296453629a44de806589f3ff64e824e775ad";
-      sha256 = "1disddd35c45ffp7irsgcf0y906f44d7rkjv96gxs6vvzwxifiih";
+      sha256 = "0gykkx8j0xlkr1dqz5k5hiyki2wsz9ys05df5zv3f2rpk2dkdwyp";
     };
     description = "Libretro port of Mupen64 Plus, GL only";
 
@@ -163,8 +163,8 @@ in
     core = "nestopia";
     src = fetchRetro {
       repo = core;
-      rev = "3b030c93edcc8f49e2f6323b1df7fc78759accd8";
+      rev = "dcaed965760669161d6fd44755887545ea393041";
-      sha256 = "0gr4s6p40j5qiyg94kpa8v3083cbp2ccdq5zp6kkpjskxzkdfhqg";
+      sha256 = "09fvk3ki9nw76kb1c4sw6c54wwn9y3ypsxnbzvhzsarmapkd9fa3";
     };
     description = "nestopia undead libretro port";
   }).override {
@@ -175,8 +175,8 @@ in
     core = "picodrive";
     src = fetchRetro {
       repo = core;
-      rev = "2babf3518e258cc3d6649f6e34a267e83dffd7d9";
+      rev = "e912fdf26376bfa5d7d6488055fe6fdbd13c2e49";
-      sha256 = "13l9ppr8v33a7jmgjpg9hqwim30mybscnwqj2bch5v0w6h3qynzh";
+      sha256 = "1jg9ig3vxbmna6cavz39hk6j9dpm4prfmmdpf7lzn1qvpqxs3ynx";
     };
     description = "Fast MegaDrive/MegaCD/32X emulator";
 
@@ -186,24 +186,12 @@ in
     configurePhase = "./configure";
   };
 
-  prboom = (mkLibRetroCore rec {
-    core = "prboom";
-    src = fetchRetro {
-      repo = "libretro-" + core;
-      rev = "437fd00bf58158bf3c5e2e49237d9344f320584a";
-      sha256 = "0g9dvmywph5r8ly20bn3xkm12271n726s5g9z0f2pd75pnv13q86";
-    };
-    description = "Prboom libretro port";
-  }).override {
-    buildPhase = "make";
-  };
-
   ppsspp = (mkLibRetroCore rec {
     core = "ppsspp";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "b82a36232f677f48e95d6f284184cb8c935d4ad2";
+      rev = "ea17e27fcf16b9f875718b6550fe7145c6257c06";
-      sha256 = "0bzqs9v37qyh6dl5jsrmm46iwy04h7ypgnibxajrxg1795ccb3rr";
+      sha256 = "0l6bzh50vh87j0g1s4144qfqa7vy7gry9ifd5vq1y5114fvbqdlb";
     };
     description = "ppsspp libretro port";
     extraBuildInputs = [ mesa ffmpeg ];
@@ -211,27 +199,38 @@ in
     buildPhase = "cd libretro && make";
   };
 
+  prboom = (mkLibRetroCore rec {
+    core = "prboom";
+    src = fetchRetro {
+      repo = "libretro-" + core;
+      rev = "90ad0db331c53e8851581e1547b7377fb9fffe5b";
+      sha256 = "0jk73nakrs9jxj3d0dmjs0csskjhddn8a4sky3mpk9vp30csx0ll";
+    };
+    description = "Prboom libretro port";
+  }).override {
+    buildPhase = "make";
+  };
+
   quicknes = (mkLibRetroCore rec {
     core = "quicknes";
     src = fetchRetro {
       repo = "QuickNES_Core";
-      rev = "0dab65e2a962640c517f23f2668b76315faf977e";
+      rev = "518638b8064c9d0cb1b5aa29d96419f8528c9de5";
-      sha256 = "12cv2ph72y6c0clcqssdyma1jxn8yi7x2ifyf2g77rbaswxr26r4";
+      sha256 = "0n6w8g0gklli9qs9vv17kljj83n9pky32ir25r7b202nl0292h53";
     };
     description = "QuickNES libretro port";
   }).override {
-    buildPhase = "cd libretro && make";
+    buildPhase = "make";
   };
 
   scummvm = (mkLibRetroCore rec {
     core = "scummvm";
     src = fetchRetro {
       repo = core;
-      rev = "bf30f7a146ab3d0ea5bcff43b1db489118b78cdf";
+      rev = "c3e719acc08c1873609bab3578939b7c9e606511";
-      sha256 = "1xgl2vsssa5mxhavcyghxrbab4lfbp9gnpy6ckhrxdd0n08kvyys";
+      sha256 = "08ab4gybp76la3z94dgg0jjzmajva9003p74256hgr7nnk2kwn4q";
     };
     description = "Libretro port of ScummVM";
-
     extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
   }).override {
     buildPhase = "cd backends/platform/libretro/build && make";
@@ -241,10 +240,10 @@ in
     core = "snes9x";
     src = fetchRetro {
       repo = core;
-      rev = "e41b0a2832fdcacc30498f23ddadd193376f837f";
+      rev = "ccf1ee2eae73ed1e4044c8dd9536dd4ac1be6d8b";
-      sha256 = "0k9zxc9g6hhkc18mdgskjp99ljgay8jqmqhir4aahsfqyxhwypgm";
+      sha256 = "1bwjk817m8v69s13fc9kcj605ig6707rsj57wmz2ri2ggmydhvcb";
     };
-    description = " Port of SNES9x git to libretro";
+    description = "Port of SNES9x git to libretro";
   }).override {
     buildPhase = "cd libretro && make";
   };
@@ -253,8 +252,8 @@ in
     core = "snes9x-next";
     src = fetchRetro {
       repo = core;
-      rev = "c04566c04b1f07979f8a8f6d5bbcb844d7594aec";
+      rev = "dfb7eef46d6bc2dbcc98f25e2bfadc9d2cff5cfd";
-      sha256 = "0lmrbmjk7qnkgz7n7dm744nps8zgbv76kz62vcja2kl5bq24kaxc";
+      sha256 = "1naznsy1mhijcijysm9g8r95dxhr8rspixmf6r187rpcrvfd4zbl";
     };
     description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
   };
@@ -263,33 +262,34 @@ in
     core = "stella";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "4c8e93ce4b250b3b2d2743bae48eca25983f29db";
+      rev = "ada5c57d632ace0ba915ce7a470d504a5d89ebcc";
-      sha256 = "1r016r9a0vwdnlms9s9hnzvszvkhpshjiyi2zql0zs2c1jbja6ia";
+      sha256 = "1riwi6n9fj5vd5jcldwpwaxxvgxv3gs232l6zm9k26x3rngwcyfz";
     };
     description = "Port of Stella to libretro";
   }).override {
     buildPhase = "make";
   };
 
+  vba-next = mkLibRetroCore rec {
+    core = "vba-next";
+    src = fetchRetro {
+      repo = core;
+      rev = "0c20cd92bc8684340d7a1bcae14a603001ad5e4a";
+      sha256 = "09shkha7i7a226nk9wfxswsj3wwrxn7xwrsaaki1x8pvbyy5wjg9";
+    };
+    description = "VBA-M libretro port with modifications for speed";
+  };
+
   vba-m = (mkLibRetroCore rec {
     core = "vbam";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "9baba21956add58fba7c411ddd752682f0d93270";
+      rev = "bedddba614bc4fcbcf5b0d8565f94619b094c20c";
-      sha256 = "1dxshbkgv7xjg3lzv9lwsyhgxjmxzfsvd6xpwmdmh3pjllfrgy1p";
+      sha256 = "1hvq4wsznb2vzg11iqmy5dnfjpiga368p1lmsx9d7ci7dcqyw7wy";
     };
     description = "vanilla VBA-M libretro port";
   }).override {
     buildPhase = "cd src/libretro && make";
   };
 
-  vba-next = mkLibRetroCore rec {
-    core = "vba-next";
-    src = fetchRetro {
-      repo = core;
-      rev = "54c37ea9e26c5480352eee92a80eb659c9b5cb39";
-      sha256 = "0hkd1n00i3kwr5ids7b2c034xvx3nskg2316nli99ky511yq5cfd";
-    };
-    description = "VBA-M libretro port with modifications for speed";
-  };
 }

pkgs/misc/emulators/retroarch/default.nix

@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "retroarch-bare-${version}";
-  version = "20141224";
+  version = "2015-11-20";
 
   src = fetchgit {
-    url = git://github.com/libretro/RetroArch.git;
+    url = https://github.com/libretro/RetroArch.git;
-    rev = "8b4176263988e750daf0c6d709fdceb4672e111e";
+    rev = "09dda14549fc13231311fd522a07a75e923889aa";
-    sha256 = "1l2iqgb7vlkh6kcwr4ggcn58ldyh63v9zvjmv26z8pxiqa1zr1xs";
+    sha256 = "1f7w4i0idc4n0sqc5pcrsxsljk3f614sfdqhdgjb1l4xj16g37cg";
   };
 
   buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Multi-platform emulator frontend for libretro cores";
     license = licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with maintainers; [ MP2E ];
+    maintainers = with maintainers; [ MP2E edwtjo ];
   };
 }

pkgs/servers/http/darkhttpd/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "darkhttpd-${version}";
+  version = "1.11";
+
+  src = fetchurl {
+    url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2";
+    sha256 = "0lbcv6pa82md0gqyyskxndf8hm58y76nrnkanc831ia3vm529bdg";
+  };
+
+  installPhase = ''
+    install -d "$out/bin"
+
+    # install darkhttpd
+    install -Dm755 "darkhttpd" "$out/bin/darkhttpd"
+
+    # install license
+    install -d "$out/share/licenses/darkhttpd"
+    head -n 18 darkhttpd.c > "$out/share/licenses/darkhttpd/LICENSE"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Small and secure static webserver";
+    homepage = http://dmr.ath.cx/net/darkhttpd/;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bobvanderlinden ];
+  };
+}

pkgs/shells/pash/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, buildDotnetPackage }:
+
+buildDotnetPackage rec {
+  baseName = "pash";
+  version = "git-2015-11-06";
+  
+  src = fetchFromGitHub {
+    owner = "Pash-Project";
+    repo = "Pash";
+    rev = "50695a28eaf6c8cbfdc8ecddd91923c64e07b618";
+    sha256 = "17hs1f6ayk9qyyh1xsydk46n6na7flh2kbd36dynk86bnda5d3bn";
+  };
+
+  preConfigure = "rm -rvf $src/Source/PashConsole/bin/*";
+
+  outputFiles = [ "Source/PashConsole/bin/Release/*" ];
+
+  meta = {
+    description = "An open source implementation of Windows PowerShell";
+    homepage = https://github.com/Pash-Project/Pash;
+    maintainers = stdenv.lib.maintainers.fornever;
+    platforms = with stdenv.lib.platforms; all;
+    license = with stdenv.lib.licenses; [ bsd3 gpl3 ];
+  };
+}

pkgs/tools/misc/gparted/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, intltool, gettext, makeWrapper
 , parted, gtk, glib, libuuid, pkgconfig, gtkmm, libxml2, hicolor_icon_theme
-, hdparm, utillinux
+, gpart, hdparm, procps, utillinux
 }:
 
 stdenv.mkDerivation rec {
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ];
 
   postInstall = ''
+    wrapProgram $out/sbin/gparted \
+      --prefix PATH : "${procps}/bin"
     wrapProgram $out/sbin/gpartedbin \
-      --prefix PATH : "${hdparm}/bin:${utillinux}/bin"
+      --prefix PATH : "${gpart}/bin:${hdparm}/bin:${utillinux}/bin"
   '';
 
   meta = with stdenv.lib; {

pkgs/tools/misc/hdf5/default.nix

@@ -8,14 +8,18 @@
 , enableShared ? true
 }:
 
-with { inherit (stdenv.lib) optional; };
+# cpp and mpi options are mutually exclusive
+# (--enable-unsupported could be used to force the build)
+assert !cpp || mpi == null;
+
+with { inherit (stdenv.lib) optional optionals; };
 
 stdenv.mkDerivation rec {
-  version = "1.8.15-patch1";
+  version = "1.8.16";
   name = "hdf5-${version}";
   src = fetchurl {
-    url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${version}/src/hdf5-${version}.tar.gz";
+    url = "http://www.hdfgroup.org/ftp/HDF5/releases/${name}/src/${name}.tar.bz2";
-    sha256 = "19k39da6zzxyr0fnffn4iqlls9v1fsih877rznq8ypqy8mzf5dci";
+    sha256 = "1ilq8pn9lxbf2wj2rdzwqabxismznjj1d23iw6g78w0bl5dsxahk";
  };
 
   passthru = {
@@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
     ++ optional cpp "--enable-cxx"
     ++ optional (gfortran != null) "--enable-fortran"
     ++ optional (szip != null) "--with-szlib=${szip}"
-    ++ optional (mpi != null) "--enable-parallel"
+    ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"]
     ++ optional enableShared "--enable-shared";
 
   patches = [./bin-mv.patch];

pkgs/tools/misc/lnav/default.nix

@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, pcre, sqlite, ncurses,
+  readline, zlib, bzip2, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+
+  name = "lnav-${meta.version}";
+
+  src = fetchFromGitHub {
+    owner = "tstack";
+    repo = "lnav";
+    rev = "v${meta.version}";
+    sha256 = "06h0hy8k0w692df2490dshxf2x8qcnw5myyp0k5jkc63ai2ra6aq";
+    inherit name;
+  };
+
+  buildInputs = [
+    autoconf
+    automake
+    zlib
+    bzip2
+    ncurses
+    pcre
+    readline
+    sqlite
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/tstack/lnav";
+    description = "The Logfile Navigator";
+    longDescription = ''
+      The log file navigator, lnav, is an enhanced log file viewer that takes
+      advantage of any semantic information that can be gleaned from the files
+      being viewed, such as timestamps and log levels. Using this extra
+      semantic information, lnav can do things like interleaving messages from
+      different files, generate histograms of messages over time, and providing
+      hotkeys for navigating through the file. It is hoped that these features
+      will allow the user to quickly and efficiently zero in on problems.
+    '';
+    downloadPage = "https://github.com/tstack/lnav/releases";
+    license = licenses.bsd2;
+    version = "0.8.0";
+    maintainers = [ maintainers.dochang ];
+  };
+
+}

pkgs/tools/misc/rrdtool/default.nix

@@ -1,10 +1,10 @@
 { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff }:
 
 stdenv.mkDerivation rec {
-  name = "rrdtool-1.5.4";
+  name = "rrdtool-1.5.5";
   src = fetchurl {
     url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
-    sha256 = "169zbidc5h88w064qmj6x5rzczkrrfrcgwc3f2i2h8f0hzda7viz";
+    sha256 = "1xm6ikzx8iaa6r7v292k8s7srkzhnifamp1szkimgmh5ki26sa1s";
   };
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ];
   

pkgs/tools/misc/youtube-dl/default.nix

@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://yt-dl.org/downloads/${meta.version}/${name}.tar.gz";
-    sha256 = "02140awgwvspnq226xpbc4clijmqkk8hlmfqhmmzzbihvs2b4xfx";
+    sha256 = "2ed713c995a5cd837205eefa35d5df49179fa90cf634a4f222a31f2bde94e668";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {
-    version = "2015.11.13";
+    version = "2015.11.19";
     homepage = http://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";

pkgs/tools/networking/axel/default.nix

@@ -1,14 +1,18 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
   name = "axel-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
-    sha256 = "0dl0r9byd2ps90cq2nj1y7ib6gnkb5y9f3a3fmhcnjrm9smmg6im";
+    sha256 = "10qsmfq2aprrxsm8sshpvzjjpxhmyv89mrik4clw9rprwxknfdq2";
   };
 
+  buildInputs = [ gettext ];
+
+  installFlags = [ "ETCDIR=$(out)/etc" ];
+
   meta = with stdenv.lib; {
     description = "Console downloading program with some features for parallel connections for faster downloading";
     homepage = http://axel.alioth.debian.org/;

pkgs/tools/networking/i2pd/default.nix

@@ -1,19 +1,20 @@
-{ stdenv, fetchFromGitHub, boost, cryptopp }:
+{ stdenv, fetchFromGitHub, boost, zlib, openssl }:
 
 stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "0.10.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "11w62rc326rhj2xh06307ngx0fai30qny8ml6n5lrx2y1dzjfxd1";
+    sha256 = "06y6pi0wlxpasncm4qq30sh0cavwl2f4gdz0hss70if8mr6z9hyq";
   };
 
-  buildInputs = [ boost cryptopp ];
+  buildInputs = [ boost zlib openssl ];
+  makeFlags = "USE_AESNI=no";
   installPhase = ''
     install -D i2p $out/bin/i2p
   '';

pkgs/tools/networking/zerotierone/default.nix

@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.0.5";
+  version = "1.1.0";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "6e2de5477fefdab21802b1047d753ac38c85074a7d6b41387125fd6941f25ab2";
+    sha256 = "2d7ff178bd7fd284ebb7011d8a91bde51befda60f100eb5429a2dcb6626cf676";
   };
 
   preConfigure = ''

pkgs/tools/system/stress-ng/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, attr, keyutils }:
 
 let
-  version = "0.04.21";
+  version = "0.05.00";
   name = "stress-ng-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    sha256 = "01308c31dx7ln7w3r74f18c473hz9236f118b27z1js94dsya0hw";
+    sha256 = "0ppri86z6fj48nm5l0x1r8mh7mwaf7bvhmi10jz6a8w7apnc181w";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

pkgs/tools/text/html2text/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Convert HTML to plain text";
     homepage = http://www.mbayer.de/html2text/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.eikek ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -1203,6 +1203,8 @@ let
 
   dar = callPackage ../tools/archivers/dar { };
 
+  darkhttpd = callPackage ../servers/http/darkhttpd { };
+
   darkstat = callPackage ../tools/networking/darkstat { };
 
   davfs2 = callPackage ../tools/filesystems/davfs2 {
@@ -2001,6 +2003,8 @@ let
 
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { };
 
+  lnav = callPackage ../tools/misc/lnav { };
+
   lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
 
   logstash = callPackage ../tools/misc/logstash { };
@@ -3682,6 +3686,8 @@ let
 
   mksh = callPackage ../shells/mksh { };
 
+  pash = callPackage ../shells/pash { };
+
   tcsh = callPackage ../shells/tcsh { };
 
   rush = callPackage ../shells/rush { };
@@ -4851,6 +4857,12 @@ let
 
   tinycc = callPackage ../development/compilers/tinycc { };
 
+  trv = callPackage ../development/tools/misc/trv {
+   inherit (ocamlPackages_4_02) findlib camlp4 core async async_unix 
+     async_extra sexplib async_shell core_extended async_find cohttp uri;
+    ocaml = ocaml_4_02;
+  };
+
   urweb = callPackage ../development/compilers/urweb { };
 
   vala = callPackage ../development/compilers/vala/default.nix { };
@@ -7682,7 +7694,6 @@ let
   mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { };
   mdds = callPackage ../development/libraries/mdds { };
 
-  # failed to build
   mediastreamer = callPackage ../development/libraries/mediastreamer { };
 
   mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { };
@@ -8408,6 +8419,7 @@ let
   t1lib = callPackage ../development/libraries/t1lib { };
 
   taglib = callPackage ../development/libraries/taglib { };
+  taglib_1_9 = callPackage ../development/libraries/taglib/1.9.nix { };
 
   taglib_extras = callPackage ../development/libraries/taglib-extras { };
 
@@ -12688,7 +12700,10 @@ let
 
   pinfo = callPackage ../applications/misc/pinfo { };
 
-  pinpoint = callPackage ../applications/office/pinpoint {};
+  pinpoint = callPackage ../applications/office/pinpoint {
+    clutter = clutter_1_24;
+    clutter_gtk = clutter_gtk_1_6;
+  };
 
   pinta = callPackage ../applications/graphics/pinta {
     gtksharp = gtk-sharp;

pkgs/top-level/go-packages.nix

@@ -665,14 +665,18 @@ let
   };
 
   fzf = buildFromGitHub {
-    rev = "0.10.8";
+    rev = "0.11.0";
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "0dkf2qb9k7x97lph6y45hmqqig4jkcg176c6jkf2r5866dydq549";
+    sha256 = "1jcvfdglmrsh7z6lasj2i7l3cwqd0ijhv5ywafmr7m1rn90nj1pf";
 
     buildInputs = [
       crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text
     ];
+
+    postInstall= ''
+      cp $src/bin/fzf-tmux $bin/bin
+    '';
   };
 
   g2s = buildFromGitHub {

pkgs/top-level/python-packages.nix

@@ -9221,19 +9221,18 @@ let
 
 
   memory_profiler = buildPythonPackage rec {
-    name = "memory_profiler-0.27";
+    name = "memory_profiler-${version}";
+    version = "0.39";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/memory_profiler/memory_profiler-0.27.tar.gz";
+      url = "https://pypi.python.org/packages/source/m/memory_profiler/${name}.tar.gz";
-      md5 = "212c0d7452dbaffb6b09474ac07b0668";
+      sha256 = "61021f2dade7edd6cc09d7924bfdccc453bd1949608412a3e021d44a410d3a23";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
-
     meta = {
       description = "A module for monitoring memory usage of a python program";
       homepage = http://pypi.python.org/pypi/memory_profiler;
+      license = licenses.bsd;
     };
   };
 
@@ -10328,7 +10327,7 @@ let
 
     buildInputs = with self; [nose]  ++ optionals isPy27 [mock];
 
-    propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests pexpect];
+    propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect];
 
     meta = {
       description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";