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

2017-09-05 20:14:08 +02:00 · 2017-09-05 20:14:08 +02:00 · bbeeee220a
commit bbeeee220a
parent c7be7c54e8 5b6d78194c
76 changed files with 2758 additions and 1028 deletions
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -212,6 +212,7 @@
  fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
  fuzzy-id = "Thomas Bach <hacking+nixos@babibo.de>";
  fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>";
+  gabesoft = "Gabriel Adomnicai <gabesoft@gmail.com>";
  gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>";
  garbas = "Rok Garbas <rok@garbas.si>";
  garrison = "Jim Garrison <jim@garrison.cc>";
@ -574,6 +575,7 @@
  taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";
  tari = "Peter Marheine <peter@taricorp.net>";
  tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
+  ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
  teh = "Tom Hunger <tehunger@gmail.com>";
  telotortium = "Robert Irelan <rirelan@gmail.com>";
  thall = "Niclas Thall <niclas.thall@gmail.com>";
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@ -16,7 +16,7 @@ containers.database =
  { config =
      { config, pkgs, ... }:
      { services.postgresql.enable = true;
-        services.postgresql.package = pkgs.postgresql92;
+        services.postgresql.package = pkgs.postgresql96;
      };
  };
 </programlisting>
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@ -53,7 +53,7 @@ in
          };

          substitutions = mkOption {
-            type = types.nullOr (types.enum ["free" "combi" "ms"]);
+            type = types.enum ["free" "combi" "ms" "none"];
            default = "free";
            description = ''
              Font substitutions to replace common Type 1 fonts with nicer
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@ -59,7 +59,7 @@ in

      package = mkOption {
        type = types.package;
-        example = literalExample "pkgs.postgresql92";
+        example = literalExample "pkgs.postgresql96";
        description = ''
          PostgreSQL package to use.
        '';
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@ -595,7 +595,7 @@ in
              { config =
                  { config, pkgs, ... }:
                  { services.postgresql.enable = true;
-                    services.postgresql.package = pkgs.postgresql92;
+                    services.postgresql.package = pkgs.postgresql96;
                  };
              };
          }
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@ -91,6 +91,8 @@ in rec {
        (all nixos.tests.keymap.neo)
        (all nixos.tests.keymap.qwertz)
        (all nixos.tests.plasma5)
+        (all nixos.tests.kernel-latest)
+        (all nixos.tests.kernel-lts)
        #(all nixos.tests.lightdm)
        (all nixos.tests.login)
        (all nixos.tests.misc)
--- a/nixos/release.nix
+++ b/nixos/release.nix
@ -261,6 +261,9 @@ in rec {
  tests.plasma5 = callTest tests/plasma5.nix {};
  tests.keymap = callSubTests tests/keymap.nix {};
  tests.initrdNetwork = callTest tests/initrd-network.nix {};
+  tests.kernel-copperhead = tests/kernel-copperhead.nix {};
+  tests.kernel-latest = tests/kernel-latest.nix {};
+  tests.kernel-lts = tests/kernel-lts.nix {};
  tests.keystone = callTest tests/keystone.nix {};
  tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
  tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
--- a/nixos/tests/kernel-copperhead.nix
+++ b/nixos/tests/kernel-copperhead.nix
@ -0,0 +1,19 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "kernel-copperhead";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { config, lib, pkgs, ... }:
+    {
+      boot.kernelPackages = pkgs.linuxPackages_hardened_copperhead;
+    };
+
+  testScript =
+    ''
+      $machine->succeed("uname -a");
+      $machine->succeed("uname -s | grep 'Linux'");
+      $machine->succeed("uname -a | grep '${pkgs.linuxPackages_hardened_copperhead.kernel.modDirVersion}'");
+      $machine->succeed("uname -a | grep 'hardened'");
+    '';
+})
--- a/nixos/tests/kernel-latest.nix
+++ b/nixos/tests/kernel-latest.nix
@ -0,0 +1,17 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "kernel-latest";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { config, lib, pkgs, ... }:
+    {
+      boot.kernelPackages = pkgs.linuxPackages_latest;
+    };
+
+  testScript =
+    ''
+      $machine->succeed("uname -s | grep 'Linux'");
+      $machine->succeed("uname -a | grep '${pkgs.linuxPackages_latest.kernel.version}'");
+    '';
+})
--- a/nixos/tests/kernel-lts.nix
+++ b/nixos/tests/kernel-lts.nix
@ -0,0 +1,17 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "kernel-lts";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nequissimus ];
+  };
+
+  machine = { config, lib, pkgs, ... }:
+    {
+      boot.kernelPackages = pkgs.linuxPackages;
+    };
+
+  testScript =
+    ''
+      $machine->succeed("uname -s | grep 'Linux'");
+      $machine->succeed("uname -a | grep '${pkgs.linuxPackages.kernel.version}'");
+    '';
+})
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ... }: {
    postgresql =
      { config, pkgs, ... }:
      { services.postgresql.enable = true;
-        services.postgresql.package = pkgs.postgresql92;
+        services.postgresql.package = pkgs.postgresql;
        services.postgresql.enableTCPIP = true;
        services.postgresql.authentication = ''
          # Generated file; do not edit!
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@ -8,18 +8,16 @@ with lib;

 stdenv.mkDerivation rec {
  name = "audio-recorder-${version}";
-  version = "1.9.4";
+  version = "1.9.7";

  src = fetchurl {
    name = "${name}-zesty.tar.gz";
    url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ezesty.tar.gz";
-    sha256 = "062bad38cz4fqzv418wza0x8sa4m5mqr3xsisrr1qgkqj9hg1f6x";
+    sha256 = "163c0vs5qj72y62731yp6sl6s0indh2szhjg02mxigv9b68dx89c";
  };

  nativeBuildInputs = [ pkgconfig intltool autoconf wrapGAppsHook ];

-  patches = [ ./icon-names.diff ];
-
  buildInputs = with gst_all_1; [
    glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf)
    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
--- a/pkgs/applications/audio/audio-recorder/icon-names.diff
+++ b/pkgs/applications/audio/audio-recorder/icon-names.diff
@ -1,51 +0,0 @@
-diff -ru audio-recorder/src/main.c audio-recorder.new/src/main.c
--- audio-recorder/src/main.c	2017-01-03 20:27:36.000000000 +0100
-+++ audio-recorder.new/src/main.c	2017-01-30 20:19:44.019255096 +0100
-@@ -1099,7 +1099,7 @@
-     gtk_container_add(GTK_CONTAINER(frame2), g_win.timer_text);
- 
-     // Timer [Save] button
-    g_win.timer_save_button = gtk_button_new_from_icon_name("gtk-save", GTK_ICON_SIZE_BUTTON);
-+    g_win.timer_save_button = gtk_button_new_from_icon_name("document-save", GTK_ICON_SIZE_BUTTON);
-     // Hide it
-     gtk_widget_hide(g_win.timer_save_button);
-     g_signal_connect(g_win.timer_save_button, "clicked", G_CALLBACK(win_timer_save_text_cb), NULL);
-@@ -1129,7 +1129,7 @@
-     // The [Info] button
-     GtkWidget *button0 = gtk_button_new();
-     gtk_widget_show(button0);
-    GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
-+    GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON);
-     gtk_widget_show(image);
-     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
-     gtk_button_set_image(GTK_BUTTON(button0), image);
-@@ -1220,7 +1220,7 @@
-     // Add [Reload] button
-     button0 = gtk_button_new();
-     gtk_widget_show(button0);
-    image = gtk_image_new_from_icon_name("gtk-refresh", GTK_ICON_SIZE_BUTTON);
-+    image = gtk_image_new_from_icon_name("view-refresh", GTK_ICON_SIZE_BUTTON);
-     gtk_widget_show(image);
-     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
- 
-@@ -1297,7 +1297,7 @@
-     gtk_widget_show(hbox4);
-     gtk_box_pack_start(GTK_BOX(vbox0), hbox4, FALSE, TRUE, 0);
- 
-    button0 = gtk_button_new_from_icon_name("gtk-close", GTK_ICON_SIZE_BUTTON);
-+    button0 = gtk_button_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON);
-     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
-     gtk_widget_show(button0);
-     gtk_box_pack_end(GTK_BOX(hbox4), button0, FALSE, FALSE, 0);
-diff -ru audio-recorder/src/settings.c audio-recorder.new/src/settings.c
--- audio-recorder/src/settings.c	2017-01-02 10:47:27.000000000 +0100
-+++ audio-recorder.new/src/settings.c	2017-01-30 20:23:04.621314105 +0100
-@@ -659,7 +659,7 @@
-     gtk_entry_set_invisible_char(GTK_ENTRY(file_name_pattern), 9679);
- 
-     button0 = gtk_button_new();
-    GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
-+    GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON);
-     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
-     gtk_button_set_image(GTK_BUTTON(button0), image);
-     g_signal_connect(button0, "clicked", G_CALLBACK(win_settings_show_filename_help), NULL);
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@ -6,6 +6,14 @@ stdenv.mkDerivation rec {
    url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
    sha256 = "081zx0i2ysw5nmy03j60q9j11zdlg1fxws81kwanncdgayxgwipp";
  };
+
+  patches = [
+    (fetchurl {
+      url = "https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/plain/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch";
+      sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway";
+    })
+  ];
+
  configurePhase = ''
    echo "PREFIX = $out" > defines.make
  '';
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@ -674,10 +674,10 @@
    ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
    elpaBuild {
        pname = "ebdb";
-        version = "0.2";
+        version = "0.3.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.2.tar";
-          sha256 = "177qrjpdg14dpip2cn18csnlidv5f8cj3xpayz6jlpbfqzyfx8bi";
+          url = "https://elpa.gnu.org/packages/ebdb-0.3.1.tar";
+          sha256 = "1g8chkw302nhjj8n6v7j3xfcw24wpn43pcp8f3bh4s4haw1l75q3";
        };
        packageRequires = [ cl-lib emacs seq ];
        meta = {
@ -702,10 +702,10 @@
    ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
    elpaBuild {
        pname = "ebdb-i18n-chn";
-        version = "1.0.1";
+        version = "1.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.0.1.el";
-          sha256 = "1g84xllw2dz6lhzschkyflqpsh3xx167161y6vjzq6yqkfy3gh1r";
+          url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.1.el";
+          sha256 = "0pf7qp15z9wp41dazvi4bhdz7y13h9k5nnghhsb0nvknn6if0k4m";
        };
        packageRequires = [ ebdb pyim ];
        meta = {
@ -1530,10 +1530,10 @@
      }) {};
    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org";
-        version = "20170828";
+        version = "20170904";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170828.tar";
-          sha256 = "0frjwgjyy7rwb7si57h6nd1p35a4gcd1dc0aka19kn8r59hbi08p";
+          url = "https://elpa.gnu.org/packages/org-20170904.tar";
+          sha256 = "1nbdphd102lwkj0sg1lywydkc547fzc8p1n8y507xwvxdjazdnyb";
        };
        packageRequires = [];
        meta = {
@ -2029,10 +2029,10 @@
      }) {};
    tiny = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "tiny";
-        version = "0.1.1";
+        version = "0.2.1";
        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tiny-0.1.1.tar";
-          sha256 = "1nhg8375qdn457wj0xmfaj72s87xbabk2w1nl6q7rjvwxv08yyn7";
+          url = "https://elpa.gnu.org/packages/tiny-0.2.1.tar";
+          sha256 = "1cr73a8gba549ja55x0c2s554f3zywf69zbnd7v82jz5q1k9wd2v";
        };
        packageRequires = [];
        meta = {
@ -2146,6 +2146,19 @@
          license = lib.licenses.free;
        };
      }) {};
+    vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "vigenere";
+        version = "1.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/vigenere-1.0.el";
+          sha256 = "1i5s6h1nngcp74gf53dw9pvj5y0ywk9j8pyvkfr7gqq49bz22hmm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vigenere.html";
+          license = lib.licenses.free;
+        };
+      }) {};
    vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "vlf";
        version = "1.7";
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@ -1732,12 +1732,12 @@
    apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "apiwrap";
-        version = "0.2";
+        version = "0.2.1";
        src = fetchFromGitHub {
          owner = "vermiculus";
          repo = "apiwrap.el";
-          rev = "1a3fff7a0265d1d13d6854b45e0c5ebe68a802de";
-          sha256 = "0pg67nlmdpfqlhljggm5id5pmddh8p6slgpwsqh1pmfqs328j5hq";
+          rev = "74b27a95429b3207d0005610d11223728039ba81";
+          sha256 = "1vp5crdjk3pswn6ip3vgkkc49kqnpayfjgzivfi6fplvhz8klrr1";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@ -3163,22 +3163,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "buffer-manage";
-        version = "0.4";
+        version = "0.5";
        src = fetchFromGitHub {
          owner = "plandes";
          repo = "buffer-manage";
-          rev = "aa743807f92d457f3a8904a2504a575f22951850";
-          sha256 = "19xjzx1fcms3cighb7qr79zd4vrlnpvzi1yrgxb6z2jvcgkb7b44";
+          rev = "1c63a3267bc7b790cebcea6308b64ca7ae08ef98";
+          sha256 = "1g4qchgf7gcy8mhynxklz3bh2nlrhshczpq6yzh7gpvgcaf2zg32";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
          sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb";
          name = "buffer-manage";
        };
-        packageRequires = [ choice-program emacs ];
+        packageRequires = [ choice-program dash emacs ];
        meta = {
          homepage = "https://melpa.org/#/buffer-manage";
          license = lib.licenses.free;
@ -4067,16 +4067,16 @@
    choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "choice-program";
-        version = "0.1";
+        version = "0.2";
        src = fetchFromGitHub {
          owner = "plandes";
          repo = "choice-program";
-          rev = "154c12ed7e2afc2d5dae031698be4787d7d647b0";
-          sha256 = "1695pmz0j93pz3pkcyqk0ngajcf8cyzxihmpp2zfspya3ihxj4ia";
+          rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852";
+          sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb";
        };
        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/894357125db5035999a39514516852d7e957453e/recipes/choice-program";
-          sha256 = "0hhp6qhrshqrw4978xq6biwddm7gv7yf4avbb64xvz66i3a2kgy1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program";
+          sha256 = "0a21yd3b8sb15vms9mclaa7xnnk0as08p6q38mwdwjp9sgcfyh1b";
          name = "choice-program";
        };
        packageRequires = [ cl-lib emacs ];
@ -8349,22 +8349,32 @@
          license = lib.licenses.free;
        };
      }) {};
-    ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
    melpaBuild {
        pname = "ein";
-        version = "0.12.8";
+        version = "0.13.0";
        src = fetchFromGitHub {
          owner = "millejoh";
          repo = "emacs-ipython-notebook";
-          rev = "2dcec6a2c4d3258a92f77a35de1899cc00d2f537";
-          sha256 = "0n8qvdj88d679ijjqs04cnnhz8prk8s3whijbp3lhlr5n034n8xa";
+          rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd";
+          sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
          sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
          name = "ein";
        };
-        packageRequires = [ cl-generic dash deferred request websocket ];
+        packageRequires = [
+          auto-complete
+          cl-generic
+          dash
+          deferred
+          request
+          request-deferred
+          s
+          skewer-mode
+          websocket
+        ];
        meta = {
          homepage = "https://melpa.org/#/ein";
          license = lib.licenses.free;
@ -8688,12 +8698,12 @@
    elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
    melpaBuild {
        pname = "elisp-refs";
-        version = "1.1";
+        version = "1.2";
        src = fetchFromGitHub {
          owner = "Wilfred";
          repo = "refs.el";
-          rev = "e309c87a91012305ecb37124a758609c64e0ca4a";
-          sha256 = "0wvz5ysaj2dnqhkp5xdqsm45fxwlhym5j8rn4g0h7g7zwdi3c6c6";
+          rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c";
+          sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@ -10263,16 +10273,16 @@
    esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "esxml";
-        version = "0.3.2";
+        version = "0.3.3";
        src = fetchFromGitHub {
          owner = "tali713";
          repo = "esxml";
-          rev = "fd0f0185cd579b00c3d76d2c383cd33fe642bb93";
-          sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb";
+          rev = "08fcc5d76abb90c194e181f267cf1d2a149b7a7c";
+          sha256 = "034lxfqn5yh78hz7i568vw8kyv3hlb699z2d1dffjiigc1lblgip";
        };
        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml";
-          sha256 = "0v63ihgg2db3648s2xygcky9s0vx9byjjpbhlgjy5j159w2w53vh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
+          sha256 = "1375gryii984l33gc8f8yhl3vncjmw1w9k6xpvjgmnpx2fwr1vbq";
          name = "esxml";
        };
        packageRequires = [];
@ -10683,12 +10693,12 @@
    evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "evil-nerd-commenter";
-        version = "3.0.3";
+        version = "3.1.0";
        src = fetchFromGitHub {
          owner = "redguardtoo";
          repo = "evil-nerd-commenter";
-          rev = "0a46b911200c75c4737bfdb2b71f10a9a8254969";
-          sha256 = "03v53zhm33fz6aib03j00bwkfqh2j45ziz7nwynynxm50j32axkg";
+          rev = "dac58399e8b1144d74d92d0a70a2d11187d1e797";
+          sha256 = "0sgm4kdjgik9snnjsycr34v17jxk8gpi8ygpddpf0zqp1v3hvjgc";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@ -15725,12 +15735,12 @@
    guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
    melpaBuild {
        pname = "guix";
-        version = "0.3.2";
+        version = "0.3.3";
        src = fetchFromGitHub {
          owner = "alezost";
          repo = "guix.el";
-          rev = "6d4ccb3f7376d6326b58b25f3c94ab546418a030";
-          sha256 = "13n8k5ak3y1x6i27x47sji49kdbqhnc3ywqkn4xwmxcnrs28kr25";
+          rev = "54bd174b514c5de11e82c4263ac2723addb0fe87";
+          sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@ -16081,12 +16091,12 @@
    hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "hasky-extensions";
-        version = "0.1.1";
+        version = "0.2.0";
        src = fetchFromGitHub {
          owner = "hasky-mode";
          repo = "hasky-extensions";
-          rev = "3f1862989a2ca3b79761dccfa352a1b6d518ee77";
-          sha256 = "10214654gvnyqimh4950jsw1r42p0y79pfl8h0x44mzll62bvz87";
+          rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa";
+          sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@ -16102,12 +16112,12 @@
    hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
    melpaBuild {
        pname = "hasky-stack";
-        version = "0.4.0";
+        version = "0.5.0";
        src = fetchFromGitHub {
          owner = "hasky-mode";
          repo = "hasky-stack";
-          rev = "2379f43b589115bd3960a11c26fa0a7d12316db7";
-          sha256 = "1vkmm3mf4zcf1wrkwln7ik4i17dqx7a9lb8j2j0l217hn7h3mk5s";
+          rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b";
+          sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@ -16165,12 +16175,12 @@
    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
    melpaBuild {
        pname = "helm";
-        version = "2.8.2";
+        version = "2.8.4";
        src = fetchFromGitHub {
          owner = "emacs-helm";
          repo = "helm";
-          rev = "d6bd5719dbe8b43f615245acf5846dfeca839867";
-          sha256 = "11fqhmyia8161hpsi2alfx3w32z573yl2sjkmn4n2kw8caa1l9x8";
+          rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93";
+          sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@ -16501,12 +16511,12 @@
    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "helm-core";
-        version = "2.8.2";
+        version = "2.8.4";
        src = fetchFromGitHub {
          owner = "emacs-helm";
          repo = "helm";
-          rev = "d6bd5719dbe8b43f615245acf5846dfeca839867";
-          sha256 = "11fqhmyia8161hpsi2alfx3w32z573yl2sjkmn4n2kw8caa1l9x8";
+          rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93";
+          sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@ -17110,12 +17120,12 @@
    helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
    melpaBuild {
        pname = "helm-notmuch";
-        version = "1.0";
+        version = "1.1";
        src = fetchFromGitHub {
          owner = "xuchunyang";
          repo = "helm-notmuch";
-          rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf";
-          sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360";
+          rev = "782c221bf293eee55990de5b54171f08d881dcee";
+          sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
@ -18412,12 +18422,12 @@
    hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "hy-mode";
-        version = "1.0";
+        version = "1.0.1";
        src = fetchFromGitHub {
          owner = "hylang";
          repo = "hy-mode";
-          rev = "c09b4e3cd8700966cb2120d5a4e62ebfb0b488b5";
-          sha256 = "054b1h621f6nfzz9nslyi1shs206my8s6zzv29k835by864bc0sq";
+          rev = "e5a4e5f64d14ca9eed06414fcdbad630c7c55ad5";
+          sha256 = "1a2b1knlyw9yklybdik30qaskbjxsi1p9fdsmdmk4frgq4xkzs3c";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@ -19375,6 +19385,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inline-crypt";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "Sodel-the-Vociferous";
+          repo = "inline-crypt-el";
+          rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282";
+          sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/inline-crypt";
+          sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
+          name = "inline-crypt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/inline-crypt";
+          license = lib.licenses.free;
+        };
+      }) {};
    inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "inlineR";
@ -22370,12 +22401,12 @@
    markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "markdown-mode";
-        version = "2.2";
+        version = "2.3";
        src = fetchFromGitHub {
          owner = "jrblevin";
          repo = "markdown-mode";
-          rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9";
-          sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs";
+          rev = "cde5c5d2bcce470c494b76e23cfe1364b6291c20";
+          sha256 = "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@ -24161,12 +24192,12 @@
    ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "ninja-mode";
-        version = "1.7.2";
+        version = "1.8.0";
        src = fetchFromGitHub {
          owner = "martine";
          repo = "ninja";
-          rev = "717b7b4a31db6027207588c0fb89c3ead384747b";
-          sha256 = "1pc4sr50wknwai33lqm92bm811yzvpyrvry9419p7wp3r6p3nmhw";
+          rev = "0c671527322d15016bb9ff5c3cf436f68e6ddbde";
+          sha256 = "0gy85bzvg50s1pd5vpwidbc4pqzbyxw011g575wv6fib3r7inhw5";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@ -25386,12 +25417,12 @@
    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "org-edit-latex";
-        version = "0.8.2";
+        version = "0.8.3";
        src = fetchFromGitHub {
          owner = "et2010";
          repo = "org-edit-latex";
-          rev = "83e03b6bef7746bc0a90c0a52ee8c18c4e87ada9";
-          sha256 = "1y9ycmsnwwc804zlsz20ad210plp0xgzjq69rpvry5gg17wp3nv8";
+          rev = "39cbc9a99acb030f537c7269ab93958187321871";
+          sha256 = "1w0lyz71dq8x28ira4hig1b70bqn1dr53w3k5dgch9szcf6xa86y";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
@ -32777,12 +32808,12 @@
    sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
    melpaBuild {
        pname = "sparql-mode";
-        version = "2.1.0";
+        version = "2.1.1";
        src = fetchFromGitHub {
          owner = "ljos";
          repo = "sparql-mode";
-          rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e";
-          sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa";
+          rev = "262c46a282ce54ca4745b863cf323d9bf69e2faa";
+          sha256 = "02ai86c15x0fbgg2bw6a9k3k825gkhl3hy9abq62dfgdwc0cqxmn";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@ -34452,22 +34483,22 @@
          license = lib.licenses.free;
        };
      }) {};
-    tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
+    tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
    melpaBuild {
        pname = "tide";
-        version = "2.4.2";
+        version = "2.5.2";
        src = fetchFromGitHub {
          owner = "ananthakumaran";
          repo = "tide";
-          rev = "f8b4752dfe7fde7b90c65895c47943231af3237d";
-          sha256 = "1hy0jzk457nz9rz7s4hq6b5asv9g9wrrs1fdsisz7jzy6hzw4pqp";
+          rev = "f1daf10e931858ac8d6ff676cf02ca73d3c62558";
+          sha256 = "1hj5mfpkfczy09ghmivkkzwmn6nawwv0ydm4ckz4mggps42hn0j1";
        };
        recipeFile = fetchurl {
          url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
          sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
          name = "tide";
        };
-        packageRequires = [ cl-lib dash flycheck typescript-mode ];
+        packageRequires = [ cl-lib dash flycheck s typescript-mode ];
        meta = {
          homepage = "https://melpa.org/#/tide";
          license = lib.licenses.free;
@ -34672,8 +34703,8 @@
          sha256 = "1993f06j1y5ch3v6gq3pp85r3bpv6cbnn19552jyl83lq0x5gi7c";
        };
        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
-          sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs";
+          sha256 = "1wcdifk6q1yjfhsndmkxx1d501zkls7nahkxavhmx6afgfslpppl";
          name = "treemacs";
        };
        packageRequires = [ ace-window cl-lib dash emacs f pfuture s ];
@ -36011,6 +36042,27 @@
          license = lib.licenses.free;
        };
      }) {};
+    web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "web-search";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "web-search.el";
+          rev = "3cb8610ced6b5a2eb2ef3f7cf3dcf90289ded3ff";
+          sha256 = "05s12gx2yvr0djxck134bj6d0ws0s7izhjk6272zd7b8aknc8ml9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search";
+          sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj";
+          name = "web-search";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://melpa.org/#/web-search";
+          license = lib.licenses.free;
+        };
+      }) {};
    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
    melpaBuild {
        pname = "webpaste";
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@ -1,10 +1,10 @@
 { callPackage }: {
    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org";
-        version = "20170828";
+        version = "20170904";
        src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170828.tar";
-          sha256 = "0zvszxw9dm1j3jf1fblvfc74kmiv3zmjydlkkj7q4vd0p4gnfvky";
+          url = "http://orgmode.org/elpa/org-20170904.tar";
+          sha256 = "1d0w3mmxdsfiwvpbc2ip21jxqlag0gk05214h86w52y9ymj0jbll";
        };
        packageRequires = [];
        meta = {
@ -14,10 +14,10 @@
      }) {};
    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
        pname = "org-plus-contrib";
-        version = "20170828";
+        version = "20170904";
        src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170828.tar";
-          sha256 = "0r3n7ilf4aqsg9hl057qkl70s9bd9w5884ddigbiahv88hldvv4y";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170904.tar";
+          sha256 = "1iz0xk5s5d6gpfxb3k2fz3xbrn5rhxnvkq69c5dbrfdk67rm7q4k";
        };
        packageRequires = [];
        meta = {
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@ -11,9 +11,6 @@ stdenv.mkDerivation rec {
  buildInputs = [ pkgconfig ncurses boehmgc ];
  nativeBuildInputs = [ help2man perl ];

-  # `help2man' wants to run Zile, which fails when cross-compiling.
-  crossAttrs.nativeBuildInputs = [];
-
  # Tests can't be run because most of them rely on the ability to
  # fiddle with the terminal.
  doCheck = false;
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@ -2,15 +2,15 @@
  libharu, opencv, vigra, postgresql }:

 stdenv.mkDerivation rec {
-  name = "saga-2.3.1";
+  name = "saga-5.0.0";

  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];

  enableParallelBuilding = true;

  src = fetchurl {
-    url = "mirror://sourceforge/project/saga-gis/SAGA%20-%202.3/SAGA%202.3.1/saga_2.3.1.tar.gz";
-    sha256 = "1h4zkfid9z02mqm1f8az9j0pzmm95f83ra57c4r7bvrrz21w3xaq";
+    url = "mirror://sourceforge/project/saga-gis/SAGA%20-%205/SAGA%20-%205.0.0/saga-5.0.0.tar.gz";
+    sha256 = "9be997209737e80262d9f13fd9b9797194a9f2facb10e5b9bd756d8cda675089";
  };

  meta = {
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@ -1,21 +1,22 @@
 { stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
+, libxcb
 , GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:

 let
  libPath = stdenv.lib.makeLibraryPath [
    stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
-    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
+    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
    libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
  ];
 in
 stdenv.mkDerivation rec {
-  version = "1.3.3";
+  version = "1.4.3";
  name = "hyper-${version}";
  src = fetchurl {
-    url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}.deb";
-    sha256 = "1i68n77yv1g4dfx4xfmcb06mfpwhf0gnb3wmldg2gxkhs0fn19zg";
+    url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
+    sha256 = "0f0qxhvwwcpsjnv1rgmdzdl5jwfprnd7fjnd6sb8liq250pij3ld";
  };
  buildInputs = [ dpkg ];
  unpackPhase = ''
@ -36,6 +37,6 @@ stdenv.mkDerivation rec {
    homepage    = https://hyper.is/;
    maintainers = with maintainers; [ puffnfresh ];
    license     = licenses.mit;
-    platforms   = [ "i686-linux" "x86_64-linux" ];
+    platforms   = [ "x86_64-linux" ];
  };
 }
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchFromGitHub
+{ stdenv, pkgconfig, fetchFromGitHub, fetchpatch
 , cmake, boost
 , portmidi, sqlite
 , freetype, libpng, pngpp, zlib
@ -22,6 +22,17 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  patches = [
+    (fetchpatch {
+      url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch";
+      sha256 = "1z1wwh0pcr8w1zlr8swx99si9y2kxx5bmavgwvy6bvdhxgm58yqs";
+    })
+    (fetchpatch {
+      url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch";
+      sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn";
+    })
+  ];
+
  buildInputs = [
    pkgconfig
    cmake boost
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@ -1,7 +1,10 @@
-{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl
-, spidermonkey_1_8_5, gpm
-, enableGuile ? false, guile ? null   # Incompatible licenses, LGPLv3 - GPLv2
-, enablePython ? false, python ? null
+{ stdenv, fetchurl, ncurses, xlibsWrapper, bzip2, zlib, openssl
+, gpm
+, # Incompatible licenses, LGPLv3 - GPLv2
+  enableGuile        ? false,                                         guile ? null
+, enablePython       ? false,                                         python ? null
+, enablePerl         ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
+, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_1_8_5 ? null
 }:

 assert enableGuile -> guile != null;
@ -17,28 +20,26 @@ stdenv.mkDerivation rec {

  patches = [ ./gc-init.patch ];

-  buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ]
+  buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ]
    ++ stdenv.lib.optional enableGuile guile
-    ++ stdenv.lib.optional enablePython python;
+    ++ stdenv.lib.optional enablePython python
+    ++ stdenv.lib.optional enablePerl perl
+    ;

-  configureFlags =
-    ''
-      --enable-finger --enable-html-highlight
-      --with-perl --enable-gopher --enable-cgi --enable-bittorrent
-      --with-spidermonkey=${spidermonkey_1_8_5}
-      --enable-nntp --with-openssl=${openssl.dev}
-    '' + stdenv.lib.optionalString enableGuile " --with-guile"
-    + stdenv.lib.optionalString enablePython " --with-python";
-
-  crossAttrs = {
-    propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];
-    configureFlags = ''
-      --enable-finger --enable-html-highlight
-      --enable-gopher --enable-cgi --enable-bittorrent --enable-nntp
-      --with-openssl=${openssl.crossDrv}
-      --with-bzip2=${bzip2.crossDrv}
-    '';
-  };
+  configureFlags = [
+    "--enable-finger"
+    "--enable-html-highlight"
+    "--enable-gopher"
+    "--enable-cgi"
+    "--enable-bittorrent"
+    "--enable-nntp"
+    "--with-openssl=${openssl.dev}"
+    "--with-bzip2=${bzip2.dev}"
+  ] ++ stdenv.lib.optional enableGuile        "--with-guile"
+    ++ stdenv.lib.optional enablePython       "--with-python"
+    ++ stdenv.lib.optional enablePerl         "--with-perl"
+    ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_1_8_5}"
+    ;

  meta = {
    description = "Full-featured text-mode web browser";
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@ -1,5 +1,5 @@
 { pname, version, updateScript ? null
-, src, patches ? [], overrides ? {}, meta
+, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [], overrides ? {}, meta
 , isTorBrowserLike ? false }:

 { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
@ -29,7 +29,6 @@
 # Set to `privacySupport` or `false`.

 , webrtcSupport ? !privacySupport
-, loopSupport ? !privacySupport || !isTorBrowserLike
 , geolocationSupport ? !privacySupport
 , googleAPISupport ? geolocationSupport
 , crashreporterSupport ? false
@ -44,11 +43,10 @@
 # option. However, in Firefox's case, those binaries may not be
 # distributed without permission from the Mozilla Foundation, see
 # http://www.mozilla.org/foundation/trademarks/.
-, enableOfficialBranding ? false
+, enableOfficialBranding ? isTorBrowserLike
 }:

 assert stdenv.cc ? libc && stdenv.cc.libc != null;
-assert !isTorBrowserLike -> loopSupport; # can't be disabled on firefox :(

 let
  flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
@ -147,8 +145,6 @@ stdenv.mkDerivation (rec {
  ++ flag ffmpegSupport "ffmpeg"
  ++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
  ++ flag webrtcSupport "webrtc"
-  ++ lib.optionals isTorBrowserLike
-       (flag loopSupport "loop")
  ++ flag geolocationSupport "mozril-geoloc"
  ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
  ++ flag crashreporterSupport "crashreporter"
@ -159,7 +155,18 @@ stdenv.mkDerivation (rec {
                    else [ "--disable-debug" "--enable-release"
                           "--enable-optimize"
                           "--enable-strip" ])
-  ++ lib.optional enableOfficialBranding "--enable-official-branding";
+  ++ lib.optional enableOfficialBranding "--enable-official-branding"
+  ++ extraConfigureFlags;
+
+  preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) ''
+    buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser")
+  '';
+
+  makeFlags = lib.optionals enableOfficialBranding [
+    "MOZILLA_OFFICIAL=1"
+    "BUILD_OFFICIAL=1"
+  ]
+  ++ extraMakeFlags;

  enableParallelBuilding = true;

--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -45,19 +45,9 @@ rec {
    };
  } {};

-  tor-browser = common rec {
-    pname = "tor-browser";
-    version = "6.5.2";
-    isTorBrowserLike = true;
-
-    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
-    src = fetchFromGitHub {
-      owner = "SLNOS";
-      repo  = "tor-browser";
-      rev   = "tor-browser-45.8.0esr-6.5-2";
-      sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j";
-    };
+} // (let

+  commonAttrs = {
    overrides = {
      unpackPhase = ''
        # fetchFromGitHub produces ro sources, root dir gets a name that
@ -101,9 +91,42 @@ rec {
      homepage = https://www.torproject.org/projects/torbrowser.html;
      platforms = lib.platforms.linux;
    };
-  } {
+  };
+
+in rec {
+
+  tor-browser-6-5 = common (rec {
+    pname = "tor-browser";
+    version = "6.5.2";
+    isTorBrowserLike = true;
+    extraConfigureFlags = [ "--disable-loop" ];
+
+    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+    src = fetchFromGitHub {
+      owner = "SLNOS";
+      repo  = "tor-browser";
+      rev   = "tor-browser-45.8.0esr-6.5-2";
+      sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j";
+    };
+  } // commonAttrs) {
    stdenv = overrideCC stdenv gcc5;
    ffmpegSupport = false;
  };

-}
+  tor-browser-7-0 = common (rec {
+    pname = "tor-browser";
+    version = "7.0.1";
+    isTorBrowserLike = true;
+
+    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+    src = fetchFromGitHub {
+      owner = "SLNOS";
+      repo  = "tor-browser";
+      rev   = "tor-browser-52.3.0esr-7.0-1-slnos";
+      sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv";
+    };
+  } // commonAttrs) {};
+
+  tor-browser = tor-browser-7-0;
+
+})
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@ -30,12 +30,6 @@ stdenv.mkDerivation rec {
    ++ stdenv.lib.optional enableFB "--with-fb"
    ++ stdenv.lib.optional enableDirectFB "--with-directfb";

-  crossAttrs = {
-    preConfigure = ''
-      export CC=$crossConfig-gcc
-    '';
-  };
-
  meta = with stdenv.lib; {
    homepage = http://links.twibright.com/;
    description = "A small browser with some graphics support";
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@ -84,7 +84,7 @@ let
  fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

  # Upstream source
-  version = "7.0.4";
+  version = "7.0.5";

  lang = "en-US";

@ -94,7 +94,7 @@ let
        "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
      ];
-      sha256 = "17hz6nv7py80zbksk1dypmj8agr5jzsfrpjncphpsrflvbqzs2bx";
+      sha256 = "1ixa1pmh3fm82gwzkm7r3gbly1lrihpvk1irmpc8b8zsi2s49ghd";
    };

    "i686-linux" = fetchurl {
@ -102,7 +102,7 @@ let
        "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
      ];
-      sha256 = "0g8m5x891f4kdvb3fhmh98xfw569sbqd9wcadflabf9vc9bqv3al";
+      sha256 = "1kb0m4xikxcgj03h6l0ch5d53i8hxdacwm7q745a377g44q84nzb";
    };
  };
 in
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@ -1,41 +1,33 @@
 { stdenv, fetchurl, cmake
 , extra-cmake-modules, qtbase, qtscript
-, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
+, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
+, kdoctools, kross, kcmutils, kwindowsystem
 , libktorrent, boost, taglib, libgcrypt, kplotting
 }:

 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
-
-  pname = "ktorrent";
-  version = "5.0.1";
+  name = "ktorrent-${version}";
+  version = "${libktorrent.mainVersion}.0";

  src = fetchurl {
-    url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz;
-    sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh";
+    url    = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${name}.tar.xz";
+    sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw";
  };

-  patches =
-    [ (fetchurl {
-        url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc;
-        sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v";
-      })
-    ];
+  nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ];

-  nativeBuildInputs = [ kdoctools extra-cmake-modules ];
-
-  buildInputs =
-    [ cmake qtbase qtscript
-      ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
-      libktorrent taglib libgcrypt kplotting
-    ];
+  buildInputs = [
+    qtbase qtscript
+    karchive kcrash kdnssd ki18n kio knotifications knotifyconfig kross kcmutils kwindowsystem
+    libktorrent taglib libgcrypt kplotting
+  ];

  enableParallelBuilding = true;

-  meta = {
+  meta = with stdenv.lib; {
    description = "KDE integrated BtTorrent client";
-    homepage = https://www.kde.org/applications/internet/ktorrent/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage    = https://www.kde.org/applications/internet/ktorrent/;
+    maintainers = with maintainers; [ eelco ];
+    platforms   = platforms.linux;
  };
 }
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@ -1,15 +1,15 @@
-{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
+{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }:

 stdenv.mkDerivation rec {
  name = "x2goclient-${version}";
-  version = "4.0.5.1";
+  version = "4.1.0.0";

  src = fetchurl {
    url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "04gdccqywas029a76k3r9zhr2mfn385i9r06cmi8mznxpczrhkl4";
+    sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab";
  };

-  buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
+  buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
  nativeBuildInputs = [ makeWrapper ];

  patchPhase = ''
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {

  installTargets = [ "install_client" "install_man" ];
  postInstall = ''
-    wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin";
+    wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin:${openssh}/libexec";
  '';

  meta = with stdenv.lib; {
--- a/pkgs/applications/networking/sniffers/kismet/default.nix
+++ b/pkgs/applications/networking/sniffers/kismet/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "kismet-${version}";
-  version = "2013-03-R1b";
+  version = "2016-07-R1";

  src = fetchurl {
    url = "http://www.kismetwireless.net/code/${name}.tar.xz";
-    sha256 = "0b3wabdkh0p3msphihm4kz5yw02p27ska5lfippfcyn6z1z4svb3";
+    sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx";
  };

  buildInputs = [ pkgconfig libpcap ncurses expat pcre libnl ];
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
        -i Makefile
  '';

-  meta = {
+  meta = with stdenv.lib; {
    description = "Wireless network sniffer";
-    homepage = http://www.kismetwireless.net/;
-    license = "GPL";
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://www.kismetwireless.net/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/science/biology/bwa/default.nix
+++ b/pkgs/applications/science/biology/bwa/default.nix
@ -1,21 +1,18 @@
-{ stdenv, fetchFromGitHub, zlib }:
+{ stdenv, fetchurl, zlib }:

 stdenv.mkDerivation rec {
  name    = "bwa-${version}";
-  version = "0.7.15";
+  version = "0.7.16a";

-  src = fetchFromGitHub {
-    owner  = "lh3";
-    repo   = "bwa";
-    rev    = "v${version}";
-    sha256 = "1aasdr3lik42gafi9lds7xw0wgv8ijjll1g32d7jm04pp235c7nl";
+  src = fetchurl {
+    url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2";
+    sha256 = "0w61zxh6b4isydw5qp6pdb1mc50jg1h8vhahw2xm24w7i1gxpv4g";
  };

  buildInputs = [ zlib ];

  installPhase = ''
-    mkdir -p $out/bin
-    cp bwa $out/bin
+    install -vD bwa $out/bin/bwa
  '';

  meta = with stdenv.lib; {
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, which }:
 stdenv.mkDerivation rec {
  name = "eprover-${version}";
-  version = "1.9.1";
+  version = "2.0";

  src = fetchurl {
    url = "http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz";
-    sha256 = "1vi977mdfqnj04m590aw4896nqzlc4c5rqadjzk86z1zvj7mqnqw";
+    sha256 = "1xmwr32pd8lv3f6yh720mdqhi3na505y3zbgcsgh2hwb7b5i3ngb";
  };

  buildInputs = [ which ];
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "gerrit-${version}";
+  version = "2.14.3";
+
+  src = fetchurl {
+    url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
+    sha256 = "1hxrlhp5l5q4lp5b5bq8va7856cnm4blfv01rgqq3yhvn432sq6v";
+  };
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1j1afxv7yj2fxaw0wy8kmxi6sl9fwj8xsxs5kzg9qz5gzayb26kp";
+
+  buildCommand = ''
+    mkdir -p "$out"/webapps/
+    ln -s ${src} "$out"/webapps/gerrit-${version}.war
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.gerritcodereview.com/index.md;
+    license = licenses.asl20;
+    description = "A web based code review and repository management for the git version control system";
+    maintainers = with maintainers; [ jammerful ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@ -14,11 +14,11 @@
 }:

 let
-  version = "2.6.20";
+  version = "2.7.0";

  src = fetchurl {
    url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
-    sha256 = "17zgqz6i0bcan04wqwksf7y4z73vxmabcpnd9y5nhx7br5zwpih3";
+    sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy";
  };

  common = {
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@ -26,7 +26,7 @@
 , libjpegSupport ? true, libjpeg ? null
 , useUnfreeCodecs ? false
 , darwin ? null
-, hostPlatform
+, buildPackages
 }:

 assert fontconfigSupport -> (fontconfig != null);
@ -84,6 +84,8 @@ let
    meta.license = stdenv.lib.licenses.unfree;
  } else null;

+  crossBuild = stdenv.hostPlatform != stdenv.buildPlatform;
+
 in

 stdenv.mkDerivation rec {
@ -100,8 +102,10 @@ stdenv.mkDerivation rec {
    rm -rf ffmpeg
  '';

+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ pkgconfig yasm ];
  buildInputs = with stdenv.lib;
-    [ pkgconfig freetype ffmpeg ]
+    [ freetype ffmpeg ]
    ++ optional aalibSupport aalib
    ++ optional fontconfigSupport fontconfig
    ++ optional fribidiSupport fribidi
@ -129,45 +133,66 @@ stdenv.mkDerivation rec {
    ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ])
    ;

-  nativeBuildInputs = [ yasm ];
+  configurePlatforms = [ ];
+  configureFlags = with stdenv.lib; [
+    "--enable-freetype"
+    (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig")
+    (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl")
+    (if xineramaSupport then "--enable-xinerama" else "--disable-xinerama")
+    (if xvSupport then "--enable-xv" else "--disable-xv")
+    (if alsaSupport then "--enable-alsa" else "--disable-alsa")
+    (if screenSaverSupport then "--enable-xss" else "--disable-xss")
+    (if vdpauSupport then "--enable-vdpau" else "--disable-vdpau")
+    (if cddaSupport then "--enable-cdparanoia" else "--disable-cdparanoia")
+    (if dvdnavSupport then "--enable-dvdnav" else "--disable-dvdnav")
+    (if bluraySupport then "--enable-bluray" else "--disable-bluray")
+    (if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb")
+    (if cacaSupport then "--enable-caca" else "--disable-caca")
+    (if lameSupport then "--enable-mp3lame --disable-mp3lame-lavc" else "--disable-mp3lame --enable-mp3lame-lavc")
+    (if speexSupport then "--enable-speex" else "--disable-speex")
+    (if theoraSupport then "--enable-theora" else "--disable-theora")
+    (if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc")
+    (if jackaudioSupport then "" else "--disable-jack")
+    (if pulseSupport then "--enable-pulse" else "--disable-pulse")
+    "--disable-xanim"
+    "--disable-ivtv"
+    "--disable-xvid --disable-xvid-lavc"
+    "--disable-ossaudio"
+    "--disable-ffmpeg_a"
+    "--yasm=${buildPackages.yasm}/bin/yasm"
+    # Note, the `target` vs `host` confusion is intensional.
+    "--target=${stdenv.hostPlatform.config}"
+  ] ++ optional
+         (useUnfreeCodecs && codecs != null && !crossBuild)
+         "--codecsdir=${codecs}"
+    ++ optional
+         ((stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) && !crossBuild)
+         "--enable-runtime-cpudetection"
+    ++ optional fribidiSupport "--enable-fribidi"
+    ++ optional stdenv.isLinux "--enable-vidix"
+    ++ optional stdenv.isLinux "--enable-fbdev"
+    ++ optionals (crossBuild) [
+    "--enable-cross-compile"
+    "--disable-vidix-pcidb"
+    "--with-vidix-drivers=no"
+  ];
+
+  preConfigure = ''
+    configureFlagsArray+=(
+      "--cc=$CC"
+      "--host-cc=$BUILD_CC"
+      "--as=$AS"
+      "--nm=$NM"
+      "--ar=$AR"
+      "--ranlib=$RANLIB"
+      "--windres=$WINDRES"
+    )
+  '';

  postConfigure = ''
    echo CONFIG_MPEGAUDIODSP=yes >> config.mak
  '';

-  configureFlags = with stdenv.lib;
-    ''
-      --enable-freetype
-      ${if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig"}
-      ${if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl"}
-      ${if xineramaSupport then "--enable-xinerama" else "--disable-xinerama"}
-      ${if xvSupport then "--enable-xv" else "--disable-xv"}
-      ${if alsaSupport then "--enable-alsa" else "--disable-alsa"}
-      ${if screenSaverSupport then "--enable-xss" else "--disable-xss"}
-      ${if vdpauSupport then "--enable-vdpau" else "--disable-vdpau"}
-      ${if cddaSupport then "--enable-cdparanoia" else "--disable-cdparanoia"}
-      ${if dvdnavSupport then "--enable-dvdnav" else "--disable-dvdnav"}
-      ${if bluraySupport then "--enable-bluray" else "--disable-bluray"}
-      ${if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb"}
-      ${if cacaSupport then "--enable-caca" else "--disable-caca"}
-      ${if lameSupport then "--enable-mp3lame --disable-mp3lame-lavc" else "--disable-mp3lame --enable-mp3lame-lavc"}
-      ${if speexSupport then "--enable-speex" else "--disable-speex"}
-      ${if theoraSupport then "--enable-theora" else "--disable-theora"}
-      ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"}
-      ${if jackaudioSupport then "" else "--disable-jack"}
-      ${if pulseSupport then "--enable-pulse" else "--disable-pulse"}
-      ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
-      ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
-      ${optionalString fribidiSupport "--enable-fribidi"}
-      --disable-xanim
-      --disable-ivtv
-      --disable-xvid --disable-xvid-lavc
-      ${optionalString stdenv.isLinux "--enable-vidix"}
-      ${optionalString stdenv.isLinux "--enable-fbdev"}
-      --disable-ossaudio
-      --disable-ffmpeg_a
-    '';
-
  NIX_LDFLAGS = with stdenv.lib;
       optional  fontconfigSupport "-lfontconfig"
    ++ optional  fribidiSupport "-lfribidi"
@ -188,20 +213,6 @@ stdenv.mkDerivation rec {
      fi
    '';

-  crossAttrs = {
-    configurePlatforms = [];
-    # Some things (vidix) are nanonote specific. Once someone cares, we can make options from them.
-    # Note, the `target` vs `host` confusion is intensional.
-    preConfigure = ''
-      configureFlags="`echo $configureFlags |
-        sed -e 's/--codecsdir[^ ]\+//' \
-        -e 's/--enable-runtime-cpudetection//' `"
-      configureFlags="$configureFlags --target=${hostPlatform.arch}-linux
-        --enable-cross-compile --cc=$crossConfig-gcc --as=$crossConfig-as
-        --disable-vidix-pcidb --with-vidix-drivers=no --host-cc=gcc"
-    '';
-  };
-
  meta = {
    description = "A movie player that supports many video formats";
    homepage = http://mplayerhq.hu;
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  name = "i3-${version}";
-  version = "4.13";
+  version = "4.14";

  src = fetchurl {
    url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl";
+    sha256 = "1mm5jazwv4dz3k8vl1lfrcw86agpws5k9lmav1ly51qvmzivsfmf";
  };

  nativeBuildInputs = [ which pkgconfig makeWrapper ];
@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
    for program in $out/bin/i3-sensible-*; do
      sed -i 's/which/command -v/' $program
    done
+
+    install -vD -t $out/share/man/man1 man/*.1
  '';

  separateDebugInfo = true;
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation ( rec {
  name = "ponyc-${version}";
-  version = "0.18.1";
+  version = "0.19.0";

  src = fetchFromGitHub {
    owner = "ponylang";
    repo = "ponyc";
    rev = version;
-    sha256 = "1yjrmi8xigh1n95d5q98m2jc4z45m5dwkah4hyi9dyibbfiiwix3";
+    sha256 = "05xswxbibkrzm6rf8mvd1y9ysf624ngpj0k0xxcrlsls197sian9";
  };

  buildInputs = [ llvm makeWrapper which ];
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@ -92,7 +92,7 @@ let
      };
    in stdenv.lib.makeOverridable drvScope (auto // manualArgs);

-  mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
+  mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope;
  defaultScope = mkScope self;
  callPackage = drv: args: callPackageWithScope defaultScope drv args;

--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/pkgs/development/libraries/avro-c++/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, boost, python2}:

-let version = "1.8.1"; in
+let version = "1.8.2"; in

 stdenv.mkDerivation {
  name = "avro-c++-${version}";

  src = fetchurl {
    url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
-    sha256 = "6559755ac525e908e42a2aa43444576cba91e522fe989088ee7f70c169bcc403";
+    sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k";
  };

  buildInputs = [
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "capnproto-${version}";
-  version = "0.6.0";
+  version = "0.6.1";

  src = fetchurl {
    url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
-    sha256 = "0gpp1cxsb9nfd7qkjjykzknx03y0z0n4bq5q0fmxci7w38ci22g5";
+    sha256 = "010s9yhq4531wvdfrdf2477zswhck6cjfby79w73rff3v06090l0";
  };

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/cdo/default.nix
+++ b/pkgs/development/libraries/cdo/default.nix
@ -0,0 +1,37 @@
+{ stdenv, fetchurl, curl, hdf5, netcdf
+, enable_cdi_lib ? false    # build, install and link to a CDI library [default=no]
+, enable_all_static ? false # build a completely statically linked CDO binary  [default=no]
+, enable_cxx ? false        # Use CXX as default compiler [default=no]
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.7.2";
+  name = "cdo-${version}";
+
+  # Dependencies
+  buildInputs = [ curl netcdf hdf5 ];
+
+  src = fetchurl {
+    url = "https://code.zmaw.de/attachments/download/12760/${name}.tar.gz";
+    sha256 = "4c43eba7a95f77457bfe0d30fb82382b3b5f2b0cf90aca6f0f0a008f6cc7e697";
+  };
+
+ # Configure phase
+ configureFlags = [
+   "--with-netcdf=${netcdf}" "--with-hdf5=${hdf5}"]
+   ++ stdenv.lib.optional (enable_cdi_lib) "--enable-cdi-lib"
+   ++ stdenv.lib.optional (enable_all_static) "--enable-all-static"
+   ++ stdenv.lib.optional (enable_cxx) "--enable-cxx";
+
+  meta = {
+    description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
+    longDescription = ''
+      Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG.
+      There are more than 600 operators available.
+    '';
+    homepage = https://code.zmaw.de/projects/cdo/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.ltavard ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@ -1,7 +1,7 @@
 { callPackage, ... } @ args:

 callPackage ./generic.nix (args // rec {
-  version = "${branch}.11";
+  version = "${branch}.13";
  branch = "2.8";
-  sha256 = "0cldkzcbvsnb7mxz3kwpa0mnb44wmlc0qyl01wwi2qznn7vf11wr";
+  sha256 = "0y3712ivmpr5dw1nsk1bqpd4b7ldzd69ak4vwbl4q02ab35ri6yz";
 })
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@ -1,19 +1,24 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, unzip }:
+{ stdenv, qt5, unzip, fetchFromGitHub, qtmultimedia }:

 stdenv.mkDerivation rec {
-  name = "herqq-1.0.0";
+  version = "2.1.0";
+  name = "herqq-${version}";

-  buildInputs = [ qt4 unzip qmake4Hook ];
+  nativeBuildInputs = [ qt5.qmake ];
+  buildInputs = [ qt5.qtbase unzip qtmultimedia ];
+  preConfigure = "cd herqq";

-  src = fetchurl {
-    url = "mirror://sourceforge/hupnp/${name}.zip";
-    sha256 = "13klwszi7h7mvdz2ap0ac4dp7lc0gswp8lzzlwidhqfmf9pwgkyb";
+  src = fetchFromGitHub {
+    owner = "ThomArmax";
+    repo = "HUPnP";
+    rev = version;
+    sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m";
  };

  meta = {
    homepage = http://herqq.org;
    description = "A software library for building UPnP devices and control points";
-    inherit (qt4.meta) platforms;
+    inherit (qt5.qtbase.meta) platforms;
    maintainers = [ ];
  };
 }
--- a/pkgs/development/libraries/herqq/gcc6.patch
+++ b/pkgs/development/libraries/herqq/gcc6.patch
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@ -28,8 +28,8 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in
 let
  result = {
    libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
-    libav_11  = libavFun  "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00";
-    libav_12  = libavFun "12"     "4ecde7274621c82a6882b7614d907b28de25cc4e";
+    libav_11  = libavFun "11.10"  "38db6721ca8423682e4d614c170eccc33ba32e00";
+    libav_12  = libavFun "12.1"   "df048240318b888e3938f649422b967f62e43e3c";
  };

  libavFun = version : sha1 : stdenv.mkDerivation rec {
--- a/pkgs/development/libraries/libctemplate/2.2.nix
+++ b/pkgs/development/libraries/libctemplate/2.2.nix
@ -1,23 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "ctemplate";
-  version = "2.2";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://ctemplate.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4";
-  };
-
-  meta = {
-    description = "A simple but powerful template language for C++";
-    longDescription = ''
-      CTemplate is a simple but powerful template language for C++. It
-      emphasizes separating logic from presentation: it is impossible to
-      embed application logic in this template language.  '';
-    homepage = http://code.google.com/p/google-ctemplate/;
-    license = "bsd";
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@ -3,27 +3,35 @@
 , boost, gmp, qca-qt5, libgcrypt
 }:

-stdenv.mkDerivation rec {
-  name = "libktorrent-2.0.1";
+let
+    mainVersion = "5.1";
+
+in stdenv.mkDerivation rec {
+  name = "libktorrent-2.1";

  src = fetchurl {
-    url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz;
-    sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7";
+    url    = "mirror://kde/stable/ktorrent/${mainVersion}/${name}.tar.xz";
+    sha256 = "0vz2dwc4xd80q56g6r5bx5wqdl9fxcibxmw2irahqhbkxk7drvry";
  };

  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ cmake extra-cmake-modules ];
+
  buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];

  propagatedBuildInputs = [ gmp boost ];

  enableParallelBuilding = true;

-  meta = {
+  passthru = {
+    inherit mainVersion;
+  };
+
+  meta = with stdenv.lib; {
    description = "A BitTorrent library used by KTorrent";
-    homepage = https://www.kde.org/applications/internet/ktorrent/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage    = https://www.kde.org/applications/internet/ktorrent/;
+    maintainers = with maintainers; [ eelco ];
+    platforms   = platforms.linux;
  };
 }
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@ -3,14 +3,14 @@
 with lib;

 stdenv.mkDerivation rec {
-  version = "0.49.1";
+  version = "0.54.0";
  name = "flow-${version}";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "flow";
    rev = "v${version}";
-    sha256 = "1fjqdyl72srla7ysjg0694ym5d3f2rdl5gfq8r9ay4v15jcb5dg6";
+    sha256 = "02z3jrfrr6gn056wplwkhymd1nyncjs67yl3vhv6n27jr3572npn";
  };

  installPhase = ''
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "jenkins-${version}";
-  version = "2.73";
+  version = "2.77";

  src = fetchurl {
    url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1q9q2vjza3slmbh6sbxak1y3ryvisphlh92nidsp88rv60zn3nv8";
+    sha256 = "1hmj5f14qpq58018q2jmdd4j36v2idsbb9caiakxfy08gppzhz00";
  };

  buildCommand = ''
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "autoconf-archive-${version}";
-  version = "2016.09.16";
+  version = "2017.03.21";

  src = fetchurl {
    url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
-    sha256 = "10mxz9hfnfz66m1l9s28sbyfb9a04akz92wkyv9blhpq6p9fzwp8";
+    sha256 = "0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq";
  };

  buildInputs = [ xz ];
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt }:
+{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:

 stdenv.mkDerivation rec {
-  name = "babeltrace-1.2.4";
+  name = "babeltrace-1.5.3";

  src = fetchurl {
    url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
-    sha256 = "1ccy432srwz4xzi6pswfkjsymw00g1p0aqwr0l1mfzfws8d3lvk6";
+    sha256 = "0z0k4qvz4ypxs4dmgrzv9da7ylf6jr94ra6nylqpfrdspvjzwj92";
  };

-  buildInputs = [ pkgconfig glib libuuid popt ];
+  buildInputs = [ pkgconfig glib libuuid popt elfutils ];

  meta = with stdenv.lib; {
    description = "Command-line tool and library to read and convert LTTng tracefiles";
-    homepage = http://www.efficios.com/babeltrace;
+    homepage = https://www.efficios.com/babeltrace;
    license = licenses.mit;
    platforms = platforms.linux;
    maintainers = [ maintainers.bjornfor ];
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@ -1,7 +1,7 @@
 { stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub
 , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
-, guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc
+, guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
 , rpm, dpkg, cdrkit, fetchpatch, pixz }:

@ -78,7 +78,7 @@ in releaseTools.nixBuild rec {
      gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
      guile # optional, for Guile + Guix support
      perlDeps perl nixUnstable
-      postgresql92 # for running the tests
+      postgresql # for running the tests
      (lib.overrideDerivation (aws-sdk-cpp.override {
        apis = ["s3"];
        customMemoryManagement = false;
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
    popd
  '';

+  patches = [
+    ./gcc6.patch
+  ];
+
  buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis pkgconfig 
    makeWrapper enet libXcursor bullet openal
  ];
--- a/pkgs/games/stuntrally/gcc6.patch
+++ b/pkgs/games/stuntrally/gcc6.patch
@ -0,0 +1,67 @@
+diff --git i/source/ogre/CarModel_Create.cpp w/source/ogre/CarModel_Create.cpp
+index 834eac7..47ec647 100644
+--- i/source/ogre/CarModel_Create.cpp
+++ w/source/ogre/CarModel_Create.cpp
+@@ -130,7 +130,8 @@ void CarModel::Load(int startId)
+ 
+ 	///  load config .car
+ 	string pathCar;
+-	pApp->gui->GetCarPath(&pathCar, 0, 0, sDirname, pApp->mClient);  // force orig for newtorked games
+  string empty;
+	pApp->gui->GetCarPath(&pathCar, &empty, &empty, sDirname, bool(pApp->mClient));  // force orig for newtorked games
+ 	LoadConfig(pathCar);
+ 	
+ 	
+diff --git i/source/ogre/Gui_Tweak.cpp w/source/ogre/Gui_Tweak.cpp
+index 76ed8e9..9444271 100644
+--- i/source/ogre/Gui_Tweak.cpp
+++ w/source/ogre/Gui_Tweak.cpp
+@@ -412,8 +412,8 @@ bool CGui::GetCarPath(std::string* pathCar,
+ 		pathUserD = PATHMANAGER::CarSimU() + "/" + pSet->game.sim_mode + "/cars/",
+ 		pathUser  = pathUserD + file;
+ 
+-	if (pathSave)  *pathSave = pathUser;
+-	if (pathSaveDir)  *pathSaveDir = pathUserD;
+	if (pathSave != "")  *pathSave = pathUser;
+	if (pathSaveDir != "")  *pathSaveDir = pathUserD;
+ 	
+ 	if (!forceOrig && PATHMANAGER::FileExists(pathUser))
+ 	{
+diff --git i/source/vdrift/cartire.cpp w/source/vdrift/cartire.cpp
+index dd6dd48..083fa0c 100644
+--- i/source/vdrift/cartire.cpp
+++ w/source/vdrift/cartire.cpp
+@@ -3,6 +3,7 @@
+ #include "cardefs.h"
+ //#include "../ogre/common/Def_Str.h"
+ 
+using namespace std;
+ 
+ void CARTIRE::FindSigmaHatAlphaHat(Dbl load, Dbl & output_sigmahat, Dbl & output_alphahat, int iterations)
+ {
+diff --git i/source/vdrift/model_obj.cpp w/source/vdrift/model_obj.cpp
+index 338d122..e67c1db 100644
+--- i/source/vdrift/model_obj.cpp
+++ w/source/vdrift/model_obj.cpp
+@@ -205,7 +205,7 @@ bool MODEL_OBJ::Save(const std::string & strFileName, std::ostream & error_outpu
+ 	std::ofstream f(strFileName.c_str());
+ 	if (!f)
+ 	{
+-		error_output << "Error opening file for writing: " << error_output << endl;
+		error_output << "Error opening file for writing: " << endl;
+ 		return false;
+ 	}
+ 	
+diff --git i/source/vdrift/texture.h w/source/vdrift/texture.h
+index b21846a..c115fd6 100644
+--- i/source/vdrift/texture.h
+++ w/source/vdrift/texture.h
+@@ -125,7 +125,7 @@ class TEXTURELIBRARY
+ 		bool FileExists(const std::string & filename)
+ 		{
+ 			std::ifstream f(filename.c_str());
+-			return f;
+			return bool(f);
+ 		}
+ 
+ 	public:
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation {
    sed -e "s@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@" -i Makefile
    sed -e 's@acpi/acpi[.]h@linux/acpi.h@g' -i acpi_call.c
  '';
- 
+
  installPhase = ''
    mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
    cp acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc
@ -37,6 +37,5 @@ stdenv.mkDerivation {
    maintainers = [stdenv.lib.maintainers.raskin];
    platforms = stdenv.lib.platforms.linux;
    description = "A module allowing arbitrary ACPI calls; use case: hybrid video";
-    broken = kernel.features.chromiumos or false;
  };
 }
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
  name = "can-utils-${version}";
  # There are no releases (source archives or git tags), so use the date of the
  # latest commit in git master as version number.
-  version = "20140227";
+  version = "20170830";

  src = fetchFromGitHub {
    owner = "linux-can";
    repo = "can-utils";
-    rev = "67a2bdcd336e6becfa5784742e18c88dbeddc973";
-    sha256 = "1v73b0nk1kb3kp5nbxp4xiygny6nfjgjnm7zgzrjgryvdrnws32z";
+    rev = "5b518a0a5fa56856f804372a6b99b518dedb5386";
+    sha256 = "1ygzp8rjr8f1gs48mb1pz7psdgbfhlvr6kjdnmzbsqcml06zvrpr";
  };

  preConfigure = ''makeFlagsArray+=(PREFIX="$out")'';
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@ -37,6 +37,5 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl2;
    maintainers = [ lib.maintainers.eelco ];
    platforms = lib.platforms.linux;
-    broken = kernel.features.chromiumos or false;
  };
 }
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch
+++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch
@ -1,48 +0,0 @@
-diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
-index 48398b4..0e37f7d 100644
--- a/drivers/base/Kconfig
-+++ b/drivers/base/Kconfig
-@@ -198,30 +198,6 @@ config DEV_COREDUMP
- 	default y if WANT_DEV_COREDUMP
- 	depends on ALLOW_DEV_COREDUMP
- 
-config WANT_DEV_COREDUMP
-	bool
-	help
-	  Drivers should "select" this option if they desire to use the
-	  device coredump mechanism.
-
-config ALLOW_DEV_COREDUMP
-	bool "Allow device coredump" if EXPERT
-	default y
-	help
-	  This option controls if the device coredump mechanism is available or
-	  not; if disabled, the mechanism will be omitted even if drivers that
-	  can use it are enabled.
-	  Say 'N' for more sensitive systems or systems that don't want
-	  to ever access the information to not have the code, nor keep any
-	  data.
-
-	  If unsure, say Y.
-
-config DEV_COREDUMP
-	bool
-	default y if WANT_DEV_COREDUMP
-	depends on ALLOW_DEV_COREDUMP
-
- config DEBUG_DRIVER
- 	bool "Driver Core verbose debug messages"
- 	depends on DEBUG_KERNEL
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index 58154a9..53a0d73 100644
--- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -81,7 +81,7 @@ config MFD_AXP20X
- 
- config MFD_CROS_EC
- 	tristate "Support ChromeOS Embedded Controller"
-	depends on MFD_CORE
-+	select MFD_CORE
- 	help
- 	  If you say Y here you get support for the ChromeOS Embedded
- 	  Controller (EC) providing keyboard, battery and power services.
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
+++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
@ -1,15 +0,0 @@
-diff --git a/fs/namei.c b/fs/namei.c
-index d999a86..eb6e530 100644
--- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -703,8 +703,8 @@ static inline void put_link(struct nameidata *nd, struct path *link, void *cooki
- 	path_put(link);
- }
- 
-int sysctl_protected_symlinks __read_mostly = 1;
-int sysctl_protected_hardlinks __read_mostly = 1;
-+int sysctl_protected_symlinks __read_mostly = 0;
-+int sysctl_protected_hardlinks __read_mostly = 0;
- 
- /**
-  * may_follow_link - Check symlink following for unsafe situations
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@ -202,7 +202,7 @@ with stdenv.lib;

  # Video configuration.
  # Enable KMS for devices whose X.org driver supports it.
-  ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) ''
+  ${optionalString (versionOlder version "4.3") ''
    DRM_I915_KMS y
  ''}
  # Allow specifying custom EDID on the kernel command line
@ -566,9 +566,7 @@ with stdenv.lib;
  MEDIA_CAMERA_SUPPORT y
  MEDIA_RC_SUPPORT y
  MEDIA_USB_SUPPORT y
-  ${optionalString (!(features.chromiumos or false)) ''
-    MEDIA_PCI_SUPPORT y
-  ''}
+  MEDIA_PCI_SUPPORT y

  # Our initrd init uses shebang scripts, so can't be modular.
  BINFMT_SCRIPT y
@ -662,67 +660,6 @@ with stdenv.lib;
    WW_MUTEX_SELFTEST? n
  ''}

-  # ChromiumOS support
-  ${optionalString (features.chromiumos or false) ''
-    CHROME_PLATFORMS y
-    VGA_SWITCHEROO n
-    MMC_SDHCI_PXAV2 n
-    NET_IPVTI n
-    IPV6_VTI n
-    REGULATOR_FIXED_VOLTAGE n
-    TPS6105X n
-    CPU_FREQ_STAT y
-    IPV6 y
-    MFD_CROS_EC y
-    MFD_CROS_EC_LPC y
-    MFD_CROS_EC_DEV y
-    CHARGER_CROS_USB_PD y
-    I2C y
-    MEDIA_SUBDRV_AUTOSELECT n
-    VIDEO_IR_I2C n
-    BLK_DEV_DM y
-    ANDROID_PARANOID_NETWORK n
-    DM_VERITY n
-    DRM_VGEM n
-    CPU_FREQ_GOV_INTERACTIVE n
-    INPUT_KEYRESET n
-    DM_BOOTCACHE n
-    UID_CPUTIME n
-
-    ${optionalString (versionAtLeast version "3.18") ''
-      CPUFREQ_DT n
-      EXTCON_CROS_EC n
-      DRM_POWERVR_ROGUE n
-      CHROMEOS_OF_FIRMWARE y
-      TEST_RHASHTABLE n
-      BCMDHD n
-      TRUSTY n
-    ''}
-
-    ${optionalString (versionOlder version "3.18") ''
-      MALI_MIDGARD n
-      DVB_USB_DIB0700 n
-      DVB_USB_DW2102 n
-      DVB_USB_PCTV452E n
-      DVB_USB_TTUSB2 n
-      DVB_USB_AF9015 n
-      DVB_USB_AF9035 n
-      DVB_USB_ANYSEE n
-      DVB_USB_AZ6007 n
-      DVB_USB_IT913X n
-      DVB_USB_LME2510 n
-      DVB_USB_RTL28XXU n
-      USB_S2255 n
-      VIDEO_EM28XX n
-      VIDEO_TM6000 n
-      USB_DWC2 n
-      USB_GSPCA n
-      SPEAKUP n
-      XO15_EBOOK n
-      USB_GADGET n
-    ''}
-  ''}
-
  ${kernelPlatform.kernelExtraConfig or ""}
  ${extraConfig}
 ''
--- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
@ -1,23 +0,0 @@
-{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ncurses, ... } @ args:
-
-# ChromiumOS requires a 64bit build host
-assert stdenv.is64bit;
-
-import ./generic.nix (args // rec {
-  version = "3.18.0";
-  extraMeta.branch = "3.18";
-
-  src = fetchgit {
-    url = "https://chromium.googlesource.com/chromiumos/third_party/kernel";
-    rev = "3179ec7e3f07fcc3ca35817174c5fc6584030ab3";
-    sha256 = "0c9ccasx9kisck23350w1xf8s7qzvgvn70xlxdbkh2b18kgm0y5f";
-  };
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-  features.chromiumos = true;
-
-  extraMeta.hydraPlatforms = [];
-} // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@ -56,16 +56,6 @@ rec {
      patch = ./genksyms-fix-segfault.patch;
    };

-  chromiumos_Kconfig_fix_entries_3_18 =
-    { name = "Kconfig_fix_entries_3_18";
-      patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch;
-    };
-
-  chromiumos_no_link_restrictions =
-    { name = "chromium-no-link-restrictions";
-      patch = ./chromiumos-patches/no-link-restrictions.patch;
-    };
-
  cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;

  DCCP_double_free_vulnerability_CVE-2017-6074 = rec
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
    license = with licenses; [ lgpl21 gpl2 mit ];
    platforms = platforms.linux;
    maintainers = [ maintainers.bjornfor ];
-    broken =
-      (builtins.compareVersions kernel.version "3.18" == -1) ||
-      (kernel.features.chromiumos or false);
+    broken = builtins.compareVersions kernel.version "3.18" == -1;
  };

 }
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@ -88,8 +88,8 @@ in
 {

  asterisk-lts = common {
-    version = "13.15.0";
-    sha256 = "0i2qzfa1iyh66nma39kdigb9lp5gz3sn46znd2djz24wgmamb2lb";
+    version = "13.17.1";
+    sha256 = "0d7vqpkz0wv8d17vi7qxs9j7dbqwf4n80s411qva030hljcmdqdf";
    externals = {
      "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26;
      "addons/mp3" = mp3-202;
@ -97,8 +97,8 @@ in
  };

  asterisk-stable = common {
-    version = "14.6.0";
-    sha256 = "1d3jjdapfv169d8yhfi92j75iwk9726brv1rjjy288d47jn3sm26";
+    version = "14.6.1";
+    sha256 = "0xg26p8rx9gw1ym9xdnpxr7bqp0kp76afy7f4ywmh25ki41inz08";
    externals = {
      "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26;
      "addons/mp3" = mp3-202;
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "cadvisor-${version}";
-  version = "0.23.8";
+  version = "0.26.1";

  src = fetchFromGitHub {
    owner = "google";
    repo = "cadvisor";
    rev = "v${version}";
-    sha256 = "0wan6a4rpyh5fflq88saznyf2kiic9nmj8sil1s49nh3c3y4yxcj";
+    sha256 = "0rv245acz2r12c6ga2ln01961sh36w15ay0nfpfcg8inz679dnvg";
  };

  buildInputs = [ go ];
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@ -91,40 +91,28 @@ let

 in {

-  postgresql91 = common {
-    version = "9.1.24";
-    psqlSchema = "9.1";
-    sha256 = "1lz5ibvgz6cxprxlnd7a8iwv387idr7k53bdsvy4bw9ayglq83fy";
-  };
-
-  postgresql92 = common {
-    version = "9.2.21";
-    psqlSchema = "9.2";
-    sha256 = "0697e843523ee60c563f987f9c65bc4201294b18525d6e5e4b2c50c6d4058ef9";
-  };
-
  postgresql93 = common {
-    version = "9.3.17";
+    version = "9.3.19";
    psqlSchema = "9.3";
-    sha256 = "9c03e5f280cfe9bd202fa01af773eb146abd8ab3065f7279d574c568f6948dbe";
+    sha256 = "1d9gmi1psg4aa6h6ylvsrdm5jnnb7p36pn4h2qrvl9z9v4n8g7pv";
  };

  postgresql94 = common {
-    version = "9.4.12";
+    version = "9.4.14";
    psqlSchema = "9.4";
-    sha256 = "fca055481875d1c49e31c28443f56472a1474b3fbe25b7ae64440c6118f82e64";
+    sha256 = "0szc0navrcjnpyafw2sai8cmwr3znsy0w6031lv7n1ab20xg4zcf";
  };

  postgresql95 = common {
-    version = "9.5.7";
+    version = "9.5.9";
    psqlSchema = "9.5";
-    sha256 = "8b1e936f82109325decc0f5575e846b93fb4fd384e8c4bde83ff5e7f87fc6cad";
+    sha256 = "1m6d4y3m3ir20dzl6q3s3yvmr0a7hq3si2v1hg5hanmbck3db379";
  };

  postgresql96 = common {
-    version = "9.6.3";
+    version = "9.6.5";
    psqlSchema = "9.6";
-    sha256 = "1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6";
+    sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6";
  };

 }
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation rec {
  name = "advancecomp-${version}";
-  version = "1.23";
+  version = "2.0";

  src = fetchFromGitHub {
    owner = "amadvance";
    repo = "advancecomp";
    rev = "v${version}";
-    sha256 = "1mrgmpjd9f7x16g847h1588mgryl26hlzfl40bc611259bb0bq7w"; 
+    sha256 = "1lvrcxcxbxac47j0ml11nikx38zan7bbr3dfjssm52r5v4cmh8j9";
  };

  nativeBuildInputs = [ autoreconfHook ];
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@ -2,18 +2,18 @@

 let

-  version = "1.0.1";
+  version = "1.1.1";
  rev = "v${version}";

  aptlySrc = fetchFromGitHub {
    inherit rev;
    owner = "smira";
    repo = "aptly";
-    sha256 = "0rqxdhy2mlwndxhqb447gz626q92zd09rpvhysr2g1rx9nxa039p";
+    sha256 = "197a7nh8li20slqxgn8s8xm13x5b8ansmabk8rx32sngb73hp4av";
  };

  aptlyCompletionSrc = fetchFromGitHub {
-    rev = version;
+    rev = "1.0.1";
    owner = "aptly-dev";
    repo = "aptly-bash-completion";
    sha256 = "0dkc4z687yk912lpv8rirv0nby7iny1zgdvnhdm5b47qmjr1sm5q";
--- a/pkgs/tools/misc/mmake/default.nix
+++ b/pkgs/tools/misc/mmake/default.nix
@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "mmake-${version}";
+  version = "1.2.0";
+
+  goPackagePath = "github.com/tj/mmake";
+
+  src = fetchFromGitHub {
+    owner = "tj";
+    repo = "mmake";
+    rev = "v${version}";
+    sha256 = "1pyqgk04v0f7a28cwq9c40bd2cgrkrv4wqcijdzpgn4bqhrqab4f";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tj/mmake;
+    description = "Mmake is a small program which wraps make to provide additional functionality, such as user-friendly help output, remote includes, and eventually more. It otherwise acts as a pass-through to standard make.";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.gabesoft ];
+  };
+}
--- a/pkgs/tools/misc/mmake/deps.nix
+++ b/pkgs/tools/misc/mmake/deps.nix
@ -0,0 +1,30 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/apex/log";
+    fetch = {
+      type = "git";
+      url = "https://github.com/apex/log";
+      rev = "0296d6eb16bb28f8a0c55668affcf4876dc269be";
+      sha256 = "067px84y73h60bai1yy6xqf2l05gq6zsp64fn58d4fwzk04aa16v";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "c605e284fe17294bda444b34710735b29d1a9d90";
+      sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6";
+    };
+  }
+  {
+    goPackagePath = "github.com/segmentio/go-env";
+    fetch = {
+      type = "git";
+      url = "https://github.com/segmentio/go-env";
+      rev = "ea0600a7760cd15ccca9057be4a87d68e95ee876";
+      sha256 = "0rgclbi0na5042cirr52lriwyb5a2rdpqx211zfwyrrvc3zq4lwq";
+    };
+  }
+]
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@ -4,10 +4,10 @@

 stdenv.mkDerivation rec {
  name = "connman-${version}";
-  version = "1.34";
+  version = "1.35";
  src = fetchurl {
    url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
-    sha256 = "07n71wcy1c4cc01ca4dl9k1jpdqr5nsyr33dqf7k87wwfa681859";
+    sha256 = "1apj5j25kj7v1bsfv3nh54aiq873nfrsjfbj85p5qm3ihfwxxmv6";
  };

  buildInputs = [ openconnect polkit
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
  doCheck = false;

  nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xml_xslt ];
-  propagatedBuildInputs = [ pythonPackages.six ];
+  propagatedBuildInputs = [ pythonPackages.six pythonPackages.kerberos ];

  postInstall = ''
    make -C docs man
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libpcap, enableStatic ? false
+{ stdenv, fetchFromGitHub, fetchpatch, libpcap, enableStatic ? false
 , hostPlatform
 }:

@ -13,6 +13,25 @@ stdenv.mkDerivation rec {
    sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p";
  };

+  patches = [
+    (fetchpatch {
+      url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11541.patch";
+      sha256 = "1lqg4lbyddnv75wpj0rs2sxz4lb3d1vp8n385i27mrpcxw9qaxia";
+    })
+    (fetchpatch {
+      url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11542.patch";
+      sha256 = "0vqgmw9i5vr3d4siyrh8mw60jdmp5r66rbjxfmbnwhlfjf4bwxz4";
+    })
+    (fetchpatch {
+      url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-CVE-2017-11543.patch";
+      sha256 = "1vk9ncpx0qjja8l69xw5kkvgy9fkcii2n98diazv1yndln2cs26l";
+    })
+    (fetchpatch {
+      url = "http://www.tcpdump.org/pre-4.9.2/PUBLISHED-OpenSSL-1.1-segfault.patch";
+      sha256 = "0mw0jdj5nyg4sviqj7wxwf2492b2bdqmjrvf1k34ak417xfcvy1d";
+    })
+  ];
+
  buildInputs = [ libpcap ];

  crossAttrs = {
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@ -1,12 +1,13 @@
 { fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/run/wrappers/bin/sendmail" }:

-stdenv.mkDerivation {
-  name = "at-3.1.16";
+stdenv.mkDerivation rec {
+  name = "at-${version}";
+  version = "3.1.20";

  src = fetchurl {
    # Debian is apparently the last location where it can be found.
-    url = mirror://debian/pool/main/a/at/at_3.1.16.orig.tar.gz;
-    sha256 = "1hfmnhgi95vsfaa69qlakpwd22al0m0rhqms6sawxvaldafgb6nb";
+    url = "mirror://debian/pool/main/a/at/at_${version}.orig.tar.gz";
+    sha256 = "1fgsrqpx0r6qcjxmlsqnwilydhfxn976c870mjc0n1bkmcy94w88";
  };

  patches = [ ./install.patch ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2139,6 +2139,8 @@ with pkgs;

  genimage = callPackage ../tools/filesystems/genimage { };

+  gerrit = callPackage ../applications/version-management/gerrit { };
+
  geteltorito = callPackage ../tools/misc/geteltorito { };

  getmail = callPackage ../tools/networking/getmail { };
@ -3275,6 +3277,8 @@ with pkgs;

  mktorrent = callPackage ../tools/misc/mktorrent { };

+  mmake = callPackage ../tools/misc/mmake { };
+
  modemmanager = callPackage ../tools/networking/modemmanager {};

  modsecurity_standalone = callPackage ../tools/security/modsecurity { };
@ -7660,6 +7664,8 @@ with pkgs;

  cdk = callPackage ../development/libraries/cdk {};

+  cdo = callPackage ../development/libraries/cdo {};
+
  cimg = callPackage  ../development/libraries/cimg { };

  scmccid = callPackage ../development/libraries/scmccid { };
@ -8414,7 +8420,7 @@ with pkgs;

  haxor-news = callPackage ../applications/misc/haxor-news { };

-  herqq = callPackage ../development/libraries/herqq { };
+  herqq = libsForQt5.callPackage ../development/libraries/herqq { };

  heyefi = haskellPackages.heyefi;

@ -8730,8 +8736,6 @@ with pkgs;

  libctemplate = callPackage ../development/libraries/libctemplate { };

-  libctemplate_2_2 = callPackage ../development/libraries/libctemplate/2.2.nix { };
-
  libcouchbase = callPackage ../development/libraries/libcouchbase { };

  libcue = callPackage ../development/libraries/libcue { };
@ -11563,7 +11567,6 @@ with pkgs;

  vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };

-  pgpool92 = pgpool.override { postgresql = postgresql92; };
  pgpool93 = pgpool.override { postgresql = postgresql93; };
  pgpool94 = pgpool.override { postgresql = postgresql94; };

@ -11575,8 +11578,6 @@ with pkgs;
  postgresql = postgresql95;

  inherit (callPackages ../servers/sql/postgresql { })
-    postgresql91
-    postgresql92
    postgresql93
    postgresql94
    postgresql95
@ -12259,18 +12260,6 @@ with pkgs;

  linux_samus_latest = linux_samus_4_12;

-  linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
-    kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
-                      kernelPatches.chromiumos_no_link_restrictions
-                      kernelPatches.genksyms_fix_segfault
-                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
-                    ];
-    # compiler-gcc.h:107:30: fatal error: linux/compiler-gcc6.h: No such file or directory
-    stdenv = overrideCC stdenv gcc5;
-  };
-
-  linux_chromiumos_latest = linux_chromiumos_3_18;
-
  /* Linux kernel modules are inherently tied to a specific kernel.  So
     rather than provide specific instances of those packages for a
     specific kernel, we have a function that builds those packages
@ -12453,10 +12442,6 @@ with pkgs;
  linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
  linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest);

-  # ChromiumOS kernels
-  linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
-  linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);
-
  # A function to build a manually-configured kernel
  linuxManualConfig = pkgs.buildLinux;
  buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -8123,14 +8123,15 @@ in {
  };

  py3status = buildPythonPackage rec {
-    version = "3.0";
+    version = "3.6";
    name = "py3status-${version}";
    src = pkgs.fetchFromGitHub {
      owner = "ultrabug";
      repo = "py3status";
      rev = version;
-      sha256 = "1mnl0rfbnimcpp7q9hva0x9jfa58j4nc27r9kvaii8869kzssw48";
+      sha256 = "01qvrwgkphb0lr7g9dm0hncbxcds05kg4qgbsrvnc7d5j2vhfdkr";
    };
+    doCheck = false;
    propagatedBuildInputs = with self; [ requests ];
    prePatch = ''
      sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py