diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7251f45bc5d7..ea1cff03fe2e 100644
--- 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>";
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index f3f65edcec2a..94f03a2ee116 100644
--- 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>
diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index 1bf9fdb19845..c7654ca78c3a 100644
--- 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
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 1bbab3296005..a23a0ebc7366 100644
--- 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.
         '';
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 001c6473a98e..82dfc1c9f1ce 100644
--- 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;
                   };
               };
           }
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 54fd4a15ffcc..84dda8cc64c2 100644
--- 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)
diff --git a/nixos/release.nix b/nixos/release.nix
index ca2a164bb6c8..59c269627f19 100644
--- 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; };
diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix
new file mode 100644
index 000000000000..07427d7f2a89
--- /dev/null
+++ 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'");
+    '';
+})
diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix
new file mode 100644
index 000000000000..1350426654d7
--- /dev/null
+++ 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}'");
+    '';
+})
diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix
new file mode 100644
index 000000000000..2aab4ce0b49e
--- /dev/null
+++ 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}'");
+    '';
+})
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index d426bbde68d2..5da5717d7f86 100644
--- 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!
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index c482e44e7aa4..ac13371dd930 100644
--- 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
diff --git a/pkgs/applications/audio/audio-recorder/icon-names.diff b/pkgs/applications/audio/audio-recorder/icon-names.diff
deleted file mode 100644
index 28f21799166a..000000000000
--- a/pkgs/applications/audio/audio-recorder/icon-names.diff
+++ /dev/null
@@ -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);
diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index b50042912715..27724bc28e99 100644
--- 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
   '';
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9b6ffa704a38..282aeef447f6 100644
--- 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";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 647d107c8ac0..7053e2d33bdf 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -759,8 +759,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
+          sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -776,12 +776,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20170823.352";
+        version = "20170831.802";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
+          sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -822,8 +822,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
-          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
+          rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f";
+          sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1322,12 +1322,12 @@
     aggressive-fill-paragraph = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-fill-paragraph";
-        version = "20161023.321";
+        version = "20170902.705";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "aggressive-fill-paragraph-mode";
-          rev = "25668da48db3b505f01875e0f4ededc5ad8dcb9e";
-          sha256 = "141vc0byjax91m192gbv7xlcqjzwhm8pp4hv5bka0chx20g14vq6";
+          rev = "c5185ad673c01e5103ab4a078095c3e2ce7ab039";
+          sha256 = "11dppmpdv26m9l5cnnnylihiss2a09zyyb7kqdrk3djdqvqplqb4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph";
@@ -1774,8 +1774,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "amx";
-          rev = "04ac50cb85d27d885b083258a43533d4ae78c08b";
-          sha256 = "1lwx5230if67a3ixpvc1951wciwmk68fnq7c0j66qfpgmggzymbs";
+          rev = "ba09f5ecf451d278a6cf5721b6942ad8d81ab911";
+          sha256 = "0xilab0v5qzvz6g8n10jdb9vz2pmlhgz6pc9cc3qsgg54r3igsv2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
@@ -2501,12 +2501,12 @@
     apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apiwrap";
-        version = "20170814.1842";
+        version = "20170901.648";
         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";
@@ -2647,14 +2647,14 @@
         pname = "arch-packer";
         version = "20170730.621";
         src = fetchFromGitHub {
-          owner = "brotzeitmacher";
+          owner = "brotzeit";
           repo = "arch-packer";
           rev = "940e96f7d357c6570b675a0f942181c787f1bfd7";
           sha256 = "0m80ka51m7a1797q6br41x96znvqfmpwzh3vk4mz66mdx2r4xk77";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer";
-          sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/arch-packer";
+          sha256 = "04kv22vpcpjhc047yz6k6dizmwwdjk6vcm8imri76gi9ns1w5n5z";
           name = "arch-packer";
         };
         packageRequires = [ async dash emacs s ];
@@ -4404,12 +4404,12 @@
     bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bash-completion";
-        version = "20170827.943";
+        version = "20170903.634";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "2378b04eeb4338a8268072d7eda7820dba390ccd";
-          sha256 = "1hc5n0d4y5ayv6c10zyr806mxdp26j4gc20vw2i9mzdb1w862jmc";
+          rev = "583d1dde611c513aa81a0165e809e8d5bafb915a";
+          sha256 = "1j2zprvv275270ss1s51c8l5rbhn8ri2n7pb1cw8679f1dlwjzpm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -5345,8 +5345,8 @@
         src = fetchFromGitHub {
           owner = "mgrachten";
           repo = "bln-mode";
-          rev = "1de92cec97a4693b8b932713e333730118db9183";
-          sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx";
+          rev = "6c20b3269e88952c19ca9ad151221c7e2e27b465";
+          sha256 = "04ggaybf1yi0ynqfr6vslx0ld5n6zs2ymmk63hr6lp2jb6dyhdhx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode";
@@ -5882,12 +5882,12 @@
     bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bshell";
-        version = "20170824.711";
+        version = "20170903.1137";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "bshell";
-          rev = "b4f27abfdbcee572368ef1d50e7537e505c92773";
-          sha256 = "163fwyk7ncnmzxar452pl7gmnxn436mzl8ls7zliipzrfaicwp34";
+          rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed";
+          sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@@ -6026,22 +6026,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 = "20170828.852";
+        version = "20170903.1113";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "buffer-manage";
-          rev = "0e50634aace95b322d00e9e91eb5e85367a02179";
-          sha256 = "195kb6hzcipz1px0fwdnk1adyyzxyyb84m9z206091dzhl2z6i3r";
+          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;
@@ -6362,12 +6362,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20170827.202";
+        version = "20170901.422";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "5d1f338a67a2ed94412d2c69f52a845ca9c752f7";
-          sha256 = "11rkhr2jkzriqg7abx1xn4fdhmw1l77ascx7qpl10isg1fmmpmcb";
+          rev = "11d7fdce9f46eec62ed86f4f9617e04d2c204b3a";
+          sha256 = "0vaq5dgajilysn720sgd294rhzvxbr7q2nyf71m74gf42pxf791d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -7286,8 +7286,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "627b6c44e5af58a0b73503dc4c9f52c077c9136e";
-          sha256 = "1ai0czdrzm58gmzg9bkcp16wa05rpwxllf1dwblny77mpd9c0ain";
+          rev = "cdaf4cc639d93f6fc648d0f622cb7238f30d416b";
+          sha256 = "1y5qvbblskyvv65hgwiyz2sx4n9zvalwn9mgx50s65rhdinja697";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7324,12 +7324,12 @@
     cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "cfml-mode";
-        version = "20170811.2240";
+        version = "20170903.1949";
         src = fetchFromGitHub {
           owner = "am2605";
           repo = "cfml-mode";
-          rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807";
-          sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d";
+          rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56";
+          sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode";
@@ -7342,6 +7342,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cframe";
+        version = "20170828.919";
+        src = fetchFromGitHub {
+          owner = "plandes";
+          repo = "cframe";
+          rev = "8b60c482a5888464caf6d05b2a0079340bdd7be8";
+          sha256 = "0skms8cwniddpns1fmpqjnhyrn1fjvv6zknzjfganpv0h10gypgk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe";
+          sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l";
+          name = "cframe";
+        };
+        packageRequires = [ buffer-manage dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/cframe";
+          license = lib.licenses.free;
+        };
+      }) {};
     cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cftag-mode";
@@ -7349,8 +7370,8 @@
         src = fetchFromGitHub {
           owner = "am2605";
           repo = "cfml-mode";
-          rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807";
-          sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d";
+          rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56";
+          sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode";
@@ -7368,7 +7389,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12319";
+          rev = "12321";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7803,16 +7824,16 @@
     choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "choice-program";
-        version = "20161230.1721";
+        version = "20170828.616";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "choice-program";
-          rev = "691ced104adc6dbb3ddf8c28563c1cd36eb165b1";
-          sha256 = "1jd0zj8g9nnzdfy76z9565sz6sd6690nbbi4zg71pxssmsqgkc3w";
+          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 ];
@@ -8059,8 +8080,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "47bbcf4268602688f90c08ce64ec93226fc3f894";
-          sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr";
+          rev = "452dfb407b640ba6eb288ff25a9de27446a409c4";
+          sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -8142,7 +8163,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "312112";
+          rev = "312487";
           sha256 = "063lnsasva07rnlhhb9dqpf5z92bjf1abs9z4rfggg5jqx1gmhs2";
         };
         recipeFile = fetchurl {
@@ -8327,12 +8348,12 @@
     clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clips-mode";
-        version = "20170829.2203";
+        version = "20170904.323";
         src = fetchFromGitHub {
           owner = "grettke";
           repo = "clips-mode";
-          rev = "13150b42a216551494505080aa82d74b6cec3993";
-          sha256 = "18905idq6d49h6jfyj4r1pj8268n2kcl5l7i2g9mh6x6jwlx26wg";
+          rev = "ee419b393277f45c7bcc2938b07b321f2f9d22bc";
+          sha256 = "027xpg25iffxj1v7xi8gdqdj5cg0j8kbri786ckfk8znx4ghqi5l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode";
@@ -8784,8 +8805,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "7321cfb667ce2907dbc0716f6a26ac64106c7eb9";
-          sha256 = "0hsxwpvj4y8c5gvkpclpjyf2ykcdi2v59k8zc2jfdq5mbvp04bbb";
+          rev = "8d13e9c1f5fa7871153ef83aa67d67e72fcaa5c1";
+          sha256 = "1fq7v4vlx2r5jwnx63y18yffi57y9yz23mrahfzp1c8wbyja6rxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9301,12 +9322,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170830.410";
+        version = "20170902.2300";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "13b4b4f8d0f84efde956c4f57c5e5ebc974e9763";
-          sha256 = "1fjg5w0xpk7qq8p677czs9lkdjk2z0m7vslml18shvpfis9rz997";
+          rev = "aad353819ad8a588c4b9e6910604733d9755c42c";
+          sha256 = "03mf2jamm04arlsimx3r2wiqjkx6av4ipz3arhq02r8lwy3rm1f6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -10011,8 +10032,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "d0d549d64d2764038b86f5d5862b94b42516e3c6";
-          sha256 = "1xcx4rbqvhjdlk3vnkwa4vsg97y8sh079bdbwfzc51g8nbmvshw4";
+          rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
+          sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10049,12 +10070,12 @@
     company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "company-irony";
-        version = "20170821.1306";
+        version = "20170831.1300";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "company-irony";
-          rev = "aa84766a4c878d0748d9d9734e312309bf2758dc";
-          sha256 = "0fcxxy7a3364qwpib3yjq6ps3z5q7gr0njf6jzwjvnrrn4m6dbga";
+          rev = "26cb30bcb055909770d4dc7fcd54792ce64ec249";
+          sha256 = "1f45zprhi5fv0p8f4gadww35sn8kkvrm607scghw15a4mb5837ra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
@@ -10221,8 +10242,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
-          sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
+          rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
+          sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10353,8 +10374,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
-          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
+          rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f";
+          sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10605,8 +10626,8 @@
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
-          sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
+          rev = "2239671d94b38d92e9b28d4e12fd79814cfb9c16";
+          sha256 = "0vz59lm7pfz0gbsgrb44y555js85wbdjn0zm6p8wfqjiqf63ds3i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
@@ -10936,12 +10957,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170817.1000";
+        version = "20170830.1025";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f";
-          sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw";
+          rev = "e9f7dcb0d26e02c2883774bae568c6eda7fe56ff";
+          sha256 = "1wwngrf9fjq1dbl59lj14kihywz8gfkjz1dpy0n9i1nm7fd5w9my";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11981,8 +12002,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "41308e574e77ec527cbcce6209a142c12f94bcaf";
-          sha256 = "08bnasd7hhly05pmp5nswp35ql8ab0pplrh1hbg91hkfz4wkc97y";
+          rev = "91ee421e9228dc7656519c7bdca6c715ca22bb56";
+          sha256 = "0basrjflmb3ika3s7xcvadwn4xvpy79laxxcbjm9p48p53mvskvf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12145,12 +12166,12 @@
     dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "20170829.1311";
+        version = "20170901.525";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "498883333cbd41d36a7533f6c2c701e574277972";
-          sha256 = "1bcgxmb837n75byz8v53rb8bxqb1kzfpdaalx0bqkwvvk7kn6byl";
+          rev = "203dcd8b748d485d1c78d04d81db22fd00cb71d7";
+          sha256 = "1ywx46mm1zrj0hnx2zwyxlxlq7ysg46hsy5vi6hmfppwbrfmkyzv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12418,12 +12439,12 @@
     dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
     melpaBuild {
         pname = "dashboard";
-        version = "20170810.1025";
+        version = "20170901.2";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58";
-          sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw";
+          rev = "8a555de891a83a9cd080c940dde183a8806479a9";
+          sha256 = "1w7f2fvnhqzcr6az4fkgb11k8qjzg81vwzx96qhym8d70sabahzh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12815,12 +12836,12 @@
     deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "deferred";
-        version = "20170531.2135";
+        version = "20170901.630";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
-          sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
+          rev = "2239671d94b38d92e9b28d4e12fd79814cfb9c16";
+          sha256 = "0vz59lm7pfz0gbsgrb44y555js85wbdjn0zm6p8wfqjiqf63ds3i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred";
@@ -13420,10 +13441,10 @@
     dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-details-plus";
-        version = "20170221.1629";
+        version = "20170903.1237";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-details+.el";
-          sha256 = "0821swa6qp2bs16r1pfamc7n62002rp8v0vimamw33cqxn2d0h6x";
+          sha256 = "03r7afjp376d0c34r1nj5hz914lbrk9y5ripar1w697bqk8kaxy3";
           name = "dired-details+.el";
         };
         recipeFile = fetchurl {
@@ -13813,6 +13834,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-sidebar";
+        version = "20170903.1538";
+        src = fetchFromGitHub {
+          owner = "jojojames";
+          repo = "dired-sidebar";
+          rev = "1f3c8ba993c94663628acc2270ca5327d0d5ea68";
+          sha256 = "0mrkxj6md4jjfpcb3374hc9ybbxp1nan189c35mlh3xnbznvxs4m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
+          sha256 = "19a4gsx9wmpc94jd992c7dj5mxfnnij2nc6qnb2lhk8ad69h1lmc";
+          name = "dired-sidebar";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dired-sidebar";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-single";
@@ -14866,12 +14908,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170827.1515";
+        version = "20170903.748";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "fb92c7c31b490c5fce997024b9c9b8c05f607301";
-          sha256 = "1wpv2cz4gs3mckdhmnz0mk57y1w6701yjcmxd8km99cpwy2bily6";
+          rev = "0fa93998c6375538dd77ed5a319820411d95d302";
+          sha256 = "1jm9622qp4w8y607yhclqd2qs8jrsl5k4ah3gj9lb2l0vzn82igz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15322,7 +15364,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1806688";
+          rev = "1807231";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -16666,11 +16708,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "20170420.1251";
+        version = "20170830.1113";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
-          sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
+          rev = "f939b1fd5eaca72e5e1ce8a379468c60caf4efca";
+          sha256 = "0wlsp57hy8pzq31raqna9yj9g50y25m47rnwxbyabfl5xlflzs7g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
@@ -16704,15 +16746,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }:
+    ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170810.1253";
+        version = "20170903.829";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "606d4b32140414cf9ced2683f3532aad9ab0859a";
-          sha256 = "19idga81cl70cir6v55cqpkman4dhkjx1rvmmby7517phnpfnjpa";
+          rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd";
+          sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16726,6 +16768,7 @@
           deferred
           request
           request-deferred
+          s
           skewer-mode
           websocket
         ];
@@ -17266,12 +17309,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170709.954";
+        version = "20170902.1318";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff";
-          sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9";
+          rev = "aadc93acbc77ac75110c870a7af099911a939a57";
+          sha256 = "077x8nkq3lwx281l7dkcff0gi5wv8kqlrp77gi2dz70d2f9q9dfv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17340,8 +17383,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff";
-          sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9";
+          rev = "aadc93acbc77ac75110c870a7af099911a939a57";
+          sha256 = "077x8nkq3lwx281l7dkcff0gi5wv8kqlrp77gi2dz70d2f9q9dfv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17462,12 +17505,12 @@
     elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "elisp-refs";
-        version = "20170828.1027";
+        version = "20170831.1347";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "fd25631d87118885bee511e1cb4e2afa8a02fcdb";
-          sha256 = "1v9n1dak8vbm5qdwk0k4j0vcl59z4pa94xj4b87mmapkqa40jpgk";
+          rev = "9ac6c1a45c620a6d7e0fae3739558fa08b3758a3";
+          sha256 = "1yniapnkr3124isnfkv1j4mqwdmb1xb7xngjwprhjlg3k1zj3rfl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -17567,12 +17610,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20170807.1924";
+        version = "20170903.221";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "4d44a51603b4004192d62fe58beb12c029709d89";
-          sha256 = "13rxgak84hqkqha86h75l1yvk9yk648sqk70pblbi0309g8sqb10";
+          rev = "ece63376b2a7a8f5e6d708bdb2061e13d6afb731";
+          sha256 = "1109si17ph8w90jcmzz72i0ha5va8ylh2y5jinabvsc3qs667bgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17795,15 +17838,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
+    elpy = callPackage ({ cl-generic, company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170701.1412";
+        version = "20170903.143";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "6b654b5fdc4e8f09cd842a0dde83ded284223c2f";
-          sha256 = "02z965inkp3bxg9nyqscjs14dfzx7s18s3kx7ry50j2yi0iki6rg";
+          rev = "d1cfe9c87031a9fd4c9754afdc4c4d0b3b3128a6";
+          sha256 = "1zy24fp888i7xaplfnxznlw8hldfpcgh9ni0053m9sq8z28nld6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17811,6 +17854,7 @@
           name = "elpy";
         };
         packageRequires = [
+          cl-generic
           company
           find-file-in-project
           highlight-indentation
@@ -18393,11 +18437,11 @@
     emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms";
-        version = "20170715.907";
+        version = "20170901.1328";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "e790730a4e258440184bc8ce5d3015efe09f8984";
-          sha256 = "0rh3hsggfw0yp5ssdwjpp0fdnc57cpcw02hxn80mrq16ylpj2zy9";
+          rev = "79793c0bb32620ad5b4db490c6e80ff8e5a20233";
+          sha256 = "13mk66vbrnzsy8bcz2wahn4hcqyiia6j0srpfffxsg49x9bssvff";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18962,8 +19006,8 @@
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-epc";
-          rev = "76fe6847a341f78c635164c18908a0b691f7212c";
-          sha256 = "11z08y61xd00rlw5mcyrix8nx41mqs127wighhjsxsyzbfqydxdr";
+          rev = "e1bfa5ca163273859336e3cc89b4b6460f7f8cda";
+          sha256 = "15nkrjgi64f829isfd6xrhl4zw8jirr8pkas7nisrbk1av868hx0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/epc";
@@ -19528,8 +19572,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "ea46749ffc0d12ff6b4e37964c26123f1af4b8ec";
-          sha256 = "1qfjh8n3pfixqapavv84rnkjdr9rpabcl146jv0ki8lih57cx9c1";
+          rev = "9b832080feadc764f7981739174df06084a2eeaa";
+          sha256 = "1vmb1jifr4248i6dx3j6i1r9bsis8q5lilf2lsan495nbaqwsd7a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20237,16 +20281,16 @@
     esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esxml";
-        version = "20170723.1503";
+        version = "20170903.150";
         src = fetchFromGitHub {
           owner = "tali713";
           repo = "esxml";
-          rev = "c4646d3a5a274e21efe125ae9f87b9934014e6ad";
-          sha256 = "05r2jhcrzrjna5dnq95gnagjn11bx0ysgbcnn4rffwms09avbwvf";
+          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 = [];
@@ -20335,6 +20379,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    euslisp-mode = callPackage ({ emacs, exec-path-from-shell, fetchFromGitHub, fetchurl, helm-ag, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "euslisp-mode";
+        version = "20170830.1229";
+        src = fetchFromGitHub {
+          owner = "iory";
+          repo = "euslisp-mode";
+          rev = "db62a2d148482317794727982576494596365a55";
+          sha256 = "187ij4s7mzppgmh0ifny70mw8w31nq86rhsrmnflz26iywnkp8x2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/euslisp-mode";
+          sha256 = "0v92lry9ynkvsvx060njaw1j5lj9sb1i3srs2hfqqwyqni5ldkri";
+          name = "euslisp-mode";
+        };
+        packageRequires = [ emacs exec-path-from-shell helm-ag s ];
+        meta = {
+          homepage = "https://melpa.org/#/euslisp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     eval-expr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eval-expr";
@@ -20464,12 +20529,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170815.1422";
+        version = "20170902.759";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "744685cb55a4eb461430e91e287279812190ae7c";
-          sha256 = "0j5gfrisf9rhjz5p7vicp5cs0x9i73146hr1fqgryq27x96dax3b";
+          rev = "a6ef21d6dad1076e5ef64fa5d1675870db37e6f1";
+          sha256 = "1419zi57ad1f4nnjdmn03cic09xx6ja4ksh6b106mncvvdsaqjbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20821,12 +20886,12 @@
     evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-goggles";
-        version = "20170808.404";
+        version = "20170830.2329";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "513ba2eb3ed7f579b9babeff0d2d0e0b0a37c69f";
-          sha256 = "0gq7wlix1zfvlcn901jcr10pfzphmsgmsymqq2pblc8d54nhv4wj";
+          rev = "1e9ebe5e4cad65b17c58390cc79527a36ae22392";
+          sha256 = "18zssqc7habn2ka6lmkk0hm1nnll26frdklwd1j14hgrzcsm4a1h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -21367,12 +21432,12 @@
     evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20170806.1150";
+        version = "20170903.603";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "e247d6980093633f04431967819bf10b0d23c59c";
-          sha256 = "1qv8f45g864vhx7k62gcsivmalq2vaqpvp1klc773d2y0k2b2w0n";
+          rev = "69adb46546a871beb54a445cb22652ac276555c1";
+          sha256 = "1g6whd2zg880wxxyn269q4b0697aybj1lc936gi7nrxvm6fnaiwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21497,8 +21562,8 @@
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "744685cb55a4eb461430e91e287279812190ae7c";
-          sha256 = "0j5gfrisf9rhjz5p7vicp5cs0x9i73146hr1fqgryq27x96dax3b";
+          rev = "a6ef21d6dad1076e5ef64fa5d1675870db37e6f1";
+          sha256 = "1419zi57ad1f4nnjdmn03cic09xx6ja4ksh6b106mncvvdsaqjbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -21951,22 +22016,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
+    exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170809.413";
+        version = "20170903.2138";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "6adaee93a4f84806cf197dae872f00039a3ca87e";
-          sha256 = "04h8qjlvcnafs6771k4k2fsrg36j7b30dfmb9whrggs0lmsb5agq";
+          rev = "cee7cc0e6dd6d1c481480f1978b6487287b4f637";
+          sha256 = "0kwrm2bz09i8dj0zz7pznpv0hy08pxl4kzl46c470abvs2dzrp67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
           sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
           name = "exwm-x";
         };
-        packageRequires = [ bind-key cl-lib exwm swiper switch-window ];
+        packageRequires = [
+          bind-key
+          cl-lib
+          counsel
+          exwm
+          ivy
+          swiper
+          switch-window
+        ];
         meta = {
           homepage = "https://melpa.org/#/exwm-x";
           license = lib.licenses.free;
@@ -22449,6 +22522,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    faustine = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "faustine";
+        version = "20170904.140";
+        src = fetchgit {
+          url = "https://bitbucket.org/yassinphilip/faustine";
+          rev = "153f3aaaa0058736dfefeb006d06e6d43d51ef45";
+          sha256 = "0fsrh43g2l56g3ck5d398v0z7hqladdaamkhcc1cpnwajmnpa9vp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine";
+          sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s";
+          name = "faustine";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/faustine";
+          license = lib.licenses.free;
+        };
+      }) {};
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
@@ -22635,12 +22728,12 @@
     fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fill-column-indicator";
-        version = "20170829.907";
+        version = "20170901.528";
         src = fetchFromGitHub {
           owner = "alpaker";
           repo = "Fill-Column-Indicator";
-          rev = "a44ac30c4c2b6efdd325604d41a154ff00ae187f";
-          sha256 = "1arx3k2lf84avx10bfv96wjhgbdn3y1606nqra4malfs8zfj7gqz";
+          rev = "2cd7469a40464dab0b3c3148d5e24c68c3f1ce51";
+          sha256 = "002yys43zc0wdm7pff08q2b4z2lc579zxcfzigl1x2fasgv6rc67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -22738,12 +22831,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20170822.1915";
+        version = "20170903.2000";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "7ebbce969733d3185bc583f3f660b96d34eb43a5";
-          sha256 = "17zalma32r9gi27a6xbszig0a95gb6y0rzi2h08hkcjwc528pzii";
+          rev = "b1de8479159b722caf74e9b4972406533b800ff0";
+          sha256 = "0sh3q9wnpk90x0mqbyzyvkg8grla2dakrgiwaxgiv70mga3mbqv2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23473,12 +23566,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170823.1732";
+        version = "20170902.312";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "8460e113e7d5e43a0c44395212a592e26d03f58d";
-          sha256 = "19f79089sh7xn67wj7n4bdfd0afvqjw70yfh3vilf4gbhipdh80j";
+          rev = "9cd155bd08dc33b51268b6f9a36796d236f734de";
+          sha256 = "1m9plvf2ydzbm888gi7fifscpv59x5fn4wd1crdw9yfz276scx5r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24653,8 +24746,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
-          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
+          rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f";
+          sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -26489,8 +26582,8 @@
         src = fetchFromGitHub {
           owner = "factor";
           repo = "factor";
-          rev = "c457c019bb2d5f2a09021581fa7fd12429cd5ca1";
-          sha256 = "1i0m89398z8waxylpmw8laq8n198894v5qv5in6hnwgkz8vs5lxp";
+          rev = "b473c5ff4c88014e4ee04d0fc58ed7d59d320db2";
+          sha256 = "0xr5d4qsap8vcgvbnp7n4a3i29k5kv4vyipaxfcq0dqg9mc9qpg1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -26615,8 +26708,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "72d6ddf110446aad7bf5988a0a0178aa89e689d8";
-          sha256 = "0q78qizshnr616q2mcfbzxncg2588d06729nkyw1rf0ihk88cf0g";
+          rev = "b7d27066200d187a185e0433831a3307998c099a";
+          sha256 = "1jq1vzrn0dbghj71vszgqpzicazfn4bikcl7d5z9184w6dwgigbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -27430,8 +27523,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1250314a4bf7bfd3971f6a422744b0e3da7b3e71";
-          sha256 = "0vzgpqjvkvx5hl0z5lyd7s5smgv86hhivr8zqqzs4q7y6s2qfxgy";
+          rev = "6caaae553112f85cb051d41fe5368a6806430902";
+          sha256 = "1psx7iscw6vn370x351ffzliw1fil1lrxhiizfk7qf3d4b9j60zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28478,8 +28571,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "d0d549d64d2764038b86f5d5862b94b42516e3c6";
-          sha256 = "1xcx4rbqvhjdlk3vnkwa4vsg97y8sh079bdbwfzc51g8nbmvshw4";
+          rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
+          sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28789,12 +28882,12 @@
     go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "go-snippets";
-        version = "20151121.2257";
+        version = "20170831.2302";
         src = fetchFromGitHub {
           owner = "toumorokoshi";
           repo = "go-snippets";
-          rev = "983eb74025030bf6d405f1ed63be3162cc28a528";
-          sha256 = "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n";
+          rev = "7e38fc0ddf2cc786cdb273882ff9b3563abc3c7a";
+          sha256 = "0dsbp0x8qmv2k649x7l264zc8cv08dlrxz09lv643fchm56rsljm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca9f3022e7f4d5391be394cd56f6db75c9cff3b6/recipes/go-snippets";
@@ -29164,22 +29257,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    gorepl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    gorepl-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gorepl-mode";
-        version = "20151121.422";
+        version = "20170904.126";
         src = fetchFromGitHub {
           owner = "manute";
           repo = "gorepl-mode";
-          rev = "17e025951f5964a0542a4b353ddddbc734c01eed";
-          sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
+          rev = "3346ee960aac04a8bea4328bc7b259bd21e6e426";
+          sha256 = "14xjpdzdj40z1d62n4qnazvwb0s70syb1r4aymyancll6nj27hwl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode";
           sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq";
           name = "gorepl-mode";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs f hydra s ];
         meta = {
           homepage = "https://melpa.org/#/gorepl-mode";
           license = lib.licenses.free;
@@ -30012,12 +30105,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170819.1015";
+        version = "20170902.1128";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "2a1c00f81a2fe702e205f99ec4d235dfe468b426";
-          sha256 = "069n9226ndgadrdfv64wphnhp0g96q2wcnmwsqfw6iq1xyy08ckl";
+          rev = "54bd174b514c5de11e82c4263ac2723addb0fe87";
+          sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30516,12 +30609,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170828.844";
+        version = "20170903.948";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "03ced314205d2441f21c18464ad1e6a775c675b2";
-          sha256 = "064pc3hzjnv9b4l6p7hp4lnmhg1bg9ji9z3n9kwiw6xxfpkpdikz";
+          rev = "adccbc4429ea5e90d75219a0c2f19f522fabbae1";
+          sha256 = "0q331sjispy2qv3312if224c7s6zf6l1pfr08cf6nz3w5zxdy77v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30578,12 +30671,12 @@
     hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hasky-extensions";
-        version = "20170520.149";
+        version = "20170830.625";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-extensions";
-          rev = "8e03c0fbb902c0ce51e822cd7b73f5f42e64aec4";
-          sha256 = "1aykx7x0dmxq42mavyi43fm1qpvs2whz1q3n7hn6rd7qsxa0x8g4";
+          rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa";
+          sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -30599,12 +30692,12 @@
     hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "hasky-stack";
-        version = "20170826.1029";
+        version = "20170901.154";
         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";
@@ -30806,12 +30899,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170830.357";
+        version = "20170904.308";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "15525a2608344c15c475564c8fe64a0acc0a654b";
-          sha256 = "044rqjxxc6n60mycbcqiy6sn3bpvr9xgb3vlgigabc7532na89dr";
+          rev = "10669b0875e3d6e2613260ad879d4a2de9ee6fa0";
+          sha256 = "01167pl0awv7vlx9n28f7z0jy0bs6k0kjri0jbghhvsvjgmjg5m4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30887,6 +30980,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-addressbook = callPackage ({ addressbook-bookmark, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-addressbook";
+        version = "20170903.28";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-addressbook";
+          rev = "62497f72d46afd3a9f9f94b27d062a82fb232de4";
+          sha256 = "1lmq7j19qv3pabs5arapx3lv2xhf0sgn4b2hl0l0kzph52fvics7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb805b0f2d2055aa4e88bd41239d75ec34f5785/recipes/helm-addressbook";
+          sha256 = "1d8byi6sr5gz1rx3kglnkp47sn9dqdd83s12d84wyay06ix3cqqi";
+          name = "helm-addressbook";
+        };
+        packageRequires = [ addressbook-bookmark cl-lib emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-addressbook";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
@@ -31415,12 +31529,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170828.2343";
+        version = "20170902.2335";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "15525a2608344c15c475564c8fe64a0acc0a654b";
-          sha256 = "044rqjxxc6n60mycbcqiy6sn3bpvr9xgb3vlgigabc7532na89dr";
+          rev = "10669b0875e3d6e2613260ad879d4a2de9ee6fa0";
+          sha256 = "01167pl0awv7vlx9n28f7z0jy0bs6k0kjri0jbghhvsvjgmjg5m4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31478,12 +31592,12 @@
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
-        version = "20170531.135";
+        version = "20170831.324";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
-          sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
+          rev = "a4e8da47d3a82b316d2b3668c95215746c6c375b";
+          sha256 = "11mgpcxv25szf8gwyjpvicq520j0nkmbnvaqr64ahg0k4d7lv31j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -31986,8 +32100,8 @@
         src = fetchFromGitHub {
           owner = "iory";
           repo = "emacs-helm-ghs";
-          rev = "f9d4ab80e8a33b21cd635285289ec5779bbe629f";
-          sha256 = "0f7wsln7z2dhqn334pjk6hrj36gvx39vg19g8ds9sj9dq9djlf27";
+          rev = "17a70bf16255d90d67c8350e88200ec8bfd47563";
+          sha256 = "1jc51anmkr44db4kbcwza17x3ln78ihpslrf2v9xs0sq0ggw1rva";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8d37030806905344a2ca56bfc469f5a238cd69/recipes/helm-ghs";
@@ -32758,12 +32872,12 @@
     helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
     melpaBuild {
         pname = "helm-notmuch";
-        version = "20170221.1208";
+        version = "20170903.2159";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "helm-notmuch";
-          rev = "aac6b3ee2142515dc3f4b59f242cdfa2b012118c";
-          sha256 = "10d2r9bksiq2v03fw6f44i30dk0hai12d1baygkci850m5n67irz";
+          rev = "782c221bf293eee55990de5b54171f08d881dcee";
+          sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
@@ -33308,8 +33422,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
-          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
+          rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f";
+          sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33661,12 +33775,12 @@
     helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
     melpaBuild {
         pname = "helm-w3m";
-        version = "20170710.1238";
+        version = "20170904.711";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-w3m";
-          rev = "0af89108183ac11dcf75be06fe23a60ae072463f";
-          sha256 = "0cjnlml9k1ak26v5j7qghpk2yj4rs37jlkpbn1m5y1j8231m472j";
+          rev = "57b8b0d3cad39abd02fab569ddd1c96336bbbad5";
+          sha256 = "059jlyljlp5g7jh6bjdjd157l35apnwvxal1r18pipwfk1fcscxq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m";
@@ -33747,14 +33861,14 @@
         pname = "helm-xref";
         version = "20170822.1708";
         src = fetchFromGitHub {
-          owner = "brotzeitmacher";
+          owner = "brotzeit";
           repo = "helm-xref";
           rev = "af55df844aa65275c8f75d3a8705e13717fd3ee6";
           sha256 = "0srjmz3xm6ycx5grjl7iqrnx5qlmg7n42i9wrb3i01zrjrjbqi7x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref";
-          sha256 = "157h2h2yw8calysa7jnyz7iy8s3ppqa6m35pl7wbgnzqx425cbny";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref";
+          sha256 = "1wyh25gxqgsc151bv4j5l050z1cz0n3yq174m62ihi1fy1pkra4l";
           name = "helm-xref";
         };
         packageRequires = [ emacs helm ];
@@ -33865,12 +33979,12 @@
     helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helpful";
-        version = "20170829.1620";
+        version = "20170902.1350";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "4b2c3f4e7a9fb41fe424fe89e46580d5f7751d69";
-          sha256 = "1lgqzilkp7byp6j1lxavnvrjryy0llakc1kd8rq05ydvnhw3wcbh";
+          rev = "0998bf11e258914eb12e7082ae0b6f7a03c88864";
+          sha256 = "14a0nbv6szb7vj2na1hhyypqrmpiv8c0rk4xcaha5f7sl17mzm1c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -35603,12 +35717,12 @@
     hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hy-mode";
-        version = "20170827.1814";
+        version = "20170903.2234";
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "23bf935a96bd4161d32d7cf810b3a2e9c1aea208";
-          sha256 = "04fl5byl0zj4sqs05dvhzryd0w0sic4vljydx4cvs8vzqzq0hxj4";
+          rev = "5e0f73ca5459ef11de87bdd20b54f0d72c20097e";
+          sha256 = "14dhqsxvml1fq5b1gwrsl60gj2v943ybzfnqp7fh5fka2iqskdn7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -35687,12 +35801,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20170813.1058";
+        version = "20170903.218";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "b4fb3298cd071d56aa9a5fc6be51ae9871ad451e";
-          sha256 = "127l60rm1dhq1l5cwsnc5i2vh7xfzdagwlhy4wmjm22xs1ms6kn2";
+          rev = "b12d37ac00d4f677b7684ed1af7d04d996167dbb";
+          sha256 = "1aw0zca0xrqig7pj5gqfsrz8cblplb4ljh7k3k1hqsl1wpxav9kg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -36521,12 +36635,12 @@
     iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iedit";
-        version = "20161228.2111";
+        version = "20170901.1951";
         src = fetchFromGitHub {
           owner = "victorhge";
           repo = "iedit";
-          rev = "03b647be8bd35ca82916f2ace27a95d5b85e8ecf";
-          sha256 = "1pbbkizaa2f8lazpsc1j7qs3snvwkmw7schzhminzxrvdx15yids";
+          rev = "abb577e44714ff0524a79c6cda278db75bd9322d";
+          sha256 = "1w227x3ivkn8mwkqm4z0w9jcrqmq8dvr5rzh3vv4qh9nar5iq5fi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
@@ -37214,10 +37328,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170828.1035";
+        version = "20170830.1104";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "1q8cxy9wc6imrn60w9yl1lsww6928xh5zsx1v5d07f9qzw9jsyp9";
+          sha256 = "0zxcqcd53fr0rf1s2fhax2a8kymk2mvg7vf7k92g8afvm888jnzj";
           name = "info+.el";
         };
         recipeFile = fetchurl {
@@ -37378,6 +37492,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inline-crypt";
+        version = "20170824.200";
+        src = fetchFromGitHub {
+          owner = "Sodel-the-Vociferous";
+          repo = "inline-crypt-el";
+          rev = "281385b383f850fd2e895926b1cef804dd052633";
+          sha256 = "0hjmq8j7y4wnjgk6z92w4ci0ag9fm6rn63z9mi3krvdv154vz2n0";
+        };
+        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;
+        };
+      }) {};
     inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inline-docs";
@@ -38172,12 +38307,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170817.1000";
+        version = "20170902.234";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f";
-          sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw";
+          rev = "e9f7dcb0d26e02c2883774bae568c6eda7fe56ff";
+          sha256 = "1wwngrf9fjq1dbl59lj14kihywz8gfkjz1dpy0n9i1nm7fd5w9my";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38302,8 +38437,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f";
-          sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw";
+          rev = "e9f7dcb0d26e02c2883774bae568c6eda7fe56ff";
+          sha256 = "1wwngrf9fjq1dbl59lj14kihywz8gfkjz1dpy0n9i1nm7fd5w9my";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38316,6 +38451,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy-lobsters";
+        version = "20170903.445";
+        src = fetchFromGitHub {
+          owner = "julienXX";
+          repo = "ivy-lobsters";
+          rev = "0bcd566b7c3df183bf5e3cc9e30ac2fc3f5208f5";
+          sha256 = "0l6zzvh0ng0wbcch9cxhyyjkbwi8w4by4410434jm5j842pl12hg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters";
+          sha256 = "1g8bwlh4nls21k16r1pmqmb633j19h3jnjbfl2vixyrh2na8ff1w";
+          name = "ivy-lobsters";
+        };
+        packageRequires = [ cl-lib ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-lobsters";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-pages";
@@ -38407,8 +38563,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
-          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
+          rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f";
+          sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -40646,8 +40802,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "500de18ac442b74d2cebd973059d643f873320c5";
-          sha256 = "0qiy4ckd6jlwwfhixmhdyndglfn6xbj5ha31400fgckb0db254fa";
+          rev = "6af68c41ff7c10b8af6a121e84efc0a9b053cb55";
+          sha256 = "02d1f7yhj2i5cav08qjarsipkvxmwmygjmwnxz5h0wpbphm31xa0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -41416,12 +41572,12 @@
     ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170830.58";
+        version = "20170901.2039";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "4ca70c65f2ced4e759801952986d828f6bf983cc";
-          sha256 = "0njxqh5cqcq1a3n25rbcplwinanriq8zyaf6zj36jykpswx2n8m3";
+          rev = "24b43e34dd34de23e54d7ddaa2a147efda6af03d";
+          sha256 = "0cdcd2hpv34yhpplgqljiyncs2q0i321f4xwfkb2inqbv9q4byhk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -41693,8 +41849,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "f62f2af216cedbcbcdb568f16392de2581dc6ba0";
-          sha256 = "1z7rpb20c5z1912p9ay1np3ffg06h8y55vpbzi8q2b3dwfd5djal";
+          rev = "40c239a608460e55563edb68c1b6faca57518b54";
+          sha256 = "1xcbl1y5yr2lsc9j2k0rm6fdsa1ygbb91n1hd0rd66rpa5lh83y3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -42890,8 +43046,8 @@
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-haskell";
-          rev = "a556e93fbe3068e0c374e261f1c4880c0812c434";
-          sha256 = "0ns9b528rknw5j9dkswjd208rjd98qqvn4s6c8dyfqcx11gcf0hc";
+          rev = "7c4caf7f87392146203ecd0616a059280deecd15";
+          sha256 = "1i5rpmz8kzcjgxwvy1g3mlxd4y1bnnjzlk6j2sz4i7c75g2aprn4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -42911,8 +43067,8 @@
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "ba797f9588944ae917ccbfa15c40ee1e427ea6e5";
-          sha256 = "0plccx57j85b53s8nmhkcw8h1hznm147v3ajhzx2j1adbb2j0h3f";
+          rev = "350c48ff4bde3c19b02b14ee519cd6ac7514d94c";
+          sha256 = "07392bkq5b1jymplxm76yskyf2d55s4hd46zf890jxrjzybk0ffp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -42928,12 +43084,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170829.1033";
+        version = "20170830.617";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "b386facc7347b3b5412d0cc8a1d8738a890e9b49";
-          sha256 = "0malv3i8hgir3hj32y4gxfqkvvpnwca2sn7iv708wkwmw3jcib5p";
+          rev = "1d29d6b1ccc59fa60f2e326c74364b4b2305dd87";
+          sha256 = "0b2pbvpvga6qi9k6n295ldbjhqyhknlh0nylk3yqp3w1g97nhhkc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -43156,6 +43312,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    maces-game = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "maces-game";
+        version = "20170903.851";
+        src = fetchFromGitHub {
+          owner = "pawelbx";
+          repo = "maces-game";
+          rev = "6a067422d305ac51612842930ed6686dc615ffec";
+          sha256 = "07pl2y4qlpcn9ap2vp1gpvdqh4l05gb7pp11c1krlaxybhwdcqjb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9f33b926ecec48a43ba4f0484c687a7349ce50/recipes/maces-game";
+          sha256 = "0wz91dsa0w4xlkl5lbdr8k4pgkgalsqcy27sd0i8xswq3wwiy0ip";
+          name = "maces-game";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/maces-game";
+          license = lib.licenses.free;
+        };
+      }) {};
     macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "macro-math";
@@ -43308,8 +43485,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1250314a4bf7bfd3971f6a422744b0e3da7b3e71";
-          sha256 = "0vzgpqjvkvx5hl0z5lyd7s5smgv86hhivr8zqqzs4q7y6s2qfxgy";
+          rev = "6caaae553112f85cb051d41fe5368a6806430902";
+          sha256 = "1psx7iscw6vn370x351ffzliw1fil1lrxhiizfk7qf3d4b9j60zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43525,8 +43702,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1250314a4bf7bfd3971f6a422744b0e3da7b3e71";
-          sha256 = "0vzgpqjvkvx5hl0z5lyd7s5smgv86hhivr8zqqzs4q7y6s2qfxgy";
+          rev = "6caaae553112f85cb051d41fe5368a6806430902";
+          sha256 = "1psx7iscw6vn370x351ffzliw1fil1lrxhiizfk7qf3d4b9j60zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43647,12 +43824,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "magithub";
-        version = "20170829.1509";
+        version = "20170901.1234";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "9408c1af76890802bb2038ce5779949003263765";
-          sha256 = "062vfj3mm9g5avf9cj8y0zm5gm8wsnqpnrqlclqwcyya3jy4jrn2";
+          rev = "7051c1bf8e316b116430be63c55b3010578c3eb4";
+          sha256 = "0jga49kwp47m39nsp2a12vwaj5n54zgcjnfq214fjjdcdrqcl3n7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -44201,12 +44378,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170829.1812";
+        version = "20170830.2131";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "8dec2fda4da3098d04aa278268bb30ec63ccef9a";
-          sha256 = "0wl7qgqqyz2hqsvfylyk2dzj74v2qbmcm9al2ghyz14r4z58xjwl";
+          rev = "2d790a7c72546b96b3fdf57e7b7d6af1663fb721";
+          sha256 = "0jfldbw7wpy05rq7xzxm5w49pwcnsz97l1ajh3g526lbj76p2rnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44959,12 +45136,12 @@
     meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "meson-mode";
-        version = "20170501.1310";
+        version = "20170901.1135";
         src = fetchFromGitHub {
           owner = "wentasah";
           repo = "meson-mode";
-          rev = "af09db99891c3d19353150e26338c191525711aa";
-          sha256 = "1rqccn3j7rm9nncxiq6m4wcx2wxkck5j02phyij8s0dc820bzlhz";
+          rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee";
+          sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
@@ -46125,8 +46302,8 @@
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "623083f05c381761a8cf2fd923e493bfa8762c28";
-          sha256 = "02d759s4zh6a2yj2xq9cdfjyrsj3a3a5wngcwkl6bq0jgbjz5pvv";
+          rev = "8dacce10f3c2d362c4fb39485a3f33c3b911b8b3";
+          sha256 = "1j6zz9lkr4n5k758qqmk3n0w69fi9grgcv8zqvhxx7yvpk9c8nvs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -46163,12 +46340,12 @@
     moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "moonscript";
-        version = "20160503.631";
+        version = "20170831.1526";
         src = fetchFromGitHub {
           owner = "k2052";
           repo = "moonscript-mode";
-          rev = "2278810a43ee41b760e84e48e54ffc48b11772b0";
-          sha256 = "0bz35m0drjl12f9y42a79nnzxz5ahf5m7c2l2nfz8fyif270ph1y";
+          rev = "56f90471e2ced2b0a177aed4d8c2f854797e9cc7";
+          sha256 = "1v2phdpfngrb01x4qygpfgxdzpgvbprki2kbmpc83vlqxlmkvvjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3046afee95277024830d7d372f2f1c84a0adcb00/recipes/moonscript";
@@ -46415,8 +46592,8 @@
         src = fetchFromGitHub {
           owner = "bard";
           repo = "mozrepl";
-          rev = "57f278849e4246a992e731e188b221a2574fc81e";
-          sha256 = "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9";
+          rev = "8cc81245f030874072c1e6b821b6390f279d04e4";
+          sha256 = "0mfpxj23wr38q5ds4i2gxb222rr8w4bcp50a3c7svfjvr5x8hymr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6839c5e52364fb32f6d8a351e5c2f21fbd6669a1/recipes/moz";
@@ -46642,12 +46819,12 @@
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "20170827.735";
+        version = "20170901.1027";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "b5d255b8a1777ea95b944f2750e7e93c5bb32f2e";
-          sha256 = "1ph85rll8mgsxb720cr87xkmw7zr3k65hha5xybpyvwr96bv6963";
+          rev = "ef90cd0f0fb6c841f326db5cad276567eb5f96b5";
+          sha256 = "0sym7mp1via65h883f5h45cbfxq58qck7ypcvcfdmnmn9jnl3j9d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
@@ -46870,12 +47047,12 @@
     multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multiple-cursors";
-        version = "20170813.38";
+        version = "20170831.1633";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "6f183a1e82ba6f998a8c4e3d47a780fa7370f231";
-          sha256 = "1aqlxp9r5nq3mpvmc53pln5abp9naq4c119wf4az1mnf6z6l2da2";
+          rev = "e048e04bd8a637095bac9291c72606300de8f74a";
+          sha256 = "0ng85q650r7la7nh3mn3qww1nsqnbrhrly8ic15p6wjjqb31gphq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -47682,12 +47859,12 @@
     ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ncl-mode";
-        version = "20170121.231";
+        version = "20170903.2355";
         src = fetchFromGitHub {
           owner = "yyr";
           repo = "ncl-mode";
-          rev = "cfabbbf5e49a856c9b4cb32408f28ef4378731b5";
-          sha256 = "1rq0snv7qxkh1l09ail3mjs2jjrxixryxy6z91maabj7qfp1yrqi";
+          rev = "84599a730169b9b19f9dcc532e20dcdc9648bbaa";
+          sha256 = "0sqbrvlx9n7abn71r4hb5fgps7nm6cfyg84hjwdbkrw0cgy2w1hc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode";
@@ -47749,8 +47926,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "d4f7a5b25f1b58a0434ed2c6b1a5e522f8017af7";
-          sha256 = "04jdy668yvsrdg1hjhwrd6gs6asj4j4p3f6pqgsp9qs9d2d4474c";
+          rev = "847d1343e63c0a2d25a43f8432c4d750e4e9e7d0";
+          sha256 = "0wriamdich72h1m0rmhx1s38ph6q8ak0rfd39kyycw7v8bvwgv08";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
@@ -47997,12 +48174,12 @@
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20170823.1252";
+        version = "20170830.2113";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "adfc03d318b6e849278c48eb3c66ee217ecb8681";
-          sha256 = "0x228qjrsx25lsidifrcjc31lxdgjb1hnvaks4n3xhnbdm07g4ww";
+          rev = "bc3af5a44f4272a8afa6e6c09f95f1cdd205c70e";
+          sha256 = "1spyz9n1p6n4npm6j4ngr89n7y2f33kp2xj6jwvd4y4340g62m49";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -48043,8 +48220,8 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "327d6cee67dac252938cda82c91a6b4d65ef523b";
-          sha256 = "19yarj8vz2lz5c09s35jgi4kgfr8k4cl54hc9ajbx1i56h324l2g";
+          rev = "b98941a605d3cc47966d8407ace6e454d781af9b";
+          sha256 = "15aywznyrjwqpxp1991597h5x0fnsyr7xk2mc8d8s67y0iq7va1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -48081,12 +48258,12 @@
     nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "20170824.2204";
+        version = "20170831.1721";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix-mode";
-          rev = "b0db22ebd50a62ccb225e8404593757cba19588f";
-          sha256 = "0g3q6xy3whrqmpds1zpfgfnxrqnk72lclz5h2sid4a48abfqjhvf";
+          rev = "4a5b6d5d2c5fcca1bf7a925dfaaa1f13e552a1ea";
+          sha256 = "10wplxvzmx98an29bzm4p9khszrfhfjq4ry2p0j2jyl8wxn5a8v3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
@@ -48438,8 +48615,8 @@
         version = "20170823.408";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "ca4852649ede6618046c1b38698af99f72063ecd";
-          sha256 = "1an10gqvrlw78pxqxc9f8sz46wym0bcvjfk37ysc378iyfx8j1d5";
+          rev = "0260ee371ea561d3e6876ab800e934ddeacb3482";
+          sha256 = "1yfvmsx8pq15ma3m0qk8v9pg64xm1c3v432yr2p7hqqm5h2jqbgv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48642,12 +48819,12 @@
     number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "number";
-        version = "20141127.1004";
+        version = "20170901.612";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "number";
-          rev = "f483365c330392b3e9362481b145acf3db040baf";
-          sha256 = "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n";
+          rev = "bbc278d34dbcca83e70e3be855ec98b23debfb99";
+          sha256 = "0a1r352zs58mdwkq58561qxrz3m5rwk3xqcaaqhkxc0h9jqs4a9r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49d56b297ab729695249143dd65d3c67543cfcc6/recipes/number";
@@ -49016,6 +49193,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-dao = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-dao";
+        version = "20170816.858";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "ob-dao";
+          rev = "fa92f62a63c684d689f57e790e5dd614c5bba270";
+          sha256 = "18i2qwxcn5p1hj32svl54n0dv2j551n3nmgb4h8gbvs39rl49qkq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6284c73f1d0797fa2ed4d9a11d3198076cc5fff9/recipes/ob-dao";
+          sha256 = "0nj1qyac0lj5ljrqfqi9g2z0d7z5yihajkvjhlx5kg9zs3lgs5rs";
+          name = "ob-dao";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-dao";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-dart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-dart";
@@ -49145,12 +49343,12 @@
     ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-ipython";
-        version = "20170628.1116";
+        version = "20170902.1253";
         src = fetchFromGitHub {
           owner = "gregsexton";
           repo = "ob-ipython";
-          rev = "a0ae4add0310d131c6b4b15139b929955cec93dd";
-          sha256 = "019impk95mnplwzirllrrjjq17hczcq6aarqr959ca75jix8jysf";
+          rev = "ed1c2d580037c0592066e1f33c0581890dd09e2e";
+          sha256 = "0ciacp8llx0njkrcbzgs13srhjm2nxx0pr7v8ladlx0sfdsxj078";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
@@ -51042,12 +51240,12 @@
     org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-edit-latex";
-        version = "20170825.810";
+        version = "20170830.1628";
         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";
@@ -51359,8 +51557,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "c01b62305e4bd69a26da9838ce4a86a73f01c92e";
-          sha256 = "1j7r8w5khnld2lcpgxgwd90bd8ilrjpp19v4ssny3s9x5rzr2if2";
+          rev = "b792e281681962679585090be9e35de47c317402";
+          sha256 = "1ksip87mf4yfl26d7ypn2bp8f7qj4751kqgmhl5mapmji6x1lw6x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51379,8 +51577,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "c01b62305e4bd69a26da9838ce4a86a73f01c92e";
-          sha256 = "1j7r8w5khnld2lcpgxgwd90bd8ilrjpp19v4ssny3s9x5rzr2if2";
+          rev = "b792e281681962679585090be9e35de47c317402";
+          sha256 = "1ksip87mf4yfl26d7ypn2bp8f7qj4751kqgmhl5mapmji6x1lw6x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51459,12 +51657,12 @@
     org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mru-clock";
-        version = "20170829.403";
+        version = "20170901.444";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "096a7c514ab8487ec63def6281cf4dce24e3a626";
-          sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp";
+          rev = "cb239b5704b742029145e7f15e928351e4e8dd9d";
+          sha256 = "0h25w6i4qrbigcwpnwkz8wak5mh3kzh29nayzsf85jlq9vd2x5hq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -52033,8 +52231,8 @@
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-super-agenda";
-          rev = "a4973debae634554325f0dd3e74bdd2810324950";
-          sha256 = "0gwfkpf511zzx907ljvx6lwnskc29s03i22is3172v4r6szr33wb";
+          rev = "2b6d6a98b06e4744790cdf2820753ef2f9ac7851";
+          sha256 = "00mbp8bzi93pywv1bd31g4c2yssdgis9xri17ygnv9754ma92byn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
@@ -53025,12 +53223,12 @@
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20170721.521";
+        version = "20170903.318";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "outshine";
-          rev = "0fdd0cd619d20e71b3157f225bb117a7e21dc9b3";
-          sha256 = "1hhvbfpbixh5s2s4h06f44p4h0kqnmbm9mlqfas3msq5m6m77h2r";
+          rev = "cd44e13800f63482511d2c70acaf4da0de78460e";
+          sha256 = "01j6n1h5k999g8kpy62kkd3vrxzxw5bhpgki31s5ih4c5znd2d5x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
@@ -55202,12 +55400,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170509.829";
+        version = "20170902.1110";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "a33c91e3738996c058841ed1985c67bedd4875e1";
-          sha256 = "10ycv3yb5xav7wslf1swcmbn9w2an5izkca8crmdgr566h9mk0gb";
+          rev = "298420817486ab7dcbe6f0d7b3f272814f0670ee";
+          sha256 = "0kqhkdg0dwyzagzwz995hpx68mdv1rsmzjn0hydqpg5bspwqg7bw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -55790,12 +55988,12 @@
     php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-runtime";
-        version = "20170828.2343";
+        version = "20170901.1106";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "php-runtime.el";
-          rev = "b33a4dc01de7b6a0b81602998dafe8257805e4e1";
-          sha256 = "1608qkn20qdgh9nfaqlgiflhgjy84i51g91b5zzv3wnw56dyavyx";
+          rev = "e1bca88ab5472e9b520b4ce915cd27d1e7803c2d";
+          sha256 = "1krnfzck9j5wmda1rkmzhl9lcdzxfw324xfy4lz92nwb92mgw8gq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime";
@@ -55916,12 +56114,12 @@
     picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "picpocket";
-        version = "20170820.309";
+        version = "20170903.1254";
         src = fetchFromGitHub {
           owner = "johanclaesson";
           repo = "picpocket";
-          rev = "e1f5c9421b53aa0edc44509b9c8c4b4cebd691d4";
-          sha256 = "14x0qg9254yx7zqlsrm2843691gv4a976qx7q84srn89xznmq99n";
+          rev = "8ec47cd36bd4058656f4f0fb7d60b606eff2ba29";
+          sha256 = "13wyn4nvdr80zglzf5gwvh4rbd4wgss5q8ckj8n5i253fhyvw51a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -56107,14 +56305,14 @@
         pname = "pippel";
         version = "20170730.623";
         src = fetchFromGitHub {
-          owner = "brotzeitmacher";
+          owner = "brotzeit";
           repo = "pippel";
           rev = "3737d5934665b5059c1e858feeb4270262b37e53";
           sha256 = "0k94y305c6abhxgq6birfvnrplsx5gadwsqwn8m87sh8ldsjnmgi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pippel";
-          sha256 = "0w6qbjb1wpz8gn4gzifzzjbc3gckhgnqvrpszrrklqmd10rk5mrw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/pippel";
+          sha256 = "1li4h0dff1n7njy2lk3d50ndrlw84fphmdg16j0srkbgy7xz90yn";
           name = "pippel";
         };
         packageRequires = [ dash emacs s ];
@@ -57874,12 +58072,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170814.522";
+        version = "20170901.47";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "d1dbd67ebdee9405ac95b0fbd71210df54457fb1";
-          sha256 = "06v3wix90y92rjp769hrl92p57p60acf1b9mpdllcy48l6q0p074";
+          rev = "31c9f90d472e07cb8e49fa8992b187b67c9c9a71";
+          sha256 = "0j38zbprkga3iq5wb77zvfa5r3sj3sqv8qh0ab62wm68qy60d6g3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -58193,8 +58391,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "c7457ef65a7a8584b1e3bd396c401ccf8e275ffa";
-          sha256 = "16mrl0fx2b4pkzf5y9rvsqhwdq8pwxn8knd8i94wlqarq5aya0sz";
+          rev = "6699f2cf64c656d96f4d6f93fa9563faf02e94b4";
+          sha256 = "0q22i3iipzv0hq6blp7cpaqn8k3rj50r4l1vrf7axkkdxnglb1pj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58911,12 +59109,12 @@
     pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
     melpaBuild {
         pname = "pyim";
-        version = "20170825.2043";
+        version = "20170901.2053";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "pyim";
-          rev = "e2f13e120cb6375d04970d6aac035a5923e13505";
-          sha256 = "0dxq9yhyzxnjiqk8b9hcw8y74a8hb19anahivrpsb1xrnrknmw6d";
+          rev = "54c05392e5a9523e34c7d54f8999632358f0ed89";
+          sha256 = "0cxyz8b1djsdd0pxy15aamxx8j4vxvakinmrrwm3k6saqx8frmr9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -59646,12 +59844,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170818.1226";
+        version = "20170902.924";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "0f8f36e1726166b1974ebea0e4c2e43de8fe2509";
-          sha256 = "09iy75d47q8s9nxv6qww6v6l87jv5fcqbim81hc56f2fwq3akylk";
+          rev = "548cf7bc2f45d3b2db45d908bb2137b2c87f0917";
+          sha256 = "0ycy66q10vhwi7mgnxciin6xqhzwg4vpjhi9bgis7m9nvv0j8py9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -60297,12 +60495,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20170825.224";
+        version = "20170830.1306";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "211c01aa4758a295bbd849cc211656df02b4738c";
-          sha256 = "1k9ccps0z4f9y7503fv1563d59931q63249zvy7pmnx1055qw9li";
+          rev = "839954ac051f473deec27495111879864162c8cb";
+          sha256 = "0vvb1c712ngl7cnxkxlqfg9abngvdwxfh64hx511zcy428q381m7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -60635,12 +60833,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20170810.2004";
+        version = "20170903.911";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "8d796eb5717c2386e8d486b6d4a58f46967f1f3a";
-          sha256 = "0d2502hcr07cy4p4d80jrcgjvah8h6irjqscs03dw1q2cmp0bdjy";
+          rev = "f96a5a50354cdc8a83b8fe347fafc49ad6c303a0";
+          sha256 = "0pq0730b8nxm4xhb3dilnmp7lhv8vb83q7860dc64mds3fl12fg0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -61530,12 +61728,12 @@
     rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rigid-tabs";
-        version = "20150807.856";
+        version = "20170903.859";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "rigid-tabs.el";
-          rev = "c7c6b726806df7e8cb25a41b213a207850c91cb7";
-          sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
+          rev = "d48ba58acbe8934700cd23db2acb574b09306238";
+          sha256 = "03dmyn5lnw0mj4ymgyxz6gksl2byw31plxn61qcggkj6gk8g500d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs";
@@ -61660,8 +61858,8 @@
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "4a24c86a1873289538134fe431e544fa3e12e788";
-          sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j";
+          rev = "39474fe464d76112e278445996cfd4ff84c39af8";
+          sha256 = "11wz3gqdyb4ffsy9qdria0515ry643g3yjzidvaqccx6g59g4d5x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -61887,12 +62085,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170829.1916";
+        version = "20170903.1710";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f0e7a74d8501f32162e76a5cf1479f5761dae4d6";
-          sha256 = "02jdz9pfql20r74isnby6s2ai1h93w6di0izqw09vpg7a6d1f9mw";
+          rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f";
+          sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61953,7 +62151,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59692";
+          rev = "59743";
           sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr";
         };
         recipeFile = fetchurl {
@@ -64578,6 +64776,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }:
+    melpaBuild {
+        pname = "simple-rtm";
+        version = "20160222.734";
+        src = fetchFromGitLab {
+          owner = "mbunkus";
+          repo = "simple-rtm";
+          rev = "8c7cd96cf66ef112be5c363e3378e304f8f83999";
+          sha256 = "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a784f931849ca836557390999b179ef9f6e775f3/recipes/simple-rtm";
+          sha256 = "0v5f0vr8sh62yvb7znx00wgybb83dfnkvgl8afyk3ry8n9xkhf5b";
+          name = "simple-rtm";
+        };
+        packageRequires = [ dash rtm ];
+        meta = {
+          homepage = "https://melpa.org/#/simple-rtm";
+          license = lib.licenses.free;
+        };
+      }) {};
     simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simple-screen";
@@ -64812,12 +65031,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170814.116";
+        version = "20170903.2004";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "b5ca813fa5c56f65fd1302d29f5babd0965a0751";
-          sha256 = "128wggbny4z6zhr9ldw3blrj5mbgvdl5bfap7i7v8pnzz660z9wy";
+          rev = "5df0ea55257b2c1f3a4e4352af4854fb81dee5cc";
+          sha256 = "0xrmsfi1nzm5yhmsxhn7xq87z70jkb68c3il4xf8r4lz6a0d8m4p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -65441,12 +65660,12 @@
     smart-tab = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smart-tab";
-        version = "20150703.917";
+        version = "20170902.1407";
         src = fetchFromGitHub {
           owner = "genehack";
           repo = "smart-tab";
-          rev = "28918a72045811294ecb33f666ba23fe66c169af";
-          sha256 = "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4";
+          rev = "76a8ec13384975d39aa1b25e5384a02558dba574";
+          sha256 = "02mj2is05adq5v64aahivbkx2kzrxmmg2va650hsvl4izj3dr2x3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/smart-tab";
@@ -66071,12 +66290,12 @@
     solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
-        version = "20170818.447";
+        version = "20170831.1159";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "7bc1e83e7fc4fa1d6d02322ebab73b30d8b0ffdf";
-          sha256 = "1vs731wn7am01d510vxls0adyb7rc7mx7hfqy1xn1kfls4bmi4x7";
+          rev = "ae7bc3f102cff597092dad7fc0bfd49e1865b0cf";
+          sha256 = "0d4cs7s2k5plf2ya0df72pvpf30xdhdbfybm0179dma4fw9fx0is";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -66540,12 +66759,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20170731.542";
+        version = "20170831.832";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e";
-          sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa";
+          rev = "397a0d5b6da3f60ca52bebd5e698b0a764956cd2";
+          sha256 = "1z9w4cn5lanxl24ws4km816dfx4fszvgvrlb2ih3wsbc13710h1l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -67186,12 +67405,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170801.2303";
+        version = "20170904.331";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "a7246531ab3d3c2d7cb3bd515353dfecbe5902c1";
-          sha256 = "1ac10acyz0d3z5gmm79flxz7mmbww0xbr278qbwyzyr8h0hv2d5d";
+          rev = "d5315bfc0c46c53120c537b0aaa74189aff8bd9e";
+          sha256 = "1rf94yj79ilq6300z5icqmy6iklb5jqpngccxd6wrbxm2y25y3g6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -68312,8 +68531,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "03222ede416dd8b8ee28a93d8720bd85b7c1612f";
-          sha256 = "0vsq2v99i0j3ff43sqsvxq6fvl7aaxy4k6rg15lk6i3y9h0i40xw";
+          rev = "e9f7dcb0d26e02c2883774bae568c6eda7fe56ff";
+          sha256 = "1wwngrf9fjq1dbl59lj14kihywz8gfkjz1dpy0n9i1nm7fd5w9my";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -68642,12 +68861,12 @@
     syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "syntactic-close";
-        version = "20170816.258";
+        version = "20170903.130";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "syntactic-close";
-          rev = "dcbdd3139e04b6f6ade034896643d6d176ad9918";
-          sha256 = "1g965a0ikva2gmpjzzdk39zq7907cw6wdsxb3k35hfwy7z2b45y7";
+          rev = "c2beff73f5054907ceaf76521493a9c8614a6c1e";
+          sha256 = "0pj80dgnscn8hg5r0z86q4m45y77372dr57ly0jvbpf1g5ps730p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -68704,12 +68923,12 @@
     system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "system-packages";
-        version = "20170710.612";
+        version = "20170831.1239";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "ae993f994ed60a845c5752e90491cf127bb1c052";
-          sha256 = "1dp8q82k7s2h3pp6qh4x2hbvq23ykn09mf6ymfy62p8jdavfvcx2";
+          rev = "ccc2a6b3794b6ada59905ee609fe9e1d973622aa";
+          sha256 = "0hs00y8wvsagnc8ckd8izxvigsli7230hgxf5xmrdknj9h4icrgw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -68746,12 +68965,12 @@
     systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "systemd";
-        version = "20170727.504";
+        version = "20170903.133";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "systemd-mode";
-          rev = "2c71ec55291eca382305b1f31020e0396907534d";
-          sha256 = "1fj7hh0p33kscjbcqkf91p2bg1fq1jgfq1i5wkgjdgwg6rg2rb62";
+          rev = "995ebbe3d5e7e18fa54ee801596abd5656a81d63";
+          sha256 = "04lr97m58lr5vjf35c86r99n3d0h0dknwi4dcl4w1912yvpq6ghg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -69228,12 +69447,12 @@
     telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "telephone-line";
-        version = "20170804.1057";
+        version = "20170831.1215";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "01a2be2798850519873fe7abc59d715a978e6f20";
-          sha256 = "06g4vd4air0rflzi1yz9qh1zxnwh7x13ffcib5fk7b0h8ypl72wd";
+          rev = "c17c71ae18ad54b8c3d1eddbe78ed82816d06186";
+          sha256 = "1f5mlxjmyliz0ahcj6c3cypssrcp2ybhqpswzsqp5vqp75bc7ysz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -69333,12 +69552,12 @@
     term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-manager";
-        version = "20170421.105";
+        version = "20170903.1212";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "7180f09078f89aadb83061420ca8fd58d929b629";
-          sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
+          rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3";
+          sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -69421,8 +69640,8 @@
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "7180f09078f89aadb83061420ca8fd58d929b629";
-          sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
+          rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3";
+          sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -70023,8 +70242,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "ec64f23d236d7874e3b28ae86c833f57c7aa3389";
-          sha256 = "0b819jbs0318dap8nfvs6ljfiw5qiqbhgda3czq4vns728m0rqsa";
+          rev = "f454369198500a90388a4a6f73970e961949c186";
+          sha256 = "1gwdnz57cv5lmmcvj2ipnvigzn1n561rnjibdg943hm26rp94zxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70081,12 +70300,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170824.2230";
+        version = "20170831.2047";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "2d92188ee66e89ee3c941a36b00eee6ef3f0552e";
-          sha256 = "1rjw9k467ximx0bi6jd9f8v5347p9x830fqdbvn11jyxj10n41hn";
+          rev = "f1daf10e931858ac8d6ff676cf02ca73d3c62558";
+          sha256 = "1hj5mfpkfczy09ghmivkkzwmn6nawwv0ydm4ckz4mggps42hn0j1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70298,12 +70517,12 @@
     tiny = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tiny";
-        version = "20160811.246";
+        version = "20170903.249";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "tiny";
-          rev = "1766056dc768df6c981c301a2e7b8de7305acb73";
-          sha256 = "0k3wmp0m4w77q00sk2i30zd23rjlwnj9r66xrl2gw55sapnayh77";
+          rev = "012b2e7a67b9f067bbfa0292479861ffbaa201fa";
+          sha256 = "13hwzq5ip9pb6nmsg3377haz5f45nm96khrwdls07mzni6gay8az";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3029dab001fff5d12e8a2bace6ddbf897842c26/recipes/tiny";
@@ -70828,8 +71047,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "47bbcf4268602688f90c08ce64ec93226fc3f894";
-          sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr";
+          rev = "452dfb407b640ba6eb288ff25a9de27446a409c4";
+          sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -70929,12 +71148,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170825.825";
+        version = "20170902.1022";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "d465378a59e2eb91372564a56e60a9ab00e48f9c";
-          sha256 = "0al0xz59lrqj97fxmyxiphblg1bvbzahc6srd8klg7s0378ybblw";
+          rev = "31b1d9486c30b69a1f86fc31876534dbf2e4aa89";
+          sha256 = "1zzn0nmrf80n011n4byn6xd5sbglkzfzi9pah4fh5zxgbgzx8hdp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -71034,16 +71253,16 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170827.311";
+        version = "20170901.659";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "c024a66581b16c15ce9ed246249451ebaeb08cbf";
-          sha256 = "06bxq0bwd728s9rnj2hy0x77404kn9s9vxnxmiiwxxmq4d8kbjq6";
+          rev = "580cffbd6713ef1cabfe6b9253b09d8b0cdbbb48";
+          sha256 = "0i1402xfk212c8x6xkw14bbwzn5j4rk5sigbyhis6zik56myf83v";
         };
         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 ];
@@ -71059,8 +71278,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "c024a66581b16c15ce9ed246249451ebaeb08cbf";
-          sha256 = "06bxq0bwd728s9rnj2hy0x77404kn9s9vxnxmiiwxxmq4d8kbjq6";
+          rev = "580cffbd6713ef1cabfe6b9253b09d8b0cdbbb48";
+          sha256 = "0i1402xfk212c8x6xkw14bbwzn5j4rk5sigbyhis6zik56myf83v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71073,6 +71292,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
+    melpaBuild {
+        pname = "treemacs-projectile";
+        version = "20170903.1235";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "treemacs";
+          rev = "580cffbd6713ef1cabfe6b9253b09d8b0cdbbb48";
+          sha256 = "0i1402xfk212c8x6xkw14bbwzn5j4rk5sigbyhis6zik56myf83v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
+          sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld";
+          name = "treemacs-projectile";
+        };
+        packageRequires = [ projectile treemacs ];
+        meta = {
+          homepage = "https://melpa.org/#/treemacs-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
     treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "treepy";
@@ -71263,12 +71503,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170828.1500";
+        version = "20170903.2000";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "1d0058a50693f18eee8bd1862b27e15b319f21ff";
-          sha256 = "14ni4fm0fhccgy1whk70hqqcal6shvc7wj2111scay5av0n28r7b";
+          rev = "f54f447613806f451bd1d4e57a085c30c6756000";
+          sha256 = "1rv3kgj04myk79cg0nq819cb2mf67a3kfhk6kdnyh0bk8i7vmdw0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -71515,12 +71755,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170830.515";
+        version = "20170831.619";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "f6d28c7a0df305893ac567cacc755a1db1bcc86c";
-          sha256 = "0728nblgh9b07g03pipvx4f2w7b28fs5bg623njiyii6qwv1v7ai";
+          rev = "0f41709e1525403767bd4889cb913900c68448dd";
+          sha256 = "038fya0gd3vy5rpf2b4ynksc1alb8va0zw7flh4y4azrmgmpxwi0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -72627,6 +72867,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vc-fossil";
+        version = "20170811.1453";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "vc-fossil";
+          rev = "0aceef306726815a84e304253711bb6d3bdf497b";
+          sha256 = "1i50nyhb3qc404xilm5j31ifyrlh98mjxk98fl0gz1cpbygvklds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/91f2e615c887f353a82deee75990609d0dc66bbe/recipes/vc-fossil";
+          sha256 = "09pslw9gamjn1hly4l3bfci6rf4xw2xq42cr7na2rj0k8c1lvxcx";
+          name = "vc-fossil";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/vc-fossil";
+          license = lib.licenses.free;
+        };
+      }) {};
     vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "vc-msg";
@@ -73218,12 +73479,12 @@
     vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vlf";
-        version = "20170713.1652";
+        version = "20170830.1148";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "vlfi";
-          rev = "b62bc046128df83c816a9b199ab5b4a7fcf93837";
-          sha256 = "1gbl08dh172fv8xc0b737cybm3bac5hlm37f50qp0xk4kdbfv2sh";
+          rev = "df677c128f8abc764b51d2a0ed26071618e686de";
+          sha256 = "1fx2ngjh3y69ynih328jiy8132z9y7q7s91rzw8mgpf3hnfmaqly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -73342,12 +73603,12 @@
     vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vue-html-mode";
-        version = "20170804.1723";
+        version = "20170831.1631";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "vue-html-mode";
-          rev = "cd76195b2bda28d247a79124334ffcc5124676cb";
-          sha256 = "1flnn6gz5ihkdw6p3pkllqcd1v7j89hc225izv8x5v2i5biyndsv";
+          rev = "1e0aa0befd2fa958b70bdc88d9bab1a4eccf94fd";
+          sha256 = "0axzdq5kss3ng9a17xr5i96x1rr4p61sil5lx783xq4zrbamh7fw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
@@ -73800,12 +74061,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170828.1221";
+        version = "20170830.1210";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "d24cb64bb366fa9e9c7704cf0fa5bf6ef8c11b5d";
-          sha256 = "1rms3apmykdan4q0hpk0aa18zf7gd9p13rxhayzm9474c06i3z0g";
+          rev = "d29e48d66b7068ec933aa271320547d12cb37336";
+          sha256 = "0sfy6f0rp91as42vb43m3q6553gj2n5cl2ip8wvylccilj8fzjs5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -73860,6 +74121,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "web-search";
+        version = "20170904.447";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "web-search.el";
+          rev = "e0629a6a3c919ccf682e9d04dc8f4cbae8772450";
+          sha256 = "09hsg58wg0k08pxnyg1icynlri7i3g81pinlsp75qw2gplfl5gnc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search";
+          sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj";
+          name = "web-search";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/web-search";
+          license = lib.licenses.free;
+        };
+      }) {};
     web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-server";
@@ -74847,8 +75129,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "with-simulated-input";
-          rev = "1012ccbec77d7d162790706c07bb23c039ccc61f";
-          sha256 = "1489njq2xbsd89kh3z560vwm892zzjbs12lzk1pr0fajqvnm62r5";
+          rev = "d0f779594243fe85e330fd3f47caeb80068f7134";
+          sha256 = "1iadgd99n1ilrdvybbrxj0f8n50sz76j3bji2nfpn3w32krj90w4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@@ -75305,12 +75587,12 @@
     x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "x509-mode";
-        version = "20170827.2317";
+        version = "20170903.507";
         src = fetchFromGitHub {
           owner = "jobbflykt";
           repo = "x509-mode";
-          rev = "9d2dbb8287c28779fa27153b16cf26f54bf2405f";
-          sha256 = "1y46v0s833lmrrz4lcg6qp1as8vzh5zm3s7j8j4vzlfrn267dagf";
+          rev = "df6710c1e7ac38047a6e05f8e33c34ee9c263e6d";
+          sha256 = "07blm2qvgb4kmwxkj47kv7lx0kkl4q6ylaxz8hkwx70lwd1jpj7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode";
@@ -75410,12 +75692,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170827.2359";
+        version = "20170901.805";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "c1f4c2fe62320ade8d1cf5ac3c73f7ace36bed8d";
-          sha256 = "0js78zj2c5x769y5isk5p711hky57rbgkfq94gjma9jcfhkpvc0h";
+          rev = "77e82020cc0b667ccc7ab2e17452922f4774aa75";
+          sha256 = "1yi9r6qs6xhl7akmbvpk6mbaxssmwwyv65kmpbnwcc50z4pwwjc4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -76065,8 +76347,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "344fc30dc83e005d0b2c7dd330e25bff16fdc5ce";
-          sha256 = "06c27fmdsyw1raq7b02zdp94w4jk859qwdnn8s1dzlcxcmf30ryl";
+          rev = "5c67557f1a5e51b67f68ebbb0eeb6ed3fdd4a82a";
+          sha256 = "122ynx66v2zymh8s70ly0rwpn394d1x7farqrzh5ziw0kcwgsmxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76374,12 +76656,12 @@
     yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "yasnippet-snippets";
-        version = "20170822.1356";
+        version = "20170903.857";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "b2f5f4af18dfedf374595e56969f5ad51edb2d76";
-          sha256 = "0f3f8n7ib25mhpb4s85vvvi5pyfpqrkssb4k8cwb55xwlmji3wsx";
+          rev = "a0bd5a05a749996e52f967b7f62cfe54cb212c7e";
+          sha256 = "0nk6kdzms36f22lddnrn2nq1lc8dsgjcy1jaypl64xiw08kigi17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -76718,12 +77000,12 @@
     zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "zephir-mode";
-        version = "20170810.2302";
+        version = "20170904.145";
         src = fetchFromGitHub {
           owner = "sergeyklay";
           repo = "zephir-mode";
-          rev = "5c8fcf633709b70f87015073a5d48556fc930b76";
-          sha256 = "1c671ncrb4dmrmbx5p7qqxv01wah63cjisn60mhrpzjcyg8w8hss";
+          rev = "bebbbfbe6ea5e7180fa71932cbfa00acdec966ff";
+          sha256 = "1a4sj302ycliqiwrphkzvzl1jixj3xinkclds44v9m8wkrgr8f88";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 783c098f99a8..9e72f4b73421 100644
--- 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";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 78a59490dbad..58b59b5c4caa 100644
--- 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 = {
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 58971b3199bf..936cde61ee85 100644
--- 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;
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 83f725622d7a..4d229450a4a7 100644
--- 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 = {
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index c3ef58060585..ba18e346a2fa 100644
--- 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" ];
   };
 }
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index f0c86fb67dbe..4ac0dc2eb944 100644
--- 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
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index cc34318edf3c..b60454c4a42d 100644
--- 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";
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 7c9ffc0f4784..de19e6118511 100644
--- 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;
 
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 1eb30bed59cb..83eb563a8e7e 100644
--- 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;
+
+})
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index f504c3c2b333..f097d748d48c 100644
--- 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";
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index fe9b8862869e..7967fe539799 100644
--- 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
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index 77c7cf321cbd..d9ffb6e2aa97 100644
--- 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;
   };
 }
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 02a25b9a2704..3edf45d9acd9 100644
--- 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; {
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix
index 8af1662b2759..21bb95d45e8f 100644
--- 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;
   };
 }
diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix
index 1ed1eda229c2..bc13032f1aac 100644
--- 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; {
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 92b5b49cec7c..79c3b74e496b 100644
--- 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 ];
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
new file mode 100644
index 000000000000..54693f3c5f01
--- /dev/null
+++ 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;
+  };
+}
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 5dae78a3e8c4..7f70818bb141 100644
--- 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 = {
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 8e28f77ffeed..fe6090c3230e 100644
--- 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;
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index df7ba69c5c5f..c706b5a19287 100644
--- 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;
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 627672a97d05..4e8ec2e587df 100644
--- 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 ];
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 562042721e72..444a4899a047 100644
--- 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;
 
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix
index eaf7b135eb5b..11c66db70752 100644
--- 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 = [
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index fd2271844ac2..78fcad5c1fe2 100644
--- 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; {
diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix
new file mode 100644
index 000000000000..b7768a3d2455
--- /dev/null
+++ 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;
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index 5e5fef5cd834..ea28769668c5 100644
--- 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";
 })
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 5a1af01c3b1d..8f1aadc3a26e 100644
--- 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 = [ ];
   };
 }
diff --git a/pkgs/development/libraries/herqq/gcc6.patch b/pkgs/development/libraries/herqq/gcc6.patch
new file mode 100644
index 000000000000..b0f7d8d0c6fa
--- /dev/null
+++ b/pkgs/development/libraries/herqq/gcc6.patch
@@ -0,0 +1,1320 @@
+diff --git c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp
+index c4d2ebe..707dbdb 100644
+--- c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp
++++ i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp
+@@ -306,7 +306,7 @@ void MediaManagerDialog::avTransportStateChanged(
+ {
+     foreach(const HAvtLastChangeInfo& info, infos)
+     {
+-        if (info.propertyName().compare("TransportState", Qt::CaseInsensitive) == 0)
++        if (info.propertyName().compare(QString("TransportState"), Qt::CaseInsensitive) == 0)
+         {
+             HTransportState state(info.value().toString());
+             if (state.isValid())
+diff --git c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp
+index 40f9fda..6739a58 100644
+--- c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp
++++ i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp
+@@ -99,7 +99,7 @@ bool HProductToken::isValidUpnpToken() const
+ {
+     QString vrs = version();
+ 
+-    return (m_token.compare("upnp", Qt::CaseInsensitive) == 0) &&
++    return (m_token.compare(QString("upnp"), Qt::CaseInsensitive) == 0) &&
+            (vrs.size() == 3    &&
+            (vrs[0]     == '1') &&
+             vrs[1]     == '.'  &&
+@@ -110,7 +110,7 @@ bool HProductToken::isValidDlnaDocToken() const
+ {
+     QString vrs = version();
+ 
+-    bool b = m_token.compare("DLNADOC", Qt::CaseInsensitive) == 0 &&
++    bool b = m_token.compare(QString("DLNADOC"), Qt::CaseInsensitive) == 0 &&
+              vrs.size() >= 3 &&
+              vrs[0] == '1' &&
+              vrs[1] == '.';
+diff --git c/herqq/hupnp/src/dataelements/hresourcetype.cpp i/herqq/hupnp/src/dataelements/hresourcetype.cpp
+index 8ed2492..94ab1e0 100644
+--- c/herqq/hupnp/src/dataelements/hresourcetype.cpp
++++ i/herqq/hupnp/src/dataelements/hresourcetype.cpp
+@@ -56,7 +56,7 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) :
+     {
+         return;
+     }
+-    if (tmp[1].compare("schemas-upnp-org") != 0)
++    if (tmp[1].compare(QString("schemas-upnp-org")) != 0)
+     {
+         flags = 0x01;
+         tmp[1] = tmp[1].replace('.', '-');
+@@ -67,11 +67,11 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) :
+     }
+ 
+     tmp[2] = tmp[2].simplified();
+-    if (tmp[2].compare("device") == 0)
++    if (tmp[2].compare(QString("device")) == 0)
+     {
+         flags |= 0x04;
+     }
+-    else if (tmp[2].compare("service") == 0)
++    else if (tmp[2].compare(QString("service")) == 0)
+     {
+         flags |= 0x08;
+     }
+diff --git c/herqq/hupnp/src/dataelements/hserviceid.cpp i/herqq/hupnp/src/dataelements/hserviceid.cpp
+index 9b0fad6..11a8640 100644
+--- c/herqq/hupnp/src/dataelements/hserviceid.cpp
++++ i/herqq/hupnp/src/dataelements/hserviceid.cpp
+@@ -64,7 +64,7 @@ public:
+             return;
+         }
+ 
+-        if (tmp[0].compare("urn", Qt::CaseInsensitive) != 0)
++        if (tmp[0].compare(QString("urn"), Qt::CaseInsensitive) != 0)
+         {
+             HLOG_WARN_NONSTD(
+                 QString("Invalid service identifier [%1]").arg(arg));
+@@ -72,7 +72,7 @@ public:
+             return;
+         }
+ 
+-        if (tmp[1].compare("upnp-org", Qt::CaseInsensitive) != 0)
++        if (tmp[1].compare(QString("upnp-org"), Qt::CaseInsensitive) != 0)
+         {
+             tmp[1] = tmp[1].replace('.', '-');
+             if (tmp[1].isEmpty())
+@@ -85,7 +85,7 @@ public:
+         }
+ 
+         bool warned = false;
+-        if (tmp[2].compare("serviceId", Qt::CaseInsensitive) != 0)
++        if (tmp[2].compare(QString("serviceId"), Qt::CaseInsensitive) != 0)
+         {
+             HLOG_WARN_NONSTD(QString("Invalid service identifier [%1]").arg(arg));
+             warned = true;
+diff --git c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp
+index b3a58fa..d1853e1 100644
+--- c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp
++++ i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp
+@@ -195,7 +195,7 @@ bool HDocParser::parseActionArguments(
+         }
+ 
+         HActionArgument createdArg;
+-        if (dirStr.compare("out", Qt::CaseInsensitive) == 0)
++        if (dirStr.compare(QString("out"), Qt::CaseInsensitive) == 0)
+         {
+             if (retValWasDefined)
+             {
+@@ -228,7 +228,7 @@ bool HDocParser::parseActionArguments(
+ 
+             outArgs->push_back(createdArg);
+         }
+-        else if (dirStr.compare("in", Qt::CaseInsensitive) == 0)
++        else if (dirStr.compare(QString("in"), Qt::CaseInsensitive) == 0)
+         {
+             if (firstOutArgFound)
+             {
+@@ -677,11 +677,11 @@ bool HDocParser::parseStateVariable(
+ 
+     QString strSendEvents = stateVariableElement.attribute("sendEvents", "no");
+     bool bSendEvents      = false;
+-    if (strSendEvents.compare("yes", Qt::CaseInsensitive) == 0)
++    if (strSendEvents.compare(QString("yes"), Qt::CaseInsensitive) == 0)
+     {
+         bSendEvents = true;
+     }
+-    else if (strSendEvents.compare("no", Qt::CaseInsensitive) != 0)
++    else if (strSendEvents.compare(QString("no"), Qt::CaseInsensitive) != 0)
+     {
+         m_lastError = InvalidServiceDescriptionError;
+         m_lastErrorDescription = QString(
+@@ -694,11 +694,11 @@ bool HDocParser::parseStateVariable(
+ 
+     QString strMulticast  = stateVariableElement.attribute("multicast", "no");
+     bool bMulticast       = false;
+-    if (strMulticast.compare("yes", Qt::CaseInsensitive) == 0)
++    if (strMulticast.compare(QString("yes"), Qt::CaseInsensitive) == 0)
+     {
+         bMulticast = true;
+     }
+-    else if (strMulticast.compare("no", Qt::CaseInsensitive) != 0)
++    else if (strMulticast.compare(QString("no"), Qt::CaseInsensitive) != 0)
+     {
+         m_lastError = InvalidServiceDescriptionError;
+         m_lastErrorDescription = QString(
+diff --git c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp
+index 2e375a0..2d6a8cc 100644
+--- c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp
++++ i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp
+@@ -197,7 +197,7 @@ HSubscribeRequest::RetVal HSubscribeRequest::setContents(
+ 
+     // this appears to be an initial subscription
+ 
+-    if (nt.simplified().compare("upnp:event", Qt::CaseInsensitive) != 0)
++    if (nt.simplified().compare(QString("upnp:event"), Qt::CaseInsensitive) != 0)
+     {
+         return PreConditionFailed;
+     }
+diff --git c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp
+index aacdfcf..b618ba7 100644
+--- c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp
++++ i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp
+@@ -37,7 +37,7 @@ HNt::HNt(const QString& type) :
+     m_typeValue(qMakePair(Type_Undefined, QString(""))),
+     m_subTypeValue(qMakePair(SubType_Undefined, QString("")))
+ {
+-    if (type.compare("upnp:event", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0)
+     {
+         m_typeValue.first  = Type_UpnpEvent;
+         m_typeValue.second = "upnp:event";
+@@ -48,13 +48,13 @@ HNt::HNt(const QString& type, const QString& subtype) :
+     m_typeValue(qMakePair(Type_Undefined, QString(""))),
+     m_subTypeValue(qMakePair(SubType_Undefined, QString("")))
+ {
+-    if (type.compare("upnp:event", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0)
+     {
+         m_typeValue.first  = Type_UpnpEvent;
+         m_typeValue.second = "upnp:event";
+     }
+ 
+-    if (subtype.compare("upnp:propchange", Qt::CaseInsensitive) == 0)
++    if (subtype.compare(QString("upnp:propchange"), Qt::CaseInsensitive) == 0)
+     {
+         m_subTypeValue.first  = SubType_UpnpPropChange;
+         m_subTypeValue.second = "upnp:propchange";
+diff --git c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp
+index 0faf7f4..addbaaf 100644
+--- c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp
++++ i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp
+@@ -43,7 +43,7 @@ HTimeout::HTimeout(const QString& timeout) :
+     m_value(-1)
+ {
+     QString tmp(timeout.simplified());
+-    if (tmp.compare("infinite", Qt::CaseInsensitive) != 0)
++    if (tmp.compare(QString("infinite"), Qt::CaseInsensitive) != 0)
+     {
+         if (tmp.startsWith("Second-", Qt::CaseInsensitive))
+         {
+diff --git c/herqq/hupnp/src/general/hupnp_datatypes.cpp i/herqq/hupnp/src/general/hupnp_datatypes.cpp
+index 9f2084f..ae8e9ae 100644
+--- c/herqq/hupnp/src/general/hupnp_datatypes.cpp
++++ i/herqq/hupnp/src/general/hupnp_datatypes.cpp
+@@ -424,15 +424,15 @@ QVariant HUpnpDataTypes::convertToRightVariantType(
+ 
+     case HUpnpDataTypes::boolean:
+     {
+-        if (value.compare("true", Qt::CaseInsensitive) == 0 ||
+-            value.compare("yes", Qt::CaseInsensitive) == 0 ||
+-            value.compare("1") == 0)
++        if (value.compare(QString("true"), Qt::CaseInsensitive) == 0 ||
++            value.compare(QString("yes"), Qt::CaseInsensitive) == 0 ||
++            value.compare(QString("1")) == 0)
+         {
+             retVal = true;
+         }
+-        else if (value.compare("false", Qt::CaseInsensitive) == 0 ||
+-            value.compare("no", Qt::CaseInsensitive) == 0 ||
+-            value.compare("0") == 0)
++        else if (value.compare(QString("false"), Qt::CaseInsensitive) == 0 ||
++            value.compare(QString("no"), Qt::CaseInsensitive) == 0 ||
++            value.compare(QString("0")) == 0)
+         {
+             retVal = false;
+         }
+diff --git c/herqq/hupnp/src/http/hhttp_server_p.cpp i/herqq/hupnp/src/http/hhttp_server_p.cpp
+index eb1a56c..42e93ca 100644
+--- c/herqq/hupnp/src/http/hhttp_server_p.cpp
++++ i/herqq/hupnp/src/http/hhttp_server_p.cpp
+@@ -121,27 +121,27 @@ void HHttpServer::processRequest(HHttpAsyncOperation* op)
+     mi->setKeepAlive(HHttpUtils::keepAlive(*hdr));
+ 
+     QString method = hdr->method();
+-    if (method.compare("GET", Qt::CaseInsensitive) == 0)
++    if (method.compare(QString("GET"), Qt::CaseInsensitive) == 0)
+     {
+         processGet(op->takeMessagingInfo(), *hdr);
+     }
+-    else if (method.compare("HEAD"), Qt::CaseInsensitive)
++    else if (method.compare(QString("HEAD")), Qt::CaseInsensitive)
+     {
+         processHead(op->takeMessagingInfo(), *hdr);
+     }
+-    else if (method.compare("POST", Qt::CaseInsensitive) == 0)
++    else if (method.compare(QString("POST"), Qt::CaseInsensitive) == 0)
+     {
+         processPost(op->takeMessagingInfo(), *hdr, op->dataRead());
+     }
+-    else if (method.compare("NOTIFY", Qt::CaseInsensitive) == 0)
++    else if (method.compare(QString("NOTIFY"), Qt::CaseInsensitive) == 0)
+     {
+         processNotifyMessage(op->takeMessagingInfo(), *hdr, op->dataRead());
+     }
+-    else if (method.compare("SUBSCRIBE", Qt::CaseInsensitive) == 0)
++    else if (method.compare(QString("SUBSCRIBE"), Qt::CaseInsensitive) == 0)
+     {
+         processSubscription(op->takeMessagingInfo(), *hdr);
+     }
+-    else if (method.compare("UNSUBSCRIBE", Qt::CaseInsensitive) == 0)
++    else if (method.compare(QString("UNSUBSCRIBE"), Qt::CaseInsensitive) == 0)
+     {
+         processUnsubscription(op->takeMessagingInfo(), *hdr);
+     }
+diff --git c/herqq/hupnp/src/http/hhttp_utils_p.h i/herqq/hupnp/src/http/hhttp_utils_p.h
+index 7285190..b3ee62e 100644
+--- c/herqq/hupnp/src/http/hhttp_utils_p.h
++++ i/herqq/hupnp/src/http/hhttp_utils_p.h
+@@ -64,10 +64,10 @@ public:
+         QString connection = hdr.value("CONNECTION");
+         if (hdr.minorVersion() == 1)
+         {
+-            return connection.compare("close", Qt::CaseInsensitive) != 0;
++            return connection.compare(QString("close"), Qt::CaseInsensitive) != 0;
+         }
+ 
+-        return connection.compare("Keep-Alive", Qt::CaseInsensitive) == 0;
++        return connection.compare(QString("Keep-Alive"), Qt::CaseInsensitive) == 0;
+     }
+ 
+     // returns the URLs as a string inside brackets. This is the format used in
+diff --git c/herqq/hupnp/src/utils/hmisc_utils_p.cpp i/herqq/hupnp/src/utils/hmisc_utils_p.cpp
+index 6641d14..7ea567a 100644
+--- c/herqq/hupnp/src/utils/hmisc_utils_p.cpp
++++ i/herqq/hupnp/src/utils/hmisc_utils_p.cpp
+@@ -70,10 +70,10 @@ bool toBool(const QString& arg, bool* ok)
+     bool retVal = false, match = true;
+     if (arg == "1") { retVal = true; }
+     else if (arg == "0") { retVal = false; }
+-    else if (arg.compare("true", Qt::CaseInsensitive) == 0) { retVal = true; }
+-    else if (arg.compare("false", Qt::CaseInsensitive) == 0) { retVal =  false; }
+-    else if (arg.compare("yes", Qt::CaseInsensitive) == 0) { retVal = true; }
+-    else if (arg.compare("no", Qt::CaseInsensitive) == 0) { retVal = false; }
++    else if (arg.compare(QString("true"), Qt::CaseInsensitive) == 0) { retVal = true; }
++    else if (arg.compare(QString("false"), Qt::CaseInsensitive) == 0) { retVal =  false; }
++    else if (arg.compare(QString("yes"), Qt::CaseInsensitive) == 0) { retVal = true; }
++    else if (arg.compare(QString("no"), Qt::CaseInsensitive) == 0) { retVal = false; }
+     else { match = false; }
+ 
+     if (ok) { *ok = match; }
+diff --git c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp
+index 6531929..8bd05c5 100644
+--- c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp
++++ i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp
+@@ -680,15 +680,15 @@ QString HObject::writeStatusToString(WriteStatus status)
+ HObject::WriteStatus HObject::writeStatusFromString(const QString& status)
+ {
+     WriteStatus retVal = UnknownWriteStatus;
+-    if (status.compare("writable", Qt::CaseInsensitive) == 0)
++    if (status.compare(QString("writable"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = WritableWriteStatus;
+     }
+-    else if (status.compare("protected", Qt::CaseInsensitive) == 0)
++    else if (status.compare(QString("protected"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = ProtectedWriteStatus;
+     }
+-    else if (status.compare("mixed", Qt::CaseInsensitive) == 0)
++    else if (status.compare(QString("mixed"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = MixedWriteStatus;
+     }
+diff --git c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp
+index 25ee560..bea6ece 100644
+--- c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp
++++ i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp
+@@ -77,11 +77,11 @@ QString HMatchingId::toString(Type type)
+ HMatchingId::Type HMatchingId::fromString(const QString& type)
+ {
+     Type retVal = Undefined;
+-    if (type.compare("SI_SERIESID", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("SI_SERIESID"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = SeriesId;
+     }
+-    else if (type.compare("SI_PROGRAMID", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("SI_PROGRAMID"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = ProgramId;
+     }
+diff --git c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp
+index 06ab6bf..e7cec20 100644
+--- c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp
++++ i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp
+@@ -108,11 +108,11 @@ QString HScheduledTime::toString(Type type)
+ HScheduledTime::Type HScheduledTime::fromString(const QString& type)
+ {
+     Type retVal = Undefined;
+-    if (type.compare("SCHEDULED_PROGRAM", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("SCHEDULED_PROGRAM"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = ScheduledProgram;
+     }
+-    else if (type.compare("ON_DEMAND", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("ON_DEMAND"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = OnDemand;
+     }
+diff --git c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp
+index 078d719..31e1af0 100644
+--- c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp
++++ i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp
+@@ -115,19 +115,19 @@ QString HSortModifier::toString(Type type)
+ HSortModifier::Type HSortModifier::fromString(const QString& type)
+ {
+     Type retVal = Undefined;
+-    if (type.compare("+", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("+"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = AscendingByValue;
+     }
+-    else if (type.compare("-", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("-"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DescendingByValue;
+     }
+-    else if (type.compare("TIME+", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("TIME+"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = AscendingByTime;
+     }
+-    else if (type.compare("TIME-", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("TIME-"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DescendingByTime;
+     }
+diff --git c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp
+index 65b67f8..f51e6b2 100644
+--- c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp
++++ i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp
+@@ -198,11 +198,11 @@ HStateVariableCollection::RcsInstanceType HStateVariableCollection::fromString(
+     const QString& type)
+ {
+     RcsInstanceType retVal = Undefined;
+-    if (type.compare("pre-mix", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("pre-mix"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = PreMix;
+     }
+-    else if (type.compare("post-mix", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("post-mix"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = PostMix;
+     }
+diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp
+index 9f5712d..cd4dacb 100644
+--- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp
++++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp
+@@ -568,7 +568,7 @@ bool HCdsDidlLiteSerializer::serializeFromXml(
+         addNamespaces(reader);
+         if (reader.readNextStartElement())
+         {
+-            if (reader.name().compare("DIDL-Lite", Qt::CaseInsensitive) != 0)
++            if (reader.name().compare(QString("DIDL-Lite"), Qt::CaseInsensitive) != 0)
+             {
+                 h_ptr->m_lastErrorDescription = "Missing mandatory DIDL-Lite element";
+                 return false;
+diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp
+index 30af243..af03c5c 100644
+--- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp
++++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp
+@@ -749,7 +749,7 @@ bool HCdsPropertyDbPrivate::serializeSvCollectionIn(
+ 
+     if (stateVariableReader.readNextStartElement())
+     {
+-        if (stateVariableReader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0)
++        if (stateVariableReader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0)
+         {
+             return false;
+         }
+diff --git c/herqq/hupnp_av/src/common/hradioband.cpp i/herqq/hupnp_av/src/common/hradioband.cpp
+index d35a559..85b7e32 100644
+--- c/herqq/hupnp_av/src/common/hradioband.cpp
++++ i/herqq/hupnp_av/src/common/hradioband.cpp
+@@ -83,23 +83,23 @@ QString HRadioBand::toString(Type type)
+ HRadioBand::Type HRadioBand::fromString(const QString& arg)
+ {
+     Type retVal = Undefined;
+-    if (arg.compare("am", Qt::CaseInsensitive) == 0)
++    if (arg.compare(QString("am"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = AM;
+     }
+-    else if (arg.compare("fm", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("fm"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = FM;
+     }
+-    else if (arg.compare("shortwave", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("shortwave"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = ShortWave;
+     }
+-    else if (arg.compare("internet", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("internet"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Internet;
+     }
+-    else if (arg.compare("satellite", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("satellite"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Satellite;
+     }
+diff --git c/herqq/hupnp_av/src/common/hstoragemedium.cpp i/herqq/hupnp_av/src/common/hstoragemedium.cpp
+index 37ab7e0..c7f2109 100644
+--- c/herqq/hupnp_av/src/common/hstoragemedium.cpp
++++ i/herqq/hupnp_av/src/common/hstoragemedium.cpp
+@@ -187,155 +187,155 @@ QString HStorageMedium::toString(Type type)
+ HStorageMedium::Type HStorageMedium::fromString(const QString& type)
+ {
+     Type retVal = Unknown;
+-    if (type.compare("UNKNOWN", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Unknown;
+     }
+-    else if (type.compare("DV", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DV"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DigitalVideo;
+     }
+-    else if (type.compare("VHS", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("VHS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = VHS;
+     }
+-    else if (type.compare("W-VHS", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("W-VHS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = W_VHS;
+     }
+-    else if (type.compare("S-VHS", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("S-VHS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = S_VHS;
+     }
+-    else if (type.compare("D_VHS", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("D_VHS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = D_VHS;
+     }
+-    else if (type.compare("VHSC", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("VHSC"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = VHSC;
+     }
+-    else if (type.compare("VIDEO8", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("VIDEO8"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Video8;
+     }
+-    else if (type.compare("HI8", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("HI8"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = HI8;
+     }
+-    else if (type.compare("CD-ROM", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("CD-ROM"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = CD_ROM;
+     }
+-    else if (type.compare("CD-DA", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("CD-DA"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = CD_DA;
+     }
+-    else if (type.compare("CD-R", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("CD-R"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = CD_R;
+     }
+-    else if (type.compare("CD-RW", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("CD-RW"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = CD_RW;
+     }
+-    else if (type.compare("VIDEO-CD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("VIDEO-CD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Video_CD;
+     }
+-    else if (type.compare("SACD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("SACD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = SACD;
+     }
+-    else if (type.compare("MD-AUDIO", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("MD-AUDIO"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = MiniDiscAudio;
+     }
+-    else if (type.compare("MD-PICTURE", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("MD-PICTURE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = MiniDiscPicture;
+     }
+-    else if (type.compare("DVD-ROM", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DVD-ROM"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DVD_ROM;
+     }
+-    else if (type.compare("DVD-VIDEO", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DVD-VIDEO"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DVD_Video;
+     }
+-    else if (type.compare("DVD+R", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DVD+R"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DVD_PlusRecordable;
+     }
+-    else if (type.compare("DVD-R", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DVD-R"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DVD_MinusRecordable;
+     }
+-    else if (type.compare("DVD+RW", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DVD+RW"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DVD_PlusRewritable;
+     }
+-    else if (type.compare("DVD-RW", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DVD-RW"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DVD_MinusRewritable;
+     }
+-    else if (type.compare("DVD-RAM", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DVD-RAM"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DVD_RAM;
+     }
+-    else if (type.compare("DAT", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DAT"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DAT;
+     }
+-    else if (type.compare("LD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("LD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = LD;
+     }
+-    else if (type.compare("HDD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("HDD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = HDD;
+     }
+-    else if (type.compare("MICRO-MV", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("MICRO-MV"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = MicroMV;
+     }
+-    else if (type.compare("NETWORK", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("NETWORK"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Network;
+     }
+-    else if (type.compare("NONE", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("NONE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = None;
+     }
+-    else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = NotImplemented;
+     }
+-    else if (type.compare("SD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = SecureDigital;
+     }
+-    else if (type.compare("PC-CARD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("PC-CARD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = PC_Card;
+     }
+-    else if (type.compare("MMC", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("MMC"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = MultimediaCard;
+     }
+-    else if (type.compare("CF", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = CompactFlash;
+     }
+-    else if (type.compare("BD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("BD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = BluRay;
+     }
+-    else if (type.compare("MS", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("MS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = MemoryStick;
+     }
+-    else if (type.compare("HD_DVD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("HD_DVD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = HD_DVD;
+     }
+diff --git c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp
+index 89d44ae..bb364b5 100644
+--- c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp
++++ i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp
+@@ -57,11 +57,11 @@ HConnectionManagerInfo::Direction
+     HConnectionManagerInfo::directionFromString(const QString& arg)
+ {
+     Direction retVal = DirectionUndefined;
+-    if (arg.compare("Input", Qt::CaseInsensitive) == 0)
++    if (arg.compare(QString("Input"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DirectionInput;
+     }
+-    else if (arg.compare("Output", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("Output"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DirectionOutput;
+     }
+@@ -92,23 +92,23 @@ HConnectionManagerInfo::ConnectionStatus
+     HConnectionManagerInfo::statusFromString(const QString& arg)
+ {
+     ConnectionStatus retVal = StatusUnknown;
+-    if (arg.compare("Ok", Qt::CaseInsensitive) == 0)
++    if (arg.compare(QString("Ok"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = StatusOk;
+     }
+-    else if (arg.compare("Unknown", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("Unknown"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = StatusUnknown;
+     }
+-    else if (arg.compare("ContentFormatMismatch", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("ContentFormatMismatch"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = StatusContentFormatMismatch;
+     }
+-    else if (arg.compare("InsufficientBandwidth", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("InsufficientBandwidth"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = StatusInsufficientBandwidth;
+     }
+-    else if (arg.compare("UnreliableChannel", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("UnreliableChannel"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = StatusUnreliableChannel;
+     }
+diff --git c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp
+index 5c0c0d0..743ed1e 100644
+--- c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp
++++ i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp
+@@ -80,11 +80,11 @@ HContentDirectoryInfo::BrowseFlag
+     HContentDirectoryInfo::browseFlagFromString(const QString& arg)
+ {
+     BrowseFlag retVal = Undefined;
+-    if (arg.compare("BrowseMetadata", Qt::CaseInsensitive) == 0)
++    if (arg.compare(QString("BrowseMetadata"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = BrowseMetadata;
+     }
+-    else if (arg.compare("BrowseDirectChildren", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("BrowseDirectChildren"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = BrowseDirectChildren;
+     }
+diff --git c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp
+index 0a663dc..1771b6f 100644
+--- c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp
++++ i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp
+@@ -85,15 +85,15 @@ HTransferProgressInfo::~HTransferProgressInfo()
+ HTransferProgressInfo::Status HTransferProgressInfo::fromString(const QString& arg)
+ {
+     Status retVal = Error;
+-    if (arg.compare("IN_PROGRESS", Qt::CaseInsensitive) == 0)
++    if (arg.compare(QString("IN_PROGRESS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = InProgress;
+     }
+-    else if (arg.compare("STOPPED", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Stopped;
+     }
+-    else if (arg.compare("COMPLETED", Qt::CaseInsensitive) == 0)
++    else if (arg.compare(QString("COMPLETED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Completed;
+     }
+diff --git c/herqq/hupnp_av/src/hav_global.cpp i/herqq/hupnp_av/src/hav_global.cpp
+index c3f93a9..27d98a0 100644
+--- c/herqq/hupnp_av/src/hav_global.cpp
++++ i/herqq/hupnp_av/src/hav_global.cpp
+@@ -647,7 +647,7 @@ HStateVariableCollection parseStateVariableCollection(const QString& arg)
+     addNamespaces(reader);
+ 
+     if (!reader.readNextStartElement() ||
+-        reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0)
++        reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0)
+     {
+         return retVal;
+     }
+diff --git c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp
+index f9e2dc4..69b7648 100644
+--- c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp
++++ i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp
+@@ -287,7 +287,7 @@ void HMediaBrowserPrivate::lastChangeReceived(
+ 
+     if (reader.readNextStartElement())
+     {
+-        if (reader.name().compare("StateEvent", Qt::CaseInsensitive) != 0)
++        if (reader.name().compare(QString("StateEvent"), Qt::CaseInsensitive) != 0)
+         {
+             return;
+         }
+diff --git c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp
+index 651e727..9fb4958 100644
+--- c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp
++++ i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp
+@@ -144,7 +144,7 @@ void HConnection::lastChangeReceived(
+ 
+     if (reader.readNextStartElement())
+     {
+-        if (reader.name().compare("Event", Qt::CaseInsensitive) != 0)
++        if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0)
+         {
+             return;
+         }
+@@ -159,7 +159,7 @@ void HConnection::lastChangeReceived(
+     {
+         QStringRef name = reader.name();
+ 
+-        if (name.compare("InstanceID", Qt::CaseInsensitive))
++        if (name.compare(QString("InstanceID"), Qt::CaseInsensitive))
+         {
+             continue;
+         }
+@@ -205,7 +205,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data)
+ 
+     if (reader.readNextStartElement())
+     {
+-        if (reader.name().compare("Event", Qt::CaseInsensitive) != 0)
++        if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0)
+         {
+             return;
+         }
+@@ -220,7 +220,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data)
+     {
+         QStringRef name = reader.name();
+ 
+-        if (name.compare("InstanceID", Qt::CaseInsensitive))
++        if (name.compare(QString("InstanceID"), Qt::CaseInsensitive))
+         {
+             continue;
+         }
+diff --git c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp
+index 174f423..bf7e9f2 100644
+--- c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp
++++ i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp
+@@ -109,7 +109,7 @@ qint32 HConnectionManagerSinkService::prepareForConnection(
+         return HConnectionManagerInfo::IncompatibleDirections;
+     }
+ 
+-    if (remoteProtocolInfo.protocol().compare("http-get", Qt::CaseInsensitive) &&
++    if (remoteProtocolInfo.protocol().compare(QString("http-get"), Qt::CaseInsensitive) &&
+         remoteProtocolInfo.protocol() != "*")
+     {
+         return HConnectionManagerInfo::IncompatibleProtocolInfo;
+diff --git c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp
+index 1ad337a..0f5e209 100644
+--- c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp
++++ i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp
+@@ -1578,19 +1578,19 @@ bool HRendererConnectionInfo::hasChannelAssociated(const QString& svName)
+ {
+     bool retVal = false;
+     QString trimmed = svName.trimmed();
+-    if (trimmed.compare("Mute", Qt::CaseInsensitive) == 0)
++    if (trimmed.compare(QString("Mute"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = true;
+     }
+-    else if (trimmed.compare("Volume", Qt::CaseInsensitive) == 0)
++    else if (trimmed.compare(QString("Volume"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = true;
+     }
+-    else if (trimmed.compare("VolumeDB", Qt::CaseInsensitive) == 0)
++    else if (trimmed.compare(QString("VolumeDB"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = true;
+     }
+-    else if (trimmed.compare("Loudness", Qt::CaseInsensitive) == 0)
++    else if (trimmed.compare(QString("Loudness"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = true;
+     }
+diff --git c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp
+index a614e17..fbb3258 100644
+--- c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp
++++ i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp
+@@ -449,7 +449,7 @@ qint32 HTransportSinkService::getStateVariables(
+     foreach(QString svName, stateVarNames)
+     {
+         svName = svName.trimmed();
+-        if (svName.compare("LastChange", Qt::CaseInsensitive) == 0 ||
++        if (svName.compare(QString("LastChange"), Qt::CaseInsensitive) == 0 ||
+             svName.startsWith("A_ARG", Qt::CaseInsensitive))
+         {
+             return HAvTransportInfo::InvalidStateVariableList;
+@@ -512,7 +512,7 @@ qint32 HTransportSinkService::setStateVariables(
+ 
+     if (reader.readNextStartElement())
+     {
+-        if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0)
++        if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0)
+         {
+             return UpnpInvalidArgs;
+         }
+diff --git c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp
+index 751a3d9..51c1ff4 100644
+--- c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp
++++ i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp
+@@ -110,59 +110,59 @@ QString HChannel::toString(Type type)
+ HChannel::Type HChannel::fromString(const QString& type)
+ {
+     Type retVal = Undefined;
+-    if (type.compare("MASTER", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("MASTER"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Master;
+     }
+-    else if (type.compare("LF", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("LF"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = LeftFront;
+     }
+-    else if (type.compare("RF", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("RF"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RightFront;
+     }
+-    else if (type.compare("CF", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = CenterFront;
+     }
+-    else if (type.compare("LFE", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("LFE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = LFE;
+     }
+-    else if (type.compare("LS", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("LS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = LeftSurround;
+     }
+-    else if (type.compare("RS", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("RS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RightSurround;
+     }
+-    else if (type.compare("LFC", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("LFC"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = LeftOfCenter;
+     }
+-    else if (type.compare("RFC", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("RFC"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RightOfCenter;
+     }
+-    else if (type.compare("SD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Surround;
+     }
+-    else if (type.compare("SL", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("SL"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = SideLeft;
+     }
+-    else if (type.compare("SR", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("SR"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = SideRight;
+     }
+-    else if (type.compare("T", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("T"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Top;
+     }
+-    else if (type.compare("B", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("B"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Bottom;
+     }
+diff --git c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp
+index fd52f9a..84f5579 100644
+--- c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp
++++ i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp
+@@ -859,7 +859,7 @@ qint32 HRenderingControlService::setStateVariables(
+ 
+     if (reader.readNextStartElement())
+     {
+-        if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0)
++        if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0)
+         {
+             return UpnpInvalidArgs;
+         }
+diff --git c/herqq/hupnp_av/src/transport/havtransport_info.cpp i/herqq/hupnp_av/src/transport/havtransport_info.cpp
+index cb18ce0..e3fcd64 100644
+--- c/herqq/hupnp_av/src/transport/havtransport_info.cpp
++++ i/herqq/hupnp_av/src/transport/havtransport_info.cpp
+@@ -94,35 +94,35 @@ HAvTransportInfo::DrmState
+     HAvTransportInfo::drmStateFromString(const QString& state)
+ {
+     DrmState retVal = DrmState_Unknown;
+-    if (state.compare("OK", Qt::CaseInsensitive) == 0)
++    if (state.compare(QString("OK"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DrmState_Ok;
+     }
+-    else if (state.compare("UNKNOWN", Qt::CaseInsensitive) == 0)
++    else if (state.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DrmState_Unknown;
+     }
+-    else if (state.compare("PROCESSING_CONTENT_KEY", Qt::CaseInsensitive) == 0)
++    else if (state.compare(QString("PROCESSING_CONTENT_KEY"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DrmState_ProcessingContentKey;
+     }
+-    else if (state.compare("CONTENT_KEY_FAILURE", Qt::CaseInsensitive) == 0)
++    else if (state.compare(QString("CONTENT_KEY_FAILURE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DrmState_ContentKeyFailure;
+     }
+-    else if (state.compare("ATTEMPTING_AUTHENTICATION", Qt::CaseInsensitive) == 0)
++    else if (state.compare(QString("ATTEMPTING_AUTHENTICATION"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DrmState_AttemptingAuthentication;
+     }
+-    else if (state.compare("FAILED_AUTHENTICATION", Qt::CaseInsensitive) == 0)
++    else if (state.compare(QString("FAILED_AUTHENTICATION"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DrmState_FailedAuthentication;
+     }
+-    else if (state.compare("NOT_AUTHENTICATED", Qt::CaseInsensitive) == 0)
++    else if (state.compare(QString("NOT_AUTHENTICATED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DrmState_NotAuthenticated;
+     }
+-    else if (state.compare("DEVICE_REVOCATION", Qt::CaseInsensitive) == 0)
++    else if (state.compare(QString("DEVICE_REVOCATION"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = DrmState_DeviceRevocation;
+     }
+diff --git c/herqq/hupnp_av/src/transport/hmediainfo.cpp i/herqq/hupnp_av/src/transport/hmediainfo.cpp
+index 9e642c1..5f33847 100644
+--- c/herqq/hupnp_av/src/transport/hmediainfo.cpp
++++ i/herqq/hupnp_av/src/transport/hmediainfo.cpp
+@@ -180,15 +180,15 @@ HMediaInfo::MediaCategory HMediaInfo::mediaCategoryFromString(
+     const QString& category)
+ {
+     MediaCategory retVal = Undefined;
+-    if (category.compare("NO_MEDIA", Qt::CaseInsensitive) == 0)
++    if (category.compare(QString("NO_MEDIA"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = NoMedia;
+     }
+-    else if (category.compare("TRACK_AWARE", Qt::CaseInsensitive) == 0)
++    else if (category.compare(QString("TRACK_AWARE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = TrackAware;
+     }
+-    else if (category.compare("TRACK_UNAWARE", Qt::CaseInsensitive) == 0)
++    else if (category.compare(QString("TRACK_UNAWARE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = TrackUnaware;
+     }
+diff --git c/herqq/hupnp_av/src/transport/hplaymode.cpp i/herqq/hupnp_av/src/transport/hplaymode.cpp
+index 8d3a20e..57605f0 100644
+--- c/herqq/hupnp_av/src/transport/hplaymode.cpp
++++ i/herqq/hupnp_av/src/transport/hplaymode.cpp
+@@ -87,31 +87,31 @@ QString HPlayMode::toString(HPlayMode::Type type)
+ HPlayMode::Type HPlayMode::fromString(const QString& type)
+ {
+     Type retVal = Undefined;
+-    if (type.compare("NORMAL", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("NORMAL"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Normal;
+     }
+-    else if (type.compare("SHUFFLE", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("SHUFFLE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Shuffle;
+     }
+-    else if (type.compare("REPEAT_ONE", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("REPEAT_ONE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RepeatOne;
+     }
+-    else if (type.compare("REPEAT_ALL", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("REPEAT_ALL"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RepeatAll;
+     }
+-    else if (type.compare("RANDOM", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("RANDOM"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Random;
+     }
+-    else if (type.compare("DIRECT_1", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("DIRECT_1"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Direct_1;
+     }
+-    else if (type.compare("INTRO", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("INTRO"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Intro;
+     }
+diff --git c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp
+index ab29f09..a1a5de0 100644
+--- c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp
++++ i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp
+@@ -81,23 +81,23 @@ HRecordMediumWriteStatus::Type HRecordMediumWriteStatus::fromString(
+     const QString& type)
+ {
+     Type retVal = Unknown;
+-    if (type.compare("WRITABLE", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("WRITABLE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Writable;
+     }
+-    else if (type.compare("PROTECTED", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("PROTECTED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Protected;
+     }
+-    else if (type.compare("NOT_WRITABLE", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("NOT_WRITABLE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = NotWritable;
+     }
+-    else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = NotImplemented;
+     }
+-    else if (type.compare("UNKNOWN", Qt::CaseInsensitive) != 0 && !type.isEmpty())
++    else if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) != 0 && !type.isEmpty())
+     {
+         retVal = VendorDefined;
+     }
+diff --git c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp
+index bf7dd90..b659fd7 100644
+--- c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp
++++ i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp
+@@ -88,31 +88,31 @@ QString HRecordQualityMode::toString(Type mode)
+ HRecordQualityMode::Type HRecordQualityMode::fromString(const QString& mode)
+ {
+     Type retVal = Undefined;
+-    if (mode.compare("0:EP", Qt::CaseInsensitive) == 0)
++    if (mode.compare(QString("0:EP"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Ep;
+     }
+-    else if (mode.compare("1:LP", Qt::CaseInsensitive) == 0)
++    else if (mode.compare(QString("1:LP"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Lp;
+     }
+-    else if (mode.compare("2:SP", Qt::CaseInsensitive) == 0)
++    else if (mode.compare(QString("2:SP"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Sp;
+     }
+-    else if (mode.compare("0:BASIC", Qt::CaseInsensitive) == 0)
++    else if (mode.compare(QString("0:BASIC"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Basic;
+     }
+-    else if (mode.compare("1:MEDIUM", Qt::CaseInsensitive) == 0)
++    else if (mode.compare(QString("1:MEDIUM"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Medium;
+     }
+-    else if (mode.compare("2:HIGH", Qt::CaseInsensitive) == 0)
++    else if (mode.compare(QString("2:HIGH"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = High;
+     }
+-    else if (mode.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0)
++    else if (mode.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = NotImplemented;
+     }
+diff --git c/herqq/hupnp_av/src/transport/hseekinfo.cpp i/herqq/hupnp_av/src/transport/hseekinfo.cpp
+index c2ac69a..d3eee2b 100644
+--- c/herqq/hupnp_av/src/transport/hseekinfo.cpp
++++ i/herqq/hupnp_av/src/transport/hseekinfo.cpp
+@@ -102,43 +102,43 @@ QString HSeekMode::toString(Type type)
+ HSeekMode::Type HSeekMode::fromString(const QString& type)
+ {
+     Type retVal = Unknown;
+-    if (type.compare("TRACK_NR", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("TRACK_NR"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = TrackNr;
+     }
+-    else if (type.compare("ABS_TIME", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("ABS_TIME"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = AbsTime;
+     }
+-    else if (type.compare("REL_TIME", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("REL_TIME"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RelTime;
+     }
+-    else if (type.compare("ABS_COUNT", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("ABS_COUNT"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = AbsCount;
+     }
+-    else if (type.compare("REL_COUNT", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("REL_COUNT"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RelCount;
+     }
+-    else if (type.compare("CHANNEL_FREQ", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("CHANNEL_FREQ"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = ChannelFreq;
+     }
+-    else if (type.compare("TAPE-INDEX", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("TAPE-INDEX"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = TapeIndex;
+     }
+-    else if (type.compare("REL_TAPE-INDEX", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("REL_TAPE-INDEX"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RelTapeIndex;
+     }
+-    else if (type.compare("FRAME", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("FRAME"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Frame;
+     }
+-    else if (type.compare("REL_FRAME", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("REL_FRAME"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = RelFrame;
+     }
+diff --git c/herqq/hupnp_av/src/transport/htransportaction.cpp i/herqq/hupnp_av/src/transport/htransportaction.cpp
+index d64b1bc..4a34b8d 100644
+--- c/herqq/hupnp_av/src/transport/htransportaction.cpp
++++ i/herqq/hupnp_av/src/transport/htransportaction.cpp
+@@ -91,31 +91,31 @@ QString HTransportAction::toString(Type type)
+ HTransportAction::Type HTransportAction::fromString(const QString& type)
+ {
+     Type retVal = Undefined;
+-    if (type.compare("PLAY", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("PLAY"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Play;
+     }
+-    else if (type.compare("STOP", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("STOP"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Stop;
+     }
+-    else if (type.compare("PAUSE", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("PAUSE"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Pause;
+     }
+-    else if (type.compare("SEEK", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("SEEK"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Seek;
+     }
+-    else if (type.compare("NEXT", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("NEXT"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Next;
+     }
+-    else if (type.compare("PREVIOUS", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("PREVIOUS"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Previous;
+     }
+-    else if (type.compare("RECORD", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("RECORD"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Record;
+     }
+diff --git c/herqq/hupnp_av/src/transport/htransportinfo.cpp i/herqq/hupnp_av/src/transport/htransportinfo.cpp
+index ecfaf0b..8ca9b1c 100644
+--- c/herqq/hupnp_av/src/transport/htransportinfo.cpp
++++ i/herqq/hupnp_av/src/transport/htransportinfo.cpp
+@@ -71,11 +71,11 @@ QString HTransportStatus::toString(HTransportStatus::Type type)
+ HTransportStatus::Type HTransportStatus::fromString(const QString& type)
+ {
+     Type retVal = Undefined;
+-    if (type.compare("OK", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("OK"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = OK;
+     }
+-    else if (type.compare("ERROR_OCCURRED", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("ERROR_OCCURRED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = ErrorOccurred;
+     }
+diff --git c/herqq/hupnp_av/src/transport/htransportstate.cpp i/herqq/hupnp_av/src/transport/htransportstate.cpp
+index b460065..f2a1ac3 100644
+--- c/herqq/hupnp_av/src/transport/htransportstate.cpp
++++ i/herqq/hupnp_av/src/transport/htransportstate.cpp
+@@ -89,31 +89,31 @@ QString HTransportState::toString(HTransportState::Type type)
+ HTransportState::Type HTransportState::fromString(const QString& type)
+ {
+     Type retVal = Undefined;
+-    if (type.compare("NO_MEDIA_PRESENT", Qt::CaseInsensitive) == 0)
++    if (type.compare(QString("NO_MEDIA_PRESENT"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = NoMediaPresent;
+     }
+-    else if (type.compare("STOPPED", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Stopped;
+     }
+-    else if (type.compare("PLAYING", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("PLAYING"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Playing;
+     }
+-    else if (type.compare("TRANSITIONING", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("TRANSITIONING"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Transitioning;
+     }
+-    else if (type.compare("PAUSED_PLAYBACK", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("PAUSED_PLAYBACK"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = PausedPlayback;
+     }
+-    else if (type.compare("PAUSED_RECORDING", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("PAUSED_RECORDING"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = PausedRecording;
+     }
+-    else if (type.compare("RECORDING", Qt::CaseInsensitive) == 0)
++    else if (type.compare(QString("RECORDING"), Qt::CaseInsensitive) == 0)
+     {
+         retVal = Recording;
+     }
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 94ebaed9c2a1..0d075efcd966 100644
--- 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 {
diff --git a/pkgs/development/libraries/libctemplate/2.2.nix b/pkgs/development/libraries/libctemplate/2.2.nix
deleted file mode 100644
index 7440039eec9a..000000000000
--- a/pkgs/development/libraries/libctemplate/2.2.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index 8b9778b269d1..8b5f189a9e1e 100644
--- 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;
   };
 }
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index e5f9fa26938c..26e81916774b 100644
--- 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 = ''
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index b0bc4f4a62ce..5c1c586fb901 100644
--- 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 = ''
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index 80e8fe59c051..1b19a1caff67 100644
--- 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 ];
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
index 282ab740b494..a82fae132552 100644
--- 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 ];
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 128ce6008fa8..d3a213ecfc57 100644
--- 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;
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index 24e54c7b13a2..70601200a248 100644
--- 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
   ];
diff --git a/pkgs/games/stuntrally/gcc6.patch b/pkgs/games/stuntrally/gcc6.patch
new file mode 100644
index 000000000000..6632ea4e8856
--- /dev/null
+++ 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:
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 4a7a2abbb599..a04d1decbd8b 100644
--- 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;
   };
 }
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 78575899ff16..616c99c8f46a 100644
--- 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")'';
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index d293e2769993..363ecf4fc41c 100644
--- 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;
   };
 }
diff --git 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
deleted file mode 100644
index 2d8af8fa7459..000000000000
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch
+++ /dev/null
@@ -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.
diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
deleted file mode 100644
index ce19dd5d1696..000000000000
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
+++ /dev/null
@@ -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
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index dfb5d2a43e17..efad17f43b4c 100644
--- 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}
 ''
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
deleted file mode 100644
index e27b2afb200e..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
+++ /dev/null
@@ -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 {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0a364823640a..93d7acdd8e71 100644
--- 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
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index d323c277814c..a2dafc0bf2db 100644
--- 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;
   };
 
 }
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 8a25188d595f..1bea8006e9f3 100644
--- 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;
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 6b8bdd4b4d56..cb9e43a5c880 100644
--- 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 ];
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 85edbbf442a4..8a3097ae9dee 100644
--- 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";
   };
 
 }
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 23acf7446b17..31ce1a986fb0 100644
--- 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 ];
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 2398d9019dc3..6214bc216f8b 100644
--- 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";
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix
new file mode 100644
index 000000000000..ce8ad76ba829
--- /dev/null
+++ 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 ];
+  };
+}
diff --git a/pkgs/tools/misc/mmake/deps.nix b/pkgs/tools/misc/mmake/deps.nix
new file mode 100644
index 000000000000..0721ad0af608
--- /dev/null
+++ 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";
+    };
+  }
+]
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 5e4966a374bd..0dc3d02d154b 100644
--- 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
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 8cf144140fad..4a4359551fa0 100644
--- 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
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 77e74569ee55..69893f0a8320 100644
--- 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 = {
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 4c1a5431f3eb..501a1bde33b3 100644
--- 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 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 489b970faf68..e7fc809c5c2d 100644
--- 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 {});
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73b6461ac215..7a62d8b95eb9 100644
--- 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