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

doc/functions.xml

@@ -99,9 +99,70 @@ in ...</programlisting>
 
 </section>
 
+<section xml:id="sec-pkg-overrideAttrs">
+  <title>&lt;pkg&gt;.overrideAttrs</title>
+
+  <para>
+    The function <varname>overrideAttrs</varname> allows overriding the
+    attribute set passed to a <varname>stdenv.mkDerivation</varname> call,
+    producing a new derivation based on the original one.
+    This function is available on all derivations produced by the
+    <varname>stdenv.mkDerivation</varname> function, which is most packages
+    in the nixpkgs expression <varname>pkgs</varname>.
+  </para>
+
+  <para>
+    Example usage:
+
+    <programlisting>helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
+  separateDebugInfo = true;
+});</programlisting>
+  </para>
+
+  <para>
+    In the above example, the <varname>separateDebugInfo</varname> attribute is
+    overriden to be true, thus building debug info for
+    <varname>helloWithDebug</varname>, while all other attributes will be
+    retained from the original <varname>hello</varname> package.
+  </para>
+
+  <para>
+    The argument <varname>oldAttrs</varname> is conventionally used to refer to
+    the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
+  </para>
+
+  <note>
+    <para>
+      Note that <varname>separateDebugInfo</varname> is processed only by the
+      <varname>stdenv.mkDerivation</varname> function, not the generated, raw
+      Nix derivation. Thus, using <varname>overrideDerivation</varname> will
+      not work in this case, as it overrides only the attributes of the final
+      derivation. It is for this reason that <varname>overrideAttrs</varname>
+      should be preferred in (almost) all cases to
+      <varname>overrideDerivation</varname>, i.e. to allow using
+      <varname>sdenv.mkDerivation</varname> to process input arguments, as well
+      as the fact that it is easier to use (you can use the same attribute
+      names you see in your Nix code, instead of the ones generated (e.g.
+      <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>,
+      and involves less typing.
+    </para>
+  </note>
+
+</section>
+
+
 <section xml:id="sec-pkg-overrideDerivation">
   <title>&lt;pkg&gt;.overrideDerivation</title>
 
+  <warning>
+    <para>You should prefer <varname>overrideAttrs</varname> in almost all
+    cases, see its documentation for the reasons why.
+    <varname>overrideDerivation</varname> is not deprecated and will continue
+    to work, but is less nice to use and does not have as many abilities as
+    <varname>overrideAttrs</varname>.
+    </para>
+  </warning>
+
   <warning>
     <para>Do not use this function in Nixpkgs as it evaluates a Derivation
     before modifying it, which breaks package abstraction and removes

lib/customisation.nix

@@ -56,16 +56,18 @@ rec {
       ff = f origArgs;
       overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs);
     in
-      if builtins.isAttrs ff then (ff //
+      if builtins.isAttrs ff then (ff // {
-        { override = newArgs: makeOverridable f (overrideWith newArgs);
+        override = newArgs: makeOverridable f (overrideWith newArgs);
-          overrideDerivation = fdrv:
+        overrideDerivation = fdrv:
-            makeOverridable (args: overrideDerivation (f args) fdrv) origArgs;
+          makeOverridable (args: overrideDerivation (f args) fdrv) origArgs;
-        })
+        ${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv:
-      else if builtins.isFunction ff then
+          makeOverridable (args: (f args).overrideAttrs fdrv) origArgs;
-        { override = newArgs: makeOverridable f (overrideWith newArgs);
+      })
-          __functor = self: ff;
+      else if builtins.isFunction ff then {
-          overrideDerivation = throw "overrideDerivation not yet supported for functors";
+        override = newArgs: makeOverridable f (overrideWith newArgs);
-        }
+        __functor = self: ff;
+        overrideDerivation = throw "overrideDerivation not yet supported for functors";
+      }
       else ff;
 
 

lib/maintainers.nix

@@ -30,6 +30,7 @@
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   ambrop72 = "Ambroz Bizjak <ambrop7@gmail.com>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
+  amiloradovsky = "Andrew Miloradovsky <miloradovsky@gmail.com>";
   amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
   AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
   anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
@@ -105,8 +106,8 @@
   cstrahan = "Charles Strahan <charles@cstrahan.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien@cassou.me>";
-  dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>";
   danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>";
+  dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>";
   davidak = "David Kleuker <post@davidak.de>";
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   davorb = "Davor Babic <davor@davor.se>";
@@ -123,6 +124,7 @@
   dipinhora = "Dipin Hora <dipinhora+github@gmail.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   dochang = "Desmond O. Chang <dochang@gmail.com>";
+  domenkozar = "Domen Kozar <domen@dev.si>";
   doublec = "Chris Double <chris.double@double.co.nz>";
   drets = "Dmytro Rets <dmitryrets@gmail.com>";
   drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
@@ -173,8 +175,8 @@
   globin = "Robin Gloster <mail@glob.in>";
   gnidorah = "Alex Ivanov <yourbestfriend@opmbx.org>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
-  goodrone = "Andrew Trachenko <goodrone@gmail.com>";
   Gonzih = "Max Gonzih <gonzih@gmail.com>";
+  goodrone = "Andrew Trachenko <goodrone@gmail.com>";
   gpyh = "Yacine Hmito <yacine.hmito@gmail.com>";
   grahamc = "Graham Christensen <graham@grahamc.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
@@ -190,7 +192,6 @@
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
   iand675 = "Ian Duncan <ian@iankduncan.com>";
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
-  domenkozar = "Domen Kozar <domen@dev.si>";
   igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
   ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
   j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
@@ -247,7 +248,6 @@
   lucas8 = "Luc Chabassier <luc.linux@mailoo.org>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
-  sternenseemann = "Lukas Epple <post@lukasepple.de>";
   lukego = "Luke Gorrie <luke@snabb.co>";
   lw = "Sergey Sofeychuk <lw@fmap.me>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
@@ -263,10 +263,10 @@
   martingms = "Martin Gammelsæter <martin@mg.am>";
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
   mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
+  matthewbauer = "Matthew Bauer <mjbauer95@gmail.com>";
   matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
   maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   mbakke = "Marius Bakke <mbakke@fastmail.com>";
-  matthewbauer = "Matthew Bauer <mjbauer95@gmail.com>";
   mbe = "Brandon Edens <brandonedens@gmail.com>";
   mboes = "Mathieu Boespflug <mboes@tweag.net>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
@@ -299,16 +299,16 @@
   muflax = "Stefan Dorn <mail@muflax.com>";
   myrl = "Myrl Hex <myrl.0xf@gmail.com>";
   nand0p = "Fernando Jose Pando <nando@hex7.com>";
-  nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
+  nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
   nequissimus = "Tim Steinbach <tim@nequissimus.com>";
   nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
   nhooyr = "Anmol Sethi <anmol@aubble.com>";
-  nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
   nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
-  notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
+  nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
   NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
+  notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
   obadz = "obadz <obadz-nixos@obadz.com>";
@@ -383,8 +383,8 @@
   rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>";
   rvlander = "Gaëtan André <rvlander@gaetanandre.eu>";
   ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>";
-  ryantm = "Ryan Mulligan <ryan@ryantm.com>";
   ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>";
+  ryantm = "Ryan Mulligan <ryan@ryantm.com>";
   rycee = "Robert Helgesson <robert@rycee.net>";
   ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
   s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";
@@ -408,8 +408,8 @@
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
   skrzyp = "Jakub Skrzypnik <jot.skrzyp@gmail.com>";
   sleexyz = "Sean Lee <freshdried@gmail.com>";
-  solson = "Scott Olson <scott@solson.me>";
   smironov = "Sergey Mironov <grrwlf@gmail.com>";
+  solson = "Scott Olson <scott@solson.me>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
   spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>";
   spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";
@@ -417,6 +417,7 @@
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   SShrike = "Severen Redwood <severen@shrike.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
+  sternenseemann = "Lukas Epple <post@lukasepple.de>";
   steveej = "Stefan Junker <mail@stefanjunker.de>";
   swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>";
   swistak35 = "Rafał Łasocha <me@swistak35.com>";
@@ -474,6 +475,7 @@
   wscott = "Wayne Scott <wsc9tt@gmail.com>";
   wyvie = "Elijah Rum <elijahrum@gmail.com>";
   yarr = "Dmitry V. <savraz@gmail.com>";
+  yochai = "Yochai <yochai@titat.info>";
   yurrriq = "Eric Bailey <eric@ericb.me>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
@@ -481,6 +483,4 @@
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
   zohl = "Al Zohali <zohl@fmap.me>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
-  amiloradovsky = "Andrew Miloradovsky <miloradovsky@gmail.com>";
-  yochai = "Yochai <yochai@titat.info>";
 }

nixos/modules/services/mail/opensmtpd.nix

@@ -115,7 +115,7 @@ in {
         chown smtpq.root /var/spool/smtpd/purge
         chmod 700 /var/spool/smtpd/purge
       '';
-      serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
+      serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
       environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
     };
 

nixos/modules/services/misc/dictd.nix

@@ -2,6 +2,10 @@
 
 with lib;
 
+let
+  cfg = config.services.dictd;
+in
+
 {
 
   ###### interface
@@ -20,7 +24,7 @@ with lib;
 
       DBs = mkOption {
         type = types.listOf types.package;
-        default = [];
+        default = with pkgs.dictdDBs; [ wiktionary wordnet ];
         example = [ pkgs.dictdDBs.nld2eng ];
         description = ''List of databases to make available.'';
       };
@@ -34,8 +38,8 @@ with lib;
 
   config = let dictdb = pkgs.dictDBCollector { dictlist = map (x: {
                name = x.name;
-               filename = x; } ) config.services.dictd.DBs; };
+               filename = x; } ) cfg.DBs; };
-  in mkIf config.services.dictd.enable {
+  in mkIf cfg.enable {
 
     # get the command line client on system path to make some use of the service
     environment.systemPackages = [ pkgs.dict ];

pkgs/applications/audio/qmidinet/default.nix

@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, qt4, alsaLib, libjack2 }:
+{ stdenv, fetchurl, qt5, alsaLib, libjack2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.1";
+  version = "0.4.1";
   name = "qmidinet-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
-    sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa";
+    sha256 = "1hh06g19lfh6r673avfvy0l2mq999mxk2jnv396226swj97lv7yz";
   };
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ qt4 alsaLib libjack2 ];
+  buildInputs = [  qt5.qtbase qt5.qttools alsaLib libjack2 ];
 
   meta = with stdenv.lib; {
     description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";

pkgs/applications/editors/emacs-modes/cask/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, emacs, python }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.4";
+  version = "0.8.1";
   name = "cask-${version}";
 
   src = fetchFromGitHub {
     owner = "cask";
     repo = "cask";
     rev = "v${version}";
-    sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
+    sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b";
   };
 
   buildInputs = [ emacs python ];

pkgs/applications/editors/nano/default.nix

@@ -12,10 +12,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.7.0";
+  version = "2.7.1";
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "08cmnca3s377z74yjw1afz59l2h9s40wsa9wxw5y4x5f2jaz6spq";
+    sha256 = "1kapx0fyp0a0pvsdd1n59pm3acrimdrp7ciglg098wqxhdlvwp6z";
   };
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];
@@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
     homepage = http://www.nano-editor.org/;
     description = "A small, user-friendly console text editor";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ joachifm ];
+    maintainers = with maintainers; [
+      jgeerds
+      joachifm
+    ];
     platforms = platforms.all;
   };
 }

pkgs/applications/editors/neovim/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
 , libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig
-, unibilium, makeWrapper, vimUtils, xsel
+, unibilium, makeWrapper, vimUtils, xsel, gperf
 
 , withPython ? true, pythonPackages, extraPythonPackages ? []
 , withPython3 ? true, python3Packages, extraPython3Packages ? []
@@ -18,13 +18,13 @@ let
   # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
   neovimLibvterm = stdenv.mkDerivation rec {
     name = "neovim-libvterm-${version}";
-    version = "2015-11-06";
+    version = "2016-10-07";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "libvterm";
-      rev = "487f21dbf65f1c28962fef3f064603f415fbaeb2";
+      rev = "e0a3d4dbd44a9534bf7437ee98ceb26dabebf3ad";
-      sha256 = "1fig6v0qk0ylr7lqqk0d6x5yywb9ymh85vay4spw5b5r5p0ky7yx";
+      sha256 = "131mcnbdq4wvsf280v4az8vnakr78yrwlaihzgr5s1wmfjvf6knf";
     };
 
     buildInputs = [ perl ];
@@ -60,13 +60,13 @@ let
 
   neovim = stdenv.mkDerivation rec {
     name = "neovim-${version}";
-    version = "0.1.5";
+    version = "0.1.6";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
       rev = "v${version}";
-      sha256 = "1ihlgm2h7147xyd5wrwg61vsnmkqc9j3ghsida4g2ilr7gw9c85y";
+      sha256 = "0s8vqf4aym1d1h8yi0znpqw5rv9v3z64y5aha9dmynbwxa58q7pp";
     };
 
     enableParallelBuilding = true;
@@ -80,6 +80,7 @@ let
       unibilium
       luajit
       luaPackages.lua
+      gperf
     ] ++ optional withJemalloc jemalloc
       ++ lualibs;
 

pkgs/applications/editors/neovim/qt.nix

@@ -3,7 +3,7 @@
 }:
 
 let # not very usable ATM
-  version = "0.2.1";
+  version = "0.2.3";
 in
 stdenv.mkDerivation {
   name = "neovim-qt-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "equalsraf";
     repo = "neovim-qt";
     rev = "v${version}";
-    sha256 = "0mqs2f7l05q2ayj77czr5fnpr7fa00qrmjdjxglbwxdxswcsz88n";
+    sha256 = "0ichqph7nfw3934jf0sp81bqd376xna3f899cc2xg88alb4f16dv";
   };
 
   # It tries to download libmsgpack; let's use ours.

pkgs/applications/networking/ipfs/default.nix

@@ -1,22 +1,31 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
 
 buildGoPackage rec {
   name = "ipfs-${version}";
-  version = "i20160112--${stdenv.lib.strings.substring 0 7 rev}";
+  version = "0.4.4";
-  rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
+  rev = "d905d485192616abaea25f7e721062a9e1093ab9";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
 
+  extraSrcPaths = [
+    (fetchgx {
+      inherit name src;
+      sha256 = "0mm1rs2mbs3rmxfcji5yal9ai3v1w75kk05bfyhgzmcjvi6lwpyb";
+    })
+  ];
+
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd";
+    sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l";
   };
 
   meta = with stdenv.lib; {
     description = "A global, versioned, peer-to-peer filesystem";
+    homepage = https://ipfs.io/;
     license = licenses.mit;
-    broken = true;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
   };
 }

pkgs/applications/networking/irc/hexchat/default.nix

@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.12.2";
+  version = "2.12.3";
   name = "hexchat-${version}";
 
   src = fetchurl {
     url = "http://dl.hexchat.net/hexchat/${name}.tar.xz";
-    sha256 = "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd";
+    sha256 = "1fpj2kk1p85snffchqxsz3sphhcgiripjw41mgzxi7ks5hvj4avg";
   };
 
   nativeBuildInputs = [

pkgs/applications/networking/pyload/default.nix

@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }:
+pythonPackages.buildPythonApplication rec {
+  version = "0.4.9-next";
+  name = "pyLoad-" + version;
+
+  src = fetchFromGitHub {
+    owner = "pyload";
+    repo = "pyload";
+    rev = "03f3ad9e39da2b9a378987693c4a69720e4084c7";
+    sha256 = "0fgsz6yzxrlq3qvsyxsyzgmy4za35v1xh3i4drhispk9zb5jm1xx";
+  };
+
+  patches =
+    let
+      # gets merged in next release version of pyload
+      configParserPatch = fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2625.diff";
+        sha256 = "1bisgx78kcr5c0x0i3h0ch5mykns5wx5wx7gvjj0pc71lfzlxzb9";
+      };
+      setupPyPatch = fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2638.diff";
+        sha256 = "006g4qbl582262ariflbyfrszcx8ck2ac1cpry1f82f76p4cgf6z";
+      };
+    in [ configParserPatch setupPyPatch ];
+
+  buildInputs = [
+    unrar rhino spidermonkey gocr pythonPackages.paver
+  ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter
+    beautifulsoup
+  ];
+
+  #remove this once the PR patches above are merged. Needed because githubs diff endpoint
+  #does not support diff -N
+  prePatch = ''
+    touch module/config/__init__.py
+  '';
+
+  preBuild = ''
+    paver generate_setup
+  '';
+
+  doCheck = false;
+
+  meta = {
+    description = "Free and open source downloader for 1-click-hosting sites";
+    homepage = https://github.com/pyload/pyload;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.mahe ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/science/logic/yices/default.nix

@@ -2,24 +2,31 @@
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.3.1";
+  version = "2.5.1";
 
   src = fetchurl {
-    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree";
+    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-${version}-src.tar.gz&accept=I+Agree";
     name = "yices-${version}-src.tar.gz";
-    sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs";
+    sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c";
   };
 
+  patchPhase = ''patchShebangs tests/regress/check.sh'';
+
   configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
                      "--with-static-gmp-include-dir=${gmp-static.dev}/include"
                    ];
   buildInputs = [ gmp-static gperf autoreconfHook ];
 
-  meta = {
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  installPhase = ''make install LDCONFIG=true'';
+
+  meta = with stdenv.lib; {
     description = "A high-performance theorem prover and SMT solver";
     homepage    = "http://yices.csl.sri.com";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
+    license     = licenses.unfreeRedistributable;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    maintainers = [ maintainers.thoughtpolice ];
   };
 }

pkgs/applications/version-management/git-and-tools/gitflow/default.nix

@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gitflow";
-  version = "1.10.0";
+  version = "1.10.2";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "petervanderdoes";
     repo = pname;
     rev = version;
-    sha256 = "1l67yizbcmgkhz8qn1zam2p04y8ha9b2gb2d89rff9y528b2m5z6";
+    sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg";
   };
 
   preBuild = ''

pkgs/applications/version-management/mercurial/default.nix

@@ -4,25 +4,23 @@
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
-  version = "3.9.1";
+  version = "3.9.2";
   name = "mercurial-${version}";
   inherit (python2Packages) docutils hg-git dulwich python;
-in
+in python2Packages.mkPythonDerivation {
-
-stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/${name}.tar.gz";
-    sha256 = "0x6zjl8za6nnlbmyxng4pfrr2h77zi3wbg985262ghjyx33lypk2";
+    sha256 = "1kw3cpcjygfapvi5c123limhpbkmg7is2i81pybk1s05gi16l139";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
 
-  buildInputs = [ python makeWrapper docutils unzip ];
+  buildInputs = [ makeWrapper docutils unzip ];
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin
+  propagatedBuildInputs = [ hg-git dulwich ]
-    [ ApplicationServices cf-private ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ];
 
   makeFlags = "PREFIX=$(out)";
 
@@ -42,7 +40,6 @@ stdenv.mkDerivation {
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
-          --prefix PYTHONPATH : "$(toPythonPath "$out ${hg-git}"):$(toPythonPath "$out ${dulwich}")" \
           $WRAP_TK
       done
 

pkgs/applications/version-management/tortoisehg/default.nix

@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "3.9.1";
+    version = "3.9.2";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "12bqvkkwkb6m5hls7gipkxbnspfrk1k6l9l0fff0wp1zajnp4pnn";
+      sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2";
     };
 
     pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ];

pkgs/applications/version-management/yadm/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub }:
 
-let version = "1.04"; in
+let version = "1.05"; in
 stdenv.mkDerivation {
   name = "yadm-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner  = "TheLocehiliosan";
     repo   = "yadm";
     rev    = "${version}";
-    sha256 = "1g5nz4y63ccxlbz67klm78525ps41ynis8683iayakg4907vd898";
+    sha256 = "11bqgz28qzgb3iz8xvda9z0mh5r1a9m032pqm772ypiixsfz8hdd";
   };
 
   buildCommand = ''

pkgs/applications/video/streamlink/default.nix

@@ -1,14 +1,14 @@
 { stdenv, pythonPackages, fetchFromGitHub, rtmpdump }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.14.0-rc1";
+  version = "0.0.2";
   name = "streamlink-${version}";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
-    rev = "ffc099b16b9a9d2c0c44081d687c50ee2e935f29";
+    rev = "${version}";
-    sha256 = "0ix2k2yd2jzcazkjjb0iczr4bv7pgx873k7bhxgb9zwplklxpw1k";
+    sha256 = "156b3smivs8lja7a98g3qa74bawqhc4mi8w8f3dscampbxx4dr9y";
   };
 
   propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ];

pkgs/build-support/fetchgx/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, gx, gx-go, go, cacert }:
+
+{ name, src, sha256 }:
+
+stdenv.mkDerivation {
+  name = "${name}-gxdeps";
+  inherit src;
+
+  buildInputs = [ go gx gx-go ];
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = sha256;
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  buildPhase = ''
+    export GOPATH=$(pwd)/vendor
+    mkdir vendor
+    gx install
+  '';
+
+  installPhase = ''
+    mv vendor $out
+  '';
+
+  preferLocalBuild = true;
+}

pkgs/data/fonts/font-awesome-ttf/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "font-awesome-${version}";
-  version = "4.6.3";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner  = "FortAwesome";
     repo   = "Font-Awesome";
     rev    = "v${version}";
-    sha256 = "135k1xskksqzriad9zzcxa79iprldyp2bnmc22wslak0dvjz74w0";
+    sha256 = "0w30y26jp8nvxa3iiw7ayl6rkza1rz62msl9xw3srvxya1c77grc";
   };
 
   buildCommand = ''

pkgs/data/fonts/google-fonts/default.nix

@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.google.com/fontsl;
+    homepage = https://fonts.google.com;
-    description = "Font files available from Google Font";
+    description = "Font files available from Google Fonts";
     license = with licenses; [ asl20 ofl ufl ];
     platforms = platforms.all;
     hydraPlatforms = [];

pkgs/development/compilers/scala/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.11.8";
+  name = "scala-2.12.0";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47";
+    sha256 = "148wmk7gjiyfms9lrwgiky7vw78pwnvpnx71rg4l30zd6jfiknp9";
   };
 
   propagatedBuildInputs = [ jre ] ;

pkgs/development/go-modules/generic/default.nix

@@ -1,4 +1,4 @@
-{ go, govers, parallel, lib, fetchgit, fetchhg }:
+{ go, govers, parallel, lib, fetchgit, fetchhg, rsync }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
 
@@ -17,6 +17,10 @@
 # Extra sources to include in the gopath
 , extraSrcs ? [ ]
 
+# Extra gopaths containing src subfolder
+# with sources to include in the gopath
+, extraSrcPaths ? [ ]
+
 # go2nix dependency file
 , goDeps ? null
 
@@ -86,6 +90,9 @@ go.stdenv.mkDerivation (
     mv goPath/* "go/src/${goPackagePath}"
     rmdir goPath
 
+  '') + (lib.optionalString (extraSrcPaths != []) ''
+    ${rsync}/bin/rsync -a ${lib.concatMapStrings (p: "${p}/src") extraSrcPaths} go
+
   '') + ''
     export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
 

pkgs/development/haskell-modules/configuration-common.nix

@@ -1021,6 +1021,10 @@ self: super: {
   # https://github.com/fpco/store/issues/77
   store = dontCheck super.store;
 
+  store_0_3 = super.store_0_3.overrideScope (self: super: {
+    store-core = self.store-core_0_3;
+  });
+
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = doJailbreak super.applicative-quoters;
 

pkgs/development/libraries/aubio/default.nix

@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aubio-0.4.1";
+  name = "aubio-0.4.3";
 
   src = fetchurl {
     url = "http://aubio.org/pub/${name}.tar.bz2";
-    sha256 = "15f6nf76y7iyl2kl4ny7ky0zpxfxr8j3902afvd6ydnnkh5dzmr5";
+    sha256 = "1azarklqggch8kkz3gbqwi2vlb6ld4lidyhp34qawr0c7h3xnb5n";
   };
 
   buildInputs = [
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
 
   installPhase = "${python2.interpreter} waf install";
 
-  meta = with stdenv.lib; { 
+  meta = with stdenv.lib; {
     description = "Library for audio labelling";
     homepage = http://aubio.org/;
     license = licenses.gpl2;
-    maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+    maintainers = with maintainers; [ goibhniu marcweber fpletz ];
     platforms = platforms.linux;
   };
 }

pkgs/development/libraries/http-parser/default.nix

@@ -42,6 +42,6 @@ in stdenv.mkDerivation {
     homepage = https://github.com/joyent/http-parser;
 
     license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux; # Broken on pure-darwin, wants xcode
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/development/libraries/libhttpseverywhere/default.nix

@@ -1,14 +1,15 @@
-{stdenv, fetchFromGitHub, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig,  valadoc}:
+{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig,  valadoc}:
 
 stdenv.mkDerivation rec {
-  name = "libhttpseverywhere-${version}";
+  major = "0.2";
-  version = "0.2.3";
+  minor = "3";
+  version = "${major}.${minor}";
 
-  src = fetchFromGitHub {
+  name = "libhttpseverywhere-${version}";
-    owner = "grindhold";
+
-    repo  = "libhttpseverywhere";
+  src = fetchurl {
-    rev = "${version}";
+    url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
-    sha256 = "0ggg1kw5yjakqqpnmjcbcpnq5m4lhc76javh8waqv2klr5mxd2a7";
+    sha256 = "0ndk6yyfcd7iwwkv4rkivhd08k0x8v03gnp9dk1ms4bxb1l2i8l1";
   };
 
   nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "library to use HTTPSEverywhere in desktop applications";
-    homepage    = https://github.com/grindhold/libhttpseverywhere;
+    homepage    = https://git.gnome.org/browse/libhttpseverywhere;
     license     = stdenv.lib.licenses.lgpl3;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ sternenseemann ];

pkgs/development/libraries/qt-5/5.6/qtwebengine.nix

@@ -1,6 +1,62 @@
-{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel }:
+{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel
+
+, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
+, fontconfig, freetype, harfbuzz, icu, dbus
+, zlib, libjpeg, libpng, libtiff
+, alsaLib
+, libcap
+, pciutils
+
+, bison, flex, git, which, gperf
+, coreutils
+, pkgconfig, python
+
+}:
 
 qtSubmodule {
   name = "qtwebengine";
   qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
+  buildInputs = [ bison flex git which gperf ];
+  nativeBuildInputs = [ pkgconfig python coreutils ];
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    export MAKEFLAGS=-j$NIX_BUILD_CORES
+    substituteInPlace ./src/3rdparty/chromium/build/common.gypi \
+      --replace /bin/echo ${coreutils}/bin/echo
+    substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \
+      --replace /bin/echo ${coreutils}/bin/echo
+    substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
+      --replace /bin/echo ${coreutils}/bin/echo
+      
+    configureFlags+="\
+        -plugindir $out/lib/qt5/plugins \
+        -importdir $out/lib/qt5/imports \
+        -qmldir $out/lib/qt5/qml \
+        -docdir $out/share/doc/qt5"
+  '';
+  propagatedBuildInputs = [
+    dbus zlib alsaLib
+
+    # Image formats
+    libjpeg libpng libtiff
+
+    # Text rendering
+    fontconfig freetype harfbuzz icu
+
+    # X11 libs
+    xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
+    xlibs.libXcomposite
+
+    libcap
+    pciutils
+  ];
+  postInstall = ''
+    cat > $out/libexec/qt.conf <<EOF
+    [Paths]
+    Prefix = ..
+    EOF
+  '';
 }

pkgs/development/libraries/qt-5/5.7/qtwebengine.nix

@@ -1,6 +1,62 @@
-{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel }:
+{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel
+
+, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
+, fontconfig, freetype, harfbuzz, icu, dbus
+, zlib, libjpeg, libpng, libtiff
+, alsaLib
+, libcap
+, pciutils
+
+, bison, flex, git, which, gperf
+, coreutils
+, pkgconfig, python
+
+}:
 
 qtSubmodule {
   name = "qtwebengine";
   qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
+  buildInputs = [ bison flex git which gperf ];
+  nativeBuildInputs = [ pkgconfig python coreutils ];
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    export MAKEFLAGS=-j$NIX_BUILD_CORES
+    substituteInPlace ./src/3rdparty/chromium/build/common.gypi \
+      --replace /bin/echo ${coreutils}/bin/echo
+    substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \
+      --replace /bin/echo ${coreutils}/bin/echo
+    substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
+      --replace /bin/echo ${coreutils}/bin/echo
+      
+    configureFlags+="\
+        -plugindir $out/lib/qt5/plugins \
+        -importdir $out/lib/qt5/imports \
+        -qmldir $out/lib/qt5/qml \
+        -docdir $out/share/doc/qt5"
+  '';
+  propagatedBuildInputs = [
+    dbus zlib alsaLib
+
+    # Image formats
+    libjpeg libpng libtiff
+
+    # Text rendering
+    fontconfig freetype harfbuzz icu
+
+    # X11 libs
+    xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
+    xlibs.libXcomposite
+
+    libcap
+    pciutils
+  ];
+  postInstall = ''
+    cat > $out/libexec/qt.conf <<EOF
+    [Paths]
+    Prefix = ..
+    EOF
+  '';
 }

pkgs/development/misc/loc/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  version = "0.3.3";
+  name = "loc-${version}";
+
+  src = fetchFromGitHub {
+    owner = "cgag";
+    repo = "loc";
+    rev = "e2dfe2c1452f25f58974b545292b11dc450afd3d";
+    sha256 = "1kp5iawig6304gs1289aivgsq44zhnn0ykqv9ymwpvj0g12l4l8r";
+  };
+
+  depsSha256 = "01jww6d4dzb5pq6vcrp3xslhxic0vp0gicsddda4adzqg1lab8c2";
+
+  meta = {
+    homepage = "http://github.com/cgag/loc";
+    description = "Count lines of code quickly";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
+

pkgs/development/ocaml-modules/containers/default.nix

@@ -4,10 +4,9 @@
 let
 
   mkpath = p:
-    let v = stdenv.lib.getVersion ocaml; in
+      "${p}/lib/ocaml/${ocaml.version}/site-lib";
-      "${p}/lib/ocaml/${v}/site-lib";
 
-  version = "0.18";
+  version = "0.20";
 
 in
 
@@ -18,7 +17,7 @@ stdenv.mkDerivation {
     owner = "c-cube";
     repo = "ocaml-containers";
     rev = "${version}";
-    sha256 = "169j8vqg8h70wbldjg610jqikfk23ggw8zypmpzv3piym5p1dfiw";
+    sha256 = "1gwflgdbvj293cwi434aafrsgpdgj2sv7r1ghm4l4k5xn17l0qzg";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ];

pkgs/development/ocaml-modules/gen/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
 
-let version = "0.3"; in
+let version = "0.4"; in
 
 stdenv.mkDerivation {
   name = "ocaml-gen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     owner = "c-cube";
     repo = "gen";
     rev = "${version}";
-    sha256 = "0xrnkcfa5q86ammf49j5hynw5563x5sa2mk7vqf7g097j1szif72";
+    sha256 = "041dga300fh1y6fi8y0fkri2qda406lf2dmbrgllazw3rp07zkzj";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ounit ];

pkgs/development/ocaml-modules/sequence/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
 
-let version = "0.6"; in
+let version = "0.8"; in
 
 stdenv.mkDerivation {
   name = "ocaml-sequence-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     owner = "c-cube";
     repo = "sequence";
     rev = "${version}";
-    sha256 = "0mky5qas3br2x4y14dzcky212z624ydqnx8mw8w00x0c1xjpafkb";
+    sha256 = "1y9nkz6g4plnbk1pcdbvs7f719r48zxrp3gsaxyq1vg98i9h8qr3";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ounit ];

pkgs/development/tools/analysis/flow/default.nix

@@ -3,14 +3,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.33.0";
+  version = "0.34.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1m0a4w50x1xx6iii5mdciksmzwlmyd8wjbyaqbf6gr1z7vhzmqwh";
+    sha256 = "0fydrxp1aq4nmjkqya3j4z4zjbjvqx575qdgjzvkxq71akg56hqv";
   };
 
   installPhase = ''

pkgs/development/tools/build-managers/gnumake/3.81/default.nix

@@ -1,48 +0,0 @@
-{stdenv, fetchurl}:
-
-let version = "3.81"; in
-stdenv.mkDerivation {
-  name = "gnumake-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/make/make-${version}.tar.bz2";
-    md5 = "354853e0b2da90c527e35aabb8d6f1e6";
-  };
-
-  doCheck = true;
-
-  patches =
-    [
-      # Provide nested log output for subsequent pretty-printing by
-      # nix-log2xml.
-      ./log-3.81.patch
-
-      # Purity: don't look for library dependencies (of the form
-      # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
-      # Likewise, when searching for included Makefiles, don't look in
-      # /usr/include and friends.
-      ./impure-dirs.patch
-    ];
-  patchFlags = "-p0";
-
-  meta = {
-    description = "GNU Make, a program controlling the generation of non-source files from sources";
-
-    longDescription =
-      '' Make is a tool which controls the generation of executables and
-         other non-source files of a program from the program's source files.
-
-         Make gets its knowledge of how to build your program from a file
-         called the makefile, which lists each of the non-source files and
-         how to compute it from other files. When you write a program, you
-         should write a makefile for it, so that it is possible to use Make
-         to build and install the program.
-      '';
-
-    homepage = http://www.gnu.org/software/make/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-}

pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch

@@ -1,34 +0,0 @@
-diff -rc read.c read.c
-*** read.c	2006-03-17 15:24:20.000000000 +0100
---- read.c	2007-05-24 17:16:31.000000000 +0200
-***************
-*** 99,107 ****
---- 99,109 ----
-  #endif
-      INCLUDEDIR,
-  #ifndef _AMIGA
-+ #if 0    
-      "/usr/gnu/include",
-      "/usr/local/include",
-      "/usr/include",
-+ #endif    
-  #endif
-      0
-    };
-diff -rc reremake.c
-*** remake.c	2006-03-20 03:36:37.000000000 +0100
---- remake.c	2007-05-24 17:06:54.000000000 +0200
-***************
-*** 1452,1460 ****
---- 1452,1462 ----
-    static char *dirs[] =
-      {
-  #ifndef _AMIGA
-+ #if 0
-        "/lib",
-        "/usr/lib",
-  #endif
-+ #endif
-  #if defined(WINDOWS32) && !defined(LIBDIR)
-  /*
-   * This is completely up to the user at product install time. Just define

pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch

@@ -1,125 +0,0 @@
-diff -rc job.c job.c
-*** job.c	2006-03-20 04:03:04.000000000 +0100
---- job.c	2009-01-19 19:37:28.000000000 +0100
-***************
-*** 1083,1089 ****
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-! 	   ? "%s" : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
---- 1083,1089 ----
-       appear.  */
-  
-    message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
-!           ? (enable_nested_output ? "\e[3s\e[a%s\e[b" : "%s") : (char *) 0, p);
-  
-    /* Tell update_goal_chain that a command has been started on behalf of
-       this target.  It is important that this happens here and not in
-diff -rc main.c main.c
-*** main.c	2006-03-20 03:36:37.000000000 +0100
---- main.c	2009-01-19 19:41:41.000000000 +0100
-***************
-*** 886,891 ****
---- 886,900 ----
-  }
-  
-  
-+ static void close_nesting()
-+ {
-+   while (stdout_nesting_level--)
-+     printf("\e[q");
-+   while (stderr_nesting_level--)
-+     fprintf(stderr, "\e[q");
-+ }
-+ 
-+ 
-  #ifdef _AMIGA
-  int
-  main (int argc, char **argv)
-***************
-*** 931,936 ****
---- 940,950 ----
-    atexit (close_stdout);
-  #endif
-  
-+   atexit(close_nesting);
-+ 
-+   if (getenv("NIX_INDENT_MAKE"))
-+     enable_nested_output = 1;
-+ 
-    /* Needed for OS/2 */
-    initialize_main(&argc, &argv);
-  
-***************
-*** 3095,3100 ****
---- 3109,3120 ----
-  
-    /* Use entire sentences to give the translators a fighting chance.  */
-  
-+   if (entering && enable_nested_output)
-+     {
-+       printf("\e[p");
-+       stdout_nesting_level++;
-+     }
-+   
-    if (makelevel == 0)
-      if (starting_directory == 0)
-        if (entering)
-***************
-*** 3124,3129 ****
---- 3144,3159 ----
-          printf (_("%s[%u]: Leaving directory `%s'\n"),
-                  program, makelevel, starting_directory);
-  
-+   if (!entering && enable_nested_output)
-+     {
-+       printf("\e[q");
-+       stdout_nesting_level--;
-+     }
-+  
-    /* Flush stdout to be sure this comes before any stderr output.  */
-    fflush (stdout);
-  }
-+ 
-+ int enable_nested_output = 0;
-+ int stdout_nesting_level = 0;
-+ int stderr_nesting_level = 0;
-diff -rc make.h
-*** make.h	2006-02-16 00:54:43.000000000 +0100
---- make.h	2009-01-19 19:32:03.000000000 +0100
-***************
-*** 609,611 ****
---- 609,614 ----
-  #define ENULLLOOP(_v,_c)   do{ errno = 0; \
-                                 while (((_v)=_c)==0 && errno==EINTR); }while(0)
-  
-+ extern int enable_nested_output;
-+ extern int stdout_nesting_level;
-+ extern int stderr_nesting_level;
-diff -rc reremake.c
-*** remake.c	2006-03-20 03:36:37.000000000 +0100
---- remake.c	2009-01-19 19:39:40.000000000 +0100
-***************
-*** 1120,1126 ****
---- 1120,1137 ----
-        /* The normal case: start some commands.  */
-        if (!touch_flag || file->cmds->any_recurse)
-  	{
-+           if (enable_nested_output) 
-+             {
-+               log_working_directory (1);
-+               fprintf(stderr, "\e[pbuilding %s\n", file->name);
-+               stderr_nesting_level++;
-+             }
-  	  execute_file_commands (file);
-+           if (enable_nested_output) 
-+             {
-+               fprintf(stderr, "\e[q");
-+               stderr_nesting_level--;
-+             }
-  	  return;
-  	}
-  

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

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   patches = [(fetchpatch {
     name = "perl-5.22.patch";
     url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool"
-      + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co";
+      + "/debian/patches/perl5.22-regex-fixes.patch?revision=47258&view=co";
     sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3";
   })];
 

pkgs/games/blobby/blobby.sh

@@ -0,0 +1,10 @@
+#! @shell@
+
+test -d ~/.blobby || {
+  mkdir ~/.blobby
+  cp -r "@out@/share/blobby"/* ~/.blobby
+  chmod u+w -R ~/.blobby
+  ( cd ~/.blobby; for i in *.zip; do @unzip@/bin/unzip "$i"; done )
+}
+
+@out@/bin/blobby.bin

pkgs/games/blobby/default.nix

@@ -1,5 +1,5 @@
 {stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib
-, pkgconfig}:
+, pkgconfig, unzip}:
 stdenv.mkDerivation rec {
   version = "1.0";
   name = "blobby-volley-${version}";
@@ -9,12 +9,22 @@ stdenv.mkDerivation rec {
     sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms";
   };
 
-  buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig];
+  buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig
+    unzip];
 
   preConfigure=''
     sed -e '1i#include <iostream>' -i src/NetworkMessage.cpp
   '';
 
+  inherit unzip;
+
+  postInstall = ''
+    cp ../data/Icon.bmp "$out/share/blobby/"
+    mv "$out/bin"/blobby{,.bin}
+    substituteAll "${./blobby.sh}" "$out/bin/blobby"
+    chmod a+x "$out/bin/blobby"
+  '';
+
   meta = {
     description = ''A blobby volleyball game'';
     license = stdenv.lib.licenses.bsd3;

pkgs/os-specific/linux/android-udev-rules/default.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20160805";
+  version = "20161014";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "0sdf3insqs73cdzmwl3lqy7nj82f1lprxd3vm0jh3qpf0sd1k93c";
+    sha256 = "0xc7wslxf7xsvfbd83wsw4nikmpq1zfd607y2p2r3j1vkw1yak08";
   };
 
   installPhase = ''

pkgs/os-specific/linux/iputils/default.nix

@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
 
       mkdir -p $out/share/man/man8
       cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \
-        doc/tracepath.8 doc/ninfod.8 $out/share/man/man8
+        doc/tracepath.8 doc/ninfod.8 doc/traceroute6.8 \
+        $out/share/man/man8
       ln -s $out/share/man/man8/{ping,ping6}.8
       ln -s $out/share/man/man8/{tracepath,tracepath6}.8
     '';

pkgs/os-specific/linux/kernel/linux-4.4.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.27";
+  version = "4.4.28";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1zbahhbwxdhl7v0l2ch1ybllywj2df3rmy8w451whr79z7c7shvc";
+    sha256 = "1z7ln5llv67n2y9k6ihy4l4zm03yabhma8xhc0psp4x8168wn6l4";
   };
 
   kernelPatches = args.kernelPatches;

pkgs/os-specific/linux/kernel/linux-4.8.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.4";
+  version = "4.8.5";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1c122kcd98ljk2f7w4qkbx4cjv7a50w4gdc9qrxkpciaj4yqvjy1";
+    sha256 = "0264h3b8h4bqgcif2jzbz4yzv290nrn444bhcqzb0lizj8a1f5s8";
   };
 
   kernelPatches = args.kernelPatches;

pkgs/os-specific/linux/kernel/linux-testing.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9-rc2";
+  version = "4.9-rc3";
-  modDirVersion = "4.9.0-rc2";
+  modDirVersion = "4.9.0-rc3";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1hf913mgyz5niy971c505s8yhqrdvq65psdrjz7cxmdxsb96pk94";
+    sha256 = "16dvjxh1i0s18mzm2bcj1v1drv7n2id39jgy71n7i5pyvzc5ffhj";
   };
 
   features.iwlwifi = true;

pkgs/os-specific/linux/wpa_supplicant/gui.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, inkscape, wpa_supplicant }:
+{ stdenv, fetchurl, qt4, qmake4Hook, imagemagick, wpa_supplicant }:
 
 stdenv.mkDerivation {
   name = "wpa_gui-${wpa_supplicant.version}";
@@ -6,33 +6,29 @@ stdenv.mkDerivation {
   inherit (wpa_supplicant) src;
 
   buildInputs = [ qt4 ];
+  nativeBuildInputs = [ qmake4Hook imagemagick ];
 
-  nativeBuildInputs = [ inkscape qmake4Hook ];
+  patches = [ ./remove_inkscape.patch ];
+  prePatch = ''
+    cd wpa_supplicant/wpa_gui-qt4
+  '';
 
-  prePatch = "cd wpa_supplicant/wpa_gui-qt4";
+  preConfigure = ''
+    lrelease wpa_gui.pro
+  '';
 
-  preConfigure =
+  postBuild = ''
-    ''
+    make -C icons
-      lrelease wpa_gui.pro
+  '';
-    '';
 
-  # We do not install .xpm icons. First of all, I don't know where they should
+  installPhase = ''
-  # be install. Second, this allows us to drop imagemagick build-time dependency.
+    mkdir -pv $out/bin
-  postBuild =
+    cp -v wpa_gui $out/bin
-    ''
+    mkdir -pv $out/share/applications
-      sed -e '/ICONS.*xpm/d' -i icons/Makefile
+    cp -v wpa_gui.desktop $out/share/applications
-      make -C icons
+    mkdir -pv $out/share/icons
-    '';
+    cp -av icons/hicolor $out/share/icons
-
+  '';
-  installPhase =
-    ''
-      mkdir -pv $out/bin
-      cp -v wpa_gui $out/bin
-      mkdir -pv $out/share/applications
-      cp -v wpa_gui.desktop $out/share/applications
-      mkdir -pv $out/share/icons
-      cp -av icons/hicolor $out/share/icons
-    '';
 
   meta = {
     description = "Qt-based GUI for wpa_supplicant";

pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch

@@ -0,0 +1,30 @@
+From 7a42ef048b420f9b939085ea8c6af6deb9c19dac Mon Sep 17 00:00:00 2001
+From: Moritz Ulrich <moritz@tarn-vedra.de>
+Date: Sun, 30 Oct 2016 22:17:54 +0100
+Subject: [PATCH] Foo
+
+---
+ icons/Makefile | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/icons/Makefile b/icons/Makefile
+index 709514c..9a5fa94 100644
+--- a/icons/Makefile
++++ b/icons/Makefile
+@@ -9,10 +9,9 @@ all: $(ICONS)
+ 
+ %.png:
+ 	mkdir -p hicolor/$(word 1, $(subst /, ,$(@)))/apps/
+-	inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) --without-gui \
+-		--export-width=$(word 1, $(subst x, , $(@)))  \
+-	        --export-height=$(word 2, $(subst x, , $(subst /, , $(@)))) \
+-		--export-png=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
++	convert $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) \
++		-size $(word 1, $(subst x, , $(@)))x$(word 2, $(subst x, , $(subst /, , $(@)))) \
++		hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
+ 
+ %.xpm:
+ 	mkdir -p pixmaps/
+-- 
+2.10.1
+

pkgs/servers/dict/dictd-db.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, callPackage }:
 
 let
  # Probably a bug in some FreeDict release files, but easier to trivially
@@ -82,4 +82,6 @@ in rec {
     dbName = "mueller-names";
     locale = "en_UK";
   };
+  wordnet = callPackage ./dictd-wordnet.nix {};
+  wiktionary = callPackage ./dictd-wiktionary.nix {};
 }

pkgs/servers/dict/dictd-wiktionary.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, dict, glibcLocales, writeScript}:
 
 stdenv.mkDerivation rec {
-  version = "20140118";
+  version = "20161001";
   name = "dict-db-wiktionary-${version}";
   data = fetchurl {
     url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
-    sha256 = "892c9fc16b248a31e2d3e42590267161c1b899b31fe923eb1ede1deb6d24cfa8";
+    sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m";
   };
 
   convert = ./wiktionary2dict.py;

pkgs/servers/nosql/redis/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.3";
+  version = "3.2.5";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "05az2g3gna5lkhh6x1a5m6yardbiig1l4ysggldlk5if8ww9qkk7";
+    sha256 = "05ak12xfkcinky6wvhy77knzd95m4vlshwka6jrdcjfqxyqww2c5";
   };
 
   buildInputs = [ lua ];

pkgs/stdenv/generic/default.nix

@@ -234,6 +234,7 @@ let
           outputs = outputs';
         } else { })))) (
       {
+        overrideAttrs = f: mkDerivation (attrs // (f attrs));
         # The meta attribute is passed in the resulting attribute set,
         # but it's not part of the actual derivation, i.e., it's not
         # passed to the builder and is not a dependency.  But since we

pkgs/tools/X11/xpra/default.nix

@@ -10,11 +10,11 @@ with lib;
 let
   inherit (pythonPackages) python cython buildPythonApplication;
 in buildPythonApplication rec {
-  name = "xpra-0.17.5";
+  name = "xpra-0.17.6";
   namePrefix = "";
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "01k5iax42820pblfadig8rqfa1wlcgpakmjp142gx3fg59fnav3i";
+    sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj";
   };
 
   buildInputs = [

pkgs/tools/audio/darkice/default.nix

@@ -1,24 +1,9 @@
-{ stdenv, buildEnv, fetchurl
+{ stdenv, buildEnv, fetchurl, pkgconfig
 , libjack2, alsaLib, libpulseaudio
 , faac, lame, libogg, libopus, libvorbis, libsamplerate
 }:
 
-let
+stdenv.mkDerivation rec {
-  oggEnv = buildEnv {
-    name = "env-darkice-ogg";
-    paths = [
-      libopus.dev libopus libvorbis.dev libvorbis libogg.dev libogg
-    ];
-  };
-
-  darkiceEnv = buildEnv {
-    name = "env-darkice";
-    paths = [
-      lame.out lame.lib libpulseaudio libpulseaudio.dev alsaLib alsaLib.dev libsamplerate.out libsamplerate.dev
-    ];
-  };
-
-in stdenv.mkDerivation rec {
   name = "darkice-${version}";
   version = "1.3";
 
@@ -27,17 +12,16 @@ in stdenv.mkDerivation rec {
     sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame
+  ];
+
+  NIX_CFLAGS_COMPILE = "-fpermissive";
+
   configureFlags = [
-    "--with-alsa-prefix=${darkiceEnv}"
     "--with-faac-prefix=${faac}"
-    "--with-jack-prefix=${libjack2}"
+    "--with-lame-prefix=${lame.lib}"
-    "--with-lame-prefix=${darkiceEnv}"
-    "--with-opus-prefix=${oggEnv}"
-    "--with-pulseaudio-prefix=${darkiceEnv}"
-    "--with-samplerate-prefix=${darkiceEnv}"
-    "--with-vorbis-prefix=${oggEnv}"
-#    "--with-aacplus-prefix=${aacplus}" ### missing: aacplus
-#    "--with-twolame-prefix=${twolame}" ### missing: twolame
   ];
 
   patches = [ ./fix-undeclared-memmove.patch ];

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

@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.10.25";
+  version = "2016.10.31";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "920048c6ff2f7f2c4b55c1ba4810e85f76efd814118e59b3568bdc2c38024697";
+    sha256 = "b8a0889bf4fed2f54d8ebbc6ea7860feae05b122d1b192417af68159b83f0bb4";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

pkgs/tools/security/mpw/default.nix

@@ -1,37 +1,41 @@
-{ stdenv, fetchurl, autoconf, automake, openssl, libxml2 }:
+{ stdenv, fetchzip, autoconf, automake, openssl, libxml2, fetchFromGitHub, ncurses }:
 
 let
-  scrypt_src = fetchurl {
+  scrypt_src = fetchzip {
-    url = "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz";
+    url = "http://www.tarsnap.com/scrypt/scrypt-1.2.0.tgz";
-    sha256 = "02vz4i66v1acd15xjgki4ilmmp28m6a5603gi4hf8id3d3ndl9n7";
+    sha256 = "0ahylib2pimlhjcm566kpim6n16jci5v749xwdkr9ivgfjrv3xn4";
   };
 
 in stdenv.mkDerivation {
-  name = "mpw-2.1-cli4";
+  name = "mpw-2.1-6834f36";
 
-  srcs = [
+  src = fetchFromGitHub {
-    (fetchurl {
+    owner = "Lyndir";
-      url = "https://ssl.masterpasswordapp.com/mpw-2.1-cli4-0-gf6b2287.tar.gz";
+    repo = "MasterPassword";
-      sha256 = "141bzb3nj18rbnbpdvsri8cdwwwxz4d6akyhfa834542xf96b9vf";
+    rev = "6834f3689f5dfd4e59ad6959961d349c224977ee";
-    })
+    sha256 = "0zlpx3hb1y2l60hg961h05lb9yf3xb5phnyycvazah2674gkwb2p";
-    scrypt_src
+  };
-  ];
-
-  sourceRoot = ".";
 
   postUnpack = ''
-    cp -R libscrypt-b12b554/* lib/scrypt
+    sourceRoot+=/MasterPassword/C
   '';
 
   prePatch = ''
     patchShebangs .
+    mkdir lib/scrypt/src
+    cp -R --no-preserve=ownership ${scrypt_src}/* lib/scrypt/src
+    chmod +w -R lib/scrypt/src
+    substituteInPlace lib/scrypt/src/libcperciva/cpusupport/Build/cpusupport.sh \
+      --replace dirname "$(type -P dirname)"
+    substituteInPlace lib/scrypt/src/Makefile.in --replace "command -p mv" "mv"
   '';
 
   NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
 
-  buildInputs = [ autoconf automake openssl libxml2 ];
+  buildInputs = [ autoconf automake openssl libxml2 ncurses ];
 
   buildPhase = ''
+    substituteInPlace build --replace '"curses"' '"ncurses"'
     targets="mpw mpw-tests" ./build
   '';
 

pkgs/tools/text/silver-searcher/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "silver-searcher-${version}";
-  version = "0.32.0";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "ggreer";
     repo = "the_silver_searcher";
     rev = "${version}";
-    sha256 = "0mz0i41fb6yrvn5x99bwaa66wqv5c8s5wd9pbnn90mgppxbn1037";
+    sha256 = "19705cgn8h476hkfyal3s5kx9mnz64hiz6dihnrx22fa3xvjfzlg";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

pkgs/tools/typesetting/asciidoctor/Gemfile.lock

@@ -4,33 +4,33 @@ GEM
     Ascii85 (1.0.2)
     addressable (2.4.0)
     afm (0.2.2)
-    asciidoctor (1.5.4)
+    asciidoctor (1.5.5)
     asciidoctor-bespoke (1.0.0.alpha.1)
       asciidoctor (>= 1.5.0)
       slim (~> 3.0.6)
       thread_safe (~> 0.3.5)
-    asciidoctor-diagram (1.4.0)
+    asciidoctor-diagram (1.5.2)
       asciidoctor (~> 1.5.0)
-    asciidoctor-latex (1.5.0.8.dev)
+    asciidoctor-latex (1.5.0.17.dev)
       asciidoctor (~> 1.5, >= 1.5.2)
       htmlentities (~> 4.3)
       opal (~> 0.6.3)
-    asciidoctor-pdf (1.5.0.alpha.11)
+    asciidoctor-pdf (1.5.0.alpha.13)
-      asciidoctor (~> 1.5.0)
+      asciidoctor (>= 1.5.0)
       prawn (>= 1.3.0, < 3.0.0)
-      prawn-icon (= 1.0.0)
+      prawn-icon (= 1.2.0)
-      prawn-svg (= 0.21.0)
+      prawn-svg (>= 0.21.0, < 0.26.0)
       prawn-table (= 0.2.2)
       prawn-templates (= 0.0.3)
       safe_yaml (~> 1.0.4)
       thread_safe (~> 0.3.5)
       treetop (= 1.5.3)
     concurrent-ruby (1.0.2)
-    css_parser (1.4.1)
+    css_parser (1.4.6)
       addressable
     hashery (2.1.2)
     htmlentities (4.3.4)
-    json (1.8.3)
+    json (2.0.2)
     opal (0.6.3)
       source_map
       sprockets
@@ -45,30 +45,30 @@ GEM
     prawn (2.1.0)
       pdf-core (~> 0.6.1)
       ttfunk (~> 1.4.0)
-    prawn-icon (1.0.0)
+    prawn-icon (1.2.0)
       prawn (>= 1.1.0, < 3.0.0)
-    prawn-svg (0.21.0)
+    prawn-svg (0.25.2)
       css_parser (~> 1.3)
-      prawn (>= 0.8.4, < 3)
+      prawn (>= 0.11.1, < 3)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     prawn-templates (0.0.3)
       pdf-reader (~> 1.3)
       prawn (>= 0.15.0)
-    rack (1.6.4)
+    rack (2.0.1)
     ruby-rc4 (0.1.5)
     safe_yaml (1.0.4)
-    slim (3.0.6)
+    slim (3.0.7)
-      temple (~> 0.7.3)
+      temple (~> 0.7.6)
       tilt (>= 1.3.3, < 2.1)
     source_map (3.0.1)
       json
-    sprockets (3.6.0)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    temple (0.7.6)
+    temple (0.7.7)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.5)
     treetop (1.5.3)
       polyglot (~> 0.3)
     ttfunk (1.4.0)
@@ -84,4 +84,4 @@ DEPENDENCIES
   asciidoctor-pdf
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

pkgs/tools/typesetting/asciidoctor/gemset.nix

@@ -26,10 +26,10 @@
   asciidoctor = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xrli1fjsf1f0h6d9g55vzivxbqac2ygawcacx5ijnqn522wg9qc";
+      sha256 = "0kj2lls8f83nlhfkdkmbf7k5q9c9kk1cc15b1a4dy6arx4yzmvw7";
       type = "gem";
     };
-    version = "1.5.4";
+    version = "1.5.5";
   };
   asciidoctor-bespoke = {
     source = {
@@ -42,26 +42,26 @@
   asciidoctor-diagram = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yb2gqzzbvgf5im0bhv26s3h09m9m6a0pjlq3swqcvwi1szc64k5";
+      sha256 = "1di271v0ic6d5xkqbbwg6scjyj1ypklgy211gdmhf18xzpka3fvi";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.5.2";
   };
   asciidoctor-latex = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wdrhcxz0sz9kx2zxn3qbqm5p664n9gzvv3lmg3214pj3si5wxnn";
+      sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz";
       type = "gem";
     };
-    version = "1.5.0.8.dev";
+    version = "1.5.0.17.dev";
   };
   asciidoctor-pdf = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06jsbn1yiavg6r07k93rmjxj6ah8csqla5mpymqjzslrkgjg5brs";
+      sha256 = "0lp1q1yxy4y9k3znxxgj6pl0cbymz0yk5hsif73sg2bnpk62id9i";
       type = "gem";
     };
-    version = "1.5.0.alpha.11";
+    version = "1.5.0.alpha.13";
   };
   concurrent-ruby = {
     source = {
@@ -74,10 +74,10 @@
   css_parser = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ql5q4n39278prbdjdsxx9wkxkxblgzzn0qcdqnwibgd1dkvb5av";
+      sha256 = "0zsldn0ihmzl7nqk4lww9h8ijv1zb3l8g92y7b4w0da2d6cnyjw8";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.4.6";
   };
   hashery = {
     source = {
@@ -98,10 +98,10 @@
   json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "2.0.2";
   };
   opal = {
     source = {
@@ -146,18 +146,18 @@
   prawn-icon = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07dcsvxg52zdywhg28p6zsbj7ybz3xzbklawc1n7jwym2mli3916";
+      sha256 = "101npavqvv5w44vgphlkqn3gdawxmsnd4j8bk6lzbxz7niqgaqny";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.2.0";
   };
   prawn-svg = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1p5fsamh33xqp2gld0j4ii80awsxmm4ffp5pq13m0s1gavzaapc3";
+      sha256 = "19zc7i6jxycs9m00frvv9g3x98sgzsyb1xf1xnn3h1ki574ibnip";
       type = "gem";
     };
-    version = "0.21.0";
+    version = "0.25.2";
   };
   prawn-table = {
     source = {
@@ -178,10 +178,10 @@
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+      sha256 = "053bqbrxr5gjw5k3rrmh6i35s83kgdycxv292lid072vpwrq1xv1";
       type = "gem";
     };
-    version = "1.6.4";
+    version = "2.0.1";
   };
   ruby-rc4 = {
     source = {
@@ -202,10 +202,10 @@
   slim = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k";
+      sha256 = "122hmc2kn3g151m8c41imadw29mghnsjwyzj8wav5zb1q69y4iqp";
       type = "gem";
     };
-    version = "3.0.6";
+    version = "3.0.7";
   };
   source_map = {
     source = {
@@ -218,18 +218,18 @@
   sprockets = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16fnlp4fqzrdxlbalbx3r0bir7dwyr1asg7s9lsmmczngl0x7fw7";
+      sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   temple = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0";
+      sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6";
       type = "gem";
     };
-    version = "0.7.6";
+    version = "0.7.7";
   };
   thread_safe = {
     source = {
@@ -242,10 +242,10 @@
   tilt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84";
+      sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf";
       type = "gem";
     };
-    version = "2.0.2";
+    version = "2.0.5";
   };
   treetop = {
     source = {

pkgs/top-level/all-packages.nix

@@ -250,6 +250,8 @@ in
   fetchNuGet = callPackage ../build-support/fetchnuget { };
   buildDotnetPackage = callPackage ../build-support/build-dotnet-package { };
 
+  fetchgx = callPackage ../build-support/fetchgx { };
+
   resolveMirrorURLs = {url}: fetchurl {
     showURLs = true;
     inherit url;
@@ -2327,6 +2329,8 @@ in
 
   lnav = callPackage ../tools/misc/lnav { };
 
+  loc = callPackage ../development/misc/loc { };
+
   lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
 
   logstash = callPackage ../tools/misc/logstash { };
@@ -5505,6 +5509,7 @@ in
   pythonFull = python.override{x11Support=true;};
   python2Full = python2.override{x11Support=true;};
   python3Full = python3.override{x11Support=true;};
+  python27Full = python2Full;
 
   # pythonPackages further below, but assigned here because they need to be in sync
   pythonPackages = python2Packages;
@@ -6045,7 +6050,6 @@ in
   gnum4 = callPackage ../development/tools/misc/gnum4 { };
 
   gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
-  gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
   gnumake3 = gnumake382;
   gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { };
@@ -9935,10 +9939,6 @@ in
 
   dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix {};
 
-  dictdWiktionary = callPackage ../servers/dict/dictd-wiktionary.nix {};
-
-  dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
-
   diod = callPackage ../servers/diod { lua = lua5_1; };
 
   #dnschain = callPackage ../servers/dnschain { };
@@ -17115,6 +17115,8 @@ in
 
   pt = callPackage ../applications/misc/pt { };
 
+  pyload = callPackage ../applications/networking/pyload {};
+
   uae = callPackage ../misc/emulators/uae { };
 
   fsuae = callPackage ../misc/emulators/fs-uae { };

pkgs/top-level/python-packages.nix

@@ -4056,6 +4056,16 @@ in {
     };
   });
 
+  contexter = buildPythonPackage rec {
+    name = "contexter-${version}";
+    version = "0.1.3";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/c/contexter/${name}.tar.gz";
+      sha256 = "0xrnkjya29ya0hkj8y4k9ni2mnr58i6r0xfqlj7wk07v4jfrkc8n";
+    };
+  };
+
 
   contextlib2 = buildPythonPackage rec {
     name = "contextlib2-${version}";
@@ -19417,7 +19427,7 @@ in {
       sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839";
     };
 
-    propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl ];
+    propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
 
     # error: invalid command 'test'
     doCheck = false;
@@ -19427,6 +19437,11 @@ in {
       export PYCURL_SSL_LIBRARY=openssl
     '';
 
+    #TODO no idea why this is needed
+    postInstall = ''
+      ln -s ${pkgs.openssl.out}/lib/libcrypto* $out/lib/
+    '';
+
     meta = {
       homepage = http://pycurl.sourceforge.net/;
       description = "Python wrapper for libcurl";
@@ -19434,7 +19449,6 @@ in {
     };
   });
 
-
   pycurl2 = buildPythonPackage (rec {
     name = "pycurl2-7.20.0";
     disabled = isPy3k;
@@ -23281,6 +23295,18 @@ in {
     };
   };
 
+  pip2nix = buildPythonPackage rec {
+    name = "pip2nix-${version}";
+    version = "0.3.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pip2nix/${name}.tar.gz";
+      sha256 = "1s76i8r4khq8y5r6g4218jg2c6qldmw5xhzymxad51ii8hafpwq6";
+    };
+
+    propagatedBuildInputs = with self; [ click configobj contexter jinja2 pytest ];
+  };
+
   pychef = buildPythonPackage rec {
     name    = "PyChef-${version}";
     version = "0.3.0";
@@ -25160,6 +25186,7 @@ in {
       sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h";
     };
 
+    doCheck = false;
     propagatedBuildInputs = with self; [ requests2 six requests_oauthlib ];
 
     meta = {
@@ -28987,12 +29014,12 @@ in {
   };
 
   neovim = buildPythonPackage rec {
-    version = "0.1.9";
+    version = "0.1.10";
     name = "neovim-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/neovim/${name}.tar.gz";
-      sha256 = "09q7yz0v9i90grp4cmb1w8dps58q9xny7sb12kgmd8gcr8xwk4dx";
+      sha256 = "1n6xxh0n250qbvrdl0cw114d890nfv6d0wjk5wpr505sg2bg9jx4";
     };
 
     buildInputs = with self; [ nose ];
@@ -29019,22 +29046,18 @@ in {
 
   neovim_gui = buildPythonPackage rec {
     name = "neovim-pygui-${self.neovim.version}";
-    version = "0.1.2";
+    version = "0.1.3";
     disabled = !isPy27;
 
     src = pkgs.fetchFromGitHub {
       owner = "neovim";
       repo = "python-gui";
       rev = version;
-      sha256 = "0sc5apxwxgfj57q7d9cih404jgvczbp7slz5z8wqdyxpxlb42pn2";
+      sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz";
     };
 
-    buildInputs = with self; [ neovim ];
-
     propagatedBuildInputs = [
-      self.msgpack
+      self.neovim
-      self.greenlet
-      self.trollius
       self.click
       self.pygobject3
       pkgs.gobjectIntrospection

pkgs/top-level/rust-packages.nix

@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-09-29";
+  version = "2016-10-29";
-  rev = "12dc47026cadf5aa2823c9d0fdd055b9f2c0f52c";
+  rev = "623cc0d9328bfb949b54209443f2b4f06c41961e";
-  sha256 = "0la6wlnbiwjixcxbq6k0d8m5js8lk5wz5f3mvdx8hwl5car20w6m";
+  sha256 = "1jyb0ixnrxb7m0c18p6yfi6x8rsy3yz5yc3nyz9f462fr4g6azcs";
 
   src = fetchFromGitHub {
       inherit rev;