diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index bb8ca565dfd..9d5b2e21bc9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -215,6 +215,7 @@
   heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hinton = "Tom Hinton <t@larkery.com>";
+  hodapp = "Chris Hodapp <hodapp87@gmail.com>";
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
   iand675 = "Ian Duncan <ian@iankduncan.com>";
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
@@ -388,6 +389,7 @@
   paholg = "Paho Lurie-Gregg <paho@paholg.com>";
   pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
   palo = "Ingolf Wanger <palipalo9@googlemail.com>";
+  panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com";
   paperdigits = "Mica Semrick <mica@silentumbrella.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   patternspandemic = "Brad Christensen <patternspandemic@live.com>";
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index f6315b8ad2a..26744322e9e 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -89,6 +89,8 @@ rec {
     msvc = {};
     eabi = {};
     androideabi = {};
+    gnueabi = {};
+    gnueabihf = {};
     unknown = {};
   };
 
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 735aa55e0dc..cec28b1a22b 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -38,7 +38,7 @@ rec {
   /* Merge two attribute sets shallowly, right side trumps left
 
      Example:
-       mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; }
+       mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; }
        => { a = 1; b = 3; c = 4; }
   */
   mergeAttrs = x: y: x // y;
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index 258e1ea948d..9851eb08afb 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -29,8 +29,10 @@ line. For instance, to create a container that has
 <literal>root</literal>:
 
 <screen>
-# nixos-container create foo --config 'services.openssh.enable = true; \
-  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];'
+# nixos-container create foo --config '
+  services.openssh.enable = true;
+  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];
+'
 </screen>
 
 </para>
@@ -97,8 +99,11 @@ This will build and activate the new configuration. You can also
 specify a new configuration on the command line:
 
 <screen>
-# nixos-container update foo --config 'services.httpd.enable = true; \
-  services.httpd.adminAddr = "foo@example.org";'
+# nixos-container update foo --config '
+  services.httpd.enable = true;
+  services.httpd.adminAddr = "foo@example.org";
+  networking.firewall.allowedTCPPorts = [ 80 ];
+'
 
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 0c9981470d7..83378247719 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
 {
-  x86_64-linux = "/nix/store/j6q3pb75q1sbk0xsa5x6a629ph98ycdl-nix-1.11.8";
-  i686-linux = "/nix/store/4m6ps568l988bbr1p2k3w9raq3rblppi-nix-1.11.8";
-  x86_64-darwin = "/nix/store/cc5q944yn3j2hrs8k0kxx9r2mk9mni8a-nix-1.11.8";
+  x86_64-linux = "/nix/store/71im965h634iy99zsmlncw6qhx5jcclx-nix-1.11.9";
+  i686-linux = "/nix/store/cgvavixkayc36l6kl92i8mxr6k0p2yhy-nix-1.11.9";
+  x86_64-darwin = "/nix/store/w1c96v5yxvdmq4nvqlxjvg6kp7xa2lag-nix-1.11.9";
 }
diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix
index 19002b17dac..f4ee94ecc0d 100644
--- a/nixos/modules/misc/extra-arguments.nix
+++ b/nixos/modules/misc/extra-arguments.nix
@@ -2,16 +2,6 @@
 
 {
   _module.args = {
-    pkgs_i686 = import ../../.. {
-      system = "i686-linux";
-      # FIXME: we enable config.allowUnfree to make packages like
-      # nvidia-x11 available. This isn't a problem because if the user has
-      # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on
-      # the 64-bit package anyway. However, it would be cleaner to respect
-      # nixpkgs.config here.
-      config.allowUnfree = true;
-    };
-
     utils = import ../../lib/utils.nix pkgs;
   };
 }
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index dafc923b000..6c2507d69d2 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -289,7 +289,10 @@
       rpc = 271;
       geoip = 272;
       fcron = 273;
-      aria2 = 274;
+      sonarr = 274;
+      radarr = 275;
+      jackett = 276;
+      aria2 = 277;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -548,7 +551,10 @@
       #rpc = 271; # unused
       #geoip = 272; # unused
       fcron = 273;
-      aria2 = 274;
+      sonarr = 274;
+      radarr = 275;
+      jackett = 276;
+      aria2 = 277;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index b8824e6374b..1793c1447d6 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -42,6 +42,8 @@ let
     merge = lib.mergeOneOption;
   };
 
+  _pkgs = import ../../.. config.nixpkgs;
+
 in
 
 {
@@ -97,6 +99,9 @@ in
   };
 
   config = {
-    _module.args.pkgs = import ../../.. config.nixpkgs;
+    _module.args = {
+      pkgs = _pkgs;
+      pkgs_i686 = _pkgs.pkgsi686Linux;
+    };
   };
 }
diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix
index e467e7ee85b..87a41ee70b5 100644
--- a/nixos/modules/services/misc/jackett.nix
+++ b/nixos/modules/services/misc/jackett.nix
@@ -22,14 +22,14 @@ in
           echo "Creating jackett data directory in /var/lib/jackett/"
           mkdir -p /var/lib/jackett/
         }
-        chown -R jackett /var/lib/jackett/
+        chown -R jackett:jackett /var/lib/jackett/
         chmod 0700 /var/lib/jackett/
       '';
 
       serviceConfig = {
         Type = "simple";
         User = "jackett";
-        Group = "nogroup";
+        Group = "jackett";
         PermissionsStartOnly = "true";
         ExecStart = "${pkgs.jackett}/bin/Jackett";
         Restart = "on-failure";
@@ -37,8 +37,11 @@ in
     };
 
     users.extraUsers.jackett = {
+      uid = config.ids.uids.jackett;
       home = "/var/lib/jackett";
+      group = "jackett";
     };
+    users.extraGroups.jackett.gid = config.ids.gids.jackett;
 
   };
 }
diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix
index cc5efffca44..245ad9f9a6d 100644
--- a/nixos/modules/services/misc/radarr.nix
+++ b/nixos/modules/services/misc/radarr.nix
@@ -22,14 +22,14 @@ in
           echo "Creating radarr data directory in /var/lib/radarr/"
           mkdir -p /var/lib/radarr/
         }
-        chown -R radarr /var/lib/radarr/
+        chown -R radarr:radarr /var/lib/radarr/
         chmod 0700 /var/lib/radarr/
       '';
 
       serviceConfig = {
         Type = "simple";
         User = "radarr";
-        Group = "nogroup";
+        Group = "radarr";
         PermissionsStartOnly = "true";
         ExecStart = "${pkgs.radarr}/bin/Radarr";
         Restart = "on-failure";
@@ -37,8 +37,11 @@ in
     };
 
     users.extraUsers.radarr = {
+      uid = config.ids.uids.radarr;
       home = "/var/lib/radarr";
+      group = "radarr";
     };
+    users.extraGroups.radarr.gid = config.ids.gids.radarr;
 
   };
 }
diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix
index 6d96daa6c3d..ecde2c33bfa 100644
--- a/nixos/modules/services/misc/sonarr.nix
+++ b/nixos/modules/services/misc/sonarr.nix
@@ -22,14 +22,14 @@ in
           echo "Creating sonarr data directory in /var/lib/sonarr/"
           mkdir -p /var/lib/sonarr/
         }
-        chown -R sonarr /var/lib/sonarr/
+        chown -R sonarr:sonarr /var/lib/sonarr/
         chmod 0700 /var/lib/sonarr/
       '';
 
       serviceConfig = {
         Type = "simple";
         User = "sonarr";
-        Group = "nogroup";
+        Group = "sonarr";
         PermissionsStartOnly = "true";
         ExecStart = "${pkgs.sonarr}/bin/NzbDrone --no-browser";
         Restart = "on-failure";
@@ -37,8 +37,11 @@ in
     };
 
     users.extraUsers.sonarr = {
+      uid = config.ids.uids.sonarr;
       home = "/var/lib/sonarr";
+      group = "sonarr";
     };
+    users.extraGroups.sonarr.gid = config.ids.gids.sonarr;
 
   };
 }
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 3985f8561d3..f4d0fc822de 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -33,6 +33,9 @@ let
     publish-hinfo=${yesNo publish.hinfo}
     publish-workstation=${yesNo publish.workstation}
     publish-domain=${yesNo publish.domain}
+
+    [reflector]
+    enable-reflector=${yesNo reflector}
   '';
 
 in
@@ -113,6 +116,11 @@ in
         description = ''Whether to enable wide-area service discovery.'';
       };
 
+      reflector = mkOption {
+        default = false;
+        description = ''Reflect incoming mDNS requests to all allowed network interfaces.'';
+      };
+
       publish = {
         enable = mkOption {
           default = false;
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 24a3196bed4..4e176353fc2 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -8,8 +8,6 @@ let
 
   homeDir = "/var/lib/i2pd";
 
-  extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
-
   mkEndpointOpt = name: addr: port: {
     enable = mkEnableOption name;
     name = mkOption {
@@ -152,9 +150,8 @@ let
 
   i2pdSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
-    ${if isNull cfg.extIp then extip else ""}
     ${pkgs.i2pd}/bin/i2pd \
-      --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \
+      ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \
       --conf=${i2pdConf} \
       --tunconf=${i2pdTunnelConf}
   '';
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 2d6bf2d58a9..cf47aed9fa9 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -239,6 +239,12 @@ in
           menuentry "Windows 7" {
             chainloader (hd0,4)+1
           }
+
+          # GRUB 2 with UEFI example, chainloading another distro
+          menuentry "Fedora" {
+            set root=(hd1,1)
+            chainloader /efi/fedora/grubx64.efi
+          }
         '';
         description = ''
           Any additional entries you want added to the GRUB boot menu.
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 33f84986cac..cb756842f36 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -2,93 +2,19 @@
 
 with lib;
 let
-  diskSize = "30720";
+  diskSize = 30720;
 in
 {
-  system.build.azureImage =
-    pkgs.vmTools.runInLinuxVM (
-      pkgs.runCommand "azure-image"
-        { preVM =
-            ''
-              mkdir $out
-              diskImage=$out/$diskImageBase
-
-              cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
-              size=$(($cyl*255*63*512))              
-              roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
-              ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
-              mv closure xchg/
-            '';
-
-          postVM =
-            ''
-              mkdir -p $out
-              ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
-              rm $diskImage
-            '';
-          diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
-          buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph =
-            [ "closure" config.system.build.toplevel ];
-        }
-        ''
-          # Create partition table
-          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
-          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}M
-          ${pkgs.parted}/sbin/parted /dev/vda print
-          . /sys/class/block/vda1/uevent
-          mknod /dev/vda1 b $MAJOR $MINOR
-
-          # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
-          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
-
-          mkdir /mnt
-          mount /dev/vda1 /mnt
-
-          # The initrd expects these directories to exist.
-          mkdir /mnt/dev /mnt/proc /mnt/sys
-
-          mount --bind /proc /mnt/proc
-          mount --bind /dev /mnt/dev
-          mount --bind /sys /mnt/sys
-
-          # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
-
-          mkdir -p /mnt/nix/store
-          echo "copying everything (will take a while)..."
-          cp -prd $storePaths /mnt/nix/store/
-
-          echo Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
-
-          echo Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package.out}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} --option build-users-group ""
-
-          echo nixos-rebuild requires an /etc/NIXOS.
-          mkdir -p /mnt/etc
-          touch /mnt/etc/NIXOS
-
-          echo switch-to-configuration requires a /bin/sh
-          mkdir -p /mnt/bin
-          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
-
-          echo Install a configuration.nix.
-          mkdir -p /mnt/etc/nixos /mnt/boot/grub
-          cp ${./azure-config-user.nix} /mnt/etc/nixos/configuration.nix
-
-          echo Generate the GRUB menu.
-          ln -s vda /dev/sda
-          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
-
-          echo Almost done
-          umount /mnt/proc /mnt/dev /mnt/sys
-          umount /mnt
-        ''
-    );
+  system.build.azureImage = import ../../lib/make-disk-image.nix {
+    name = "azure-image";
+    postVM = ''
+      ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
+    '';
+    configFile = ./azure-config-user.nix;
+    format = "raw";
+    inherit diskSize;
+    inherit config lib pkgs;
+  };
 
   imports = [ ./azure-common.nix ];
 
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index f1101d7ea66..c26cae06cd1 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -7,8 +7,7 @@ with lib;
 let
 
   cfg = config.virtualisation.docker;
-  pro = config.networking.proxy.default;
-  proxy_env = optionalAttrs (pro != null) { Environment = "\"http_proxy=${pro}\""; };
+  proxy_env = config.networking.proxy.envVars;
 
 in
 
@@ -106,6 +105,7 @@ in
 
       systemd.services.docker = {
         wantedBy = optional cfg.enableOnBoot "multi-user.target";
+        environment = proxy_env;
         serviceConfig = {
           ExecStart = [
             ""
@@ -122,7 +122,7 @@ in
             ""
             "${pkgs.procps}/bin/kill -s HUP $MAINPID"
           ];
-        } // proxy_env;
+        };
 
         path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
       };
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 5673d55b339..ff39f1bf8da 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -2,7 +2,7 @@
 
 with lib;
 let
-  diskSize = "1G";
+  diskSize = 1024; # MB
 in
 {
   imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ];
@@ -10,89 +10,21 @@ in
   # https://cloud.google.com/compute/docs/tutorials/building-images
   networking.firewall.enable = mkDefault false;
 
-  system.build.googleComputeImage =
-    pkgs.vmTools.runInLinuxVM (
-      pkgs.runCommand "google-compute-image"
-        { preVM =
-            ''
-              mkdir $out
-              diskImage=$out/$diskImageBase
-              truncate $diskImage --size ${diskSize}
-              mv closure xchg/
-            '';
-
-          postVM =
-            ''
-              PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
-              pushd $out
-              mv $diskImageBase disk.raw
-              tar -Szcf $diskImageBase.tar.gz disk.raw
-              rm $out/disk.raw
-              popd
-            '';
-          diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
-          buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph =
-            [ "closure" config.system.build.toplevel ];
-        }
-        ''
-          # Create partition table
-          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
-          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
-          ${pkgs.parted}/sbin/parted /dev/vda print
-          . /sys/class/block/vda1/uevent
-          mknod /dev/vda1 b $MAJOR $MINOR
-
-          # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
-          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
-
-          mkdir /mnt
-          mount /dev/vda1 /mnt
-
-          # The initrd expects these directories to exist.
-          mkdir /mnt/dev /mnt/proc /mnt/sys
-
-          mount --bind /proc /mnt/proc
-          mount --bind /dev /mnt/dev
-          mount --bind /sys /mnt/sys
-
-          # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
-
-          mkdir -p /mnt/nix/store
-          echo "copying everything (will take a while)..."
-          ${pkgs.rsync}/bin/rsync -a $storePaths /mnt/nix/store/
-
-          # Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
-
-          # Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package.out}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
-              --option build-users-group ""
-
-          # `nixos-rebuild' requires an /etc/NIXOS.
-          mkdir -p /mnt/etc
-          touch /mnt/etc/NIXOS
-
-          # `switch-to-configuration' requires a /bin/sh
-          mkdir -p /mnt/bin
-          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
-
-          # Install a configuration.nix.
-          mkdir -p /mnt/etc/nixos /mnt/boot/grub
-          cp ${./google-compute-config.nix} /mnt/etc/nixos/configuration.nix
-
-          # Generate the GRUB menu.
-          ln -s vda /dev/sda
-          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
-
-          umount /mnt/proc /mnt/dev /mnt/sys
-          umount /mnt
-        ''
-    );
+  system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
+    name = "google-compute-image";
+    postVM = ''
+      PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
+      pushd $out
+      mv $diskImage disk.raw
+      tar -Szcf nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw.tar.gz disk.raw
+      rm $out/disk.raw
+      popd
+    '';
+    configFile = ./google-compute-config.nix;
+    format = "raw";
+    inherit diskSize;
+    inherit config lib pkgs;
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 1933f11d1ff..c75edfcd8cf 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -75,6 +75,7 @@ let
       exec ${qemu}/bin/qemu-kvm \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
+          -smp ${toString config.virtualisation.cores} \
           ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
           ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \
           -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
@@ -244,6 +245,18 @@ in
           '';
       };
 
+    virtualisation.cores =
+      mkOption {
+        default = 1;
+        type = types.int;
+        description =
+          ''
+            Specify the number of cores the guest is permitted to use.
+            The number can be higher than the available cores on the
+            host system.
+          '';
+      };
+
     virtualisation.pathsInNixDB =
       mkOption {
         default = [];
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index b20bce8edce..75c6d793feb 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -56,11 +56,19 @@ in
   testScript = ''
     $master->start;
     $master->waitForUnit("mysql");
+    $master->waitForOpenPort(3306);
     $slave1->start;
     $slave2->start;
     $slave1->waitForUnit("mysql");
+    $slave1->waitForOpenPort(3306);
     $slave2->waitForUnit("mysql");
-    $slave2->sleep(100); # Hopefully this is long enough!!
+    $slave2->waitForOpenPort(3306);
     $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+    $slave2->succeed("systemctl stop mysql");
+    $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N");
+    $slave2->succeed("systemctl start mysql");
+    $slave2->waitForUnit("mysql");
+    $slave2->waitForOpenPort(3306);
+    $slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
   '';
 })
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 34472bf8637..e3129254058 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -175,10 +175,10 @@
       }) {};
     auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "auctex";
-        version = "11.90.1";
+        version = "11.90.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-11.90.1.tar";
-          sha256 = "0bn5pg6v7zgqxs080bzrsx6789nzdx4622m3020ymzl66017nf0r";
+          url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar";
+          sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6";
         };
         packageRequires = [];
         meta = {
@@ -644,10 +644,10 @@
     el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
     elpaBuild {
         pname = "el-search";
-        version = "1.3.1";
+        version = "1.3.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.3.1.tar";
-          sha256 = "01f5pyalw60dr36w007mvvxry548zrhixzmba1sad19531bry7fc";
+          url = "https://elpa.gnu.org/packages/el-search-1.3.2.tar";
+          sha256 = "0lf0hk2pvy9yrb02sa3bg0hipshbgl9m4hx7db46jvmz5bf15nfq";
         };
         packageRequires = [ emacs stream ];
         meta = {
@@ -1769,10 +1769,10 @@
       }) {};
     stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "stream";
-        version = "2.2.3";
+        version = "2.2.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/stream-2.2.3.el";
-          sha256 = "1y9nh5473p0dd149g675nybsdnzp8c4mq3wdql066nir7scz6rhy";
+          url = "https://elpa.gnu.org/packages/stream-2.2.4.tar";
+          sha256 = "1fdjjxfnpzfv5jsy0wmmnrsk821bg8d3magsng609fb2pkwvk1ij";
         };
         packageRequires = [ emacs ];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 082301e254b..d5ce5e272f7 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -800,8 +800,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1090,12 +1090,12 @@
     ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-window";
-        version = "20170219.256";
+        version = "20170421.428";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "d92320e74089cb346e172c63b02cce48a0d8cca7";
-          sha256 = "06sidq00xaw0n0gfh7akzyxfr65ma5h299yk347f1q916bqqxna5";
+          rev = "0a59342b7aafa9f89b477b0cc28f41a1abb8096c";
+          sha256 = "05wkd93lm7mp5s3bgjqg6cq70dz5429cj27bj0pmls8nbzmyc5bw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1215,12 +1215,12 @@
     addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "addressbook-bookmark";
-        version = "20170331.1209";
+        version = "20170424.808";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "addressbook-bookmark";
-          rev = "54c4e57b000d54cedb3d791d054d293c8f45f2fe";
-          sha256 = "17g4j5yc7phnn95cya8sw13jm1219j1yrjzdcvadi5xdwlb9gxgz";
+          rev = "2e905403922d9e79f75911586163c2cb5997a2cb";
+          sha256 = "1smfn2l4b9k422dyjzklbk2n075030hmypvhs82fnzgx7zcvzr3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
@@ -1299,12 +1299,12 @@
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "20161228.1641";
+        version = "20170420.1424";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "b390f212947546498a098f2ceb16033709ff32fd";
-          sha256 = "0x6p79bcn8g4r8736j977hz3qwyd9c2p4qkaq88jbfhvxyzkpdaa";
+          rev = "2718190a0202aa4ab02b1f1f3d6ba7b996b69d6d";
+          sha256 = "1j3l7p3rnlax82jrdrjld1a26gk7cg002jcaj7677fhy261vxmib";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1591,12 +1591,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170417.201";
+        version = "20170423.244";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "9c6a36842aedf9960c5fa81ffe8ba9745dd9cb86";
-          sha256 = "0kam8p4nid1rmmr5jw3l8728fd5c9s67gabyacky7qnfa0klja5s";
+          rev = "8d7cc77b174b56cba6cf2bac27fea99f918340f0";
+          sha256 = "05xfbndlk65a38ixl7m92lha0v9z3hw4zk051a7nr2bzsfvyg92g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1612,12 +1612,12 @@
     all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons-dired";
-        version = "20170210.811";
+        version = "20170418.1431";
         src = fetchFromGitHub {
           owner = "jtbm37";
           repo = "all-the-icons-dired";
-          rev = "6e5152dfeb0f8be01a61d6fb0c0cb248ecdf1718";
-          sha256 = "1siwrcfpj9wnrq5q0y5yhbqnh081db0v4kzvxiiqs3idppdnddxg";
+          rev = "980b7747d6c4a7992a1ec56afad908956db0a519";
+          sha256 = "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/all-the-icons-dired";
@@ -2311,12 +2311,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "20170412.445";
+        version = "20170419.152";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "08bf0752e5b885a0492fbd0d7790668683c87797";
-          sha256 = "13026l259vbbgi7q0lb6jb7d54z6jgapv0d2qlprh9mlqjf32xic";
+          rev = "5af52ef940493d3d5acb56fc6372004ca48f75ca";
+          sha256 = "1n96n45ajx12ksnn8ij44b2jbcyvcki9k834ix96cwm1fcr553vg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2558,12 +2558,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170414.1333";
+        version = "20170418.1352";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "8d79047d58bf30e01cc9851431e7ee093c6bc60a";
-          sha256 = "1ijdyd3a5hxanz1wm4fxzsnnr00dwlwivj12533n9wrx029bkg4z";
+          rev = "0d918da74a7a225fe5a586e26f5d834e579c5323";
+          sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -3680,12 +3680,12 @@
     auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }:
     melpaBuild {
         pname = "auto-virtualenvwrapper";
-        version = "20170309.1536";
+        version = "20170421.26";
         src = fetchFromGitHub {
           owner = "robert-zaremba";
           repo = "auto-virtualenvwrapper.el";
-          rev = "114a096561ac3a3b10165d05a6e763cb3c39a9b3";
-          sha256 = "0j392l0kb6h5ckmpvhd71blw7ad9i2r7fc6laqq6vsibnw899wy5";
+          rev = "de613a872e9f3cf59786578883177b1bd654a75c";
+          sha256 = "1y2b3i5fk3qhp90xcpdwzl2bdgjk3nrlxi78icpb81rw700qlqzq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
@@ -3722,12 +3722,12 @@
     autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autobookmarks";
-        version = "20170303.1213";
+        version = "20170417.1407";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "62a1bbf904d075e7786fe1de2df86c5088a4be2d";
-          sha256 = "156wbir32fvkwfvamp5yfw9gkz8j0cs2shgx406mhv7prcr6cnhs";
+          rev = "cd19e15b8951a7af55d67a5bb4e0948e62b0a119";
+          sha256 = "1xv73ls9mhvgjxa9lpw3brmzdd8739zyn9nqb1lrnvx468bz4kry";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -5032,6 +5032,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "binclock";
+        version = "20170418.812";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "binclock.el";
+          rev = "38ef6531fed16eb2fa69824fbdafac998cf201ac";
+          sha256 = "13s4j04b60l44xs381v4padhdyqs8625ssqph24qral6iizwry8d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
+          sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk";
+          name = "binclock";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/binclock";
+          license = lib.licenses.free;
+        };
+      }) {};
     bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-chord";
@@ -5638,12 +5659,12 @@
     boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "boxquote";
-        version = "20170329.406";
+        version = "20170418.835";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "boxquote.el";
-          rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
-          sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
+          rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883";
+          sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
@@ -6343,12 +6364,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20170401.703";
+        version = "20170421.245";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "f60ed2a563b3867a98ab41290b46572789c43272";
-          sha256 = "11axmbqvak8djldjp9kqcaz7q6dxkig9h193l5javgf78pfcdlki";
+          rev = "ed649d722aeb20683705a2378438833efd96e271";
+          sha256 = "1bjkfivxs0x0jlj5qh5adjxmjvj8nd0vs77l4mbm6yv2gm08shxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6536,8 +6557,8 @@
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-cake-inflector";
-          rev = "a91cecd533930bacf1dc30f5209831f79847abda";
-          sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4";
+          rev = "a1d338ec4840b1b1bc14f7f9298c07e2c1d2d8fc";
+          sha256 = "0m8ss9aky24f5i6b8fyy8mhv9ygj158crjyddnj9xx73vsjf96bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77c46238b632047160d6dfac9b257f57b0c4283b/recipes/cake-inflector";
@@ -6557,8 +6578,8 @@
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-cake2";
-          rev = "0a9d0b3a1c49ba1730088416f50507f53221c70b";
-          sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
+          rev = "caffb646c86333b8747cefeba070d57ac4fbaf00";
+          sha256 = "14q5hny3bdwcaq3ls6jlk8np4hf99jksxz84dhm2rdvnm18b1wk3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18e38d9cdb9f1a8cc05545c52c3a76265a9aa2ab/recipes/cake2";
@@ -7141,8 +7162,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "1fcf27f62b30e839020ac31145951f9abbd1c148";
-          sha256 = "0nm3mjbynqfg0vr2b5x10vak859pjxq2kgmgkv4i1y1y2cfhp3fc";
+          rev = "863111d5e625700a95679f6068f1de230dc73eb5";
+          sha256 = "0a1fvr8raqa9na41znsznikimm2q0cldrdq5xw75c2xw8glfi3q6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7181,7 +7202,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12128";
+          rev = "12149";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7492,12 +7513,12 @@
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20170309.2126";
+        version = "20170422.1932";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "a73397712f5a1d008330778b45b3071df5232806";
-          sha256 = "0rx9z90k6mmlgnmwn4d3az9q72rd51zv8x038ws4f6aa7zji7wnx";
+          rev = "02c996e14c0dac64a02c47b01b64dc578aedafc0";
+          sha256 = "0vjdwq7bghq2gxm5n9jgk3l7wjvq3dpmrm5a45icx2vr0m05r0jb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -8059,8 +8080,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "300461";
-          sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
+          rev = "301302";
+          sha256 = "1m3h5kln4v2hcwc4ahzk356415iizcg8cmika8221qvqci4wj7bm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8701,8 +8722,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "be2c45f2a98d69cc9952b592777bb506f69149a2";
-          sha256 = "1nq63k8baym6dm8s05ac81iqvy9gi60a10c962x7zlxkk5r0klbp";
+          rev = "759c6752127092447e8978a978eefde451024b28";
+          sha256 = "016473s4x0z154hbcgafzv178rxq45rvspb7ap2qm6fw32abs117";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9444,12 +9465,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170415.1248";
+        version = "20170420.1837";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "b753952d5a0ee288b6c49b2d8dfa9a223ff59715";
-          sha256 = "11725dhdyy67qynp9vld691ljfz2yb9v3ql4j75l7y5jl3gjklwr";
+          rev = "1fe263493fc3cb3551c55bb3441fd9d7eb0c0a96";
+          sha256 = "14l8p1qibhd2jx9cgfb6h2fvcl1xn8rw4l6jd5n2m5580qv7cx5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9620,12 +9641,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20170327.827";
+        version = "20170424.639";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "daec3ad0f3119f04108574ce48cd77068a850392";
-          sha256 = "04fv3713sgy8c5y9blgx2xyjdg5qvg5idhvsf2p5lk9gjxbslp29";
+          rev = "2480548183935f3d2c75e64a0ecd3a57303e1913";
+          sha256 = "0q6gdbflwhdbc2pa6g1rrd63d1gr9q84w4njpvk6g9djvqdvj1vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9879,12 +9900,12 @@
     company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-go";
-        version = "20170401.345";
+        version = "20170420.515";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1";
-          sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7";
+          rev = "6c2585cf0fc321a20a36b4c596fb6b80f811670a";
+          sha256 = "0wqm7jvzlwh4bz5kk4ghz63z0yjvals0x513bnzrcjd43z2p048i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10225,8 +10246,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10242,12 +10263,12 @@
     company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-shell";
-        version = "20161128.953";
+        version = "20170417.2320";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "company-shell";
-          rev = "a4a7b9ed6b81e4c9f9cb04f63b386fd76d952f11";
-          sha256 = "00bgxd66pwchpy1lnv43izgr6gk4c9nh02jab6laf5jk8s9xs2h7";
+          rev = "40599df46a7e4b7b1ef5ad6e23764dda8510bbf4";
+          sha256 = "1qnlqwifrlbzcsi1lf1s7c32v6szpi5n6ngmj2lmdyic2b3pv1id";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
@@ -10393,8 +10414,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
-          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
+          rev = "21ada9ffbf5f921c87837796ea0b542d6d447d56";
+          sha256 = "1pzc4fvrm2yfrrnfjhnnial2vj4iavr6vfnw6q2i4hz95h5b9mih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10745,12 +10766,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170416.1036";
+        version = "20170425.51";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
-          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
+          rev = "f98f89f1bd90e8165c776efe47bb6c8c7377c5a2";
+          sha256 = "1xx7xic3cn4ak0adpariib2f636m42d04m197x7y74msx4jwjd6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11517,12 +11538,12 @@
     cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cubicaltt";
-        version = "20161020.1343";
+        version = "20170421.1132";
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "9ae218e0beefd3cc2c617cf6b66ac9faba1a8af7";
-          sha256 = "08d09wgi7j8qihqsxyl2lgvwcsi7gwl8kbz3c36yc0gb656m7blr";
+          rev = "a2358867957d0046f960a32660580d8b0ef22a58";
+          sha256 = "02kiy3rn87kcpjcw4l7f2qrf37bnzp7f44qwlh3905rlzs4vby4f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11785,8 +11806,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "0558bdb4d1ed4da734ac7194f0bdbe7c030cc70e";
-          sha256 = "18hf07pyyxdgb1li26yf26g77xqdpmgkxqkhxsq5aa8chj6zv900";
+          rev = "e1e33240b3eeaaca5a4dd5ced7c80d481a68aca1";
+          sha256 = "0vcqn3jimrihk9awhnyir2b3csc7lg3pwwpq5p5ghcdkdgsv8f5l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11886,12 +11907,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20170404.426";
+        version = "20170424.247";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "e7066a1310b2437d1b68ec5afd800d06977dd687";
-          sha256 = "116hyd5c74m713xmzsl9panvn7014r7bg4267wvla6844n1qshp8";
+          rev = "764382bdcb1056e96f31a66f7910c16de39c7801";
+          sha256 = "0gj2hqcmf88i12vlc6i8pr7r6d1hczqhg7ablnycj673hnzzc5jh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11907,12 +11928,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20170410.700";
+        version = "20170420.45";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "d93001794bb505b32708d7d7b1755ef0bbe13c82";
-          sha256 = "11dpdvn3lkd2yrzbibd7xqx1pznhn6i8wrp9bzg1yagn27jsyry8";
+          rev = "b762667c372a36e631eabee02f4feca7cdeb267c";
+          sha256 = "142yw8lm57h94n8ycybbrjzgd9lm7xdraiwvmmzdv1m44h1rmf79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12033,12 +12054,12 @@
     darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darkburn-theme";
-        version = "20151003.100";
+        version = "20170423.952";
         src = fetchFromGitHub {
           owner = "gorauskas";
           repo = "darkburn-theme";
-          rev = "a0151684ae4fa7c364115188422f6c3425d1594c";
-          sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf";
+          rev = "0af794ff7fac19778ac8a7efb92455c6f6c2158f";
+          sha256 = "0nv917r8pbj6mfncjl8d7hq4763c69q491d4iwnff1n3wzlcp42s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a04dd517e02bc4b4a62d956aa901a727354202b0/recipes/darkburn-theme";
@@ -12142,8 +12163,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "98e819e407bbc35478cde30a74be15f077bd6d4b";
-          sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm";
+          rev = "81ef1efa63590db02351cd52d2953717bde8dd00";
+          sha256 = "1ivf14i61h6fgk052qggc7cfnjnmsrcjps1zjy9nbkwj0a56swyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12184,8 +12205,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "98e819e407bbc35478cde30a74be15f077bd6d4b";
-          sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm";
+          rev = "81ef1efa63590db02351cd52d2953717bde8dd00";
+          sha256 = "1ivf14i61h6fgk052qggc7cfnjnmsrcjps1zjy9nbkwj0a56swyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12201,12 +12222,12 @@
     dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
     melpaBuild {
         pname = "dashboard";
-        version = "20170408.1653";
+        version = "20170419.2358";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "b409028a42059c70ac3a64e5a033477f27607101";
-          sha256 = "1s5lrc1vgc9q82nyz43sg094za0ncimr67p4mhmxqqxxchfk75x7";
+          rev = "27c559952483301cc92539f68a89a047a0cc69ad";
+          sha256 = "0hl97zc5wvxnpizp29rri7nbpklgx7fvb3idmghckinpgg3gnz2x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12910,12 +12931,12 @@
     diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "20161102.1726";
+        version = "20170424.303";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "c476e4080de7bea98a7a9a1173df20397d1c7671";
-          sha256 = "185gl1p80yx68d2hzawhrz26zy75z30qr1lb7c0gzmk5ryy5yzgv";
+          rev = "3e9d26407e8767375e75757e5adcb23a6fe94985";
+          sha256 = "1bdpn00vlgzsi3w53l7k5lkw6ps1h0mb0d9ww3zmif2y801krzqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
@@ -13056,12 +13077,12 @@
     diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diminish";
-        version = "20151215.915";
+        version = "20170419.1036";
         src = fetchFromGitHub {
           owner = "myrjola";
           repo = "diminish.el";
-          rev = "826e19186bef91d2241739cb8b48b8cfba14c17a";
-          sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4";
+          rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d";
+          sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish";
@@ -13144,8 +13165,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13307,8 +13328,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13328,8 +13349,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13454,8 +13475,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13475,8 +13496,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13531,12 +13552,12 @@
     dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-rainbow";
-        version = "20141214.543";
+        version = "20170417.1341";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13556,8 +13577,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13653,8 +13674,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "61eec5b692d06e87644cb2eb6519e44a92c86681";
-          sha256 = "0nanyz56ladq6n4qwsncz9v55ldhzb126jgxf1p2f3gg9pp772m6";
+          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
+          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -13754,12 +13775,12 @@
     direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "direx";
-        version = "20151023.1606";
+        version = "20170422.627";
         src = fetchFromGitHub {
           owner = "m2ym";
           repo = "direx-el";
-          rev = "9497231cf50767987494718db073731b05a4f970";
-          sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr";
+          rev = "a79bfdb5980cf6ed7bfb3b41ddc471a7b6c0ede4";
+          sha256 = "0fl9hdnrq54awx43635p6pmc8bqyppa02gs1d76nifi0q4g9v4m7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b0903466d63b1c87abc002b0e064e36a8cddd3/recipes/direx";
@@ -14493,12 +14514,12 @@
     dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dockerfile-mode";
-        version = "20170221.1317";
+        version = "20170418.1024";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "5f1e17e4e59fee4725c5b4cd9b5b49f1faaa108f";
-          sha256 = "1pw6706lnd6n866scwp35ar58y2c6jjyn82qpjdk0ma12hgv3gzf";
+          rev = "3c6bc90360a2df53caad1721ee4c8285e2e22369";
+          sha256 = "166hfzfb45f11jfhx78w6h23cyj9wr1nrwrxxqs2m5cry407gj3k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -14598,12 +14619,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170411.1533";
+        version = "20170422.1853";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "1618b28f188b2ca547c2cceb16ad8e6ac9ec5a83";
-          sha256 = "1bxfx7i9gdp870x4qkqkmqqb9jszi1hn345h5xwqajik6ys7d2cj";
+          rev = "bde6fb34c735631e3995443580efe7eda65b7baf";
+          sha256 = "0lyrl7lqg0ws4xyz1h0ps6c74rfwra9p93lkip613vr7fr70pinc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -15028,7 +15049,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1791699";
+          rev = "1792605";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15129,12 +15150,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170412.1246";
+        version = "20170418.1359";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "877fe466c8c60edbd9ea5602185690b1fa599a6b";
-          sha256 = "1wm9kl4sximr75pfw18wxsd3c59qp0i1vn1565f4srfgq71r23yg";
+          rev = "b164a17ed218a36f424d442810843040c50fc727";
+          sha256 = "1nww3rwimkgal7ps8ifav89rzk0whblwxg3xabvqj9ll5gc0f0bw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15506,12 +15527,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170409.2149";
+        version = "20170425.110";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "b994c79a739fad4999ddc0d2b5a152bf0a4dbc7a";
-          sha256 = "1j2b2nwa4h95s2dr879iaa6zxy9gvvljvx5ksjirgmy6vf36lb0q";
+          rev = "37ddd55bedce68643948b928e09cf6195a8dc301";
+          sha256 = "11agzmkwmij861ppgvdkqqpxs1sccvc4w5rl3956igc9c3lys008";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -16133,12 +16154,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20170309.2006";
+        version = "20170417.2125";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "0a6d9a3c0259aba57a332ac8db582c33e522f12f";
-          sha256 = "114zfk7p6p61mcphd1hn3r1hqj0j9ra0acmfx1k74d60npci25pj";
+          rev = "bad62d8ac750bd06e7c31d2c3e744a37129c2ccd";
+          sha256 = "1iwirdvrs7fl1qx5qwhxa8xjxsnh3dn2vvbh43bkm2an8abssx4y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16214,15 +16235,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, eproject, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
+    edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "edts";
-        version = "20160812.729";
+        version = "20170421.55";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "a3e4eeb5b340186f727bd06aa3d4d3fcacc16292";
-          sha256 = "0kbm11v3sfvkc821lpcv87z21pqb3pb4jzv7wyiy6mlkbnqjl289";
+          rev = "3f90f4484ac03f06286b15b0c33ff0e5aeed2bb5";
+          sha256 = "0wpr7h7vl1pi05sxyivk1a22qhcm74iacnra9h1d2jcf6as1h5x4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16233,7 +16254,6 @@
           auto-complete
           auto-highlight-symbol
           dash
-          eproject
           erlang
           f
           popup
@@ -16330,11 +16350,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "20170407.1229";
+        version = "20170420.1251";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "d15589a117ac710b70df71cdf33a33ca05e55d13";
-          sha256 = "0k0x8xlxnv4fn2q3fyaxpbj4776cbc6ylbiwxqjzvqqzaq6lmx8j";
+          rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
+          sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
@@ -16368,22 +16388,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ cl-generic, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170411.1509";
+        version = "20170421.1829";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "f0f0c0d2069972f71cdfb5e520f42c688465be8c";
-          sha256 = "0w6xjvpkm6cfpvbxjkjd580znjyh44mkldj1p330rda0ykarshdv";
+          rev = "5ed0b871ce40364a555eda5c6cef23529e6b6ac9";
+          sha256 = "0qi13019b980dlz18107pwsckk3x152rrf3hbcliczbprzxgy8wp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
           sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
           name = "ein";
         };
-        packageRequires = [ cl-generic request websocket ];
+        packageRequires = [ cl-generic dash request websocket ];
         meta = {
           homepage = "https://melpa.org/#/ein";
           license = lib.licenses.free;
@@ -16488,8 +16508,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "cdd39a51aab1ed23ac7195297eb986fc482e8c42";
-          sha256 = "0av2lpj1rij8mcf0jxdfm6pm6pwrv1wzh095z8vsfcdda8svznxc";
+          rev = "4274e2f59010150abf103cf8896db4d62e6cf08d";
+          sha256 = "1r517q4cs356bd8akvk3dh3f98ik05nylk41s5w07kb3n3n3dkg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16940,12 +16960,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170416.556";
+        version = "20170420.1828";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "409be5108d736df595b18f5d373c3b32bf7ab4b4";
-          sha256 = "1ab27kqwnrl9g81cyrzzm6j31zg0sl4iz16anhzcm6cqhsrm4hcn";
+          rev = "ea702790bb2af6cd10078dc3a1d22c95009231a2";
+          sha256 = "122fas0qyws80icd9k573k66mf0jwnasxmd7c093flx5l061pipz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16986,22 +17006,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed-org = callPackage ({ dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    elfeed-org = callPackage ({ cl-lib ? null, dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "elfeed-org";
-        version = "20160814.314";
+        version = "20170423.128";
         src = fetchFromGitHub {
           owner = "remyhonig";
           repo = "elfeed-org";
-          rev = "ccb571188b7942ec3e1f93561ed4bb8b659a78a2";
-          sha256 = "15wcwp8gfv1zsykyc59ml07g43p1w305q3mgahis37rl9bpyaadn";
+          rev = "a54649f0fd83fd536213f58ee4268c67a799293a";
+          sha256 = "05vqvkyyqbj4a886c9x53z7yv8hapmgm9c1ccfibpw0clyf0dixp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org";
           sha256 = "0rnxr2q2ib6xrdx41ams1z2ivw5zhcsmqdylyvbw62h20rlmlgm8";
           name = "elfeed-org";
         };
-        packageRequires = [ dash elfeed org s ];
+        packageRequires = [ cl-lib dash elfeed org s ];
         meta = {
           homepage = "https://melpa.org/#/elfeed-org";
           license = lib.licenses.free;
@@ -17014,8 +17034,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "409be5108d736df595b18f5d373c3b32bf7ab4b4";
-          sha256 = "1ab27kqwnrl9g81cyrzzm6j31zg0sl4iz16anhzcm6cqhsrm4hcn";
+          rev = "ea702790bb2af6cd10078dc3a1d22c95009231a2";
+          sha256 = "122fas0qyws80icd9k573k66mf0jwnasxmd7c093flx5l061pipz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17427,22 +17447,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-clone";
-        version = "20161222.1009";
+        version = "20170423.412";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "elpa-clone";
-          rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d";
-          sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a";
+          rev = "144bee09445b30cbf4f60b371a289f0d75a387aa";
+          sha256 = "1k80y3wcqvhdbc0w5ybicn2hqjldp7b4jwraca2b99676c0yiq25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
           sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa";
           name = "elpa-clone";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/elpa-clone";
           license = lib.licenses.free;
@@ -18066,11 +18086,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20170301.1406";
+        version = "20170417.1344";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "0cd9ea411391c9049f4fbcd5d9164ba11b73fe56";
-          sha256 = "1g9jrv23bzwlafrsywdzzc4g79v2a7lm37644cfnmdma8a8ywrh5";
+          rev = "946e954e78013f19fed870b16935aa0865c5cae7";
+          sha256 = "1q3plymvvnikzyx77ya60ixb1p0isk7pyxx6j5qhv79g8xnjivj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18473,22 +18493,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enh-ruby-mode";
-        version = "20160817.1711";
+        version = "20170417.2356";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "5493f9fde48557d6aaaf38dd63adfdd8538496ff";
-          sha256 = "1nm304bg3k38s1gi21x7n6g8228fnyp91yb9p1i39hfckxjynq39";
+          rev = "6d13ecc4cbcdd712ded273f5a0f043eb76dedec4";
+          sha256 = "0f0wrvxmz591s8296gq862bphjpn9c2kkkfcanqjczfkkaapkid9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/enh-ruby-mode";
           license = lib.licenses.free;
@@ -18560,12 +18580,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170401.257";
+        version = "20170424.30";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "bb09141e7e2a25947f891008cf6036525c8ed484";
-          sha256 = "15r76hmibpyvz87mwi9qzyn63l7k4ab5bhx5g5ziaak8q3vwwibl";
+          rev = "74dc2ca769200c731f7452ddcd900612a2960390";
+          sha256 = "1rmwq0jfhakqq5q150mqsphfl30ljnp7c1n8ysa8h6pawa0942sj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19201,8 +19221,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a5b52a94e67ec18f9f5c276f8387d27ab6c32c3b";
-          sha256 = "157jfq86xlq7kcbkrsvg9ybb3z3i0dh9lgif4z5kglxwr43vgrc4";
+          rev = "8ca868848600702696828d729387343d73311a50";
+          sha256 = "0shzkcgm8kxg923dxy47iqlb0mz86pifmgdlva1qiinn2sfac323";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19364,12 +19384,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170410.354";
+        version = "20170424.1036";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "25a7361365d25ad6823b99913be72d1b724083b3";
-          sha256 = "0lqxk54443x0ccxr745k5dlq6zh4kqc1dmnhh6dqcnfyc4amqs0v";
+          rev = "9e600c514018377655646a95aace8b272f8f0009";
+          sha256 = "19ralpvy7v4ki92cb89lx2m7d1birkr1mhh21hm089dhmysjbpr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
@@ -19406,12 +19426,12 @@
     esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esa";
-        version = "20160430.2340";
+        version = "20170423.525";
         src = fetchFromGitHub {
           owner = "nabinno";
           repo = "esa.el";
-          rev = "b944078e190f050f8312eb7ea91dab4d049ca080";
-          sha256 = "1rxfqj46zg3xgg7miflgsb187xa9fpwcvrbkqj41g8lvmycdnm0a";
+          rev = "5313d17d57c237d7c2903ded3be61bda5512c585";
+          sha256 = "1wgk51dvhpliyak83li4hm7wcjldm3b41awf6aq8chxask0qd22j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa";
@@ -20156,12 +20176,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170323.1140";
+        version = "20170419.37";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "273a714e2d073257f6604d03be53c5fd784117c4";
-          sha256 = "0vrvfgrl1pdmvphscsf9zyy9yvl25xm53h5k1wiw7v3kb66x7s88";
+          rev = "f0684c1f6644a8c4e0e5fce50a1a04796555eaf1";
+          sha256 = "0q5zg7d3ml9v1hylmngvb6k45f2lakrq7xcn9z1qkbk1b003j6rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20261,12 +20281,12 @@
     evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-colemak-basics";
-        version = "20170405.1037";
+        version = "20170425.509";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-colemak-basics";
-          rev = "207fddde50e36fc3ccd926c69ef7901e938db2ff";
-          sha256 = "06r0x6yvwa811sfb9izzld4a460wip7nn6dfxw91i6x8g825h2qd";
+          rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960";
+          sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
@@ -20597,12 +20617,12 @@
     evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-lion";
-        version = "20170417.550";
+        version = "20170420.1028";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-lion";
-          rev = "6885d51d8124ce2f6d2a0137659911b3c7d27c8b";
-          sha256 = "0qwz9k5zcf8h3iq2ak1pqbdk4zhpr7a911a00sg2xyk83z4zdj24";
+          rev = "8a78f89c9aa11832b4a063439f726e5123f436fa";
+          sha256 = "118jlz2risrhy5d6x6lq4b1ihbpb23n9ah982w7ccwxs5xmjsl0v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -21434,26 +21454,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "exiftool";
-        version = "20170301.232";
-        src = fetchgit {
-          url = "https://git.systemreboot.net/exiftool.el/";
-          rev = "240ae7b829733d5da1d2e255a3e7f5638f83c745";
-          sha256 = "00bkwaydh4j76gpxd77m3pyxrnqhws1rg70r1g7vmgm6h5ah9ndc";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
-          sha256 = "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab";
-          name = "exiftool";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/exiftool";
-          license = lib.licenses.free;
-        };
-      }) {};
     expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "expand-line";
@@ -21517,6 +21517,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "exsqlaim-mode";
+        version = "20170418.124";
+        src = fetchFromGitHub {
+          owner = "ahmadnazir";
+          repo = "exsqlaim-mode";
+          rev = "3cac2ba06862a6407ce487423898af04de4996c6";
+          sha256 = "149g76rms1h183f78kzns6cy3jyllxyyhvb1x61c2823k2372wvh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode";
+          sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7";
+          name = "exsqlaim-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "https://melpa.org/#/exsqlaim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "extempore-mode";
@@ -21559,22 +21580,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm-x = callPackage ({ cl-lib ? null, dmenu, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, start-menu, switch-window }:
+    exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170313.1538";
+        version = "20170424.250";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "b916c87ef43b6983d76334c2321ba57f4ec102ad";
-          sha256 = "1ng7bd2gbn9ns6hhva66ibq4kqsjijxbqw30cay8xvn4m6kklmvp";
+          rev = "e5e8e572531c859e944d3607478b681e0f4a4603";
+          sha256 = "0627ysigqv25hf58rjk85xm9hmcwf5qs8sl6nvvxha4laq9cw98g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
           sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
           name = "exwm-x";
         };
-        packageRequires = [ cl-lib dmenu exwm start-menu switch-window ];
+        packageRequires = [ cl-lib exwm swiper switch-window ];
         meta = {
           homepage = "https://melpa.org/#/exwm-x";
           license = lib.licenses.free;
@@ -21601,25 +21622,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }:
-    melpaBuild {
-        pname = "eyedropper";
-        version = "20170221.1640";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/eyedropper.el";
-          sha256 = "1nyplgpcpbczb1lfj2x5l92ckn6f7wz28sviqiinh45fzsji5h3r";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/eyedropper";
-          sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk";
-          name = "eyedropper";
-        };
-        packageRequires = [ hexrgb ];
-        meta = {
-          homepage = "https://melpa.org/#/eyedropper";
-          license = lib.licenses.free;
-        };
-      }) {};
     eyuml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "eyuml";
@@ -22275,22 +22277,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "finalize";
-        version = "20140127.1046";
+        version = "20170418.1245";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elisp-finalize";
-          rev = "9ac589cf487f5d37163dc9e7ca8c52800710805e";
-          sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa";
+          rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
+          sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
-        packageRequires = [ cl-lib eieio emacs ];
+        packageRequires = [ cl-generic cl-lib eieio emacs ];
         meta = {
           homepage = "https://melpa.org/#/finalize";
           license = lib.licenses.free;
@@ -22608,12 +22610,12 @@
     fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fish-mode";
-        version = "20160924.1207";
+        version = "20170425.106";
         src = fetchFromGitHub {
           owner = "wwwjfy";
           repo = "emacs-fish";
-          rev = "d8b3493623ad834cb18f7de957dfbd17e2fba3ba";
-          sha256 = "16x8fv8yl9wxmrxh4p7npixrh36vdwdc2n6paly0swlmj9a2j399";
+          rev = "f6c52f5863605cc227dbfada4aa46fef55f5106a";
+          sha256 = "00aa98y53864n22qca6jhkzw9xsld0nmrfz3g78fjwxkm7gl9gci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
@@ -22819,6 +22821,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flatui-dark-theme";
+        version = "20170423.958";
+        src = fetchFromGitHub {
+          owner = "theasp";
+          repo = "flatui-dark-theme";
+          rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63";
+          sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme";
+          sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y";
+          name = "flatui-dark-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flatui-dark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     flatui-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flatui-theme";
@@ -22905,12 +22928,12 @@
     flimenu = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flimenu";
-        version = "20160821.1330";
+        version = "20170417.1847";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "flimenu";
-          rev = "ecbd47c857781b9c38035048d69415b617a75422";
-          sha256 = "0a37kjpcpkm172icd2dbb5ndi6s164rbrpvy0c7kr0gl30n1gb8c";
+          rev = "9351201d89b05cbdaec312a6ebd7fd10c38d6112";
+          sha256 = "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ffc67a266de3d58553b27325b7fc6937df425be/recipes/flimenu";
@@ -22962,24 +22985,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flow-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
-        pname = "flow-mode";
-        version = "20170320.1043";
+        pname = "flow-minor-mode";
+        version = "20170418.1253";
         src = fetchFromGitHub {
           owner = "an-sh";
-          repo = "flow-mode";
-          rev = "072efa15255146cf39450dd71fd8f35e9f6fe621";
-          sha256 = "0cga2vzi82b93l8j54jx5krfcxksx64h1m6y18p9gjgqd424g014";
+          repo = "flow-minor-mode";
+          rev = "b05d59f387133249e03004b79bf16d6fe6c38217";
+          sha256 = "0kw001kcdqjj3ymk9vn9giiv18icp3yrys8xdvszkhlby99y74h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
-          sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
-          name = "flow-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
+          sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
+          name = "flow-minor-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "https://melpa.org/#/flow-mode";
+          homepage = "https://melpa.org/#/flow-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23074,8 +23097,8 @@
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "2d40aadedde2b4a5d0bc9094f19020128d242801";
-          sha256 = "0pwlhzfl7av9vkkbdaiky1m2djjxsl93kprigklmjz1vkg7wsza0";
+          rev = "52897d5808e17c416cfe394c638c3c7dfb9ad7c4";
+          sha256 = "1vpvs160ykqn607qy8vzf0zxgx0v7kljp3ld9f5mf0fzvm3kxyqv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23889,12 +23912,12 @@
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
-        version = "20161229.205";
+        version = "20170417.1807";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "11805f1d420e297db0346a6657f144b08e2ca556";
-          sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il";
+          rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
+          sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -24124,8 +24147,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24313,8 +24336,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
-          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
+          rev = "21ada9ffbf5f921c87837796ea0b542d6d447d56";
+          sha256 = "1pzc4fvrm2yfrrnfjhnnial2vj4iavr6vfnw6q2i4hz95h5b9mih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25684,6 +25707,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "frame-mode";
+        version = "20170419.1427";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "frame-mode";
+          rev = "fcdbafbda45758cd60ab3acb492fbbd692987a58";
+          sha256 = "1sdxbjxx1lk2j220794af2qz9z068bmx55drm8h0b8kih0037ydn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e83da89eeee834cc14c0b128d55ef3634f76fd0/recipes/frame-mode";
+          sha256 = "0ch58x07fnsx3v3r9cvcmqrqws121m8achjilhqk988hkg7y47c8";
+          name = "frame-mode";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/frame-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-tag";
@@ -25881,12 +25925,12 @@
     fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170415.1236";
+        version = "20170424.818";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "f40c9358b1749bf413a8b30c94d14284890d16c5";
-          sha256 = "130k0aii2b5k5r54axcy9n3jsn9y8avdwdnbnl0saw7hc9ykwcpa";
+          rev = "727d7066c7b125b659a920ee08a601c15a31b00c";
+          sha256 = "0h8h7dwffmgis1ppwj7k68bsr0y5r1x00h37k52zizam9pc2gia7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fstar-mode";
@@ -25899,6 +25943,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fuel";
+        version = "20170107.626";
+        src = fetchgit {
+          url = "git://factorcode.org/git/factor.git";
+          rev = "717a49c365298549a5ba0588980c7fcf528c2f40";
+          sha256 = "1zib3yd3mp7a8g2mg9rl6xqm8bhyr39jfyl8388qqr1k1p2mbw8b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
+          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
+          name = "fuel";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fuel";
+          license = lib.licenses.free;
+        };
+      }) {};
     fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "fuff";
@@ -26011,8 +26075,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "dbebfec3bf64a3d74adf978d2f6a059739ac2472";
-          sha256 = "1l722z28hbqma1qgsydfjkxb0p24c80splpxx752x74qi2cid71z";
+          rev = "e1bdbff5957c0ea43bd21a7b072c8614f885c549";
+          sha256 = "1cijh09jfzfcm8nbv8pqlnaz27lh834r5qyvyhj9aj9w6991r7nr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26734,12 +26798,12 @@
     git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-annex";
-        version = "20170120.931";
+        version = "20170417.1653";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "git-annex-el";
-          rev = "d574b9d9e264167245e49bb96b000988a83af259";
-          sha256 = "0c1hqff1g1ahaqalfdp09g7qk852bj83dcwd94q3wwmnsy1mf493";
+          rev = "22b7161adcd144f88681b9b904972cea42b27fca";
+          sha256 = "038h1dnvncdjy7q1ix3xrx4yqfqfp4ll69ksipj5kawsrch75nh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex";
@@ -26822,8 +26886,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
-          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
+          rev = "a34259407996c6d3b7e520ed38340017befa26ab";
+          sha256 = "08sn6vl2r06r19xkmb9n9zicycc6dq1grhsfhh4zjg7lzp7v9bj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26836,22 +26900,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
+    git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "git-commit-insert-issue";
-        version = "20170109.734";
+        version = "20170424.326";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "git-commit-insert-issue";
-          rev = "7b8cf1f5ce9b2c19e9b7efe1ef03f3e37098eea7";
-          sha256 = "13vd83k6sc3wy4552gvx7zmnmjpa7zs9nk1dlp5v8fc8p3j7afgb";
+          rev = "f73f5b4b7ce2b1696212b2cbfec4f68554e06364";
+          sha256 = "0vp5rbm0vdhdbkw4xb244q71jiaax81a5py52z0jc0kwsi4khwn9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
           sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
           name = "git-commit-insert-issue";
         };
-        packageRequires = [ github-issues gitlab helm projectile s ];
+        packageRequires = [ bitbucket github-issues gitlab helm projectile s ];
         meta = {
           homepage = "https://melpa.org/#/git-commit-insert-issue";
           license = lib.licenses.free;
@@ -27469,12 +27533,12 @@
     gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gmail2bbdb";
-        version = "20161104.2041";
+        version = "20170423.444";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "gmail2bbdb";
-          rev = "181ef6039227bb30a02041d8cfdc435551a7d948";
-          sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn";
+          rev = "a84fa385cfaec7fc5f1518c368e52722da139f99";
+          sha256 = "1qbf3r8a66xlrbni3hv5q5b5v3izis5aid06228rfpc2hwa97hr7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb";
@@ -27785,8 +27849,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1";
-          sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7";
+          rev = "6c2585cf0fc321a20a36b4c596fb6b80f811670a";
+          sha256 = "0wqm7jvzlwh4bz5kk4ghz63z0yjvals0x513bnzrcjd43z2p048i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28394,8 +28458,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "emacs-google-this";
-          rev = "6af9dcee88b9637b3bdd1900a907f7ac83113988";
-          sha256 = "1l3aklpzzn407ww2k4ncjin3n869hg4lyf050p00nig3qfgvjnbz";
+          rev = "4713c93d4c45458a7320b5e2af9b1edd43fd5e0b";
+          sha256 = "0q8d10ihvqvnbp7gn19ixgi37cvpgyc5a8ls9nkr6w7valc4c0rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
@@ -28580,8 +28644,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3";
-          sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65";
+          rev = "8e61e010f3b6dd5e1302b76f23d1fa9aa56a82a6";
+          sha256 = "1pgxq0s4cap8b3chh86jx3myrraiidbn35l6lagxml313xf7qq1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28823,8 +28887,8 @@
         src = fetchFromGitHub {
           owner = "davazp";
           repo = "graphql-mode";
-          rev = "6e1f5335fa0b252b2bc422a837b82fdc82492eac";
-          sha256 = "1x47abqqsry5f0ww01hp3470rqdzzr3yia8ljqq3ixpbnspp5q83";
+          rev = "3ddf204de7c4d50fb11e8d8af4b15fb9987065ae";
+          sha256 = "10l9n26rsfs5za5fi3vgnl73zab1yvj067pgxg1321fbldiaqwwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
@@ -29233,12 +29297,12 @@
     guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guess-language";
-        version = "20170415.544";
+        version = "20170417.1359";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "guess-language.el";
-          rev = "8c8a1616b6a7bc4c10942ee0a1b2591b98fcd493";
-          sha256 = "00hbawijr9c6hpmp7y4yh8xla7nmsi9nq071zkxwyl8yzj34s678";
+          rev = "2bc0e1f9c8947b9b5ac8d792bd7f6d2c36d294ab";
+          sha256 = "0nl9963m20cpfn3n50khbbmc1aas56q38xjjwiq01s8pmjvmcs6v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
@@ -29296,12 +29360,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170413.1236";
+        version = "20170420.351";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "51405f409508cd95f6e84d2e0fc08c4c380b1791";
-          sha256 = "0ffh6ksd21g896fn4av8nh82cd3qfrczbjkp5ndhhbr16nqgkr56";
+          rev = "9343c749ebf4ffbd3961042ba0e5d0b00f688df0";
+          sha256 = "12r2rlyh8xmx0yn17yb4qpb0c50rr553p39nfj17m0ishrgb8vbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30068,12 +30132,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170416.945";
+        version = "20170425.328";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
-          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
+          rev = "5edb88b03f1779fe93d59401570da2555d46733b";
+          sha256 = "16y7ga4x1h1hvfq6yqn1hw9dakzlkslbq2hg9sgan5fr1fxlyqzr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30656,12 +30720,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170416.945";
+        version = "20170425.234";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
-          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
+          rev = "5edb88b03f1779fe93d59401570da2555d46733b";
+          sha256 = "16y7ga4x1h1hvfq6yqn1hw9dakzlkslbq2hg9sgan5fr1fxlyqzr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31223,12 +31287,12 @@
     helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git-grep";
-        version = "20161111.2337";
+        version = "20170423.759";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-git-grep";
-          rev = "5ef4b5ff81707214c0c141d8bf219b1645fefe17";
-          sha256 = "1a0cs7yf6yb4pkgknb1515a24649d3v5i7jjcfvw831jwc51gnca";
+          rev = "605e214632644224b5b7adf2a68f265489c2a080";
+          sha256 = "03hix4vqp1krh8v3x6iqs3xqpcjzibwlafxrmn2gz3n4f9xb9j37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
@@ -31751,8 +31815,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "77f6f47277cfca5df9019165037277cafd0aac76";
-          sha256 = "1cbiqvgynnbj7cc30da2yyakik52bh9aqpr4b55pzly6mcq32qfl";
+          rev = "2ece0aaaab86c38cf8f81f165dc81f84209c28d9";
+          sha256 = "0j3km2qln3sak4mmlaajyr88w6gikh0baalhz0qb5mvnys2d6l74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -31936,12 +32000,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170409.1055";
+        version = "20170420.1958";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "540d095b769980dbe5e12968a1fd7688d6bc6526";
-          sha256 = "1aqp82njc06zap4iv6jbf7iznw6knwfqi5a7m3cd4ngdcg4gl7s8";
+          rev = "918bc67e0d44e4413294aac983d1930f39a7c20f";
+          sha256 = "0l6nkwqsf0kwd5wzdp3vjf3bz1sq7d683i2678wsbhgjj3a1r5zm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32272,12 +32336,12 @@
     helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-rage";
-        version = "20170331.607";
+        version = "20170422.510";
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-rage";
-          rev = "67c62eafe8af70b330895576dcb004e45c93a98a";
-          sha256 = "0rrrkz092h7cikcafwf6blkyqsb6qwq1mkw8k4mbb8vy9bp9mx0b";
+          rev = "dc51371265acea60ac0691016f6ce84597bcace1";
+          sha256 = "1asz4rq5c4w82w167li0vvmqv3zjl4rz67c2dj8i717ihcm45sip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
@@ -32444,8 +32508,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -32734,12 +32798,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "20170412.437";
+        version = "20170419.135";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "e0fc2b0f9c3763e9c1e35cc515a29ebbbcd322e0";
-          sha256 = "06mxff0dx5l2q1ayy574gyhlslngv7ha7jc6yazw8wkhqnldp79h";
+          rev = "f88715d495b7f6d65904bd05dee549404ca250d3";
+          sha256 = "0sdhbk4vpq5vl9rz5dcfnjmkcvsfw9146f1bvjgfi0fqhb3pq8da";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -32878,6 +32942,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-xref";
+        version = "20170424.428";
+        src = fetchFromGitHub {
+          owner = "brotzeitmacher";
+          repo = "helm-xref";
+          rev = "29d1f46d3f2c7346f13e2abcdc3e8c8605265818";
+          sha256 = "0rqgbm5f402agyi2jqni9dv6gdxkm1w92a39qlhz7gya1235a9si";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref";
+          sha256 = "157h2h2yw8calysa7jnyz7iy8s3ppqa6m35pl7wbgnzqx425cbny";
+          name = "helm-xref";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-xref";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
     melpaBuild {
         pname = "helm-youtube";
@@ -33259,12 +33344,12 @@
     hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hierarchy";
-        version = "20170417.231";
+        version = "20170418.44";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "b2ce428d199967ddfb6face22ec7ec0593bd06fe";
-          sha256 = "11zzm10xivqs16msdw2p2w12zjzwy2qk8mpan08y8zm982dx2mnc";
+          rev = "1a98edfbb5c90d1cc14e222c618f302ed7a2359e";
+          sha256 = "1n378rr2vv79i9d3b01qssyjwkmspn715bzgy4dd0n61jkwynzn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -33437,12 +33522,12 @@
     highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indent-guides";
-        version = "20170106.1025";
+        version = "20170420.1557";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "087f719fda7d60c837146c81b1d9d0aab22ba88e";
-          sha256 = "0q8ch945h9slfp636clf0f60ws78zcbnc1grld8n59chhq22nfyb";
+          rev = "8298186c3b4da68d000b06c317f0572c09ba391c";
+          sha256 = "0czv1mg30rn069zddzjfy1i6kjkrrps96sp45bjbjkc66c6mvpw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -33857,8 +33942,8 @@
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-historyf";
-          rev = "66590519a02816cde8f442032fb144f3c38ebc6e";
-          sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0";
+          rev = "196c058ceb092fdd56b0e4ce85b7e714d6f72224";
+          sha256 = "0fgm1m9mq1zn5gnrynf332hamif05qhh8haqci7gii7crzy47c0g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a67279875c19475433fa13625c95ee5855962a59/recipes/historyf";
@@ -34430,12 +34515,12 @@
     html2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "html2org";
-        version = "20170416.624";
+        version = "20170417.2201";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "html2org.el";
-          rev = "89d35daea5e00bb597798800354ddd9fddcc2887";
-          sha256 = "1il0h1plwn6472r8xa312dg0zvxxwdmj7yh6zh94l9p3y4iiwy4d";
+          rev = "6904aed40259ad8afccff079ebd8a07bff319ebc";
+          sha256 = "0dryk622fz0yj939pbs0fbb9i4m8qjnmkcxjsssws8f90plk06af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/771e6604edc90182697bbd4827c8c46c34b48289/recipes/html2org";
@@ -36072,12 +36157,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170414.156";
+        version = "20170424.1433";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "0da2825dc21d3ba14b5dea6965f79330eb7ba13e";
-          sha256 = "1hf9ls1wh5iykai454rc96gkcl4959h71akf7i5gm9kk4hsjcf5q";
+          rev = "72e8e4496758b8a590f41caaa4bf79df04496a5f";
+          sha256 = "12q9lbyi5yabls94q7rm3k3va9vx70vdf3hadzrbny97kfqh75rf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -36318,6 +36403,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ini-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ini-mode";
+        version = "20170424.209";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "ini-mode";
+          rev = "2194cfa2fd13196a37350ec20b3f00dcf6162b7c";
+          sha256 = "0s3dcqywrbggrcn9j5nibhcl4xbnhdndz5sibcp26qswd18jyrdk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/000cca577d000bafe7bf5711d0bfe7593fb6975a/recipes/ini-mode";
+          sha256 = "0f6fbmg4wmlzghcibfbcx3z124b2017rhsasi5smgx9i2vkydzrm";
+          name = "ini-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ini-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "init-loader";
@@ -37176,8 +37282,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
-          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
+          rev = "f98f89f1bd90e8165c776efe47bb6c8c7377c5a2";
+          sha256 = "1xx7xic3cn4ak0adpariib2f636m42d04m197x7y74msx4jwjd6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37214,12 +37320,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170411.451";
+        version = "20170424.2319";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "9ee63f0415e9774082993d672d8200bc7e62d715";
-          sha256 = "0wrkpl6v56k553zzksy4rh6wkwxdp027x8n0byic9phydrnsdn57";
+          rev = "906c31b679a4a676fe593a9620fbfc3707afb616";
+          sha256 = "1sxz8cyr9i4nk5vrvf6qag8i7yrgqnxyhkilrqrmdyf6vw1vxgag";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37281,8 +37387,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
-          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
+          rev = "f98f89f1bd90e8165c776efe47bb6c8c7377c5a2";
+          sha256 = "1xx7xic3cn4ak0adpariib2f636m42d04m197x7y74msx4jwjd6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37365,8 +37471,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38406,12 +38512,12 @@
     js2-highlight-vars = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-highlight-vars";
-        version = "20161209.128";
+        version = "20170418.1129";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "js2-highlight-vars.el";
-          rev = "15dbc583d8c2b7385f677d7ea563065fe6bfdb56";
-          sha256 = "0da32ky9fg5rilb3h3s6s7v8swvnyqfwv51f55y3dhyya3n1lclm";
+          rev = "e3bb177e50f76b272e8073a94d4f46be6512a163";
+          sha256 = "0yy8sqkn6c7r377qr2id4z550vw1x70xjd4i7yg0g1rj7q1kg98l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars";
@@ -38427,12 +38533,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170330.639";
+        version = "20170417.1325";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "908395e3aa413b4293b35aab9d41a56f1dbe1e04";
-          sha256 = "1klwg6clx5nvj6755rakzdg62brfms1s8g9cccdkipbb8m6paffh";
+          rev = "32f9782bd95bf5d79e26b006f44a793e37771c45";
+          sha256 = "1d6w0fl01r3vl7hw4wn1npzwmk5v16gc6gndvfbz469xmz3h7c4y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38532,12 +38638,12 @@
     json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
     melpaBuild {
         pname = "json-mode";
-        version = "20170402.1808";
+        version = "20170418.1900";
         src = fetchFromGitHub {
           owner = "joshwnj";
           repo = "json-mode";
-          rev = "c528c7784f6449a35a8c90db58cb73125c69987e";
-          sha256 = "0g9zc9sbs3m92qn2jx4nyd0b8s10c1nl92z5rwq9nci5wsmpqxzg";
+          rev = "c3a7ab350533dddf6d18b4c55423bc0d1b40f3fb";
+          sha256 = "1zfzpylckna92zdx1l9ssj3xvrx5fizhypcmmpl2fsm56p97l8c5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -38949,11 +39055,11 @@
       }) {};
     kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "kanban";
-        version = "20170203.1701";
+        version = "20170418.110";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/kanban.el";
-          rev = "4481f57aee47";
-          sha256 = "1crghlq0d87kc9mwy7prifxqla4q59c2447hhhl0pxbkf3ag9si1";
+          rev = "dd11d722b20a";
+          sha256 = "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kanban";
@@ -38990,12 +39096,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170416.1713";
+        version = "20170425.321";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "1e3a03e0b3c408913c8487cac291d163c53217e8";
-          sha256 = "0zr187f1pc4lj9kglzsh0h71k6vf8j1pkk3p02pacxs4ixs473vy";
+          rev = "a51f9118ee6b5d9dfafa0f5588917e7e2df51431";
+          sha256 = "19cfsksjhyh20d9yh2qbddaccq3pwf8gg75dm0dblvv5vlakcrhv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39498,8 +39604,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "fd01c099e9bb5a65bcd58e3a67b090bd39b1e764";
-          sha256 = "060lw75dk8ibgswq2f0yysvkkgpw5q0jmdwqpicdj6n1nc4zn99r";
+          rev = "75cf7bf7b3668b38c606089f07238b2b0da4ebc2";
+          sha256 = "04fh2wjdm09z7njh30lfgh1kvhv1v4rpm2wk3073c6fkyvflc8sg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39767,12 +39873,12 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "20170416.2333";
+        version = "20170422.2016";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "34b991ec138dece790e9c7ab51a1c0031b81b39b";
-          sha256 = "0vzmx4hahrc4g3qxqrvyqz890zpgz2n3cj9libk13bf4nsfbbj6y";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -39788,12 +39894,12 @@
     kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
     melpaBuild {
         pname = "kubernetes-evil";
-        version = "20170416.1959";
+        version = "20170422.2016";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "34b991ec138dece790e9c7ab51a1c0031b81b39b";
-          sha256 = "0vzmx4hahrc4g3qxqrvyqz890zpgz2n3cj9libk13bf4nsfbbj6y";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -39995,12 +40101,12 @@
     lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "lastpass";
-        version = "20170415.1008";
+        version = "20170418.1102";
         src = fetchFromGitHub {
           owner = "storvik";
           repo = "emacs-lastpass";
-          rev = "5407aefb0135b400cd73203b92ac23b8b74050f8";
-          sha256 = "1amqs8v27037qljjrz5r5fn6fscknm3r0hwap1ia5fivg9j8fnzv";
+          rev = "ff05ae82b1073759989616caf362c85575fdfc58";
+          sha256 = "1wsnb1w3q2b0lj6087njy0r5nnlyddrnqyxkbv6p6mbqin1zkahs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -40264,22 +40370,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170413.2120";
+        version = "20170423.1748";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "61670fb0ee5ced369fb2265e096ca0b476789c8c";
-          sha256 = "0jvm0j1m5p5hkag61swgmn5zjs6wbgx5ayxs1wf0b9v6cvmjm7vp";
+          rev = "348ba97b960d045bccbd9cb5a63697704c401315";
+          sha256 = "0qcjdvzis6ws8z0laixakik26djjmcv021dbz00pjrwkcwfs5nwi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
-          sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
+          sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf";
           name = "ledger-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/ledger-mode";
           license = lib.licenses.free;
@@ -40288,12 +40394,12 @@
     leerzeichen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leerzeichen";
-        version = "20151105.2228";
+        version = "20170422.613";
         src = fetchFromGitHub {
           owner = "fgeller";
           repo = "leerzeichen.el";
-          rev = "e67e59a0e15bc4a41006fdd9822c4b3e6d7da626";
-          sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn";
+          rev = "5acf9855ecb2b2cd5da4402bb48df149e7525cc5";
+          sha256 = "1bx4pv51a9x8f51pjrms8jkfrpa3glwkh308svz05gnyi2g0r8hw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5de7033e75bc28de6e50b2146511cdaac4542ad6/recipes/leerzeichen";
@@ -40836,12 +40942,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170415.842";
+        version = "20170424.1045";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "10a7297d6772367a9cf9cd39ee44e2ff4a04e6c3";
-          sha256 = "1bc6x4bxqlb3dpaia4cm7gvys1nlnq22nn1vqpmfy4scmlrngxc7";
+          rev = "fe138743a47bc0079c31509eda32c86e2943c91c";
+          sha256 = "1mywr9nsx1x0lsb7v0g8ak9ympiddnybm6ajg0pdlr8psh0nzzw7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41174,8 +41280,8 @@
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "58ccb38fdbfbc2e227c8515fea40325fba164f92";
-          sha256 = "14fkwdizn085avhjmd89z6ld8l3aanzj6sx06z3fxy407arfd01v";
+          rev = "f5603fb6bcfbae1e6950da7f91c3a15cf5250bb1";
+          sha256 = "1zzk3rc86xrkys3rcqiz61mnp00jkvb05f8p21av52h19axm4nn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41257,8 +41363,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "82b3362feae87748cb6e5bbd997d9ce182d65329";
-          sha256 = "0g6rdfcm7wz7dq13vlrz12ldvc6xspgqlxwwwcfayb7nh9czdqbh";
+          rev = "1ef6a945eb9723326c1e7748ed1680dca46edf92";
+          sha256 = "10kxnhvfhwpdrsjgba2vlg9vaqk7r9kjq8zv7aa05x7zn06i985h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41627,19 +41733,82 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-go";
+        version = "20170419.605";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-go";
+          rev = "3ef571cc8c534e305a3ad6831a0b244a30ca57fe";
+          sha256 = "0aiyspr1wg3lwx0sy8c52h86zjs9ifycy02c2w8q2287kv61lqxk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go";
+          sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c";
+          name = "lsp-go";
+        };
+        packageRequires = [ go-mode lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-go";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-haskell";
+        version = "20170421.328";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-haskell";
+          rev = "c22e6f4a70156e615e303d623e75362d3b14bcf4";
+          sha256 = "1iv1y1pri313m5h59a06cydj8kkzy6ig4mi3hnzz5nxkcynd2whz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
+          sha256 = "0pdcxnfp8ng24bfk695wpx5wcdqnjrjsfpks0xicih3mcdm1x9l8";
+          name = "lsp-haskell";
+        };
+        packageRequires = [ haskell-mode lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-haskell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-java";
+        version = "20170421.325";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-java";
+          rev = "a5aeccc2c8b37af13d48616aa3e96d4b1a7d20d3";
+          sha256 = "1vzvx38n57jfzarwl3hw188smn8dwjzz1x4rpsp3x6yza685s7cf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
+          sha256 = "1y5wxggkr7v4a2a3h2n01911gd1xv047dikbvyy1gappf05fdngj";
+          name = "lsp-java";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-java";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170415.848";
+        version = "20170422.954";
         src = fetchFromGitHub {
-          owner = "vibhavp";
-          repo = "emacs-lsp";
-          rev = "84c2ca12cd5934322393d764584907d664776bd9";
-          sha256 = "09xvm70np4yz0bmb3hahfrfnajh4lflx2gf27ffn8lviwwxkfkbb";
+          owner = "emacs-lsp";
+          repo = "lsp-mode";
+          rev = "fcec82c2f05d603031599d0d170c093bbd2c3a83";
+          sha256 = "0jhlijviazn0hdcrgmh1lnbywcfrb6lsf9gbv0lh56kjwf8896p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
-          sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
+          sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9";
           name = "lsp-mode";
         };
         packageRequires = [ emacs flycheck ];
@@ -41648,6 +41817,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-python";
+        version = "20170421.322";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-python";
+          rev = "972f1b77ac059e8a8d39f1f0b48fe2b9f146f439";
+          sha256 = "02i97m1d35pz2w50006pdpc3anpgnysxbxhkx6hl1s2m8kwrrlwz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
+          sha256 = "0x8cyvkwp4znliiwf3qfrhnk80h8n1jfyyq0n5yfccsgk7gpm8qx";
+          name = "lsp-python";
+        };
+        packageRequires = [ lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-python";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }:
+    melpaBuild {
+        pname = "lsp-rust";
+        version = "20170421.326";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-rust";
+          rev = "ec2a89f901726fee61a5587b09c237615ee8b25a";
+          sha256 = "16ihil3gsvlwbg9hjjl9sp6y7d7zm4k9zhrb61z5biwfxh49a6in";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
+          sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28";
+          name = "lsp-rust";
+        };
+        packageRequires = [ lsp-mode rust-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-rust";
+          license = lib.licenses.free;
+        };
+      }) {};
     lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lua-mode";
@@ -41942,12 +42153,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170416.1549";
+        version = "20170424.1053";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
-          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
+          rev = "a34259407996c6d3b7e520ed38340017befa26ab";
+          sha256 = "08sn6vl2r06r19xkmb9n9zicycc6dq1grhsfhh4zjg7lzp7v9bj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42075,12 +42286,12 @@
     magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "magit-gitflow";
-        version = "20160809.1335";
+        version = "20170425.128";
         src = fetchFromGitHub {
           owner = "jtatarik";
           repo = "magit-gitflow";
-          rev = "a2b7b85134784317445faee13d647fb62401ea23";
-          sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p";
+          rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
+          sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@@ -42138,12 +42349,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170308.146";
+        version = "20170420.544";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "3c7ac0ed47b8597749f8eaa1b27b9a2029dc2754";
-          sha256 = "0hfar78wkn69s54dkn5m4ky6bvx8sh66sszy67nvqpr5ax9y8dkl";
+          rev = "a34259407996c6d3b7e520ed38340017befa26ab";
+          sha256 = "08sn6vl2r06r19xkmb9n9zicycc6dq1grhsfhh4zjg7lzp7v9bj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42453,12 +42664,12 @@
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
-        version = "20170410.242";
+        version = "20170421.906";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "8ab9e0bcefb122ef5b931284c6cc329d8f8aaa82";
-          sha256 = "0pasdzgikp8rylxxyfmxd0dd4gfjklgrsd6v1idv8cd0955gbrd8";
+          rev = "5207995089020ff0e8ea2f1fe4628c61de7eb7d5";
+          sha256 = "1ikhy7yyl65j7aw1yyhfi8bz2p4p8s8f2cmzsa6ld0gmvjw6cl5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -42877,22 +43088,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    markup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markup";
-        version = "20130207.1309";
+        version = "20170420.429";
         src = fetchFromGitHub {
           owner = "leoc";
           repo = "markup.el";
-          rev = "5ff4874ce897db146f5fd2b3d32147a0d404e1e5";
-          sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi";
+          rev = "876da2d3f23473475bb0fd0a1480ae11d2671291";
+          sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
           name = "markup";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/markup";
           license = lib.licenses.free;
@@ -42982,6 +43193,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mastodon";
+        version = "20170424.2154";
+        src = fetchFromGitHub {
+          owner = "jdenen";
+          repo = "mastodon.el";
+          rev = "b18b37b6807875ff1b84afa85d82be819342e7d6";
+          sha256 = "1398svw9jfvcsigchdaf8amc9c8r8fy900hsxl297hsfbm5sb79g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
+          sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i";
+          name = "mastodon";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mastodon";
+          license = lib.licenses.free;
+        };
+      }) {};
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
@@ -43275,12 +43507,12 @@
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20170411.1921";
+        version = "20170418.1035";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "d4a00fa6873d09920d94b7c35eabe08c715b906d";
-          sha256 = "1l0pfgjv6f5rlqgn8bnc81pzzf743z7ij5qharhxh860248gy41k";
+          rev = "e1adf088e621c3446d04cb2222756edcb03eb363";
+          sha256 = "00yh92g9if4vgh2qzgf9ji8k88gj9k2k9ap055r4mlg3fcyf1r4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
@@ -43503,12 +43735,12 @@
     meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "meson-mode";
-        version = "20170416.247";
+        version = "20170417.2345";
         src = fetchFromGitHub {
           owner = "wentasah";
           repo = "meson-mode";
-          rev = "61d8177c3e3c195b32f7420d769a0860a873b7d9";
-          sha256 = "0qqwp5mn11fm8f13nfn72c7bmrxa49jqmacga8ipcla3gx59vhs2";
+          rev = "157f684e9ecdf03f36be2117e05c631b5eefa7e1";
+          sha256 = "0wbnlnhq432q378pwcs17643463jjizx0xac6giskw69lxypmgd9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
@@ -45178,12 +45410,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170416.1618";
+        version = "20170419.1926";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "7774641630ef85999ab2f6d57eebddbc7c1e7244";
-          sha256 = "12ajrlgyj14jf66if7bdgj69jm72wzrmiclx7x8dpsz4zpj38m20";
+          rev = "029f814d3261b02f650ff361f52d9d80611bbfbc";
+          sha256 = "05k0ssxmjp7lpj803lrcbyqxmxf1vnxa2j3wvpvlqrixjc63mjr9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -45322,12 +45554,12 @@
     multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "multi-line";
-        version = "20161103.1715";
+        version = "20170417.1856";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "multi-line";
-          rev = "f510b7bc3c4726f262620bd6739f7de80d13ff35";
-          sha256 = "01dbk0vxznmqhx8vd2iaa967ng5apnwkv0mlyd235wk2z1j8wci4";
+          rev = "7e99fd560b15a6176a5ccfcac0af4ef9e8dd0656";
+          sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -45842,10 +46074,10 @@
       }) {};
     naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "naked";
-        version = "20170307.920";
+        version = "20170418.1822";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/naked.el";
-          sha256 = "1l6r7vdhzlbv70in16qiyac81930srakr4d14dqda5j3h4w09hbg";
+          sha256 = "1k3j6dyp8p47q43i4ba53krl06yx32rkjnh2f5x1zqk6nxnb1wf8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked";
@@ -46721,8 +46953,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "f8a2e8a55203f2cc16d70ad43afcc186adaab6b3";
-          sha256 = "19m36vw8j9b4ll6llhaisa4w6w9iilj8af8vvw4bglcmd3jbn8mg";
+          rev = "9b63bb88c8873d192b8b01608e5d230817dd3375";
+          sha256 = "1w75zcq721awyyfn0v2bycmg4cgrgzmmj9hxzpwsywab2l25kjba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47029,11 +47261,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170313.1712";
+        version = "20170420.258";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "e08f5f76e406de2c6bdcf85952aaeb66ec0d37de";
-          sha256 = "0g9wryjv56xvgvflii0wilvj17hrf4ddk7vjl2bj9lg4glhyyvl0";
+          rev = "77c9ec1fddcbe145facfc3d65eee55b11ad61fb9";
+          sha256 = "08y191khn0zbjysai73rgcrgvq4y25mc870h3xrpa0lsd51fmvdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47319,12 +47551,12 @@
     nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nyan-mode";
-        version = "20160429.1323";
+        version = "20170423.40";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
           repo = "nyan-mode";
-          rev = "98f2283d60686d331346371bc7f7f3d49bdfaf34";
-          sha256 = "0yv6wv1vdc5zd1sh3f8vcz7wdizziasjzr11shx2bhm8nhnqcdbj";
+          rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
+          sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
@@ -47847,8 +48079,8 @@
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "ob-sagemath";
-          rev = "1d99614509624d7bfd457325ca52f3bf1059f4d5";
-          sha256 = "11qsh0lfb1kqiz0cfx7acfpyw0a90bh7r86a4h31d4xl1xfq94sx";
+          rev = "68d3e516c712bc7aa5042f305f3eb5bbb6d656c2";
+          sha256 = "1yr7d3ayrdnycapnhc08zyf6b9gp7xw0pngz90h75s6j33pisx30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
@@ -48389,12 +48621,12 @@
     omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "omni-log";
-        version = "20150604.1038";
+        version = "20170420.407";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-log.el";
-          rev = "21b81c2358e2a17a636c6494eb084241d06962b7";
-          sha256 = "1241jfckijwimm6b9xfp2rjap5va5hkphcvj3qflkprq2y33y8s3";
+          rev = "60fd1b7ba77bd82787e43ce1aee2832f53981c68";
+          sha256 = "1s81qj4g8nhw6k4b7wi4ya9g51xbsqzyi659zs4zdxjxj7acdq8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -48410,12 +48642,12 @@
     omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
     melpaBuild {
         pname = "omni-quotes";
-        version = "20170416.1416";
+        version = "20170423.1216";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-quotes.el";
-          rev = "be1e719c046ca468275ed844989320f48358f2cd";
-          sha256 = "0sc4mhvxj91rs4h1vg3x759fq77cmlzkqyn5wv456w3w3g2narxw";
+          rev = "3ea0853eb36fec07c8ff2da0d29fd969febaadcd";
+          sha256 = "0zbj07gi23f2g1gzf2d9d86jngxjrq91lm3dbd3rwlwpnhd8285p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
@@ -49423,12 +49655,12 @@
     org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-edit-latex";
-        version = "20170408.2046";
+        version = "20170420.1738";
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "a3faf83fe13910596c370a0d4b9a69f9b65f6f99";
-          sha256 = "13q2xd8h0i4ain1y68qnvipmilly9ivdsv2glvnz5ji8k9f5wajk";
+          rev = "945f4cffb501d3aa2b1c6dcaef7c18a83c090a89";
+          sha256 = "1bwa4sb6yybvl2jdbxmx84s2bivqkil1dxy1y5wypv4cnib5skn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
@@ -49527,12 +49759,12 @@
     org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }:
     melpaBuild {
         pname = "org-gcal";
-        version = "20161115.357";
+        version = "20170420.1401";
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "org-gcal.el";
-          rev = "d32031f7c488be0d9845c47cc1452d6d6489e561";
-          sha256 = "0b3jwrfr55hqar5kyhv4wg05x21gzxab0n93xm1371vimhahgmbl";
+          rev = "bdc704842da000a1cffb8f155ef3887c5e1d0446";
+          sha256 = "0nbwxmc2arssy1ll416i6chb0rx239jh2fm1lcylhdg3af25rsbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal";
@@ -49657,8 +49889,8 @@
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "ab86b343634acaaa04b81ecea511a38e975977d1";
-          sha256 = "19sd42w91gzhd0qxgymi09ms0kn6yhv3kdpky1n6l5mkpbv3kp39";
+          rev = "2ec35547088c090ae1ad71bbc943953f619611e6";
+          sha256 = "1zfam31pjm8sg3j038vvd1jf3qi9jq3452vriqmzczbjfg3b7l7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -49740,8 +49972,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "1dfdb8193251ebf3a5e38834ccd5c04204159c5d";
-          sha256 = "1l92143firgpl071k3k5nw3633951sn0ibvcni2221wqc3397n2k";
+          rev = "9874458468d527a4ac0b520a8771e0b6eaed4a9b";
+          sha256 = "1rh294zhsnpicvw8jv32x52b2sxiw2bnrjn88wlvnhp51wzgwgpr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -49760,8 +49992,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "1dfdb8193251ebf3a5e38834ccd5c04204159c5d";
-          sha256 = "1l92143firgpl071k3k5nw3633951sn0ibvcni2221wqc3397n2k";
+          rev = "9874458468d527a4ac0b520a8771e0b6eaed4a9b";
+          sha256 = "1rh294zhsnpicvw8jv32x52b2sxiw2bnrjn88wlvnhp51wzgwgpr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49924,12 +50156,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20170416.2327";
+        version = "20170419.2242";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "58f51112d557d328d818c8b9cada5e3dab539de3";
-          sha256 = "12kk2yn5sm4jq19kiln3giq1nnljcjyd617p0ff3r9qn5dh1qnxs";
+          rev = "8aac90e1c1bf06c91430306d652fd5c40961f99f";
+          sha256 = "1vhdd2n7ynmy8gc51mga9nf0wpsk4hfnqgbihsy3i3i73k6wil0v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -50168,12 +50400,12 @@
     org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-recent-headings";
-        version = "20170417.17";
+        version = "20170423.1817";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "d53f97bd8c640a06eb606b35c1c269bd3089cb54";
-          sha256 = "0697nwfvkhik8i87apq2xyb4qkk10xa4s03gz6ijybxn98576hli";
+          rev = "0558fa8b6e114321f76ab6315e0a319c01213b78";
+          sha256 = "197nm66g6iljfpsy218kvqi0kan5dyacdsar5xglsz19cy2n2wkf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -50210,12 +50442,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170413.1111";
+        version = "20170423.1812";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "81204eaa39d556b6628b35627e0ccbe2799a8e68";
-          sha256 = "0ppr3d7l15xwxjdhpdkczjpwhsvxm3y2jfz2ddxqpydqywhgypn4";
+          rev = "5f56a28e2ec242f5291b5f16f62af29619ecfdcd";
+          sha256 = "17gia39gi54ggbbz69w0dfk9cannjyp2jz9wn3ki0mbjgjflg3c6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50322,22 +50554,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sticky-header";
-        version = "20170413.1844";
+        version = "20170422.2135";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-sticky-header";
-          rev = "f2dbfc443e7504e0468b417ef89a68b152ec1f2d";
-          sha256 = "134ss1rrf1q73afvhj4k5ymlwhyagfab18y11v51j5xyx77ydaw6";
+          rev = "aae8dbc7f3b33c4dd35dc38d83791d7c23757060";
+          sha256 = "1vdaqi0054hgf70i1g4lxxr3ry6k855ndjysq9c8ip4x2dfzyrv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9a600bd156eb766ba5ce37e16f3e8253f37ee8/recipes/org-sticky-header";
           sha256 = "0ign3vjckmxp7n3625wb53qlch07c3s4l67jsvk38dhhcsg1rhnj";
           name = "org-sticky-header";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs org ];
         meta = {
           homepage = "https://melpa.org/#/org-sticky-header";
           license = lib.licenses.free;
@@ -50808,12 +51040,12 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "20170118.1647";
+        version = "20170403.1323";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "cbce5871fe267fef725631b0b7365952c35ae401";
-          sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7";
+          rev = "c91e662ace7e3ce992269cbf755f378bc6742511";
+          sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -51379,8 +51611,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "f686459c02b27e6f22128c2ff4e26818fb7f4ee7";
-          sha256 = "0i8fd8jjimzp3p9l10ixdxv7ghlc3x191914wlq1znqzra09xb0p";
+          rev = "45c3d06ca2c0a651934e60a67f9e7f0dad55e98d";
+          sha256 = "1j4xl7qy51my0c4dswpmj5yyh97i4745g1a508pwq13wzngb3s3a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -51690,12 +51922,12 @@
     ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-rst";
-        version = "20170219.2052";
+        version = "20170418.758";
         src = fetchFromGitHub {
           owner = "masayuko";
           repo = "ox-rst";
-          rev = "c5f300cf020e6bdd654e304e0388a0c63d4b8ea1";
-          sha256 = "1cdlqk0sbj8pa24dqxwg5kgjrghq4f7dma8d0mk33cfaxaq7jvxv";
+          rev = "70f15591715796b1d96af660481739f019c295cb";
+          sha256 = "1q6qfgfajl103hsf5zp4zxpf4svypv0n1kiqkhjp12b0hy45n2l0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
@@ -52136,8 +52368,8 @@
           sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/palette";
-          sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2cdf2d07307007a95d1fe8dc8d2f105c34a26416/recipes/palette";
+          sha256 = "1s9lklvr1b0a496q0ljbhkl8zdx80d7bqvkdjnfp35z2s37f1zz3";
           name = "palette";
         };
         packageRequires = [ hexrgb ];
@@ -53362,12 +53594,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170401.218";
+        version = "20170419.1022";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "651fe02ff10eece65c01ac8d286174cc8ffa87fa";
-          sha256 = "1nij6mrz2fm411z97z13dyy38i482dkpj50fjsgnlc9pmggykqnx";
+          rev = "3e45de29ea6ef0431df65db18f4a73615c409dfb";
+          sha256 = "1acjxyyxl06b45clg7z1mqm6qpa0rmvnbh5rqx0wizrjp96xls99";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -53845,12 +54077,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170412.514";
+        version = "20170419.1240";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "56a7e7c67b70c4aba5919317a8898157ba0b08e4";
-          sha256 = "1jdpb4f6msw4g9amp1wmbgngldy033x7lhf8y8r34n6q2c7sb68r";
+          rev = "8fd56d646985201f7a6bebb49aaaeed760cad302";
+          sha256 = "1rlj7zm19vgk9k7q1b44ckw3sabyw5jk9bqhp06fq8bpvi46hy3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -54160,12 +54392,12 @@
     pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pinyinlib";
-        version = "20160505.1248";
+        version = "20170424.1352";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "pinyinlib.el";
-          rev = "457b5ac6611d0f35ff2444e62008c798b45ae368";
-          sha256 = "0kxsam8zb1rdw82d4jpa2n9kcdk05iscymgan39izgaa0w422s0r";
+          rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234";
+          sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
@@ -54458,8 +54690,8 @@
         src = fetchFromGitHub {
           owner = "thomasluquet";
           repo = "playerctl.el";
-          rev = "fa79b3c1223738ed89ded01fb1f4fb5fdd3aa92d";
-          sha256 = "1c5bdkr7wr803pz889dmhhlcar0jmmwg1yy2b04zwc58cqw9g1i9";
+          rev = "8354352813cd206efb60002f2af4427957bf8894";
+          sha256 = "1138jcn2yjfhg0abkiwzzrf69pc5nddppf2hj35mn8b0rr7zs4bq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl";
@@ -54616,11 +54848,11 @@
       }) {};
     po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "po-mode";
-        version = "20160827.857";
+        version = "20170419.303";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "41e5199f0e4a3e9d518d6f95a3efdfae5e2c7913";
-          sha256 = "06ww6081aicw2d4rprig8ab5g1rx7dqx7cl9xh444k746c8a554d";
+          rev = "cde62682dfd40070308af1c2b484a204977e1fa6";
+          sha256 = "0rpah9ljgs15szf6ndg6nj76xx5bzh4cski4bsqa55kbv2k9kd3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -55780,8 +56012,8 @@
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "da581cdfe4f4f63137f3320ed3dbda9cf6c20e14";
-          sha256 = "1bgkx3vwn3vy796a1aq2hd7817qaznf4laqni417gzi43jqf8414";
+          rev = "56e262dd3b5998d0dc6a590d06bc11058839c588";
+          sha256 = "0sq0w5fi4zrxccabnh78vjb7drw05ay2lpw7wvnrfv97xkywzr4z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -56179,8 +56411,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "8aa927f08f6b92808976b0c22fa4a45850279987";
-          sha256 = "12n6i25mvb4a4yqpiyrfd9firfz2frv0zh0akpjd03qv93fmw30j";
+          rev = "4920e27a488976c9993cef686d868a846868eb56";
+          sha256 = "1abrznpxaflnvds1vfnz92jxs88sw4z3i6skwrsq0f3cii5ymiwq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -56217,12 +56449,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20170324.243";
+        version = "20170420.2343";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "28a3a95890243993b20c2c2bf66d6c00a2f0fd21";
-          sha256 = "0kajvmfyaxma9mh7mbrc3hiilzkdjwmgvv6zdfv39r9llwkrv80k";
+          rev = "3a5416c150a69a1420b4e94c7d130e13b42ff58a";
+          sha256 = "1yv4wdjhmh811852y4vzcbkbb0cf1j60ixp89zn2psz4ij8lvmp3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -56437,12 +56669,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170415.2259";
+        version = "20170421.2255";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "1f74263f42c56c0b88e8fded540231a2d4fd9e36";
-          sha256 = "1mc6msf6hzy0fdm1gwq4f9gadspk68d1mdwbhl1j1ngx2gqbrhik";
+          rev = "e704bc790a96f5f3703b2c56e5a1b15bc4446937";
+          sha256 = "07dcrpkyf3b2kpdgfxir3mvm1c5rs2zdbgv9ajkn9y0b9zvp0cm8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -57506,12 +57738,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170407.858";
+        version = "20170424.1130";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "3332895078ebc5e2f547538913eccb1db63ec0ca";
-          sha256 = "09a251m0j8ican0myp96755ykg6z2bp0kgggwbdbg4af6bwz3a13";
+          rev = "471c46fa9eb9de2e0b0056814caae824986f0915";
+          sha256 = "11s25kxh0909pq00xmpyv2lhafxhz4p40hivz884rkpi0gfvggg1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -58293,8 +58525,8 @@
         src = fetchFromGitHub {
           owner = "vic";
           repo = "rebecca-theme";
-          rev = "ddbc2e0ceaa4849ddd284a9265211b61a8777106";
-          sha256 = "0d4yk6gkswfx7hkwgq5s9qc2bi73041fcsigpzvl2q0smb8202cr";
+          rev = "cf8c45993ed4e0a49dcbda71827dbe5835bda077";
+          sha256 = "15v688mnr0vg7pj8mcwqpwbw896xrfjpcbwhgfhq2bd0z0j0shbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -59553,12 +59785,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "20161115.456";
+        version = "20170422.832";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "5347e3609c5ea8b767f9ec0c08969467d288c516";
-          sha256 = "1gnbphf4ldi60wdfwpcyyyhgj2scj0wmlxp10014cwz9xcdqnfl5";
+          rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
+          sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -59574,12 +59806,12 @@
     robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "20170316.511";
+        version = "20170418.314";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "53360f55df3857933a483af652aefe33187f5304";
-          sha256 = "1na2h4pxrs0l3i5bsyn2c5mf5nbpr90lyhxav57wc2jcqz24nz4l";
+          rev = "39d07da7e3fbcfbf9ab851acdeca1511974e913b";
+          sha256 = "1km8cglgqrg8gb35011jmgz86i273v6hbbna3x17828kmyh8w7wn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
@@ -59784,12 +60016,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170416.1111";
+        version = "20170421.1131";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "f1f8709556f25d0cef12b1d4dff5ca0b09a890a0";
-          sha256 = "05r888crk8y5fi4xvarrnr89wjjrrzzdr4bfmd0kzq83vs0azr77";
+          rev = "18c6aa5b00451abf9dd34df60cb5b35e7d0866a6";
+          sha256 = "1ih0bbjq0ydcs41zaz5lv87q32lx871rhjfgs7yqgd713bc55xxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -59850,7 +60082,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58383";
+          rev = "58479";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59930,7 +60162,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58383";
+          rev = "58479";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -60329,8 +60561,8 @@
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "c10f969e06deb0cb1471ebaa4c9bef8e3aeed39c";
-          sha256 = "05g6pd125bjh4494fm65iyxjc1nn3a21amdf8cbzcyjakywajjwa";
+          rev = "db99da9189002f3a95e9dc24038f73fc3a3f0499";
+          sha256 = "1bbkfwnqlr68qkzdcjs3gjm3lfvbcw7vwx9bvrfx6rhl8k9a2i15";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -60581,8 +60813,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "ac72fb1103c506ce8c00f1b2be37b5c5ab771a61";
-          sha256 = "19z8dwybj4bmmqlxa8g6jc87kkj2bdnlgv0k31d0kqxwswng309w";
+          rev = "0a00aecc6f3a510a8ef0c396bc04a73e5746cbeb";
+          sha256 = "1k6psvjx8l0znb4rx46q4ykw6mc6npcwiz8xhk9nm9pd66hjnw7g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -62702,12 +62934,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170331.2242";
+        version = "20170422.956";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "86756c37968cbbc171e52e416ef656af2a2258a8";
-          sha256 = "1vhcfmyk9swf5h7gka9fbwq2s3x4a540km6wjxqynmpw8c45q154";
+          rev = "dbda2739d49b073095bde1ededd3321c99857630";
+          sha256 = "019dzm2nxawbkk2qhqz130w4pa3i8s0w8vpmw4r7f408kz32m23y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -62765,12 +62997,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170319.1601";
+        version = "20170421.1423";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "0f3459f558bb71daab2416102b99a8ce39947d83";
-          sha256 = "0sqjsc7gbiqivi9f8y53fc3nys61dhs8lq1zz57yg24qvv3hxqi3";
+          rev = "7dc97e11f0d7efecc3adadfbc24dcc69fe0709fb";
+          sha256 = "06iij0xcs8w3j9ikffmx8c1cvfplngjnwhyfq5xbzd4vj2iqwxn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -63454,12 +63686,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170417.1126";
+        version = "20170424.505";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "72f3d2846a7fe324136b7b58d6bf3f8939551c99";
-          sha256 = "181sb5rv0li00gp67sg16g9clhcs9gbmp1cs8f29ww3m753k1nvs";
+          rev = "64813a85884c704cba185e9937c26bd4813e0e8f";
+          sha256 = "1gmqnm3rd9bhr41bqz16ij5r1jxj3srgvwhmqw4k8yprw3zaqz2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -63580,12 +63812,12 @@
     smblog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smblog";
-        version = "20160317.430";
+        version = "20170419.321";
         src = fetchFromGitHub {
           owner = "aaptel";
           repo = "smblog-mode";
-          rev = "25bf9374f692aec845d911286f10a11aaa0945d8";
-          sha256 = "1ca8i45dj41vif2hm87ircwm9alxdm98irfi586ybrc72s24036r";
+          rev = "5245e7aeac20915121946f59bba30899305d950b";
+          sha256 = "0i5q29b3hk644dnc0d98d613l065p0k846ljg13vgawpiic6ld6b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6469537a11972509fa2bfb10eb3f8816cc98efed/recipes/smblog";
@@ -64363,12 +64595,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170417.105";
+        version = "20170425.313";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "26a9e571122aed17318948f677827068e13cb216";
-          sha256 = "0bpy812hlnmjracnz66xb9v4xd8m1sxizls7nhhpi68i870q2449";
+          rev = "be53e5bde0e855c012bc99602830984a7008604a";
+          sha256 = "19xwy2dqlp585vi2ihr85rhf609lc57l133gc3bcz09aii24lfkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -64468,12 +64700,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20170313.721";
+        version = "20170418.231";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "33da09b3895e03e64959005678d448ab82e527b6";
-          sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w";
+          rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642";
+          sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -65116,12 +65348,12 @@
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "082219f18f34d146e3b6ced175c912f2da31220d";
-          sha256 = "1035r0msl7av5g0hkn69784zdqvpamplvzgn06yzjsnf0bfbsdl5";
+          rev = "ff82fd1e48a8fde61c845eb213584d67e754e8a1";
+          sha256 = "1p1kplnkpnhi28fj3j8f5f0v0kccgmx5knyxr2kwn1fq7s9zqbh8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode";
-          sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
+          sha256 = "1jlaf1bipmf51552jyp2ax6n4gwg38n2348kyxlwd7d8vwsibbpq";
           name = "ssh-config-mode";
         };
         packageRequires = [];
@@ -65133,12 +65365,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170315.844";
+        version = "20170423.2332";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "4c1a539e6f95e4847c13685d2b752e40d2b8aad8";
-          sha256 = "1zkxiy66d34v09krfajx6y8i2s5jdp99sxfzbvzi854s9hldl58x";
+          rev = "56da852dd3b34add0b2cce499cb07f076767a976";
+          sha256 = "14c8grlbjymdcvkpw6fv80qd9b3l3kmji4xqqh9z2hdvifn412a3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -65548,12 +65780,12 @@
     string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "string-inflection";
-        version = "20161220.1825";
+        version = "20170419.1638";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5";
-          sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5";
+          rev = "297aaf68e666381521b02d433fcd28d8b51c48de";
+          sha256 = "1621lwda3j3pwfxqwfa2gp4fxz869bc0ib87v71mrab8p1qsdizg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -66315,8 +66547,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "a3abf3ffd670776da591ae9e5e2d7011b6d6a190";
-          sha256 = "1jn7lry6fdnv9m24m4i5fgvz0qywcx3r08a36l2y1ksb125vank8";
+          rev = "f98f89f1bd90e8165c776efe47bb6c8c7377c5a2";
+          sha256 = "1xx7xic3cn4ak0adpariib2f636m42d04m197x7y74msx4jwjd6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -66458,12 +66690,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20170417.116";
+        version = "20170424.907";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "3fd1607725ac8163b38f9f60142af7764afbd1e1";
-          sha256 = "02pq1gnmg87brdbhzjvb0dx4mm0m28rrnf07p11d0k9hscpg6ln4";
+          rev = "0a03aecead1c11355fe4be61d2f6339f6116bc32";
+          sha256 = "1m6d792zc82w615py9f401nl7ab21nz6k3f2sipinv27d9zkn911";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -66644,12 +66876,12 @@
     syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "syntactic-close";
-        version = "20161213.735";
+        version = "20170418.3";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "syntactic-close";
-          rev = "e03d1c8d09825377fcb6ae271c60a554f4d7a000";
-          sha256 = "0l1ymn6ld15rvpkrz1pyq79c72y4rpc9wz99wfc791r30dqgvj2d";
+          rev = "79b0de7f93e9590700aa2226752bc99434c53b42";
+          sha256 = "0rqw7ckgcxa5m4ykvw1kgqgdyzc569j2pfj71q866drg150yq8s4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -67062,12 +67294,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170412.1916";
+        version = "20170419.1308";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "2ca07996e91636314aaf921edcba8191c03aabec";
-          sha256 = "1ljif6cpygphl5y3cra9kxq0yahv445hsi388q4zp0qgq8pqslpx";
+          rev = "9d2973b20b414cafe6df917bbe4599310d67170b";
+          sha256 = "1s5lpba1zn4f48jzbchal6wpm8jz666bmr37l0si04fi4019har1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -67356,12 +67588,12 @@
     term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-manager";
-        version = "20161110.1707";
+        version = "20170421.105";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9";
-          sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45";
+          rev = "7180f09078f89aadb83061420ca8fd58d929b629";
+          sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -67440,12 +67672,12 @@
     term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }:
     melpaBuild {
         pname = "term-projectile";
-        version = "20161106.1419";
+        version = "20170421.105";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "f29bced3ecdf23d999f55573894b1ec1e2a94fc9";
-          sha256 = "1nkahsnwvmg1fv3qsdc49k5xick6wji3j6qffwfnpw1prx2n2a45";
+          rev = "7180f09078f89aadb83061420ca8fd58d929b629";
+          sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -67857,12 +68089,12 @@
     theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "theme-looper";
-        version = "20170330.1829";
+        version = "20170425.606";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "theme-looper";
-          rev = "4c07f6f6e1c733d274e26ed8eb03cc5bb6e9149a";
-          sha256 = "0nq298fclba9k1bdg9yhhnfsxw1dnvs96m6wdl5wnv21087zj77j";
+          rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9";
+          sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
@@ -67975,12 +68207,12 @@
     thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thinks";
-        version = "20170325.430";
+        version = "20170418.854";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "122c0dcafa79bb1d9b37dc5bf6045e9f62666e6c";
-          sha256 = "05jczr3vj7j7b83sv2w79hrd4hq8xip79yx4z9g1v8lr3j3l4gzq";
+          rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5";
+          sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -68042,8 +68274,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "2d65c2365f19f637bc732222e71d78727bf0b709";
-          sha256 = "0g347bhy6hppkl4769ahfyw2cbl0dqhv889c0xf8wbzfbsn9kaz5";
+          rev = "3311a9b2375276441234218f4351c6a8f66a6bc2";
+          sha256 = "0raiwmix51sk97g9y3d45wism9yf6f1k2kq8b7m8ypacd1vhijdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69527,12 +69759,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170324.1301";
+        version = "20170424.2231";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "f25f4751fea12298905c811a1f469a6b0a169ef1";
-          sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw";
+          rev = "e0b4a6cb31750314e827bbc57de9a35558b34fd9";
+          sha256 = "0z9s1aacalc17inc6rxxmyp8ffwy4as0va96rwfmhq3lmhcbbclf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -70242,12 +70474,12 @@
     uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uptimes";
-        version = "20170402.143";
+        version = "20170425.331";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "uptimes.el";
-          rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
-          sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
+          rev = "07bcd6517243c9c9f61172202d33718bd9b2a850";
+          sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@@ -70365,12 +70597,12 @@
     utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "utop";
-        version = "20151105.247";
+        version = "20170423.2354";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "a9696b7ea30ffe709fb11f865570595103516e91";
-          sha256 = "0wnhfhdac3qfcrim5q4cp2i2k3ich5hkkljinsbmg14qncqxcmrx";
+          rev = "d9f198899bba90bb5b38271046fde9c1af24830d";
+          sha256 = "1wj7m5f6kgh6m8sl0j6wlfaz01i960lxyam2mk1nxhf7nl6zp7bk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -70869,12 +71101,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20170315.1525";
+        version = "20170424.659";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b";
-          sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs";
+          rev = "9b6b9f20004dd33c5b603e09b5ca133bc864d1a4";
+          sha256 = "0blgbrbp5bkrcl0dpfwp8akcdgx9ng730kk2lr3g2rzr5v7y8dck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -71806,12 +72038,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170410.1335";
+        version = "20170419.132";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "841f253e11e3c5880b357204190996c4ad98d9dc";
-          sha256 = "009s886spm45jjk7valdk3kjb4dchc60wzqlswgylbvcmx6b3mxn";
+          rev = "a2e274403a1813dcace73759cb56acbe81deeace";
+          sha256 = "0bk6pkbg37kdbmg6lrbyklfd19xfy8mz5ir0cfw8z64qx9dzyi3z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -71911,12 +72143,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20170328.1448";
+        version = "20170423.22";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "382e01d787c4a0fa6bd4c58bed1810ed5b7787e2";
-          sha256 = "1nz4ri36k49gwdkc9sb886avpijijssrj4frjyrw27ff9aj9q9h0";
+          rev = "69f94520035282c3eb838e6f240a6db93e54b99c";
+          sha256 = "0qxcx2pns77s4mgr1cfzvlhxmfvzckx52phq63b2wmxkijkbwpba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -72163,12 +72395,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20170407.605";
+        version = "20170418.501";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "bb30f56868ae4888a8ac5a406c7c7ee2ff168f9b";
-          sha256 = "1v50qa611lqj0hjp8v6pnyqvnmljkd0p5g9aj517kv5d7b2rk1dj";
+          rev = "2e855196c78420b76f6f6cb92822255669599d7e";
+          sha256 = "1hgdanmifn97i4n73q2nv7s2g0kidrv9hf4bysb08rmn38w26ny3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -72721,12 +72953,12 @@
     winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winum";
-        version = "20170217.110";
+        version = "20170418.631";
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "3c28c0dd685ee71b073e6a336efe3bff21f65a9b";
-          sha256 = "0bxwhkshyxzq5f2jlsp6z97j2gdgz3a0hbp8bvjj71biywhn2m26";
+          rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
+          sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
@@ -72783,12 +73015,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20170111.609";
+        version = "20170417.1458";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0";
-          sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn";
+          rev = "eb0083125eb69033d53374742fd4af7a850a97fb";
+          sha256 = "0i0cw68vv8w01jwlxvs4zjh2b72msjq358x3cv074mzv1ma3y3v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -72972,12 +73204,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20170326.712";
+        version = "20170422.416";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "820fe2316d672e7bb2be7a2ead8ad5ed027f1a9a";
-          sha256 = "13d089n9y8y7ka708byg9704rq0slxvdzfhw8vk0yzzd3jrbfgs3";
+          rev = "015d2fd00a112215d370ae6d11c44f4702e2239f";
+          sha256 = "0afxqgiw3p2y3lhgny8j25fqkf0im9qqdz9fsjgddhrmq0gkllhc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -74271,12 +74503,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170409.2044";
+        version = "20170418.351";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "47f37f70f4748e30010b700b5eca39d5cd063616";
-          sha256 = "0rl0hd6cwa5jvzi3aixws90hvin4p7ppylc4jn7v8cnhy2hckzjp";
+          rev = "8797a31337895fe5fb29727c5ef289168a856a1b";
+          sha256 = "0qvr7gbvjhh4n7j5hqj424v8np17x2kdcs1nx49p2zg9hm6y04ap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -74296,8 +74528,8 @@
         src = fetchFromGitHub {
           owner = "mineo";
           repo = "yatemplate";
-          rev = "b58d17e176f77ded83860d33f4f43fcb5f7d2c9c";
-          sha256 = "13as073yw6wphcs7w62zicqgva0lh4xx4f1c9sph8ip1wydkr9pg";
+          rev = "3854836489ce06bb65cf9aecbdc06aa5fc6801c5";
+          sha256 = "051wwf802f00xk5gq5js1l0dd1ax0ls2jvlybz7xfy58dl8fbijx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
@@ -74374,12 +74606,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170416.312";
+        version = "20170424.1519";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35553f0e8b84f6b1dc149b84dedb52b72a64240a";
-          sha256 = "1cwbpl2mi63faxj7izl97qn7gc9g1wy8xig89d2yxyv3isb65la2";
+          rev = "21ada9ffbf5f921c87837796ea0b542d6d447d56";
+          sha256 = "1pzc4fvrm2yfrrnfjhnnial2vj4iavr6vfnw6q2i4hz95h5b9mih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -75028,11 +75260,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170413.2126";
+        version = "20170420.2233";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "08ae558834c2";
-          sha256 = "1bwjn1shnirmrqf7xcvzhnyg87jpwbcv231r28hlnyb5f2sqvr2y";
+          rev = "085e342c3b84";
+          sha256 = "1pmq15xrh2787cwj7ckn03rparknyf7qwrskmy2f8n9dqlfw7pnq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 818d1058ec8..df1fa4a3340 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1157,12 +1157,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "4f7c556167e42c02d2f840aec345b8f60b71c477";
-          sha256 = "0vhmw6z6q5a3abxphxxq5yd37hz5x9hs61vgx4wfyk2853701ks0";
+          rev = "2169d831731d206902114de3fc1b075b9e6b4ed4";
+          sha256 = "125qw96rzbkv39skxk5511jrcx9hxm0fqcmny6213wzswgdn37z3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1564,12 +1564,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "0.3.3";
+        version = "0.4.3";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "08bf0752e5b885a0492fbd0d7790668683c87797";
-          sha256 = "13026l259vbbgi7q0lb6jb7d54z6jgapv0d2qlprh9mlqjf32xic";
+          rev = "c4629201a63047f9094be0d9150f201dd5be18ad";
+          sha256 = "0fr4brysc7sk89jp1ggl68r3r6ikrhipb2h5kc1b2a8vz7i05bq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2680,6 +2680,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "binclock";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "binclock.el";
+          rev = "2e529ace67a04e6872a2328769782ef33b0e463a";
+          sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
+          sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk";
+          name = "binclock";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/binclock";
+          license = lib.licenses.free;
+        };
+      }) {};
     bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-key";
@@ -2893,12 +2914,12 @@
     boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "boxquote";
-        version = "2.0";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "boxquote.el";
-          rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
-          sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
+          rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883";
+          sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
@@ -5028,6 +5049,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-shell";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "company-shell";
+          rev = "40599df46a7e4b7b1ef5ad6e23764dda8510bbf4";
+          sha256 = "1qnlqwifrlbzcsi1lf1s7c32v6szpi5n6ngmj2lmdyic2b3pv1id";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
+          sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
+          name = "company-shell";
+        };
+        packageRequires = [ cl-lib company dash ];
+        meta = {
+          homepage = "https://melpa.org/#/company-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
@@ -7890,11 +7932,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "2.1.1";
+        version = "2.1.2";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "524494fd2b23217c6807b30b43bb95b5724f809e";
-          sha256 = "0w9j5q5pzw55nwsw5wic7dl7psvg75vk1cxhrz2isgra6gissh9z";
+          rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
+          sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
@@ -8390,22 +8432,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-clone";
-        version = "0.0.4";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "elpa-clone";
-          rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d";
-          sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a";
+          rev = "144bee09445b30cbf4f60b371a289f0d75a387aa";
+          sha256 = "1k80y3wcqvhdbc0w5ybicn2hqjldp7b4jwraca2b99676c0yiq25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
           sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa";
           name = "elpa-clone";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/elpa-clone";
           license = lib.licenses.free;
@@ -9014,22 +9056,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enh-ruby-mode";
-        version = "20150711";
+        version = "20170417";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "f945cff5e784e23e0028bf0a5221f4f47a822fac";
-          sha256 = "1f6zyz5jmbrvv37mbzsvwb3ycmq105p4ryz8p65b76jz3ps8yq5w";
+          rev = "2e483fe316ff993c80eafcf4ce4defd87d97776d";
+          sha256 = "1xzhgmbc9iplxmqm7gc4hqk6nfdhqcrxz8g9kkf5ww3dx1czhiv7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/enh-ruby-mode";
           license = lib.licenses.free;
@@ -9381,12 +9423,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.3.1";
+        version = "19.3.2";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "d25ad84195ca42969fbfb017a52aab8c8effc246";
-          sha256 = "06jxpypw8i13gjiq006p0ahy0mlkxhmpq8fhn4pp7hi2n4ycnfj1";
+          rev = "6acb7d6fb8d23c0b0b78d30a618d2636ad463e6e";
+          sha256 = "1a3yk18sr3y524jl8icp8qh5j143ykxs51xdwz2bzxac2y78k0xk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9965,22 +10007,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-colemak-basics";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-colemak-basics";
-          rev = "f976bda20098c43be1418c36520a57467c8c6c13";
-          sha256 = "18f1k4z7lkh237sz4p1xz4sxzs41ywmvd6dj7k9b6d9dscv3yxws";
+          rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960";
+          sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
           sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k";
           name = "evil-colemak-basics";
         };
-        packageRequires = [ emacs evil ];
+        packageRequires = [ emacs evil evil-snipe ];
         meta = {
           homepage = "https://melpa.org/#/evil-colemak-basics";
           license = lib.licenses.free;
@@ -10699,6 +10741,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "exsqlaim-mode";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "ahmadnazir";
+          repo = "exsqlaim-mode";
+          rev = "e77d2a07addffd7df4393019d9c3dad1ab1925d9";
+          sha256 = "19v5sf3nf6dciakvs7ksbg66b5z1hybc4ivs24hm6k3fziblfzzs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode";
+          sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7";
+          name = "exsqlaim-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "https://melpa.org/#/exsqlaim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "extend-dnd";
@@ -10720,6 +10783,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
+    melpaBuild {
+        pname = "exwm-x";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "exwm-x";
+          rev = "87715a6891b31bc19954ea9fe1c1a9bf57bdbbce";
+          sha256 = "0x9gg3fy5xw3vf8gyfa5j5k08gnnfpsyjh4dk80sbbnf0z7cwycw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
+          sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
+          name = "exwm-x";
+        };
+        packageRequires = [ cl-lib exwm swiper switch-window ];
+        meta = {
+          homepage = "https://melpa.org/#/exwm-x";
+          license = lib.licenses.free;
+        };
+      }) {};
     eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eyebrowse";
@@ -10993,22 +11077,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "finalize";
-        version = "1.0.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elisp-finalize";
-          rev = "72c8eaab3deb150ee2cf7f1473114cecffb5204a";
-          sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
+          rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
+          sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
-        packageRequires = [ cl-lib eieio emacs ];
+        packageRequires = [ cl-generic cl-lib eieio emacs ];
         meta = {
           homepage = "https://melpa.org/#/finalize";
           license = lib.licenses.free;
@@ -11273,6 +11357,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flatui-dark-theme";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "theasp";
+          repo = "flatui-dark-theme";
+          rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63";
+          sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme";
+          sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y";
+          name = "flatui-dark-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flatui-dark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
@@ -11294,24 +11399,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+    flow-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
-        pname = "flow-mode";
+        pname = "flow-minor-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "an-sh";
-          repo = "flow-mode";
+          repo = "flow-minor-mode";
           rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
           sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
-          sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
-          name = "flow-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
+          sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
+          name = "flow-minor-mode";
         };
-        packageRequires = [ emacs web-mode ];
+        packageRequires = [];
         meta = {
-          homepage = "https://melpa.org/#/flow-mode";
+          homepage = "https://melpa.org/#/flow-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11696,12 +11801,12 @@
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
-        version = "1.0.6";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "11805f1d420e297db0346a6657f144b08e2ca556";
-          sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il";
+          rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
+          sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -12725,12 +12830,12 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "2.2.2";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "4e88b7525c2f39c3d25f689b394b0ece7c6eed6d";
-          sha256 = "1vcc8sdm0b3kss3g47wggc6mv28pr474559d3786fhncp5mxl1qq";
+          rev = "37289bb68f01dd49b1192032ade6b0741d024a54";
+          sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -12835,6 +12940,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "fuel";
+        version = "0.96";
+        src = fetchgit {
+          url = "git://factorcode.org/git/factor.git";
+          rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
+          sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
+          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
+          name = "fuel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fuel";
+          license = lib.licenses.free;
+        };
+      }) {};
     full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "full-ack";
@@ -13423,6 +13547,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "git-commit-insert-issue";
+        version = "0.3";
+        src = fetchFromGitLab {
+          owner = "emacs-stuff";
+          repo = "git-commit-insert-issue";
+          rev = "7ee9dc88acc1e766700a6170a2ba6b0b853220db";
+          sha256 = "1fi0gy0093dwdcsl7ikzdjxklqrf1p6f99bpxi4xzk2waca70klf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
+          sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
+          name = "git-commit-insert-issue";
+        };
+        packageRequires = [ bitbucket github-issues gitlab helm projectile s ];
+        meta = {
+          homepage = "https://melpa.org/#/git-commit-insert-issue";
+          license = lib.licenses.free;
+        };
+      }) {};
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
@@ -16311,12 +16456,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "1.3.0";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "c8ad1d86dd375f1be433b95e2bc40876f663663f";
-          sha256 = "1ia960sqkbc5bqljjb0arw54q90x36lhp0230s75xcg6m47bxpw3";
+          rev = "6d467b82d8c7584b7ab839bbaaac701af393209b";
+          sha256 = "1mmwms4s52537sq17zhm8sakyq1mkf4nqcxgydsg4zlmvzzxpz8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -16773,12 +16918,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "0.3.3";
+        version = "0.4.3";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "68d4c614830970e9eaf929882e1d395a61872bea";
-          sha256 = "0zfhdlzpy6w7prdh60nd98cwgzfqfsn87xh2kb5hi40dh8gsccfb";
+          rev = "0885339369b65bc5d06829d82af734560dc45555";
+          sha256 = "088bpikbnsaxsjfq896fcg7y9qgvfbq7iwxsh391yc6h46zgarkk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -16941,12 +17086,12 @@
     hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hierarchy";
-        version = "0.2.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "d44d60d85cbeaf81d5e02ba154f4fcdca9faf7fd";
-          sha256 = "14zww0174vwf08fl9fv23faqn2byapb80rn72z4iv54p6pqykc2f";
+          rev = "ca919a4c71c187e1fbbad7e814aac1cf662ec51a";
+          sha256 = "0rrrj44ml2ymvxmg8igpn2irdhihv3djy5dfm6p6499cm64mawai";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -19539,6 +19684,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaolin-theme";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "0rdy";
+          repo = "kaolin-theme";
+          rev = "041cc6637a58a3a24086d1c2b8c3eb113434127e";
+          sha256 = "1qx6568s8wj6ha8wfy8hih1qwwcdiybdb83w3fr9lqwh0lyhjp0f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
+          sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c";
+          name = "kaolin-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/kaolin-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     karma = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "karma";
@@ -19899,12 +20065,12 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "0.6.0";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "494dae923b96a10853ba26f405059e8c04e72d22";
-          sha256 = "03lnflyyqags7im9gp7cq3q6fnfr9a65s62m333aydbg7dzk5pzh";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -19920,12 +20086,12 @@
     kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
     melpaBuild {
         pname = "kubernetes-evil";
-        version = "0.6.0";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "494dae923b96a10853ba26f405059e8c04e72d22";
-          sha256 = "03lnflyyqags7im9gp7cq3q6fnfr9a65s62m333aydbg7dzk5pzh";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -20096,8 +20262,8 @@
           sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
-          sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
+          sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf";
           name = "ledger-mode";
         };
         packageRequires = [];
@@ -20494,12 +20660,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "2.14.0";
+        version = "2.15.0";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "51b1e177f115ab527cc47baf98abe09d43d9a95f";
-          sha256 = "0rcxrq3r4vbr9zb844andy1zj246gs8s1ksqp1f092fiiyqpllnx";
+          rev = "f5603fb6bcfbae1e6950da7f91c3a15cf5250bb1";
+          sha256 = "1zzk3rc86xrkys3rcqiz61mnp00jkvb05f8p21av52h19axm4nn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -20921,12 +21087,12 @@
     magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "magit-gitflow";
-        version = "2.2.1";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "jtatarik";
           repo = "magit-gitflow";
-          rev = "a2b7b85134784317445faee13d647fb62401ea23";
-          sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p";
+          rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
+          sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@@ -21324,6 +21490,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markup";
+        version = "2.0.1";
+        src = fetchFromGitHub {
+          owner = "leoc";
+          repo = "markup.el";
+          rev = "876da2d3f23473475bb0fd0a1480ae11d2671291";
+          sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup";
+          sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
+          name = "markup";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/markup";
+          license = lib.licenses.free;
+        };
+      }) {};
     markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markup-faces";
@@ -21366,6 +21553,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mastodon";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "jdenen";
+          repo = "mastodon.el";
+          rev = "9b9e0bb7c4d414ffc26a0547d1e76cd106cc58b6";
+          sha256 = "1cjx022zrn7jbcq1x7x61xayhlpik2bm6vs37hh382ad7bnqgcyb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
+          sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i";
+          name = "mastodon";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mastodon";
+          license = lib.licenses.free;
+        };
+      }) {};
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
@@ -21600,12 +21808,12 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "2.5.3";
+        version = "2.5.4";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "89f9643c08211a770454919551a7fd8605d1fca8";
-          sha256 = "13x0zjd297ssqmbvba32zk2p588kznd5ag4wh3nqb6fdgyzy4d63";
+          rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83";
+          sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -23317,12 +23525,12 @@
     nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nyan-mode";
-        version = "1.1.1";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
           repo = "nyan-mode";
-          rev = "b5db3a612bba35c8f54f44c300ebc879db6b3288";
-          sha256 = "199ii1658k4sp5krha77n9l5jblyvnvvvr28g2nbc74lfybckjwq";
+          rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
+          sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
@@ -23653,12 +23861,12 @@
     omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "omni-log";
-        version = "0.1.2";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-log.el";
-          rev = "7eb30e42cc89064abb7acbec63cb9644c2ad7c9b";
-          sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
+          rev = "e86c80065030306645e28badcb0c25c549560106";
+          sha256 = "10nsl45z3a1mvagffcsqj501x8wk3avmsncyn9laq3k4z1hjgdz5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -23674,12 +23882,12 @@
     omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
     melpaBuild {
         pname = "omni-quotes";
-        version = "0.3.0";
+        version = "0.4.22";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-quotes.el";
-          rev = "be1e719c046ca468275ed844989320f48358f2cd";
-          sha256 = "0sc4mhvxj91rs4h1vg3x759fq77cmlzkqyn5wv456w3w3g2narxw";
+          rev = "a10eca089dd87389c99f5c5ef8e3f8779f2652d2";
+          sha256 = "0i2xnpa6jickpp2i47c5l7c6djxz2lli8lcx402sijzmn1lx44sj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
@@ -24910,12 +25118,12 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "1.3.0";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "cbce5871fe267fef725631b0b7365952c35ae401";
-          sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7";
+          rev = "c91e662ace7e3ce992269cbf755f378bc6742511";
+          sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -25330,12 +25538,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
-          sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
+          rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1";
+          sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -26397,12 +26605,12 @@
     pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pinyinlib";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "pinyinlib.el";
-          rev = "f1e6c86f47e16c2bd48436630286bae8d6f8cb8c";
-          sha256 = "13q95z0j1mpk2yrrq0amc2jjhajaz4884bfliy2h8adh109j4q1d";
+          rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234";
+          sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
@@ -27297,12 +27505,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "3.2.1";
+        version = "3.3.0pre1";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "b50c9ec1223895973d0e2fa6b6cb74ec3c8f3ce8";
-          sha256 = "17drjxry365als0drs56gzdpdjhkhjwg9jwvrhmq5dp9ly0rb2f4";
+          rev = "fba2acd72e8cbf138912295df227ee2c914158c3";
+          sha256 = "1862lp6br6ngfd13gz8m1x2glkz02qxbp6vj261ricbvc7fgkyd7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28830,12 +29038,12 @@
     rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "rjsx-mode";
-        version = "0.1.0";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0";
-          sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a";
+          rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
+          sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -30529,12 +30737,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "1.9.0";
+        version = "1.10.1";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "253afc49ff30a19ea1a7af10e1e8abdb46546ac1";
-          sha256 = "0ml0fdvgx60vqansh4j17ihkrnyjdndkijysqhqx1q78d97vnhi4";
+          rev = "7841b2f02a1a99e1cb166d595f24f16a514ccbb5";
+          sha256 = "062g6y8an4kvfym2w56qy2iqd4ngxdxba38136ph0ckkzl0yrl7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -30967,6 +31175,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
+    melpaBuild {
+        pname = "spaceline-all-the-icons";
+        version = "1.0.5";
+        src = fetchFromGitHub {
+          owner = "domtronn";
+          repo = "spaceline-all-the-icons.el";
+          rev = "be53e5bde0e855c012bc99602830984a7008604a";
+          sha256 = "19xwy2dqlp585vi2ihr85rhf609lc57l133gc3bcz09aii24lfkb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
+          sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6";
+          name = "spaceline-all-the-icons";
+        };
+        packageRequires = [ all-the-icons emacs spaceline ];
+        meta = {
+          homepage = "https://melpa.org/#/spaceline-all-the-icons";
+          license = lib.licenses.free;
+        };
+      }) {};
     sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparkline";
@@ -30991,12 +31220,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "33da09b3895e03e64959005678d448ab82e527b6";
-          sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w";
+          rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642";
+          sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -32664,15 +32893,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "theme-looper";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "myTerminal";
+          repo = "theme-looper";
+          rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9";
+          sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
+          sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf";
+          name = "theme-looper";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/theme-looper";
+          license = lib.licenses.free;
+        };
+      }) {};
     thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thinks";
-        version = "1.10";
+        version = "1.11";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "370d399703d232010599d24a242b5f91e25a1b9d";
-          sha256 = "1kac32mgk2gcchh9lvnny81xq03h4656v05xyd3fpkpr30sisyrq";
+          rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5";
+          sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -33428,12 +33678,12 @@
     uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uptimes";
-        version = "3.3";
+        version = "3.5";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "uptimes.el";
-          rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
-          sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
+          rev = "07bcd6517243c9c9f61172202d33718bd9b2a850";
+          sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@@ -33659,12 +33909,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "5.4";
+        version = "5.5";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b";
-          sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs";
+          rev = "af4ff24ae4489e0a3bfbbddf6bc934f66b0af527";
+          sha256 = "1z88wy7m6rj028dqxzyyyf67gw4jqd72dgsvlr8inwimds2iplbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -34121,12 +34371,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "1.1.0";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "f6583397a4f8c9cde6b556175a6e05303d6238de";
-          sha256 = "0z7pkqfli1lqvfjjaf8p1sbbwf0f7xgz87k3rqqav9xyc9iqh0ni";
+          rev = "69f94520035282c3eb838e6f240a6db93e54b99c";
+          sha256 = "0qxcx2pns77s4mgr1cfzvlhxmfvzckx52phq63b2wmxkijkbwpba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -34541,12 +34791,12 @@
     winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winum";
-        version = "1.0.0";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518";
-          sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9";
+          rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
+          sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index a5914c92e8f..fa8d4d8313e 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -17,6 +17,7 @@
 , kparts
 , ktexteditor
 , kwindowsystem
+, okular
 , poppler
 }:
 
@@ -48,6 +49,7 @@ let
         kparts
         ktexteditor
         kwindowsystem
+        okular.unwrapped
         poppler
         qtscript
       ];
@@ -64,5 +66,5 @@ kdeWrapper
 {
   inherit unwrapped;
   targets = [ "bin/kile" ];
-  paths = [ konsole.unwrapped ];
+  paths = [ konsole.unwrapped okular.unwrapped ];
 }
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index e1e25b2acf2..52cb403f202 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -4,7 +4,7 @@
   extra-cmake-modules, kdoctools, makeWrapper,
 
   karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
-  kservice, kpty, kwidgetsaddons, libarchive,
+  kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
 
   # Archive tools
   p7zip, unzipNLS, zip,
@@ -22,7 +22,7 @@ let
       ];
       propagatedBuildInputs = [
         khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
-        kpty kwidgetsaddons libarchive
+        kpty kwidgetsaddons libarchive kitemmodels
       ];
       postInstall =
         let
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index c31b8a86583..7cd707092ba 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.12.3/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index 2f270d24224..d43de1fdc36 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,7 +1,8 @@
 {
   kdeApp, lib, kdeWrapper,
-  cmake, automoc4,
-  kdelibs, perl, python, php
+  extra-cmake-modules, kdoctools,
+  kio, ki18n,
+  perl, python, php
 }:
 
 kdeWrapper {
@@ -11,8 +12,8 @@ kdeWrapper {
       license = with lib.licenses; [ gpl2 ];
       maintainers = with lib.maintainers; [ orivej ];
     };
-    nativeBuildInputs = [ cmake automoc4 ];
-    buildInputs = [ kdelibs perl python php ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+    buildInputs = [ perl python php kio ki18n ];
     enableParallelBuilding = true;
   };
 
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index c151396f247..5322c66b01d 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,6 +1,8 @@
 { kdeApp, lib, kdeWrapper
-, extra-cmake-modules, qtscript, qtsvg, qtquickcontrols
-, gpsd
+, extra-cmake-modules, kdoctools
+, qtscript, qtsvg, qtquickcontrols, qtwebkit
+, krunner, shared_mime_info, kparts, knewstuff
+, gpsd, perl
 }:
 
 let
@@ -9,9 +11,10 @@ let
       name = "marble";
       meta.license = with lib.licenses; [ lgpl21 gpl3 ];
 
-      nativeBuildInputs = [ extra-cmake-modules ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
       propagatedBuildInputs = [
-        qtscript qtsvg qtquickcontrols
+        qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info
+        krunner kparts knewstuff
         gpsd
       ];
 
@@ -20,6 +23,6 @@ let
 in
 kdeWrapper {
   inherit unwrapped;
-  targets = [ "bin/marble-qt" ];
+  targets = [ "bin/marble-qt" "bin/marble" ];
   paths = [ unwrapped ];
 }
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 445c5783b8e..95aef32cc37 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2227 +3,2235 @@
 
 {
   akonadi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-16.12.3.tar.xz";
-      sha256 = "00sbchj3yjbqdjckrciv2c7j9i7kc5yqvyvbmjlxacbkq80a4j7w";
-      name = "akonadi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-17.04.0.tar.xz";
+      sha256 = "1m0176q7g1vw2iy567xiadrpg87p58njinh7bab2pqv7zya7cbwn";
+      name = "akonadi-17.04.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-calendar-16.12.3.tar.xz";
-      sha256 = "0kv636a8x75fcagw8hjnrwnxzvqnnm42hfw68ywfics0pn0pl50g";
-      name = "akonadi-calendar-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-calendar-17.04.0.tar.xz";
+      sha256 = "08ajx9iq49y1ca9gxxcczxyqhjvkq4pnhm5s6yyblgmb9cpwivh9";
+      name = "akonadi-calendar-17.04.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-calendar-tools-16.12.3.tar.xz";
-      sha256 = "157kmcl77pj32ysbwr1xw365p5pgk69w5j8397axly6dmdl71x47";
-      name = "akonadi-calendar-tools-16.12.3.tar.xz";
-    };
-  };
-  akonadiconsole = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadiconsole-16.12.3.tar.xz";
-      sha256 = "195amn610y5ydg665ag45xb0l1wyplbdlrwagzc7yvswp12rlcv3";
-      name = "akonadiconsole-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-calendar-tools-17.04.0.tar.xz";
+      sha256 = "0s34m96i4y51fdb23v12mav7q2livq77xrpx0h2ghma0nljdhy1m";
+      name = "akonadi-calendar-tools-17.04.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-contacts-16.12.3.tar.xz";
-      sha256 = "1205g4z5rz02j8swrmhncm06d8m727z63d526djygz5svz15sd2l";
-      name = "akonadi-contacts-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-contacts-17.04.0.tar.xz";
+      sha256 = "01fw0qmnbsbcpy7wx14sg0kwbws4n2d63mbslb3c4hqgq6ahgz37";
+      name = "akonadi-contacts-17.04.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-import-wizard-16.12.3.tar.xz";
-      sha256 = "0dnpiqcmphm2x76f21acrwhg7ah5ih0hnhxdy1d6pm3ng2p1irfq";
-      name = "akonadi-import-wizard-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-import-wizard-17.04.0.tar.xz";
+      sha256 = "0a9k78w55wg9p22x7qwbpz7lzyijz1z3k12fv1c1g0vn1nbwcadv";
+      name = "akonadi-import-wizard-17.04.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-mime-16.12.3.tar.xz";
-      sha256 = "1xay3rlygdhf9lp356wjb92wnmxdpaxgm3prxnfxcdg5ql6xcg07";
-      name = "akonadi-mime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-mime-17.04.0.tar.xz";
+      sha256 = "1aidmb1bsx5xvppypzs2gg81jifcvc3jv2827hjkqvd021z831nv";
+      name = "akonadi-mime-17.04.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-notes-16.12.3.tar.xz";
-      sha256 = "0405nkz9ri9qlclgvwycvdx1gsms2pm1fn6xhvyrj2v4s8brb3r7";
-      name = "akonadi-notes-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-notes-17.04.0.tar.xz";
+      sha256 = "0jfcw9lh1rhydw1c14z065lv3h9xl1q3i66slmfmmamy99czczjr";
+      name = "akonadi-notes-17.04.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akonadi-search-16.12.3.tar.xz";
-      sha256 = "0wf22rmfz471iw6zxl7yz279fkks2pj5jfw4bs5185kr3xw2q7zp";
-      name = "akonadi-search-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akonadi-search-17.04.0.tar.xz";
+      sha256 = "1mgq0n5z8ar1zajwsrrs1failrrrkkv6g0pcs7grq2prfsv4z1p3";
+      name = "akonadi-search-17.04.0.tar.xz";
+    };
+  };
+  akonadiconsole = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/akonadiconsole-17.04.0.tar.xz";
+      sha256 = "01adzv1z92zyfi22psa6m30c290w37n0m01hd9wgjj8in4hzmk3d";
+      name = "akonadiconsole-17.04.0.tar.xz";
     };
   };
   akregator = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/akregator-16.12.3.tar.xz";
-      sha256 = "1v6jg35ha6wrjgwfvrvy1qwl1700dmk40d0fwy1irkpdlgg79128";
-      name = "akregator-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/akregator-17.04.0.tar.xz";
+      sha256 = "1dpvyx13lyl1pmphqr8mc9cxywkjcqy6aqmh7hdsi0vggafkiim5";
+      name = "akregator-17.04.0.tar.xz";
     };
   };
   analitza = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/analitza-16.12.3.tar.xz";
-      sha256 = "0ap3sf8bw9f58pzw3zy6w60apd4ccc47zs3v61x4kp1g81rn265w";
-      name = "analitza-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/analitza-17.04.0.tar.xz";
+      sha256 = "1mx2y0cqsj2v8pwcwpqsg5brakaw6g14acqxrx7xmpfzzi0y8mxg";
+      name = "analitza-17.04.0.tar.xz";
     };
   };
   ark = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ark-16.12.3.tar.xz";
-      sha256 = "0q1bxrsb03pwsvxqlbnzfmahlj300l336pdrm82vin89m294ird0";
-      name = "ark-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ark-17.04.0.tar.xz";
+      sha256 = "0qk829f10pjpvn3qpfbr16y6qkrgkbi510d1bqbsjnpnfz821hwk";
+      name = "ark-17.04.0.tar.xz";
     };
   };
   artikulate = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/artikulate-16.12.3.tar.xz";
-      sha256 = "113k6c0yrir61j258gn9n6k7fifa6g9g8wxf3zq18jy3liwdl97s";
-      name = "artikulate-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/artikulate-17.04.0.tar.xz";
+      sha256 = "1y6w1b17ndrplkkakskdzqws6apfa801gpqfh7lnq2r0vj48kz7m";
+      name = "artikulate-17.04.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/audiocd-kio-16.12.3.tar.xz";
-      sha256 = "0bmmi2rxx368nss8ciwj32dspc1ailc0shm06ynmhw3slrplnx1y";
-      name = "audiocd-kio-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/audiocd-kio-17.04.0.tar.xz";
+      sha256 = "1fqdgvl2rgln6zr73pgznp7bn3lhbaw03q5hd3ndh14yvlin64xw";
+      name = "audiocd-kio-17.04.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/baloo-widgets-16.12.3.tar.xz";
-      sha256 = "0h75zhdiylyjifdk9ikw9gpwla3p87knndc2svkci90ga7ynggvl";
-      name = "baloo-widgets-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/baloo-widgets-17.04.0.tar.xz";
+      sha256 = "0nkk2xj35cqg2w7795ys2lpynkcmwf4fnq53sb20vn95scnn88mw";
+      name = "baloo-widgets-17.04.0.tar.xz";
     };
   };
   blinken = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/blinken-16.12.3.tar.xz";
-      sha256 = "1z50ack1iqh194vn487nhdkrbn1camswy4a3g2ayxv3qfgmxdcga";
-      name = "blinken-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/blinken-17.04.0.tar.xz";
+      sha256 = "0mimvcy6jdx5xr46li4jc00c9yy4626p2jlzimnl1sv2fcs1f72h";
+      name = "blinken-17.04.0.tar.xz";
     };
   };
   blogilo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/blogilo-16.12.3.tar.xz";
-      sha256 = "14yl52m8x7b8bj2b7pkhabwg7rrmmhnkjq4z7mrxbnsndqmsi10f";
-      name = "blogilo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/blogilo-17.04.0.tar.xz";
+      sha256 = "0v9vv1jfis5bvbf9yflqkqilbpx0kp4zbwnazzcgc3hi9bgm2fdb";
+      name = "blogilo-17.04.0.tar.xz";
     };
   };
   bomber = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/bomber-16.12.3.tar.xz";
-      sha256 = "1h4s6amjzazr3ywcqw8d14a0fi1arzxka0g6i9ii85s904k23r41";
-      name = "bomber-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/bomber-17.04.0.tar.xz";
+      sha256 = "0kv3z2kz85mxbi99rdkz4i9xyv9xgkhayk4pq0qsy7g6lk31sv9h";
+      name = "bomber-17.04.0.tar.xz";
     };
   };
   bovo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/bovo-16.12.3.tar.xz";
-      sha256 = "1pr67gf47xmw21sv1im7k0dz18bhjfpbkhd7j5gaifj66h65sfy6";
-      name = "bovo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/bovo-17.04.0.tar.xz";
+      sha256 = "0j5nf701zj1wafy08mhv094dqqyzy9y9waz0wappvxn8maqj0dk2";
+      name = "bovo-17.04.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/calendarsupport-16.12.3.tar.xz";
-      sha256 = "0r30z2wzyms7m7s8y0livsfy5pj82g988bs6amaj2571hz55d8y0";
-      name = "calendarsupport-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/calendarsupport-17.04.0.tar.xz";
+      sha256 = "1r7cai24ac857an7sgmgyyjy6m2vrjy80ba3qxszys9v3mya60ya";
+      name = "calendarsupport-17.04.0.tar.xz";
     };
   };
   cantor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/cantor-16.12.3.tar.xz";
-      sha256 = "1nzg9sfnv8afpa84x51whbw1qh8gfwqnkr5zyai7817kkc97g1l8";
-      name = "cantor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/cantor-17.04.0.tar.xz";
+      sha256 = "0vy7ygiimlrqnv4nq2393hriaryr5si478kijf6q0dvqg1px59xy";
+      name = "cantor-17.04.0.tar.xz";
     };
   };
   cervisia = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/cervisia-16.12.3.tar.xz";
-      sha256 = "14r55ngvz4rci1h3iqdwbfcyxmm2b04c5smkv9x0bqxq4zz2yfvk";
-      name = "cervisia-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/cervisia-17.04.0.tar.xz";
+      sha256 = "1z9svqp42slh7fwczjv847scyjdbz9a5pzzkrfvqggi2wc85vzin";
+      name = "cervisia-17.04.0.tar.xz";
     };
   };
   dolphin = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/dolphin-16.12.3.tar.xz";
-      sha256 = "0y35ljbjib4pvyngdgbq1yx3rfmy94crpa7v1zzwfav94lm3kwb2";
-      name = "dolphin-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/dolphin-17.04.0.tar.xz";
+      sha256 = "09r2pqzjq7g7322m2vb1s1909bzckh0h9fwzsxvrmyz1cfdd765y";
+      name = "dolphin-17.04.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/dolphin-plugins-16.12.3.tar.xz";
-      sha256 = "18azlmzw33praz4z6lamamj79gyxbbdgz7lp1cimxyddhmacc2x9";
-      name = "dolphin-plugins-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/dolphin-plugins-17.04.0.tar.xz";
+      sha256 = "0mj0p1lbdvfn46i5bry394rqpriv0w1389dw526xz6cplrzydi2q";
+      name = "dolphin-plugins-17.04.0.tar.xz";
     };
   };
   dragon = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/dragon-16.12.3.tar.xz";
-      sha256 = "1652cl6sa9d71c685xpwqv5hgz3spxg2hynwcnn8xybn5hv9ar4r";
-      name = "dragon-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/dragon-17.04.0.tar.xz";
+      sha256 = "08mlsj4ib0s219vnrmy7g6iap8zaaha12vhqrc5950248k0rz181";
+      name = "dragon-17.04.0.tar.xz";
     };
   };
   eventviews = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/eventviews-16.12.3.tar.xz";
-      sha256 = "0z8jznvw2nhszrlll7458gb4r0585ivkbq9dqplkw2mdrv7vxz5c";
-      name = "eventviews-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/eventviews-17.04.0.tar.xz";
+      sha256 = "1gylv5p9v96g4krcnd9xqg0nfvxzhxyc4ywy0wbqfn5zwngzpz80";
+      name = "eventviews-17.04.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ffmpegthumbs-16.12.3.tar.xz";
-      sha256 = "1scyyd85rs21rv3ghcxv7pw3aa2nl703gi4dpikbsd7wjmxixzq9";
-      name = "ffmpegthumbs-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ffmpegthumbs-17.04.0.tar.xz";
+      sha256 = "0jrq940x50n9g613db254sflwpw4pa70r79hkvkf3ri11s80hmgm";
+      name = "ffmpegthumbs-17.04.0.tar.xz";
     };
   };
   filelight = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/filelight-16.12.3.tar.xz";
-      sha256 = "13gcx1w9zq3i9fy32m3ypjyqcd9vrkqyr0j4cbqfvhpzv2chk3is";
-      name = "filelight-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/filelight-17.04.0.tar.xz";
+      sha256 = "18dz82kdgazwv00kvbfm5ln13g28s5sqyp9cfm0c7vrdnq8spng8";
+      name = "filelight-17.04.0.tar.xz";
     };
   };
   granatier = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/granatier-16.12.3.tar.xz";
-      sha256 = "17vpz6jz2vvpvsrhvllglacrwg0sxy15aqnm8n6d73sk9zlv9n76";
-      name = "granatier-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/granatier-17.04.0.tar.xz";
+      sha256 = "08jlpnriq6kvsnfgjar0w3ci6mla1m4bd3qzsxbv5f0hbqj78rm8";
+      name = "granatier-17.04.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/grantlee-editor-16.12.3.tar.xz";
-      sha256 = "007q6cb5f3vzw6dwm2y2b5m3dhb5mws5b6083ssm8rydycyi9pzi";
-      name = "grantlee-editor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/grantlee-editor-17.04.0.tar.xz";
+      sha256 = "1famfm6r32m8i0mp7aiqki8k4rhl6p5dvp3905lbdm355rv2b60b";
+      name = "grantlee-editor-17.04.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/grantleetheme-16.12.3.tar.xz";
-      sha256 = "19mka62p75qnv6r9ib70y25jjj3bpziz0xqihfkb6jvafrgy8p8k";
-      name = "grantleetheme-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/grantleetheme-17.04.0.tar.xz";
+      sha256 = "1dikbf90l55d62zxmw8rw85bkpcgrdf455k33b91ldnhfb3vw3i4";
+      name = "grantleetheme-17.04.0.tar.xz";
     };
   };
   gwenview = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/gwenview-16.12.3.tar.xz";
-      sha256 = "069fblw9g9h6r9gy05nj2n93jpnsx610jncwl6403q01rwlbrgbr";
-      name = "gwenview-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/gwenview-17.04.0.tar.xz";
+      sha256 = "0n4m1zd43g68qgpdvifj5h3ry39262qmm553w3f7yd6i2gpvy2a1";
+      name = "gwenview-17.04.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/incidenceeditor-16.12.3.tar.xz";
-      sha256 = "11jplw3fngnyvpjkhqwv1gzzwxxcm4v93h09f68hs015apncjvpp";
-      name = "incidenceeditor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/incidenceeditor-17.04.0.tar.xz";
+      sha256 = "10yi8hqf5p5nbi9rq8kzkqmbjq0c41a9mz8rjhbz1pac686b87c7";
+      name = "incidenceeditor-17.04.0.tar.xz";
     };
   };
   jovie = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/jovie-16.12.3.tar.xz";
-      sha256 = "190c4g587x4wxbfksf0mszq5qv1pzny6bkd3w2pwwsj222bl0fxa";
-      name = "jovie-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/jovie-17.04.0.tar.xz";
+      sha256 = "1n3d03h9mzfyrga9c78mlk5vd53xqqpz9cjj27sw35fhc9l6h5fp";
+      name = "jovie-17.04.0.tar.xz";
     };
   };
   juk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/juk-16.12.3.tar.xz";
-      sha256 = "1ssgia5sknam2hnjflzglv0khxbwyyvzm4w1wmxw04rbjzs4gi4h";
-      name = "juk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/juk-17.04.0.tar.xz";
+      sha256 = "0il7i8lbij9axm7wfgpnzmax3kz8qbdsiizmkwivvaxizvsvc1yz";
+      name = "juk-17.04.0.tar.xz";
+    };
+  };
+  k3b = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/k3b-17.04.0.tar.xz";
+      sha256 = "0wsa8s5ndcbskgd505l0nkp9ghj7dsrxwnlkq0rhqjwvfsa7law3";
+      name = "k3b-17.04.0.tar.xz";
     };
   };
   kaccessible = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kaccessible-16.12.3.tar.xz";
-      sha256 = "162a4pw61b3rhq5mf7zdhgyyhbrxhr9fjw7bidicw7aljiy2cwb9";
-      name = "kaccessible-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kaccessible-17.04.0.tar.xz";
+      sha256 = "0gkcvm0kz8kwkla3mclryisi4j0cdd6byaq8wvpnfhl68kwb8a33";
+      name = "kaccessible-17.04.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kaccounts-integration-16.12.3.tar.xz";
-      sha256 = "0w8h33sysf590xyg4bvf2a2z39kzc0wn6mxv31mrf68b6ks7b9h2";
-      name = "kaccounts-integration-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kaccounts-integration-17.04.0.tar.xz";
+      sha256 = "0ml1jq4dd3n2ksmw7i5vrsv4lhibdk1d2mvy3yn45w1g8gpqwl8l";
+      name = "kaccounts-integration-17.04.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kaccounts-providers-16.12.3.tar.xz";
-      sha256 = "0iqqwfjadsf7nhrqvpzypazipris4ljhf6daprxwxqa2bfigr5j2";
-      name = "kaccounts-providers-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kaccounts-providers-17.04.0.tar.xz";
+      sha256 = "1i19q1rmjwmkd5r23w3zjyk0gf4xrw7j4f0s8q591rgqzy2lhkc3";
+      name = "kaccounts-providers-17.04.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kaddressbook-16.12.3.tar.xz";
-      sha256 = "1a86asy0pw8ivyg7aaw2mais4xbplabp5aljzcyb2rykij6482rh";
-      name = "kaddressbook-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kaddressbook-17.04.0.tar.xz";
+      sha256 = "1qglxn2inibqiljazsd2mc49sk8pv3jkvjn9icxhgfdjg234fl4z";
+      name = "kaddressbook-17.04.0.tar.xz";
     };
   };
   kajongg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kajongg-16.12.3.tar.xz";
-      sha256 = "0xwwkl2npls0aq4435xlcvssm8pmfhramjgxv70mnjapr0dlpk5c";
-      name = "kajongg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kajongg-17.04.0.tar.xz";
+      sha256 = "1bzfafrslsihbldzdnl1a48wx65yrc9phxjnaiws82ig5369r3xn";
+      name = "kajongg-17.04.0.tar.xz";
     };
   };
   kalarm = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kalarm-16.12.3.tar.xz";
-      sha256 = "1n3h252cvqib1bx4ryq3xgj2mkqr38wvhiyj2vkkll4pf5lphpqz";
-      name = "kalarm-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kalarm-17.04.0.tar.xz";
+      sha256 = "1zqblg5wflw0y3fdqihifh25xzm2y0ih9b0i3909wkw0j7p1z4g7";
+      name = "kalarm-17.04.0.tar.xz";
     };
   };
   kalarmcal = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kalarmcal-16.12.3.tar.xz";
-      sha256 = "064sihcsbdi1w6viv5gq6sw2m8r7x3nn1hl2aji1109pf5913vbr";
-      name = "kalarmcal-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kalarmcal-17.04.0.tar.xz";
+      sha256 = "136vw2sak3z571lv9m2lmnxpgkwhy663q81j6z2gq8vday72ar44";
+      name = "kalarmcal-17.04.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kalgebra-16.12.3.tar.xz";
-      sha256 = "0qhini5gm41dlyham4zzqgz6r11s2rfwwphb81xvwp1bgn8q2rqb";
-      name = "kalgebra-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kalgebra-17.04.0.tar.xz";
+      sha256 = "05gkw20g7qc72lsgbhqqmxvmgkgs5bdsyw71kp1dz4h6q7gvck04";
+      name = "kalgebra-17.04.0.tar.xz";
     };
   };
   kalzium = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kalzium-16.12.3.tar.xz";
-      sha256 = "0rlfjqfb1vpr0cdcx429nvrbkr7kc1m4ps3z3pphkajq4vlrql8i";
-      name = "kalzium-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kalzium-17.04.0.tar.xz";
+      sha256 = "17bpn0yqkdrsqrx08zvhxwbjh8f0wdngq375cvv2mgmkjikq375k";
+      name = "kalzium-17.04.0.tar.xz";
     };
   };
   kamera = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kamera-16.12.3.tar.xz";
-      sha256 = "04p19qv5ssf5wlpfqzhqsi8281pzcdjkd0jy177f9r7qgqq4lkgr";
-      name = "kamera-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kamera-17.04.0.tar.xz";
+      sha256 = "178886fbkj3fz25xddgpprmxmn0iv7ndnxygsxq434c9pv3zdxb9";
+      name = "kamera-17.04.0.tar.xz";
     };
   };
   kanagram = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kanagram-16.12.3.tar.xz";
-      sha256 = "183hkxxwf7h335gmfvi2lppsyhpv80lvlg1fg4whq79f1d2lrw47";
-      name = "kanagram-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kanagram-17.04.0.tar.xz";
+      sha256 = "0r4k5jsc8vnj2pgpca0iyr0lrz2q683db8nsk6axgv72hkp3v07i";
+      name = "kanagram-17.04.0.tar.xz";
     };
   };
   kapman = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kapman-16.12.3.tar.xz";
-      sha256 = "1if3dzn1qy2pr42zcmzpq7f38spkxh492gl12vndckzah67cmz4g";
-      name = "kapman-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kapman-17.04.0.tar.xz";
+      sha256 = "18mr5i0qvix4vnmy7m721jipafwlh19paczay0ci7qpj1538vrlq";
+      name = "kapman-17.04.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kapptemplate-16.12.3.tar.xz";
-      sha256 = "036npdxyh9rx0aaiwvdjqrb39f8bqglqbl3iddb1vh7w9p1h158n";
-      name = "kapptemplate-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kapptemplate-17.04.0.tar.xz";
+      sha256 = "1wf29198h6964p2bcb6p5harrsjpbdqsh8r82rn6wh755f033038";
+      name = "kapptemplate-17.04.0.tar.xz";
     };
   };
   kate = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kate-16.12.3.tar.xz";
-      sha256 = "1fbrdlf64bdj71g692fkk7fiym0nm9vvbki2q105carrhl4w9s0r";
-      name = "kate-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kate-17.04.0.tar.xz";
+      sha256 = "0hk03bpbxyb7jrhbjihqymsih9c3wh8xllz3f4y7qfpcl8v1k3bc";
+      name = "kate-17.04.0.tar.xz";
     };
   };
   katomic = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/katomic-16.12.3.tar.xz";
-      sha256 = "14dnfjww1fzgz3nbg45ck5yqbxdyvp0la9qs4n5cjy1ym52k5pjm";
-      name = "katomic-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/katomic-17.04.0.tar.xz";
+      sha256 = "0m1dymjsa0b11yqcjska84x779xb8q14igshb4cnrr3rlyr71p5f";
+      name = "katomic-17.04.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kblackbox-16.12.3.tar.xz";
-      sha256 = "0i359pq65swrzsb7vdk0m00vjrj2xgvbgxin8ly2cijqlmfd3iv8";
-      name = "kblackbox-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kblackbox-17.04.0.tar.xz";
+      sha256 = "1dsc5pbh3g05skw25x6fyg55cykkyjaw6abhnl947z16gbixnqrg";
+      name = "kblackbox-17.04.0.tar.xz";
     };
   };
   kblocks = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kblocks-16.12.3.tar.xz";
-      sha256 = "09kdbwya4xl84vzayhz286lmfb6a0mmp9i40hzldfl59as4d67kw";
-      name = "kblocks-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kblocks-17.04.0.tar.xz";
+      sha256 = "1cn4qdk0jgw78v9ymsr353rk8h8p3mcd5r57pjnw3wmjpswc0plg";
+      name = "kblocks-17.04.0.tar.xz";
     };
   };
   kblog = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kblog-16.12.3.tar.xz";
-      sha256 = "0q1qswg7dgy0jvk9kaz6cps6sfddsmv0lp5r3nhk751l497bbl3x";
-      name = "kblog-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kblog-17.04.0.tar.xz";
+      sha256 = "076225i38iqr4ml1g54nhd8mkjia8k0j7rc8ixv812ksq7xza69b";
+      name = "kblog-17.04.0.tar.xz";
     };
   };
   kbounce = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kbounce-16.12.3.tar.xz";
-      sha256 = "0cwvsbw0a60a2csxqvpkm3znbcd1whsl80v63ljyc3gyik7wxil0";
-      name = "kbounce-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kbounce-17.04.0.tar.xz";
+      sha256 = "0jjmpmhqsjksvgxl92bh7xmh2wf1cz52fdk5vfa90mw08xi07d4n";
+      name = "kbounce-17.04.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kbreakout-16.12.3.tar.xz";
-      sha256 = "0zszxxw7r7ggxhc47pngsi7bl57mnhbzkb0bhvy5rcyamgi90v39";
-      name = "kbreakout-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kbreakout-17.04.0.tar.xz";
+      sha256 = "0n206mxxbgkynw74sry7jfvyvspyc34vzs3xilny8xiks2g4zbjm";
+      name = "kbreakout-17.04.0.tar.xz";
     };
   };
   kbruch = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kbruch-16.12.3.tar.xz";
-      sha256 = "12zmp9ix8q9mf3a4xpbsr0y9h4g1srwx48604x1phdwwdhgx0gsj";
-      name = "kbruch-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kbruch-17.04.0.tar.xz";
+      sha256 = "0i9pmir83js31kzwqdw9ka93lpgnb6gbrsi96djjqv7pj93gql32";
+      name = "kbruch-17.04.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcachegrind-16.12.3.tar.xz";
-      sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
-      name = "kcachegrind-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcachegrind-17.04.0.tar.xz";
+      sha256 = "130m50lnkcqpr3c4icznlysnj9xnzy5viv95756fxnass44vi349";
+      name = "kcachegrind-17.04.0.tar.xz";
     };
   };
   kcalc = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcalc-16.12.3.tar.xz";
-      sha256 = "06kfz1d5i01h31v277y04pqnx08yv0050rlb6phv72cx6div4mgp";
-      name = "kcalc-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcalc-17.04.0.tar.xz";
+      sha256 = "01cmcn20hbnaph2217wam0qf42mfvwqb9s3h467qk0y3pgq7syb4";
+      name = "kcalc-17.04.0.tar.xz";
     };
   };
   kcalcore = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcalcore-16.12.3.tar.xz";
-      sha256 = "09i43vs6jpjmmk52df6pzclh0jn8shn3wfnaivw2wlirwa60d901";
-      name = "kcalcore-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcalcore-17.04.0.tar.xz";
+      sha256 = "0xmsh0fkmz0qrj4ali1d7n6jbxj0cl8s640fjvwd1sic5ib7pcj0";
+      name = "kcalcore-17.04.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcalutils-16.12.3.tar.xz";
-      sha256 = "0449029fa1w496fmb81csb5amk801n11ish450drqw34lp9qla4n";
-      name = "kcalutils-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcalutils-17.04.0.tar.xz";
+      sha256 = "0if4c989a846aqcn7mc0blkxwrl3zk3w2jrrigdyaafrpb6k6jch";
+      name = "kcalutils-17.04.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcharselect-16.12.3.tar.xz";
-      sha256 = "1iwqqds9fy970ykgq1xbpbrzpdacy1h4bw87h1jingi42z1jkw2n";
-      name = "kcharselect-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcharselect-17.04.0.tar.xz";
+      sha256 = "1fi6malyh357xwi8i456b6iksbx208mhsnhhl6bgwrvqpkd1h3h3";
+      name = "kcharselect-17.04.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcolorchooser-16.12.3.tar.xz";
-      sha256 = "13nkvxl3z2l3m6zs057ipxgqfgsw7gma1rs66maqhzl30k3hrcyb";
-      name = "kcolorchooser-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcolorchooser-17.04.0.tar.xz";
+      sha256 = "1jc43ric98kwknalhh7nlh1zm28g12ygvaiv3jmrqw97rra86wa0";
+      name = "kcolorchooser-17.04.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcontacts-16.12.3.tar.xz";
-      sha256 = "1479g32c9532pjgmfpy38vycii1sxk1nzv27z7wbgpxch6735szx";
-      name = "kcontacts-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcontacts-17.04.0.tar.xz";
+      sha256 = "165adk2a8vyqyszp3llwm24n5ngs5l4bhhym022zynq7fh8w1grh";
+      name = "kcontacts-17.04.0.tar.xz";
     };
   };
   kcron = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kcron-16.12.3.tar.xz";
-      sha256 = "0whxc9h7qn0fwcca9sq6qy0j4hfb8xlkdypnb6gspl687ws799xz";
-      name = "kcron-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kcron-17.04.0.tar.xz";
+      sha256 = "0v6w543ns1gyr2c0lxajdd969f669si93hadahx6d3vnqk8nqa70";
+      name = "kcron-17.04.0.tar.xz";
     };
   };
-  kdebugsettings = {
-    version = "16.12.3";
+  kdav = {
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdebugsettings-16.12.3.tar.xz";
-      sha256 = "0mkhklv4dynz23w8w9yh5qspdlfp3hi6fyiijyfwj358rqgbf3p5";
-      name = "kdebugsettings-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdav-17.04.0.tar.xz";
+      sha256 = "03nibqip9ryrb56hix5aq1lihp9w06c1hdzg505wjcnvwr7rd02c";
+      name = "kdav-17.04.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-dev-scripts-16.12.3.tar.xz";
-      sha256 = "0kiddn0wg90p98zgnpq3x2hcfw8xczn98nyd21zbkzz357v14pya";
-      name = "kde-dev-scripts-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-dev-scripts-17.04.0.tar.xz";
+      sha256 = "1s6k746hzsycwk7jb2i5blhfvg84flfgc79j1aa8kzpx4l31v3qz";
+      name = "kde-dev-scripts-17.04.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-dev-utils-16.12.3.tar.xz";
-      sha256 = "0svbl7yd5vz285gaymxy5mz0ll6fviamrbd6fjhj7rc4qx1gjgin";
-      name = "kde-dev-utils-16.12.3.tar.xz";
-    };
-  };
-  kdeedu-data = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdeedu-data-16.12.3.tar.xz";
-      sha256 = "0vqzamp5fc2d0i9qn6986f3a1s1fdbrlzrsnimpdfcas5xngbv5m";
-      name = "kdeedu-data-16.12.3.tar.xz";
-    };
-  };
-  kdegraphics-mobipocket = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdegraphics-mobipocket-16.12.3.tar.xz";
-      sha256 = "06zqny8idaw7s85h7iprbwdp7y1qspfp7yh5klwav12p72nn54w2";
-      name = "kdegraphics-mobipocket-16.12.3.tar.xz";
-    };
-  };
-  kdegraphics-thumbnailers = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdegraphics-thumbnailers-16.12.3.tar.xz";
-      sha256 = "01q2czzqq240cbp9yg7mji2q15kmiwn1aqs6iii00i56yy2mwaxq";
-      name = "kdegraphics-thumbnailers-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-dev-utils-17.04.0.tar.xz";
+      sha256 = "03dqxaqj36bgwnn2r3dcwgqfxrqf7i5lwqr1sp6rq2799dv135j2";
+      name = "kde-dev-utils-17.04.0.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ar-16.12.3.tar.xz";
-      sha256 = "1a6in9zq0a4a1v7mijm7gdrprkb5djp4qzyrbrwwlyzpk0sjs153";
-      name = "kde-l10n-ar-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ar-17.04.0.tar.xz";
+      sha256 = "1yj46m2appxwjvabsb0c1inmfkfviwqg1dfh7kcyqbg3nb11kdj6";
+      name = "kde-l10n-ar-17.04.0.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ast-16.12.3.tar.xz";
-      sha256 = "05di4xbm8viam0lz6gsyl8zip01dan5bb3h1ib7n7ri4rd49gb13";
-      name = "kde-l10n-ast-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ast-17.04.0.tar.xz";
+      sha256 = "1pxbdd464ifvxcpk5nwfnqakggaq8648cpdksp9p68ybca33iwg0";
+      name = "kde-l10n-ast-17.04.0.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-bg-16.12.3.tar.xz";
-      sha256 = "1clqz50ri2zpsaqvlwq01jc44d2w4abpwaqd37jcvcpjg836kj32";
-      name = "kde-l10n-bg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-bg-17.04.0.tar.xz";
+      sha256 = "128pf72srr0gypyzs7vqgxphhxqy397aaj1m35bav87r80xvqgk1";
+      name = "kde-l10n-bg-17.04.0.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-bs-16.12.3.tar.xz";
-      sha256 = "1lfpq4lixamh08vmmj8ai8pzdybs1anlg8vfb6lnxj3dpplxxjdv";
-      name = "kde-l10n-bs-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-bs-17.04.0.tar.xz";
+      sha256 = "1k3j2ilafmzpzf5shqcjggr8j26kwjr33w1qvnxhssnsjc6adx9l";
+      name = "kde-l10n-bs-17.04.0.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ca-16.12.3.tar.xz";
-      sha256 = "1h3d7gdpixiqn4gyk1z9lj5k4bhf4719w1rcfzcajrpwrmvdfvms";
-      name = "kde-l10n-ca-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ca-17.04.0.tar.xz";
+      sha256 = "1zw3b967arp2vz86phj4n4y0mib6y2rqv5ak9jfxqmfpj03qlgf9";
+      name = "kde-l10n-ca-17.04.0.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.12.3";
+    version = "ca_valencia-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ca@valencia-16.12.3.tar.xz";
-      sha256 = "00g1124n84lq380srykcr4yigqr5w9xivssj27jf1ak40vyanln0";
-      name = "kde-l10n-ca_valencia-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ca@valencia-17.04.0.tar.xz";
+      sha256 = "0f36rz4nnvz0k97c4wrrhy3zr6njydvib2v10smph58zfqwd233d";
+      name = "kde-l10n-ca_valencia-17.04.0.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-cs-16.12.3.tar.xz";
-      sha256 = "0nvl0lbg1pw1r73ggycfqjvlga6lg7gyin4bigyjcq41k9y6xf91";
-      name = "kde-l10n-cs-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-cs-17.04.0.tar.xz";
+      sha256 = "12280xwvpz3m43arc62s4w0bfc1p10fqfi9v0d90adsgmh0zffhs";
+      name = "kde-l10n-cs-17.04.0.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-da-16.12.3.tar.xz";
-      sha256 = "1bsv0z0q5fqgn2jkgazm3aazi6s9crz23acwx9p2w7fc7h98bqpq";
-      name = "kde-l10n-da-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-da-17.04.0.tar.xz";
+      sha256 = "05icziwpysbyz7y8b6snpvf6cyrs2yzic0p1v2x1m2s392nwx0qp";
+      name = "kde-l10n-da-17.04.0.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-de-16.12.3.tar.xz";
-      sha256 = "0ym6f1n86rvbwdk0xlx2ajfv4l70kw3qir8z82d2jf5dhgz9h2k6";
-      name = "kde-l10n-de-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-de-17.04.0.tar.xz";
+      sha256 = "18fi7a5z9lnjmqabaz6q4yxcrpkmb62ri6c0zf1bff57cwvn2wbd";
+      name = "kde-l10n-de-17.04.0.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-el-16.12.3.tar.xz";
-      sha256 = "1dd51kh52rq9y3r2iz985ib2bpi109vf2xv2abkm8ddsfmb1mq6c";
-      name = "kde-l10n-el-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-el-17.04.0.tar.xz";
+      sha256 = "04nqk6par22126y6v0c343ylwy2h0ylw03gjs0pp7a7cgq1lqh13";
+      name = "kde-l10n-el-17.04.0.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-16.12.3";
+    version = "en_GB-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-en_GB-16.12.3.tar.xz";
-      sha256 = "0yc6fk5ak0442gv1gxwwz2zz13s9d1ihlfkvl8aqi6zky5b6c91n";
-      name = "kde-l10n-en_GB-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-en_GB-17.04.0.tar.xz";
+      sha256 = "0a0xwcvwv2sgjkzzy6wvyymm1l7b8xfk7lhiwh7bgm0il66shw98";
+      name = "kde-l10n-en_GB-17.04.0.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-eo-16.12.3.tar.xz";
-      sha256 = "0p43p1as9s2x4145k59li39fvg77c38mjnlb16zhb5bg5c0r1401";
-      name = "kde-l10n-eo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-eo-17.04.0.tar.xz";
+      sha256 = "0cbf5qwh18yd4kadkn11mh86d9zhxkwm0gnivjmd62lrz41rxr92";
+      name = "kde-l10n-eo-17.04.0.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-es-16.12.3.tar.xz";
-      sha256 = "194svk1axicbijy4ywsrn1q27pzrm3g139i63388qh3lzv8654p1";
-      name = "kde-l10n-es-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-es-17.04.0.tar.xz";
+      sha256 = "1xjjmia250w02wcw4jm7lsmixwd4qp2db5nxl1hql4ln1n2af9hk";
+      name = "kde-l10n-es-17.04.0.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-et-16.12.3.tar.xz";
-      sha256 = "1q0mrc517jr5hicklhzvs6vw5vwgvb2gj3fi93a9iqxbw1a794pk";
-      name = "kde-l10n-et-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-et-17.04.0.tar.xz";
+      sha256 = "1ivydzg39j0rv0y1vvkkh9429iyfx6mk44sswkg2gc9mccpwfa5s";
+      name = "kde-l10n-et-17.04.0.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-eu-16.12.3.tar.xz";
-      sha256 = "0dgwklynwwksdm0dxk8dm53y0v92kfin6vgwpn2scc97fns16r08";
-      name = "kde-l10n-eu-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-eu-17.04.0.tar.xz";
+      sha256 = "0pkj8sghzyvp20qgd6ys8znri011scrlgkx32ky3q74gn5dr4k95";
+      name = "kde-l10n-eu-17.04.0.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fa-16.12.3.tar.xz";
-      sha256 = "1ywipqg2dv3dapp3m7sfhap4izhabb4srk3gpl2kd2wx0abnwmdb";
-      name = "kde-l10n-fa-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fa-17.04.0.tar.xz";
+      sha256 = "1slmhm6rl691n60xw53f9s5ibn8b9h1sb7i0rc8s2mk9cs6zqs4i";
+      name = "kde-l10n-fa-17.04.0.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fi-16.12.3.tar.xz";
-      sha256 = "11grklvacq70mq4fj0772v8xqmp1b1pl7gff8gvy692rva5qhv29";
-      name = "kde-l10n-fi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fi-17.04.0.tar.xz";
+      sha256 = "1yq7kiiqv4hhn7i14ccvh3nllv8i0xw9jv3z38r427gimi6d8p3d";
+      name = "kde-l10n-fi-17.04.0.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-fr-16.12.3.tar.xz";
-      sha256 = "0qx849ilp1597nxrx6cmgnmm202all14y8pcyd19gp70wdra8wcm";
-      name = "kde-l10n-fr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fr-17.04.0.tar.xz";
+      sha256 = "0v2i6f7yf58qzd69hcb0jz0x1j3w99702wiflfags7qyzbszgan2";
+      name = "kde-l10n-fr-17.04.0.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ga-16.12.3.tar.xz";
-      sha256 = "06w92m84bxqs06gyi45x1jmzh99ip7vnnzjq7ixx7ny9k6m0as1m";
-      name = "kde-l10n-ga-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ga-17.04.0.tar.xz";
+      sha256 = "0q9y1dqk9j1fgk6fc1fdg3g26896x47cnnmbdgf037plbr0b4j5b";
+      name = "kde-l10n-ga-17.04.0.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-gl-16.12.3.tar.xz";
-      sha256 = "1k6jydmqbmxfkimxqn8qhd136zdjz4z7d5mk0n80607n91y7n3kv";
-      name = "kde-l10n-gl-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-gl-17.04.0.tar.xz";
+      sha256 = "118p49vkdnmn707rf20gaycrrq3kb2qjqa9abq2ibfxdigwj20cy";
+      name = "kde-l10n-gl-17.04.0.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-he-16.12.3.tar.xz";
-      sha256 = "1ry1wd9ng5xwpi402p1rqbsrb0ma7bgkmx53yygzc5mpszarga6y";
-      name = "kde-l10n-he-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-he-17.04.0.tar.xz";
+      sha256 = "0ba1ccwkwqsdxlxfbq3fcjmbpww2sr9kx08j3nz453qdndfyp9md";
+      name = "kde-l10n-he-17.04.0.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hi-16.12.3.tar.xz";
-      sha256 = "1qwjiarqi8c3b15nc2nqrxvb6pcrb232qcx6nz0f9day2d0zxdwk";
-      name = "kde-l10n-hi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hi-17.04.0.tar.xz";
+      sha256 = "0gy7c67b9glhp0x6l8jxycp8vsdkv77025wdf9kn5l8sy1hqqhbp";
+      name = "kde-l10n-hi-17.04.0.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hr-16.12.3.tar.xz";
-      sha256 = "0y3pvdy1pkhraahsfkwhkar6004ll19gd6rhhhzgaw0irmw1yxp1";
-      name = "kde-l10n-hr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hr-17.04.0.tar.xz";
+      sha256 = "063pppyl57i241dxr68wbvh8k3ccck5589mrn5yhdcw30b0hiwr7";
+      name = "kde-l10n-hr-17.04.0.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-hu-16.12.3.tar.xz";
-      sha256 = "001pl0l0cj4f2j7c6fjv9jv4wnkk2zb428y8szqm78zg85ms9wpz";
-      name = "kde-l10n-hu-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hu-17.04.0.tar.xz";
+      sha256 = "1b16xbdkh5varv650frnp9jsp8di6lnd61i04gaa3sxfy25xjzb2";
+      name = "kde-l10n-hu-17.04.0.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ia-16.12.3.tar.xz";
-      sha256 = "09p9r6xzirr6cwcjdg10db62g3d4z0ksl6caf45rz0i2k5zn4r6r";
-      name = "kde-l10n-ia-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ia-17.04.0.tar.xz";
+      sha256 = "0gmzk2cac5gfa6j0m2d7lbwpi9y1dkrlk37r7iqvvzmqdsx2nzsy";
+      name = "kde-l10n-ia-17.04.0.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-id-16.12.3.tar.xz";
-      sha256 = "1kanlr401ljaaqijhdvv52lvrn90m9b0l6i2jly8mdnnnwp896ra";
-      name = "kde-l10n-id-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-id-17.04.0.tar.xz";
+      sha256 = "1cdsapfq74600n2p49fzv8lflall755kyvkpi152clb7a66vmysc";
+      name = "kde-l10n-id-17.04.0.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-is-16.12.3.tar.xz";
-      sha256 = "10a9sxjnv9xb9wy04b9pfwpj4xg22x0ami37jhwggpskl9sj736v";
-      name = "kde-l10n-is-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-is-17.04.0.tar.xz";
+      sha256 = "0g9s9ywkhdnyh76lr7j73ba7ydsvh6ki6y0qcgvhzg9jnd4rywzb";
+      name = "kde-l10n-is-17.04.0.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-it-16.12.3.tar.xz";
-      sha256 = "0f771kli3zw6dgwdxgk19kiy6gwv9yj3f2cgiyxaiak8yawa9ary";
-      name = "kde-l10n-it-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-it-17.04.0.tar.xz";
+      sha256 = "0hhq5gvlzfhz270caqh6g5k1dp740cakamn46zli5586hpmpdk8d";
+      name = "kde-l10n-it-17.04.0.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ja-16.12.3.tar.xz";
-      sha256 = "1p0arv340i34gdlkdbjw234c9a4jqy8z417f0p19pn6ic3i5i6yv";
-      name = "kde-l10n-ja-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ja-17.04.0.tar.xz";
+      sha256 = "149zazsdm89q5shfxpg5xsd51l0xrq12w8pw4nnkwpbv6vqwsf8w";
+      name = "kde-l10n-ja-17.04.0.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-kk-16.12.3.tar.xz";
-      sha256 = "1ik3abczhxkm2b8i22akz12q5lm7rsc7i4qdz6ml1sn4kd0949i5";
-      name = "kde-l10n-kk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-kk-17.04.0.tar.xz";
+      sha256 = "1n4qfkj2h03x2b9d1q1zjkz7aiqqjvy9sci3scbqqd3apf80jgn9";
+      name = "kde-l10n-kk-17.04.0.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-km-16.12.3.tar.xz";
-      sha256 = "1lwpfkv87i6km9pxrm78cqnnb1jnysaij0lmgvz2d0bs6dldaxrs";
-      name = "kde-l10n-km-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-km-17.04.0.tar.xz";
+      sha256 = "1bd0m5rkrvizvlr57wagixavk8c6449a8xl07j0hk12ha7c3livy";
+      name = "kde-l10n-km-17.04.0.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ko-16.12.3.tar.xz";
-      sha256 = "0c0hkprngxyxj2sf05s5i0y04i5f4vgqis1mgq500l03q0x16b4y";
-      name = "kde-l10n-ko-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ko-17.04.0.tar.xz";
+      sha256 = "10j0can8m0814jsch96f20625pr01ag8xqjyx4ridfssh8jry8s9";
+      name = "kde-l10n-ko-17.04.0.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-lt-16.12.3.tar.xz";
-      sha256 = "04d2l2qisbpzxppxchfrxnijc8706pq3s9pgmyyy6c0v26gsgz77";
-      name = "kde-l10n-lt-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-lt-17.04.0.tar.xz";
+      sha256 = "0l7w027g66dczhr8242k0fqvzjpcqi2jmna0lv1d7281kmyc0h49";
+      name = "kde-l10n-lt-17.04.0.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-lv-16.12.3.tar.xz";
-      sha256 = "1af13p7ri4x3dhwlv30gf7za7dgsr1kx3khzlgdg4hcgi2s4aq12";
-      name = "kde-l10n-lv-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-lv-17.04.0.tar.xz";
+      sha256 = "0ykl7wpi7x5nwy6pdp0h3fpm8ycvc4r2q0p446rz63fmp0vmax2h";
+      name = "kde-l10n-lv-17.04.0.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-mr-16.12.3.tar.xz";
-      sha256 = "16g8ln11x9qpda4wgzwvvij77bdpsdd6vsh7ysik8fc87km4qkax";
-      name = "kde-l10n-mr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-mr-17.04.0.tar.xz";
+      sha256 = "0k4dkq744ak3w7mfx4x3skkpnp2lnvj5zqihchhp2w6ik2yq3wkd";
+      name = "kde-l10n-mr-17.04.0.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nb-16.12.3.tar.xz";
-      sha256 = "091wm8z6ibw8by220j89xdf0vpk7dp341hph2dhz17ykdzck3cdf";
-      name = "kde-l10n-nb-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nb-17.04.0.tar.xz";
+      sha256 = "1fqxssd12cpg9vkf2kc6f3gbivqr9xf4p489r2j6s6di7zn1na96";
+      name = "kde-l10n-nb-17.04.0.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nds-16.12.3.tar.xz";
-      sha256 = "052nw25rd3vq0fkixcwmn1iwaxnfwcg7iarf78c276w6vzrbvvcc";
-      name = "kde-l10n-nds-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nds-17.04.0.tar.xz";
+      sha256 = "0xrzy8v3a7riznb9fpjbx9zc4h47n6vpm36rbjdm93z0k8ifvqll";
+      name = "kde-l10n-nds-17.04.0.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nl-16.12.3.tar.xz";
-      sha256 = "0axlpjq70142blccsfqbh7zs7l8k31mkc30lr79d03975dp2ivzi";
-      name = "kde-l10n-nl-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nl-17.04.0.tar.xz";
+      sha256 = "116kigy5agm3dpan5wk54j144fq1sf9i6njpqmjdjrgyylr6cska";
+      name = "kde-l10n-nl-17.04.0.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-nn-16.12.3.tar.xz";
-      sha256 = "0ql8pvj47kwvdaj2gsjlc4rxb7mpl9nv4fraavffinv4xzrh0v18";
-      name = "kde-l10n-nn-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nn-17.04.0.tar.xz";
+      sha256 = "1i1jm30gyd1s6igv7bwckdrbzsrsahzi7ki0c9dpfhm85gv8i957";
+      name = "kde-l10n-nn-17.04.0.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pa-16.12.3.tar.xz";
-      sha256 = "0r2snb5bkvha8yj692g1y8xwdwcnav06w3qliz1v7jiyb6hv8ncm";
-      name = "kde-l10n-pa-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pa-17.04.0.tar.xz";
+      sha256 = "15n37z6wglw315jd8hijbyf883kpcw5919zp4yr57srjsvkay85v";
+      name = "kde-l10n-pa-17.04.0.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pl-16.12.3.tar.xz";
-      sha256 = "1bp8br37wfn3xlxl4hzr45sv41w2i562rgjcj25ngn27y7cqvwq5";
-      name = "kde-l10n-pl-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pl-17.04.0.tar.xz";
+      sha256 = "0ncaln92v5ib34zl700a61gzlc5akik3ss7pi4rygvlggfcjv4s2";
+      name = "kde-l10n-pl-17.04.0.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pt-16.12.3.tar.xz";
-      sha256 = "1f3ray689q3w4yr20j0bj8vvwyb1qzi608ip0p6n4nzjkq3ycqh6";
-      name = "kde-l10n-pt-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pt-17.04.0.tar.xz";
+      sha256 = "1ha6zfv9750idpw93z6hlmlypk7pgfriirfvfwbag43664ywl96n";
+      name = "kde-l10n-pt-17.04.0.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-16.12.3";
+    version = "pt_BR-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-pt_BR-16.12.3.tar.xz";
-      sha256 = "06h0dp54n8brv7kcfdbxy3yxk6c5b1ncbd9fzmflr8bpivifj66s";
-      name = "kde-l10n-pt_BR-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pt_BR-17.04.0.tar.xz";
+      sha256 = "0n16al9pivlz3s0ard79k88cank988107jbxmzsiyrbvlwfqih8a";
+      name = "kde-l10n-pt_BR-17.04.0.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ro-16.12.3.tar.xz";
-      sha256 = "17kbkh50jf8zb9p3kl2malddvq08ybg881x1w5gmw514k3d3hwxh";
-      name = "kde-l10n-ro-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ro-17.04.0.tar.xz";
+      sha256 = "0g3svxknwdn6nsq8v3ml0p3m5lwlv34h3ikr8cdra5zigqjmgxmf";
+      name = "kde-l10n-ro-17.04.0.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ru-16.12.3.tar.xz";
-      sha256 = "12ghgwy84i6nmlgi8wmvhxn7d9mvanhyd6pqyd302r5x0zxd8rza";
-      name = "kde-l10n-ru-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ru-17.04.0.tar.xz";
+      sha256 = "0f0pzvxacik48w3r1i7svfkn5dna9qmnz1cpci8sbcirpkw0xsp1";
+      name = "kde-l10n-ru-17.04.0.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sk-16.12.3.tar.xz";
-      sha256 = "0hc1cm2npsw2w9mx09kn9jxvaqpjhv6snhwdi2mybpbs9qmgnzcn";
-      name = "kde-l10n-sk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sk-17.04.0.tar.xz";
+      sha256 = "0x3yx3hcq4ia4s0f9bv3sib6hvfws8r8b8rgsgikf6d0ghk0y5z1";
+      name = "kde-l10n-sk-17.04.0.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sl-16.12.3.tar.xz";
-      sha256 = "02d0fg40pvlr6wnxg425n3fpqpizvdppznyp8nnxbzb9ia583aw0";
-      name = "kde-l10n-sl-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sl-17.04.0.tar.xz";
+      sha256 = "0gdj3710c6q6h6g5mnrslzg2qza2bnr78skiy8h3x7ihrmgyjmrl";
+      name = "kde-l10n-sl-17.04.0.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sr-16.12.3.tar.xz";
-      sha256 = "1yq44dykajcz4n10zrad85lji30phr9cm5dnmx4s08404qwh68cz";
-      name = "kde-l10n-sr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sr-17.04.0.tar.xz";
+      sha256 = "1si249lwy3ansacj33agxqs2vdrmyll6g2zk1754b34nr01arbq3";
+      name = "kde-l10n-sr-17.04.0.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-sv-16.12.3.tar.xz";
-      sha256 = "1q8ags96jwjrihi8ai8139c3s9nfy7v7lss9ci3xl786hyggdlrb";
-      name = "kde-l10n-sv-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sv-17.04.0.tar.xz";
+      sha256 = "1zh7ajp6f7vh098nbp501891cc68h1lwq8igzxzh2l0gd35rcpn4";
+      name = "kde-l10n-sv-17.04.0.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-tr-16.12.3.tar.xz";
-      sha256 = "1l24d0abhhlbam0wfz52495nvjy1blfid9h31233hkykb782gi0n";
-      name = "kde-l10n-tr-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-tr-17.04.0.tar.xz";
+      sha256 = "0w8s5wfkaz7p209dk9a2z38as3hif5lbwfjbx8342vp2sv3s9yy2";
+      name = "kde-l10n-tr-17.04.0.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-ug-16.12.3.tar.xz";
-      sha256 = "0sb4136wjyg9g1fvhcgqv97wpv82ia37aknd8xcvjnp5n2jl80nn";
-      name = "kde-l10n-ug-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ug-17.04.0.tar.xz";
+      sha256 = "00fswh5mfg7spdnqm3wfir5v0al91p8qd8cj7mb9jlmdm6ydd2wk";
+      name = "kde-l10n-ug-17.04.0.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-uk-16.12.3.tar.xz";
-      sha256 = "073pqvxbpibwd1bv0vh4rijgkhg061g2gaaaqnckaakw677g2bmz";
-      name = "kde-l10n-uk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-uk-17.04.0.tar.xz";
+      sha256 = "0zxf372yn0nsdnpylq364h0c4g2rzxxs462lh9ixwja2m8p91wsi";
+      name = "kde-l10n-uk-17.04.0.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-wa-16.12.3.tar.xz";
-      sha256 = "14qms294pz7hf4ramhscif9n6jfk5ixfwww558ypi0lwnzc17mrf";
-      name = "kde-l10n-wa-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-wa-17.04.0.tar.xz";
+      sha256 = "0p44q7mki01fq15y96qibw2hap9lfaya2480vjl4f7hdqw2xjfhh";
+      name = "kde-l10n-wa-17.04.0.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-16.12.3";
+    version = "zh_CN-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-zh_CN-16.12.3.tar.xz";
-      sha256 = "01q92gc13wjpd2gzvn1sipgl5xs86mwq8y0583glsx7s2wfp3g41";
-      name = "kde-l10n-zh_CN-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-zh_CN-17.04.0.tar.xz";
+      sha256 = "0a3kfdkp6d3fgil3s3rd0kjc7jnqzakr46683dd108shqzb26rcs";
+      name = "kde-l10n-zh_CN-17.04.0.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-16.12.3";
+    version = "zh_TW-17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-l10n/kde-l10n-zh_TW-16.12.3.tar.xz";
-      sha256 = "0a9xnxlbr5469k1ij7hc8wa5p38r3yqq1d9fxmmpqyj111v63g3h";
-      name = "kde-l10n-zh_TW-16.12.3.tar.xz";
-    };
-  };
-  kdelibs = {
-    version = "4.14.30";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdelibs-4.14.30.tar.xz";
-      sha256 = "0v8r70d55c4jhfhnh8lj41584qggc2lb4f6jwm4yl9qc6bpw77x3";
-      name = "kdelibs-4.14.30.tar.xz";
-    };
-  };
-  kdenetwork-filesharing = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdenetwork-filesharing-16.12.3.tar.xz";
-      sha256 = "0345wq7ayahfd2jlpgfs18c7nrdp9gn9yxig2x75pspqmb5pgxh7";
-      name = "kdenetwork-filesharing-16.12.3.tar.xz";
-    };
-  };
-  kdenlive = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdenlive-16.12.3.tar.xz";
-      sha256 = "1z7afrx00yaracf6cv9p8r14gqampabya8li6ws1ihzdgfamlkd0";
-      name = "kdenlive-16.12.3.tar.xz";
-    };
-  };
-  kdepim-addons = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdepim-addons-16.12.3.tar.xz";
-      sha256 = "1hqm7vi7fy7s17djayq9q7l3dxdnzk2ii78mjdg90aac9cxdxgmm";
-      name = "kdepim-addons-16.12.3.tar.xz";
-    };
-  };
-  kdepim-apps-libs = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdepim-apps-libs-16.12.3.tar.xz";
-      sha256 = "1q4ksp377piqxbs843nxafzssz80ayjii90iz86r2z2rd3lyrjzw";
-      name = "kdepim-apps-libs-16.12.3.tar.xz";
-    };
-  };
-  kdepim-runtime = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdepim-runtime-16.12.3.tar.xz";
-      sha256 = "0j5c3y8bqnffcrx4g7ilq7id46h11d1hiw81l7x4mg1p0zw07bg1";
-      name = "kdepim-runtime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-zh_TW-17.04.0.tar.xz";
+      sha256 = "0mdc8lqb5b99rkswallm5allcnp8i6xlsyv6q9k1n1jlyjkxl1xx";
+      name = "kde-l10n-zh_TW-17.04.0.tar.xz";
     };
   };
   kde-runtime = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kde-runtime-16.12.3.tar.xz";
-      sha256 = "1sqp827l30adiqrp12djx3xk6mlz2lb46hmxnbnzv52mv2whcr3y";
-      name = "kde-runtime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kde-runtime-17.04.0.tar.xz";
+      sha256 = "0phdmsmlqbadxi45n19hzkzfkkcazzlkxb0rxfr6c3jny2ncg5cn";
+      name = "kde-runtime-17.04.0.tar.xz";
+    };
+  };
+  kdebugsettings = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdebugsettings-17.04.0.tar.xz";
+      sha256 = "140drnnv7573fvfs94kwk0kgqqkc5nrj8jkj3i3l6idikw0xi0qm";
+      name = "kdebugsettings-17.04.0.tar.xz";
+    };
+  };
+  kdeedu-data = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdeedu-data-17.04.0.tar.xz";
+      sha256 = "1khxi2z5qv0wrj7pn6r643829619bhymzzbdlgjr1zs5k244iajy";
+      name = "kdeedu-data-17.04.0.tar.xz";
+    };
+  };
+  kdegraphics-mobipocket = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdegraphics-mobipocket-17.04.0.tar.xz";
+      sha256 = "0ja7a6p7ckw0zy6jffwm96vc5g33mqr722c77890173hsb45wy83";
+      name = "kdegraphics-mobipocket-17.04.0.tar.xz";
+    };
+  };
+  kdegraphics-thumbnailers = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdegraphics-thumbnailers-17.04.0.tar.xz";
+      sha256 = "0h2ydkcj1i35qhrmcva5977ib2127186q735xh2dg60fmdcyni14";
+      name = "kdegraphics-thumbnailers-17.04.0.tar.xz";
+    };
+  };
+  kdelibs = {
+    version = "4.14.31";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdelibs-4.14.31.tar.xz";
+      sha256 = "00ai1s0wz4nyg7fhj6g7cp3p5sz8rw676dv127bpbvm5yszlz561";
+      name = "kdelibs-4.14.31.tar.xz";
+    };
+  };
+  kdenetwork-filesharing = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdenetwork-filesharing-17.04.0.tar.xz";
+      sha256 = "176n41xnz2v3wn62nip5sdv966g4rs15ah27zzr9cx32jrs52z4c";
+      name = "kdenetwork-filesharing-17.04.0.tar.xz";
+    };
+  };
+  kdenlive = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdenlive-17.04.0.tar.xz";
+      sha256 = "0kd93zxz5fch1ski9mbz2sbfda3spq9gsfgzvik2mzjwr994x574";
+      name = "kdenlive-17.04.0.tar.xz";
+    };
+  };
+  kdepim-addons = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdepim-addons-17.04.0.tar.xz";
+      sha256 = "01qyg9p6nh2n2hsmmjfyjcd80z6cfpw509zmgs608lmbm8hskzxd";
+      name = "kdepim-addons-17.04.0.tar.xz";
+    };
+  };
+  kdepim-apps-libs = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdepim-apps-libs-17.04.0.tar.xz";
+      sha256 = "02igc1c8zykwf5yydmk0l1s4l3z3m5c90jlhyrqjkpmkwvnkrd3n";
+      name = "kdepim-apps-libs-17.04.0.tar.xz";
+    };
+  };
+  kdepim-runtime = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/kdepim-runtime-17.04.0.tar.xz";
+      sha256 = "00cjlnqq029850n2ib1r5ylass8q1f71p24sqicbfcfyd6vksvdl";
+      name = "kdepim-runtime-17.04.0.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdesdk-kioslaves-16.12.3.tar.xz";
-      sha256 = "17zqp43a1266616h3g6yccjmfgwni6lr8lz4rrvfda275vvwbshj";
-      name = "kdesdk-kioslaves-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdesdk-kioslaves-17.04.0.tar.xz";
+      sha256 = "1rfj2zk34i7i3289n85b57szd4154zj6r4m7zyif2cc019ax5b0q";
+      name = "kdesdk-kioslaves-17.04.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdesdk-thumbnailers-16.12.3.tar.xz";
-      sha256 = "0p2s6pyq16jmjv29r8n9ygvsh1dxgz9zk90mk138cxxhbx9nks9h";
-      name = "kdesdk-thumbnailers-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdesdk-thumbnailers-17.04.0.tar.xz";
+      sha256 = "145rgk62c083g1nl7ssx9xalv0plsjdlyp4a7jqv83vqphcyd789";
+      name = "kdesdk-thumbnailers-17.04.0.tar.xz";
     };
   };
   kdf = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdf-16.12.3.tar.xz";
-      sha256 = "1502ib1hlc5xxsphspxwj8jvjm7qig0zdwckvm3nmh7hf4474sc5";
-      name = "kdf-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdf-17.04.0.tar.xz";
+      sha256 = "1bavp593622014ik1h066mdldlzlyq5f2rw93plsv5i2lpabdbfd";
+      name = "kdf-17.04.0.tar.xz";
     };
   };
   kdialog = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdialog-16.12.3.tar.xz";
-      sha256 = "161barz5x9jrdk2p5hqc2vk1rqfwn8nlhdmc1vjqnhvww786ghmh";
-      name = "kdialog-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdialog-17.04.0.tar.xz";
+      sha256 = "0vdlfnkm9949rjalmf8f9dc86jsha63lya0fgl34admrs8d530hb";
+      name = "kdialog-17.04.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kdiamond-16.12.3.tar.xz";
-      sha256 = "0qdh9ngrz5ph0kly27c58sxhwamqm3wq566337yhdqjizzcin4pf";
-      name = "kdiamond-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kdiamond-17.04.0.tar.xz";
+      sha256 = "021mmygp28z7vvg2gjb4p781kcg33qj4lcz9vqvyh5qmv81qh93w";
+      name = "kdiamond-17.04.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/keditbookmarks-16.12.3.tar.xz";
-      sha256 = "0dn3jb5lsjj2c6pbrbn4cik68fqqk99ljl45vbal9cc27lmrfa2n";
-      name = "keditbookmarks-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/keditbookmarks-17.04.0.tar.xz";
+      sha256 = "1daab64k5kk6krphi3k3rgprmql126bwykl8aaa93ls890xln3g8";
+      name = "keditbookmarks-17.04.0.tar.xz";
     };
   };
   kfilereplace = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kfilereplace-16.12.3.tar.xz";
-      sha256 = "0gym9bmkyjwg97khy6xxiaidjp6wi98fzmk7wa97wbdqc0qvswja";
-      name = "kfilereplace-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kfilereplace-17.04.0.tar.xz";
+      sha256 = "0prc6v9kps1yjwccscm7skcapnzza53xh36pbdavhw81pag6wwsy";
+      name = "kfilereplace-17.04.0.tar.xz";
     };
   };
   kfind = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kfind-16.12.3.tar.xz";
-      sha256 = "1d7rn3xri4dgv97s6jw3n4cbsg73zyrbcm3ligxgj37ziggrhgsj";
-      name = "kfind-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kfind-17.04.0.tar.xz";
+      sha256 = "08hlylw13frq7frjz4rvisr0001n44nkafh2ga84mvkvlgxl0602";
+      name = "kfind-17.04.0.tar.xz";
     };
   };
   kfloppy = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kfloppy-16.12.3.tar.xz";
-      sha256 = "07mgrpjqd2kdz5gmg8ylmvdb4mis328b7qlchszdx0l1z30kqkzp";
-      name = "kfloppy-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kfloppy-17.04.0.tar.xz";
+      sha256 = "1di15ri8y3qinr40j83hrvfc1h3y8pan0mbfin1jdm4vwgjwgrqn";
+      name = "kfloppy-17.04.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kfourinline-16.12.3.tar.xz";
-      sha256 = "087c00sggx5i1g8i2rjvvwlys15bisgx9fm2nl8f30h2ba3im4sg";
-      name = "kfourinline-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kfourinline-17.04.0.tar.xz";
+      sha256 = "119jrs63dfbdpq7a3ng0fy0dri1jw7dbaz6n5hyz6ihzizsr9nm2";
+      name = "kfourinline-17.04.0.tar.xz";
     };
   };
   kgeography = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kgeography-16.12.3.tar.xz";
-      sha256 = "1rnk00nj29zimpw36vhm0yrwlmpmxwv9wzxnhr7n2jq5qhbqsp5g";
-      name = "kgeography-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kgeography-17.04.0.tar.xz";
+      sha256 = "17kwpv352aiacghacjp0bz1ak19jh52300nmjhlj8ysl57q48n3z";
+      name = "kgeography-17.04.0.tar.xz";
     };
   };
   kget = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kget-16.12.3.tar.xz";
-      sha256 = "0h8nklsl6gddwzgjig5cwp463s96ffn5688zjlsyx4hphnvbj8kb";
-      name = "kget-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kget-17.04.0.tar.xz";
+      sha256 = "093mrv9c699s8jwrf4lxfg78ajiqhlpbi7swpgmhk2545wg1ngn7";
+      name = "kget-17.04.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kgoldrunner-16.12.3.tar.xz";
-      sha256 = "028kz5x8a3jb3zp3vfxajmszrqk859hdln9175pp6zj78b278xz4";
-      name = "kgoldrunner-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kgoldrunner-17.04.0.tar.xz";
+      sha256 = "1in4ddlrn1lnjdgww4saa7is6v8lj33n31bmrf2f6hmq7sg3i6h9";
+      name = "kgoldrunner-17.04.0.tar.xz";
     };
   };
   kgpg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kgpg-16.12.3.tar.xz";
-      sha256 = "0abh15j2p0vinskd8f1yvjkyi1a70k0wf1sdldrfdwpdgq1pqsxw";
-      name = "kgpg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kgpg-17.04.0.tar.xz";
+      sha256 = "1i9pyz35pzn5p3p4mvkxwxfrmmpmf7ngpj83m28zxcj654dfcl6x";
+      name = "kgpg-17.04.0.tar.xz";
     };
   };
   khangman = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/khangman-16.12.3.tar.xz";
-      sha256 = "03ffigr9a6n3aj1a7lxcw9wgf1pafdjwqjnwnny2ric5vn6lpq1z";
-      name = "khangman-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/khangman-17.04.0.tar.xz";
+      sha256 = "14ddaqvhmlwwb85bl5hi0r0m61akx38aabzrs9ys045z64si8b9d";
+      name = "khangman-17.04.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/khelpcenter-16.12.3.tar.xz";
-      sha256 = "100xcjjjbszhbwgydbylk9m9lrxikjyazmhaq2rvv2mfzsbijjm7";
-      name = "khelpcenter-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/khelpcenter-17.04.0.tar.xz";
+      sha256 = "10x8c18vbwg7j6nfrrl7c0wj9x882ijv33mfnrhj0vpdc2bnkkxn";
+      name = "khelpcenter-17.04.0.tar.xz";
     };
   };
   kholidays = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kholidays-16.12.3.tar.xz";
-      sha256 = "09iwkqpnmn3h7yfin4y9izb2sdk6hrm8rfq106cnz7j8i31q93ad";
-      name = "kholidays-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kholidays-17.04.0.tar.xz";
+      sha256 = "0k0dm17bvr9snxmc87gicizpqqdsr95gxypnhgyiwc0mz90l5qb7";
+      name = "kholidays-17.04.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kidentitymanagement-16.12.3.tar.xz";
-      sha256 = "1b23cwdhc7rv260kmn4akff3jfa21hk49p0kp8p0mf6nw6qahbvp";
-      name = "kidentitymanagement-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kidentitymanagement-17.04.0.tar.xz";
+      sha256 = "1vrmj0ch1zg8hh1qqjv0i7fys5nrw3g6rj5sns6ghi0kswlskwfw";
+      name = "kidentitymanagement-17.04.0.tar.xz";
     };
   };
   kig = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kig-16.12.3.tar.xz";
-      sha256 = "0fnlgxwcnspaqzv4y40xm0kq3xwwd4r5abh7ssbd6iqsbzgm6ghw";
-      name = "kig-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kig-17.04.0.tar.xz";
+      sha256 = "0bx4vzg5x4lp7k49i5a55ka1c60iy3d1xjlrcx0gjx2bj35k6893";
+      name = "kig-17.04.0.tar.xz";
     };
   };
   kigo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kigo-16.12.3.tar.xz";
-      sha256 = "08rdz91jzz79884xhg87cwy57q1jk2414shyxxy9r0pb4wdcdbhn";
-      name = "kigo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kigo-17.04.0.tar.xz";
+      sha256 = "1vi07v5nnwxpm04hxspxadf0qw7qka7pajggn54frc37hq5ibxia";
+      name = "kigo-17.04.0.tar.xz";
     };
   };
   killbots = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/killbots-16.12.3.tar.xz";
-      sha256 = "0lwniwm8cbnwpqhfis38x5qvkz53626v9bn00amml57zj8x3hjnd";
-      name = "killbots-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/killbots-17.04.0.tar.xz";
+      sha256 = "0ccl1249x7lpkm6hpani1fyvdgs0dqlxd250f9hm7k6j8b6jwg01";
+      name = "killbots-17.04.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kimagemapeditor-16.12.3.tar.xz";
-      sha256 = "0362zcj6by3kydr5v3sr7l6k9kkyfcy16879f93d1qqkjfi11cic";
-      name = "kimagemapeditor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kimagemapeditor-17.04.0.tar.xz";
+      sha256 = "1n828j0sqvas9c3iqmbj3jl8bmhyw7bqj3s6zf0qifjdxvlxpwaq";
+      name = "kimagemapeditor-17.04.0.tar.xz";
     };
   };
   kimap = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kimap-16.12.3.tar.xz";
-      sha256 = "1jlva17hy500jpb5mg6m3vrcy6mqikcy8m1pgy68d2ip0m93rb5f";
-      name = "kimap-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kimap-17.04.0.tar.xz";
+      sha256 = "1xgaixdplpycsdd2w09liy1vxp0lx5p2n6bmbds5dq887dwmj73i";
+      name = "kimap-17.04.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kio-extras-16.12.3.tar.xz";
-      sha256 = "1mfpllrmc88khlpg3yd4sghs8igg8dh0x568jw46vv90qgdb9xss";
-      name = "kio-extras-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kio-extras-17.04.0.tar.xz";
+      sha256 = "1kvah1qg98zlsps5qv6by7ic1mjmnhk6xs2041cf143k0kifrsi9";
+      name = "kio-extras-17.04.0.tar.xz";
     };
   };
   kiriki = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kiriki-16.12.3.tar.xz";
-      sha256 = "142p2zv1826iclaa2zrfyzfdwnflh3sq2xymca4di5anrmcwmm2m";
-      name = "kiriki-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kiriki-17.04.0.tar.xz";
+      sha256 = "1xmvamriklxhs9bwv75z2668by0w8nx95hb4l56z9yck5f7dlh6m";
+      name = "kiriki-17.04.0.tar.xz";
     };
   };
   kiten = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kiten-16.12.3.tar.xz";
-      sha256 = "0skwgv3v79p5z1livjbdsg7i18ky8vc49z53dmgsgbziqvs0s2y4";
-      name = "kiten-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kiten-17.04.0.tar.xz";
+      sha256 = "1h6cxp4qpzgdd67s05zr403mk5jswzz7sk38j78fapmfc9hwz7gh";
+      name = "kiten-17.04.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kjumpingcube-16.12.3.tar.xz";
-      sha256 = "1fii1arzpsdhnnb5yladhpsb0g6icald5si0fwnl47wg3gshaqiz";
-      name = "kjumpingcube-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kjumpingcube-17.04.0.tar.xz";
+      sha256 = "1las1sb01zm2vdr77fvsz3spjpjnv5fjhvdah17l4rlgdww2kqwc";
+      name = "kjumpingcube-17.04.0.tar.xz";
     };
   };
   kldap = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kldap-16.12.3.tar.xz";
-      sha256 = "0a7pm9dzcvyyznqs4apwdl6dpg87qhxcr3a06grjwxhqvfdl52na";
-      name = "kldap-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kldap-17.04.0.tar.xz";
+      sha256 = "0b19si2nx7mimxxsdr1vp4bh3zr8ddz5k7217fa5wg190143zi9b";
+      name = "kldap-17.04.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kleopatra-16.12.3.tar.xz";
-      sha256 = "1ja26gzdj8h5f8w1061scl40p6ahba3ci4hp91n2vp3rrz9m96wa";
-      name = "kleopatra-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kleopatra-17.04.0.tar.xz";
+      sha256 = "1l823l9wlqqzkcycqzfca6l3yfpr70a76786mvajswnkwasgfwyc";
+      name = "kleopatra-17.04.0.tar.xz";
     };
   };
   klettres = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/klettres-16.12.3.tar.xz";
-      sha256 = "0m3k3zyrw7rwm6ad75c86bap80v2y5k938mdhqjaciglqc9pk83h";
-      name = "klettres-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/klettres-17.04.0.tar.xz";
+      sha256 = "0liaym1cnnysmpd3bj3ss2bgrds9xh0f0i631vpj8z3n6pdm70s9";
+      name = "klettres-17.04.0.tar.xz";
     };
   };
   klickety = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/klickety-16.12.3.tar.xz";
-      sha256 = "0mim86wxcljs192q9y6a6i326sic350jd89m1vx3p78dwpj35q42";
-      name = "klickety-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/klickety-17.04.0.tar.xz";
+      sha256 = "15rjg09xa48082va8gxz51d3wacmfivla7bhmqdcgddagkmjy9cd";
+      name = "klickety-17.04.0.tar.xz";
     };
   };
   klines = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/klines-16.12.3.tar.xz";
-      sha256 = "03ran5hyl8p9vfi82m2pkzng9hn5ipx1plgq9bz25c53z5fg63di";
-      name = "klines-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/klines-17.04.0.tar.xz";
+      sha256 = "0ix039d89mjm581zx1fchhj0vmjwx3da1l3indprh62664v2ihwb";
+      name = "klines-17.04.0.tar.xz";
     };
   };
   klinkstatus = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/klinkstatus-16.12.3.tar.xz";
-      sha256 = "0kmjh0398k6fpz6lgz6d5rb79xl6wpgd4j56zacpha9046cfnmsk";
-      name = "klinkstatus-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/klinkstatus-17.04.0.tar.xz";
+      sha256 = "102djlmp8dcha1p5iacrnyjgjp1w4qi5sf04lnlq43j2k2qhvr0r";
+      name = "klinkstatus-17.04.0.tar.xz";
     };
   };
   kmag = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmag-16.12.3.tar.xz";
-      sha256 = "1llv9vd1557h4lz2sdd1wjlqb9wzrk9jxn4731iac2b5wdwpihii";
-      name = "kmag-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmag-17.04.0.tar.xz";
+      sha256 = "1jfs9n880yva5vi36gc25kz4d6vy7djpa05nm2niga03gbv0r0lx";
+      name = "kmag-17.04.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmahjongg-16.12.3.tar.xz";
-      sha256 = "0xy3w5kxn69l0dagly5qd9dqzkpikflmrjbv1b45psafdmj3125r";
-      name = "kmahjongg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmahjongg-17.04.0.tar.xz";
+      sha256 = "1k9rmcdlrybxnccdh0w5ggy4p41l19ccv3hsc2ph0aj9cxh9svac";
+      name = "kmahjongg-17.04.0.tar.xz";
     };
   };
   kmail = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmail-16.12.3.tar.xz";
-      sha256 = "1kyhc952k78yg2wa9cgxvqa6qrrgc08dly7fin7as8cxfh49i0b0";
-      name = "kmail-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmail-17.04.0.tar.xz";
+      sha256 = "04cfdjsy2gnwkcjhq0ikws68rpr65ycycdnwzrvskg4whmp5h01a";
+      name = "kmail-17.04.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmail-account-wizard-16.12.3.tar.xz";
-      sha256 = "0w94v2c38sl0qnyr38yzlfj6pxixaziw5kb4fkawv26c18fi42pl";
-      name = "kmail-account-wizard-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmail-account-wizard-17.04.0.tar.xz";
+      sha256 = "03c5gg980r18rjwsdkgclyw2qd3l1vc7grwdbfm2kib5fqk61gd3";
+      name = "kmail-account-wizard-17.04.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmailtransport-16.12.3.tar.xz";
-      sha256 = "1dkw7niymhnf0jncflvqyldw28c9j0q6j598flb5ksds0n30iasy";
-      name = "kmailtransport-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmailtransport-17.04.0.tar.xz";
+      sha256 = "0683lrmadw51h1q345lsdy888dynph06ani54awx60qdc1crnx7j";
+      name = "kmailtransport-17.04.0.tar.xz";
     };
   };
   kmbox = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmbox-16.12.3.tar.xz";
-      sha256 = "0khvf4kqf9i425fjczl1miqsz0pxbyryxy32bf9knr3k5kmwbn24";
-      name = "kmbox-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmbox-17.04.0.tar.xz";
+      sha256 = "001f32yrxhavrk2plyyl05ny6gcazj6a9h51gv0fc5mb850w1ryq";
+      name = "kmbox-17.04.0.tar.xz";
     };
   };
   kmime = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmime-16.12.3.tar.xz";
-      sha256 = "0gzbh0g075ml5x0qy4zd1cg1qygdsnssl5ahk9pcgc0fik4p9j20";
-      name = "kmime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmime-17.04.0.tar.xz";
+      sha256 = "1bywzanv82xpxscxpgxfj0bivx9l6vwlspgdbvzh3nnhjv2g41qp";
+      name = "kmime-17.04.0.tar.xz";
     };
   };
   kmines = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmines-16.12.3.tar.xz";
-      sha256 = "0dz6yx7y0jpxhmyjrfyf6rrkiayn4mpyr4n1iszs11gac1bqppvn";
-      name = "kmines-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmines-17.04.0.tar.xz";
+      sha256 = "101midljjq8ws7l3n6a8kym13n6c64xyhzv1d6py35cawyg3zfpv";
+      name = "kmines-17.04.0.tar.xz";
     };
   };
   kmix = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmix-16.12.3.tar.xz";
-      sha256 = "1mq4kna3z62269m43qy42knq4byrvirk0mk5yp56n51im1bmdyj4";
-      name = "kmix-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmix-17.04.0.tar.xz";
+      sha256 = "0qyml01rmf5p4qlwi7y96lc6hjdy70xbq6z4pwyy0rpk254jz754";
+      name = "kmix-17.04.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmousetool-16.12.3.tar.xz";
-      sha256 = "1678sjj96f22sn60ccyj6hqi2vghkf4facnx8l15x4xx05yq1vgg";
-      name = "kmousetool-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmousetool-17.04.0.tar.xz";
+      sha256 = "0chybr31ag087zfq47f8scvlzli2yf8l18gq965b2nl7vnz7kr0s";
+      name = "kmousetool-17.04.0.tar.xz";
     };
   };
   kmouth = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmouth-16.12.3.tar.xz";
-      sha256 = "1afvjds1kfb8zvv3ma8c6svan6zlbd1w9a164vxwp7gl3ycjyj52";
-      name = "kmouth-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmouth-17.04.0.tar.xz";
+      sha256 = "0k05g7rhcbl7mq4sv05c8kghmrm5cpdhj46vvmz5alqdik5g06xd";
+      name = "kmouth-17.04.0.tar.xz";
     };
   };
   kmplot = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kmplot-16.12.3.tar.xz";
-      sha256 = "02vh4diqs4688p2xlia437jywx89yhpaf8ipprdq92q034glybyz";
-      name = "kmplot-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kmplot-17.04.0.tar.xz";
+      sha256 = "1n3skmyrmhl8p0kypm0wfvm8whw8fhq5byv1hjj0xdpwdv9r7n1j";
+      name = "kmplot-17.04.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/knavalbattle-16.12.3.tar.xz";
-      sha256 = "0164z9h1689bz600p17p8fq552g8pq73l81nj4f5csklhnsiykkg";
-      name = "knavalbattle-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/knavalbattle-17.04.0.tar.xz";
+      sha256 = "0m3y39lfngbc9ddnh2cifhc6qh4i1vlz983mhyz1psgamvy71djx";
+      name = "knavalbattle-17.04.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/knetwalk-16.12.3.tar.xz";
-      sha256 = "1mavc0rn41y3vgzf0ikwvk3kh4fszylh7h4briw9k0kqx2cxh5vk";
-      name = "knetwalk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/knetwalk-17.04.0.tar.xz";
+      sha256 = "1z5brajv2kq4c617zyphcpk5as2dibb14h9l8vym9v1j3k59jqsh";
+      name = "knetwalk-17.04.0.tar.xz";
     };
   };
   knotes = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/knotes-16.12.3.tar.xz";
-      sha256 = "1yyx98zn7a3hbiyr16fcbylbm5v8lyg22v8gwf7xpnbx5jb4hpb8";
-      name = "knotes-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/knotes-17.04.0.tar.xz";
+      sha256 = "051y5ghrjs87xhdw7mih4gmbp93s23vicpsnmawi98hcbqh16n6c";
+      name = "knotes-17.04.0.tar.xz";
     };
   };
   kolf = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kolf-16.12.3.tar.xz";
-      sha256 = "136iyf8clr2r8qkjcm0nqcq0sjr5xry9gbxjhz128lc0nywsxpd5";
-      name = "kolf-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kolf-17.04.0.tar.xz";
+      sha256 = "1rvvy52avlpbdgvd7qbw73kfarn77h7ka9gny6q3xsy0knhgxy3a";
+      name = "kolf-17.04.0.tar.xz";
     };
   };
   kollision = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kollision-16.12.3.tar.xz";
-      sha256 = "0kwnqqm9gs6ac7ags9x82ykmp3vccp3kdd3js26a1kz1zkip32il";
-      name = "kollision-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kollision-17.04.0.tar.xz";
+      sha256 = "18k88jj9vyplh3lffw86pjwy0w568ddf17xza1spam3xpmlh9fix";
+      name = "kollision-17.04.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kolourpaint-16.12.3.tar.xz";
-      sha256 = "1yg3xnbbzvhcgb7i92bya41gq4z0135njcc77848khndpgkxvczb";
-      name = "kolourpaint-16.12.3.tar.xz";
-    };
-  };
-  kommander = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kommander-16.12.3.tar.xz";
-      sha256 = "1wlks0alw82ra3g63d8k8nj9sq899hjv1r2kshk7c4vdk7arn1fg";
-      name = "kommander-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kolourpaint-17.04.0.tar.xz";
+      sha256 = "1qmwpx0ql3nl5wnbh21dfw369cb76ll7n55w6pfja8izljic67xh";
+      name = "kolourpaint-17.04.0.tar.xz";
     };
   };
   kompare = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kompare-16.12.3.tar.xz";
-      sha256 = "18z6424xidpx5kmbjiasvhagh2b1a9pxizc0dsvba47v9xcavsaw";
-      name = "kompare-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kompare-17.04.0.tar.xz";
+      sha256 = "06ix1x7hvryqnysg256z2b0igjqaqya33mm24p9sw75misi7ay6f";
+      name = "kompare-17.04.0.tar.xz";
     };
   };
   konqueror = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/konqueror-16.12.3.tar.xz";
-      sha256 = "1pwv2mj9xrn6aymhkqmwd89d5i3v2jixp07dz0by62rcpfhm89p5";
-      name = "konqueror-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/konqueror-17.04.0.tar.xz";
+      sha256 = "0crqcnqk4bl6wg6izs34b6dgdh19rsnid0dpcsdminfglj6kb9lm";
+      name = "konqueror-17.04.0.tar.xz";
     };
   };
   konquest = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/konquest-16.12.3.tar.xz";
-      sha256 = "1fhz9pwi2dmmcjg10vp36m8d759zikg6nqpjdp41dg95lkyf5vkf";
-      name = "konquest-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/konquest-17.04.0.tar.xz";
+      sha256 = "0fgmh3z012k710c098bp02dj5v2gcmfp1dg29257zglk7qkvaa0b";
+      name = "konquest-17.04.0.tar.xz";
     };
   };
   konsole = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/konsole-16.12.3.tar.xz";
-      sha256 = "10k7ryvsssbskpxk04iqx2mrp2a91291r8nzvg1780lrhql5rdj7";
-      name = "konsole-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/konsole-17.04.0.tar.xz";
+      sha256 = "01iasaiabqnr8fsjyl250h2ha0l788gx58xizafzj2q649ijbj4h";
+      name = "konsole-17.04.0.tar.xz";
     };
   };
   kontact = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kontact-16.12.3.tar.xz";
-      sha256 = "0wj4w9ak6dm330s393hjb79w16gs5kij5gz9swf3pxwg21xbd4ps";
-      name = "kontact-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kontact-17.04.0.tar.xz";
+      sha256 = "0i2k3ay7n92sd8gxhqy4ld8g9qzpwy9rxzm3qj70r4v0byw8a176";
+      name = "kontact-17.04.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kontactinterface-16.12.3.tar.xz";
-      sha256 = "0n5hvx3xp01krwwd2szgh1s6nn5spfns1ivc36i1gdbhkf871k98";
-      name = "kontactinterface-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kontactinterface-17.04.0.tar.xz";
+      sha256 = "15dd5mfgrqayfs522wj4c5lhvfv474whv7r5zimi9ngp0n4zwjl6";
+      name = "kontactinterface-17.04.0.tar.xz";
     };
   };
   kopete = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kopete-16.12.3.tar.xz";
-      sha256 = "1dkn4d13knf0lcj4241fmjcj51ypg9frzsf0pl02mr08rd2rxgk1";
-      name = "kopete-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kopete-17.04.0.tar.xz";
+      sha256 = "1wdk5i7vj5ssw65majvl0h7sn9h5npdb3v81m0qbp4m94zlv7njh";
+      name = "kopete-17.04.0.tar.xz";
     };
   };
   korganizer = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/korganizer-16.12.3.tar.xz";
-      sha256 = "1724l321gzjwha8yhrans4lhzs39fs98xi7wbd5msfflzyg3l6ga";
-      name = "korganizer-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/korganizer-17.04.0.tar.xz";
+      sha256 = "13mdxsvimlp0rvi2by1vg4aqmpamwszy35qi4wrynnq3ndn3cd1s";
+      name = "korganizer-17.04.0.tar.xz";
     };
   };
   kpat = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kpat-16.12.3.tar.xz";
-      sha256 = "04qvv7q7rlsiyff2isy18h2fbz2lnljal5spq5qg9zl6v8hx6qzm";
-      name = "kpat-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kpat-17.04.0.tar.xz";
+      sha256 = "0597z2pzxplcjsynkw9igs24fbsrj317xgyc0rmkgciilv0w69vy";
+      name = "kpat-17.04.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kpimtextedit-16.12.3.tar.xz";
-      sha256 = "06iz9l8z708kdivzibqkgdrbvw7kfd2lr2grf3v9l6gfl3qs1kbw";
-      name = "kpimtextedit-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kpimtextedit-17.04.0.tar.xz";
+      sha256 = "1050kc0d81kgqh6w44nahaddgpw1big2gwyxzdyvrvipkiipp42i";
+      name = "kpimtextedit-17.04.0.tar.xz";
     };
   };
   kppp = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kppp-16.12.3.tar.xz";
-      sha256 = "0lqv95zfzcik8k95a39s6whjsnq6g15amnxlzy898liyxkr499bc";
-      name = "kppp-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kppp-17.04.0.tar.xz";
+      sha256 = "1kiwc8rgh6vnvkpqsw2pz4cflwnsv0j86b8idkap6zh9vbajyln1";
+      name = "kppp-17.04.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kqtquickcharts-16.12.3.tar.xz";
-      sha256 = "1xzn9vxiqam8pk4zj8qcq55v9g52d9qkddbdv25pml8s0yhlsgqf";
-      name = "kqtquickcharts-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kqtquickcharts-17.04.0.tar.xz";
+      sha256 = "0sq4xs4ispb50wcyibwln1d8vlh698d0pw408z8gzwvr384gf2bk";
+      name = "kqtquickcharts-17.04.0.tar.xz";
     };
   };
   krdc = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/krdc-16.12.3.tar.xz";
-      sha256 = "0visx3371ym78n9aqkln2akvvf0rphyxg5hxvc2981pgpdry20zq";
-      name = "krdc-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/krdc-17.04.0.tar.xz";
+      sha256 = "1ryzk0k8xm9ych562qapjwawnljxz834vvwcnx2kv1n7gilqkdqh";
+      name = "krdc-17.04.0.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kremotecontrol-16.12.3.tar.xz";
-      sha256 = "0xcs8gvb7ack0xqdp99x04lyv6hbqgxa5nq44pxl7czzc0la5nbk";
-      name = "kremotecontrol-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kremotecontrol-17.04.0.tar.xz";
+      sha256 = "07w5fpwp4rjm8sdf6wadsf82a4f2igav8yb9m04pj70mymqhr4nn";
+      name = "kremotecontrol-17.04.0.tar.xz";
     };
   };
   kreversi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kreversi-16.12.3.tar.xz";
-      sha256 = "1qi6y263c8qp0bv9vmjk4rxq55mc0v1kn56yvivc5sfg9p4bqs9b";
-      name = "kreversi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kreversi-17.04.0.tar.xz";
+      sha256 = "075nmgnxlw2h743zj748xr6xdfj7w05ndyi85yfarpls5qf1qrz3";
+      name = "kreversi-17.04.0.tar.xz";
     };
   };
   krfb = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/krfb-16.12.3.tar.xz";
-      sha256 = "1ijz0zdlkxb9mldgd5a5k7aa2ikmmg023mafmxrjwymsig7ya4hv";
-      name = "krfb-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/krfb-17.04.0.tar.xz";
+      sha256 = "11kavv3h0pvwqd0y6xxb08bliclszqh7ijvjgzazqhvwnd5pmsby";
+      name = "krfb-17.04.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kross-interpreters-16.12.3.tar.xz";
-      sha256 = "0z1n42imbhsx0qmx479sklnihwvbd5l5pigbpbpm80rgwda2ib57";
-      name = "kross-interpreters-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kross-interpreters-17.04.0.tar.xz";
+      sha256 = "17wgckmz17zrc7cbjl9zif1x8nq31551hsl8psnj1wpb78pv1b56";
+      name = "kross-interpreters-17.04.0.tar.xz";
     };
   };
   kruler = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kruler-16.12.3.tar.xz";
-      sha256 = "08w7pb7wyaqnhwvqczxzbrbnm8930wzkl8y4lpimp5mqzb94i8qx";
-      name = "kruler-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kruler-17.04.0.tar.xz";
+      sha256 = "1rkhrzn54l8bhd37gyc3l27frxgxlyh28cq73p7id87qa62wcya9";
+      name = "kruler-17.04.0.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksaneplugin-16.12.3.tar.xz";
-      sha256 = "1z0ziapcjmi7fqfnb0zsbjgd1q05np1s7smj1k8cd8c6f169yrld";
-      name = "ksaneplugin-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksaneplugin-17.04.0.tar.xz";
+      sha256 = "10w92awf66q8mg796pva6hrx8cjzhimg70bqldb4fb3nni5figrn";
+      name = "ksaneplugin-17.04.0.tar.xz";
     };
   };
   kscd = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kscd-16.12.3.tar.xz";
-      sha256 = "1mpba78m4hs8541n4ydz7vswq1chi0fmmlfw2kqnrzarcandyga0";
-      name = "kscd-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kscd-17.04.0.tar.xz";
+      sha256 = "0lrdjawim18bzd2z9328gdqrjklrkr6wlx3jlmh5bd8iw52akdxa";
+      name = "kscd-17.04.0.tar.xz";
     };
   };
   kshisen = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kshisen-16.12.3.tar.xz";
-      sha256 = "17szjblrp172rvyl98x5a0g9yg29b85bmwkzk7pqnjbn387kgy9r";
-      name = "kshisen-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kshisen-17.04.0.tar.xz";
+      sha256 = "1l4f1akiagz4yhyxvvk14papnim8jfvikypkbsw3bqy1qbxbph93";
+      name = "kshisen-17.04.0.tar.xz";
     };
   };
   ksirk = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksirk-16.12.3.tar.xz";
-      sha256 = "1akfskyfhffh71w2hknw9vvap2a2sq0irmkxij9xcdmlvpfwnkn5";
-      name = "ksirk-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksirk-17.04.0.tar.xz";
+      sha256 = "0ifqyf6plgq0n60llncc1ipdnlqhwcr3ml86k3kch5w2gmypzyj0";
+      name = "ksirk-17.04.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksnakeduel-16.12.3.tar.xz";
-      sha256 = "1797kac3prchq5254dby41k04i8i7hgf2a9cb8s71n7hrsj62dyn";
-      name = "ksnakeduel-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksnakeduel-17.04.0.tar.xz";
+      sha256 = "1zjfca5qlmsqdx09958h7l169i1pvbgny800q8v6wxhc6c8h4g0r";
+      name = "ksnakeduel-17.04.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kspaceduel-16.12.3.tar.xz";
-      sha256 = "0ipx1sxhv207nlw7rcp7155l76z39x7j1b5y3qwxcgd7s69wb82k";
-      name = "kspaceduel-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kspaceduel-17.04.0.tar.xz";
+      sha256 = "0z4ffrpmij99ybhzl2dvg89a8whandggc24fxalpf01kxz4vw3v4";
+      name = "kspaceduel-17.04.0.tar.xz";
     };
   };
   ksquares = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksquares-16.12.3.tar.xz";
-      sha256 = "0abd19hf1rvlzkxc4kvdljs5yk39pay81n3n9n0w6qyr764r4qn9";
-      name = "ksquares-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksquares-17.04.0.tar.xz";
+      sha256 = "0mzgwvf077jpzvka1hyw2vm93v9mqng8hnr2nzk38zxbjhb3fkf4";
+      name = "ksquares-17.04.0.tar.xz";
     };
   };
   kstars = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kstars-16.12.3.tar.xz";
-      sha256 = "0lcrn7r1nw85c0w6dg03mwf5lnsahmww60y6vwzfh2r53nbm9c1y";
-      name = "kstars-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kstars-17.04.0.tar.xz";
+      sha256 = "1hpadx9fq3bcdzq2lh9csxnlm96q5n1fmss1lkxby7hac28942fk";
+      name = "kstars-17.04.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksudoku-16.12.3.tar.xz";
-      sha256 = "00hi8x09fj5ahj0ah9rsci2dscrdl8x9mrlcacjrwgwm503y95gk";
-      name = "ksudoku-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksudoku-17.04.0.tar.xz";
+      sha256 = "0411s9dpzb6sicb2wcg5mv9sy7vi27lkrg7ssdna9k0wp0d9aqvs";
+      name = "ksudoku-17.04.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ksystemlog-16.12.3.tar.xz";
-      sha256 = "0xd6pp02k84a1r6gy10x0br33g4awpbhx45j7n69l1s96szj4aki";
-      name = "ksystemlog-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ksystemlog-17.04.0.tar.xz";
+      sha256 = "162lclr2zx80cwqj0r1gm0cvijciab0rkhl5fyz8bb0xk7ihrimy";
+      name = "ksystemlog-17.04.0.tar.xz";
     };
   };
   kteatime = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kteatime-16.12.3.tar.xz";
-      sha256 = "0wqzw9sa4zkgkwndvyas47x5wc4gcya3pmdcvg7wf7wl8j5k7vdy";
-      name = "kteatime-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kteatime-17.04.0.tar.xz";
+      sha256 = "0rklccjb7qi4mir44fp71aiqxb44s9mwpd7aj6yda80ic8yafvhw";
+      name = "kteatime-17.04.0.tar.xz";
     };
   };
   ktimer = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktimer-16.12.3.tar.xz";
-      sha256 = "0hpskwa8g88fz39b0y7sjl574s82d6smla1bhs8mdjlabv0sln6z";
-      name = "ktimer-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktimer-17.04.0.tar.xz";
+      sha256 = "0px3dxndyhy0xi3s3pac2baw1a5g3a9hg46aj01mk1143z0l8nfz";
+      name = "ktimer-17.04.0.tar.xz";
     };
   };
   ktnef = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktnef-16.12.3.tar.xz";
-      sha256 = "0v38h7bwjwab1656w3c2h1by5925f616idnvflgp123v1cs6jy1n";
-      name = "ktnef-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktnef-17.04.0.tar.xz";
+      sha256 = "1azy1j045br0xdzyc7nx8h7lvxzzwcvvv223c39d5s008d1i9xp8";
+      name = "ktnef-17.04.0.tar.xz";
     };
   };
   ktouch = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktouch-16.12.3.tar.xz";
-      sha256 = "17gkvzczfgmip18y3jbjisz4z8m5hwbgkqn4qynabp6dqihwhzgg";
-      name = "ktouch-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktouch-17.04.0.tar.xz";
+      sha256 = "0d4d7mzjm2lnisih9i94sblspkdqvphqa0irk9ps1dyykdwhbw08";
+      name = "ktouch-17.04.0.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-accounts-kcm-16.12.3.tar.xz";
-      sha256 = "0pr191i9fmz66wlv8krmy1pba7igd1qwa0akb4kdzkm4bx3z8wq3";
-      name = "ktp-accounts-kcm-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-accounts-kcm-17.04.0.tar.xz";
+      sha256 = "0bh8s8yiajxxvlnisjlv4mg0v7p51vy5jncmqg6lrq3y29zycbwc";
+      name = "ktp-accounts-kcm-17.04.0.tar.xz";
     };
   };
   ktp-approver = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-approver-16.12.3.tar.xz";
-      sha256 = "08aj2j9bjdyigl4cx65v5fjsdayid07mx0mq72iy6l17d8z4b39a";
-      name = "ktp-approver-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-approver-17.04.0.tar.xz";
+      sha256 = "06vcxq72idrx24l9y5mvbbxashaqdkv78ihx7qcxq9v8b2kv9ph0";
+      name = "ktp-approver-17.04.0.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-auth-handler-16.12.3.tar.xz";
-      sha256 = "08ryqkba9zngjabsp1b9w13psp0n97qhjd31id007hc6r6s1nxxx";
-      name = "ktp-auth-handler-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-auth-handler-17.04.0.tar.xz";
+      sha256 = "0r0yp2xhi12wxk7yaqxwnxg27ccafxlcmn2pzsjf278azymyfral";
+      name = "ktp-auth-handler-17.04.0.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-call-ui-16.12.3.tar.xz";
-      sha256 = "1aq0s4v972kskjnq720364y971iyr0m6pj42fw5rpkl7j8vfg1rd";
-      name = "ktp-call-ui-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-call-ui-17.04.0.tar.xz";
+      sha256 = "1bpvisfg58dvpywhvwgb8n4vlai14f7wayzbw1a30344lhca1aql";
+      name = "ktp-call-ui-17.04.0.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-common-internals-16.12.3.tar.xz";
-      sha256 = "0g3vmds5f7wmffp9rv915bll8ky7qf3lz172ymc6q9i1xvghp215";
-      name = "ktp-common-internals-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-common-internals-17.04.0.tar.xz";
+      sha256 = "1bp2x8f4ymav53icdfxpmdd58kms676qgj5x4jnjbjypw9iyxy9j";
+      name = "ktp-common-internals-17.04.0.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-contact-list-16.12.3.tar.xz";
-      sha256 = "05asblclq6sjd3d9faaj2ya37srf4lhg8jx705aw13wd5d6pk75w";
-      name = "ktp-contact-list-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-contact-list-17.04.0.tar.xz";
+      sha256 = "1nldhg221kf9y0fakanj1kj47jrgz820ql766f2yb276y4da31cm";
+      name = "ktp-contact-list-17.04.0.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-contact-runner-16.12.3.tar.xz";
-      sha256 = "1lcx9smfv2dqrwsbdd4srcq7dqap8bclz788p6jjn04xi6wcbbiq";
-      name = "ktp-contact-runner-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-contact-runner-17.04.0.tar.xz";
+      sha256 = "13q31cqpmafimx0nk680z0szxgzanmcqr3xay78ndc9fsg21yc83";
+      name = "ktp-contact-runner-17.04.0.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-desktop-applets-16.12.3.tar.xz";
-      sha256 = "1pd8vzwmxcsw6pq80r9casi07wwisr70l5ffm231v9d73k4fw7kv";
-      name = "ktp-desktop-applets-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-desktop-applets-17.04.0.tar.xz";
+      sha256 = "0fihfqn5wzcxi7kj3lsnnimaiz4k5vzzcfx81rklf75d327lnkvx";
+      name = "ktp-desktop-applets-17.04.0.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-filetransfer-handler-16.12.3.tar.xz";
-      sha256 = "0ddmrpnh6myl7m3drh3cxx9pp06al98g8mppnysmgswgkwafg6cq";
-      name = "ktp-filetransfer-handler-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-filetransfer-handler-17.04.0.tar.xz";
+      sha256 = "0xm9znnk38xy6z3ndb8i9yjkbx5jv240j4niaagr4kpnsfcmq0yk";
+      name = "ktp-filetransfer-handler-17.04.0.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-kded-module-16.12.3.tar.xz";
-      sha256 = "06zw8padspbn8ydcbs69v3ggmfpqrb3axxd2v1sgg4p4kdp0jyml";
-      name = "ktp-kded-module-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-kded-module-17.04.0.tar.xz";
+      sha256 = "04mng6j3fz1glfa3c4jx9360hd6blplnba02257s3vk2kqiah64i";
+      name = "ktp-kded-module-17.04.0.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-send-file-16.12.3.tar.xz";
-      sha256 = "1m7cj3q4lzj8qj2cla6wm1crpjid77b3f3yywri167f1zd4p51z6";
-      name = "ktp-send-file-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-send-file-17.04.0.tar.xz";
+      sha256 = "0iz544hn8s93dxf40vcg80fngq2mxzmmyzd4iwjxk218md86k9wn";
+      name = "ktp-send-file-17.04.0.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktp-text-ui-16.12.3.tar.xz";
-      sha256 = "0ssxr35vcqjppnppyjxwzrkzvb5sx45fpnvbzsv9md5rnlf2xh1k";
-      name = "ktp-text-ui-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktp-text-ui-17.04.0.tar.xz";
+      sha256 = "18yl0yb3ccwykxn24gyv9i6mw3xbz46mlgygrn7iswgwnrqpckwa";
+      name = "ktp-text-ui-17.04.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/ktuberling-16.12.3.tar.xz";
-      sha256 = "1vn35bn0x5ykd9j78q5apg1i14v546jrqq1yn2q178d9qmx79pgv";
-      name = "ktuberling-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/ktuberling-17.04.0.tar.xz";
+      sha256 = "0i9f5nf1zzvw7xgwi4j3g0bilmcknihh3f1as1mhxjgwfslk5xar";
+      name = "ktuberling-17.04.0.tar.xz";
     };
   };
   kturtle = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kturtle-16.12.3.tar.xz";
-      sha256 = "1mpdwb6999nar16mpha30cf4qzmpbsdha44aw77gn301v215rwj3";
-      name = "kturtle-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kturtle-17.04.0.tar.xz";
+      sha256 = "1f8bzfwjwlhvz8y1hm4if03kbllk85gdq3ih709xikj6vs922jqj";
+      name = "kturtle-17.04.0.tar.xz";
     };
   };
   kubrick = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kubrick-16.12.3.tar.xz";
-      sha256 = "1bwr8xi4d58k94h7lpl02iqf87nxhpls33ca654kzy353awqbp7f";
-      name = "kubrick-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kubrick-17.04.0.tar.xz";
+      sha256 = "15njanlbqf73khgk42n7sqkhsy8zhdhxn45n2bq5ak5wirf1gqs9";
+      name = "kubrick-17.04.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kwalletmanager-16.12.3.tar.xz";
-      sha256 = "07miaqr0yaqb0lkssb1jfg35cvr9svn16nhvb1zffvbf9fdlim47";
-      name = "kwalletmanager-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kwalletmanager-17.04.0.tar.xz";
+      sha256 = "0x8l9hzwwd97k8cj6nwgb6wyzx2zgral4sx98hasvg52cn82zfb1";
+      name = "kwalletmanager-17.04.0.tar.xz";
     };
   };
   kwave = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kwave-16.12.3.tar.xz";
-      sha256 = "1s5zwhck204m5rkrpmbghzid3dpzhqbwsilb5pfh4128d04fx9ad";
-      name = "kwave-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kwave-17.04.0.tar.xz";
+      sha256 = "1232sr45qbbdkafpbnz6ddbqabc5jasp43v5lyi3lhgppfz4gz43";
+      name = "kwave-17.04.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/kwordquiz-16.12.3.tar.xz";
-      sha256 = "1r8q2d6j7bq8jdr4cl9maapadzg7yp0zldjxkcqg08ldwsrrsnqj";
-      name = "kwordquiz-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/kwordquiz-17.04.0.tar.xz";
+      sha256 = "1wp8ccsamz6b2yk85i85r8a1r10r7b4lhxg82r8z5gv8im7g1glb";
+      name = "kwordquiz-17.04.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libgravatar-16.12.3.tar.xz";
-      sha256 = "0m726ixss72rz3gwgn7q5s34xwbghi877y7gxa1ilcrk9rhyxv2f";
-      name = "libgravatar-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libgravatar-17.04.0.tar.xz";
+      sha256 = "06d5c2kn2l5rvg23frj5hhr0hnfx5ncmhr8dlqdxz0x7pmyjbign";
+      name = "libgravatar-17.04.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkcddb-16.12.3.tar.xz";
-      sha256 = "0iaascv9a5g8681mjc6b7f2fd8fdi9p3dx8l9lapkpzcygy1fwpc";
-      name = "libkcddb-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkcddb-17.04.0.tar.xz";
+      sha256 = "0rfvq4g4d9l85p3jcqgs54bnskq2w5bqfw2j0jgizkdffk0dzvfj";
+      name = "libkcddb-17.04.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkcompactdisc-16.12.3.tar.xz";
-      sha256 = "021yws9854w6fwwfw31b87rpz92ach5xyq427968m3mc3c430d4l";
-      name = "libkcompactdisc-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkcompactdisc-17.04.0.tar.xz";
+      sha256 = "1bfli5za4rcf6ixmd3j6g9xzh6d5cp9838m6c898317sac00b957";
+      name = "libkcompactdisc-17.04.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkdcraw-16.12.3.tar.xz";
-      sha256 = "03ag6vzdj5n7zbb8yb9k84ckm1zwp2i9qqrsfn2mmmhypwknpg4w";
-      name = "libkdcraw-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkdcraw-17.04.0.tar.xz";
+      sha256 = "191cqv8q43zg5s9f52bwyrj1visf39i03d1d9d74sj1lfw7ghqys";
+      name = "libkdcraw-17.04.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkdegames-16.12.3.tar.xz";
-      sha256 = "0w7q7x04imwrdfj5zwgv0y49k4wi7a6ghqipyc5qmrwfg9ya85b3";
-      name = "libkdegames-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkdegames-17.04.0.tar.xz";
+      sha256 = "0ydja5fmyrgkxjnbcxfgyz0x5m3ymkkp436z30ikx9d5s0kyhl6k";
+      name = "libkdegames-17.04.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkdepim-16.12.3.tar.xz";
-      sha256 = "07afpxhvxpf50h10vg6vla543n4rvy1grldjj4aygwh1fgl5snm0";
-      name = "libkdepim-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkdepim-17.04.0.tar.xz";
+      sha256 = "00whk97jkycxg6s3n6dsb5addkwwk4bs696brsm1vj93rffhbslf";
+      name = "libkdepim-17.04.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkeduvocdocument-16.12.3.tar.xz";
-      sha256 = "05s79q269m5s78zjwxljxvprrqvpalf6h38n90m589vks82ahxx0";
-      name = "libkeduvocdocument-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkeduvocdocument-17.04.0.tar.xz";
+      sha256 = "0c1rj2rds7q779rfapn79w00qzdfhla8bngbnpa8s2qghb965lff";
+      name = "libkeduvocdocument-17.04.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkexiv2-16.12.3.tar.xz";
-      sha256 = "02fr10prqmpaqqlcj8hf5h4b3vhhiwkfsbpzlag64n5764x1hl3f";
-      name = "libkexiv2-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkexiv2-17.04.0.tar.xz";
+      sha256 = "07iwwfvj27m4m9h81jsrabyqamhh9gyqx1k265jxq4nll68nh0px";
+      name = "libkexiv2-17.04.0.tar.xz";
     };
   };
   libkface = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkface-16.12.3.tar.xz";
-      sha256 = "068xixlw0hfhi3c9nxik2y6xyci1ilwwfq4sjm1paqfszp0f4rq8";
-      name = "libkface-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkface-17.04.0.tar.xz";
+      sha256 = "1bazry6pmmdppmpr7fdzj61cykk9h4kwz67zay7vck0jk77n5myr";
+      name = "libkface-17.04.0.tar.xz";
+    };
+  };
+  libkgapi = {
+    version = "17.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.0/src/libkgapi-17.04.0.tar.xz";
+      sha256 = "0m3walc6hw5nmsr0cjlspczjlc90jzqam8xk32if5pl8bynmgh4c";
+      name = "libkgapi-17.04.0.tar.xz";
     };
   };
   libkgeomap = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkgeomap-16.12.3.tar.xz";
-      sha256 = "1zz2w7cbabyrvzvw2ph38mxw7khyhjzg86na2lcywla7japlbsd9";
-      name = "libkgeomap-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkgeomap-17.04.0.tar.xz";
+      sha256 = "1la4pggz7kbppmhvdv4g4szh3dyw4d3kas2m00xdvfbdjmmxswp3";
+      name = "libkgeomap-17.04.0.tar.xz";
     };
   };
   libkipi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkipi-16.12.3.tar.xz";
-      sha256 = "0f1m0v0cm11dqwm3n9w1mwz25sj3bggx19fi0jj4ij7zqicpykz6";
-      name = "libkipi-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkipi-17.04.0.tar.xz";
+      sha256 = "0yzg9dml7yjqmp1niqc003baxavvr4bprkpvahigh84r4kxbba6a";
+      name = "libkipi-17.04.0.tar.xz";
     };
   };
   libkleo = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkleo-16.12.3.tar.xz";
-      sha256 = "0rzp2bxqij9fkdsghskd2f05vgcybdc9l7wdrjqhhcngi8qxl0nn";
-      name = "libkleo-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkleo-17.04.0.tar.xz";
+      sha256 = "1bx9g4dc1h7vy3157nshlyn3m42x88dzffhcix9kw6cw5c5zfinl";
+      name = "libkleo-17.04.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkmahjongg-16.12.3.tar.xz";
-      sha256 = "0fhz7jp4wcvjcicyiwc4qq4vviwagfjdy6n5bhv7bmlccq4xfk5x";
-      name = "libkmahjongg-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkmahjongg-17.04.0.tar.xz";
+      sha256 = "0q6n15aa9hqh3i7fm6c7q37p38clasc2xqvyz1nha5s8rkm0dw73";
+      name = "libkmahjongg-17.04.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libkomparediff2-16.12.3.tar.xz";
-      sha256 = "1hm2d6217qwxsq6nyyh7iv573zkkmcn68x188zav48kmydj45l9i";
-      name = "libkomparediff2-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libkomparediff2-17.04.0.tar.xz";
+      sha256 = "0p3iys22f21fqz31dxnrrc1kkz234zrpfcv5dj9kwh114va64j5r";
+      name = "libkomparediff2-17.04.0.tar.xz";
     };
   };
   libksane = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libksane-16.12.3.tar.xz";
-      sha256 = "0406jdzs193scmb8rkx2fqcr2a0svz53sf1av9qi2nq9dnil9hcq";
-      name = "libksane-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libksane-17.04.0.tar.xz";
+      sha256 = "1yr21f0mvvgb2p29rfp8b6c33pfz893wk1xqdfsbiar7p1l4by46";
+      name = "libksane-17.04.0.tar.xz";
     };
   };
   libksieve = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/libksieve-16.12.3.tar.xz";
-      sha256 = "1riqsfl3x4vpwqv7398gj86hnwfzqwfj7d69wsxk3r02jp3xd9i2";
-      name = "libksieve-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/libksieve-17.04.0.tar.xz";
+      sha256 = "04bb0k06p384p0a0i02kj80a1kszcg6nfjal227mmj4qdra9i0nf";
+      name = "libksieve-17.04.0.tar.xz";
     };
   };
   lokalize = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/lokalize-16.12.3.tar.xz";
-      sha256 = "17ikk89680jjzv95gnrzah4bi3xnyp5mi64prhblhw7kz6vlf8x0";
-      name = "lokalize-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/lokalize-17.04.0.tar.xz";
+      sha256 = "1gjlidbhkx0alcydc8z7pi4m5gzhcj0bqpascj905vk72az0by8j";
+      name = "lokalize-17.04.0.tar.xz";
     };
   };
   lskat = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/lskat-16.12.3.tar.xz";
-      sha256 = "02mqb4c650ydy9qp3qg1avrj0m0a8yxmg0zw6hcv5pvckgfpcxki";
-      name = "lskat-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/lskat-17.04.0.tar.xz";
+      sha256 = "06nk276dsbrbw6jilh3kpjcf1nlx8vbqkl61g15m8dbhrrz833rd";
+      name = "lskat-17.04.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/mailcommon-16.12.3.tar.xz";
-      sha256 = "1sx7dgy9jad6vqp1dljg9m40x57zz6xy9d2f1lgab5ibs1lrjhq5";
-      name = "mailcommon-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/mailcommon-17.04.0.tar.xz";
+      sha256 = "1lbvzgbsn1fh96m1ck56dafsglbq7f71w9wknwm7d3afl8jp2rr6";
+      name = "mailcommon-17.04.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/mailimporter-16.12.3.tar.xz";
-      sha256 = "08yj4i6jy08hk62mxw299sh2n5pknzxanmzr96n6lf8g1jcf2l21";
-      name = "mailimporter-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/mailimporter-17.04.0.tar.xz";
+      sha256 = "1dpvxp704cmaj1yzp2wbib4avlwmgmbizrr19mssby467qb09j6z";
+      name = "mailimporter-17.04.0.tar.xz";
     };
   };
   marble = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/marble-16.12.3.tar.xz";
-      sha256 = "08dykrmiq1jk9yv83sjj6s3gps56bw0hxjbvb90bzd1g0kh0c82j";
-      name = "marble-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/marble-17.04.0.tar.xz";
+      sha256 = "0w47v85brj18g2s63axqmfrqz6hs5fq1vvbs7gr6gyirw9vbg2ka";
+      name = "marble-17.04.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/mbox-importer-16.12.3.tar.xz";
-      sha256 = "04sxijnyr13yjqkd1wm14bxm3k7r17dv24mfb3kbf804s7g8hvq7";
-      name = "mbox-importer-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/mbox-importer-17.04.0.tar.xz";
+      sha256 = "1jbia6zxcammk58hlyawhwr6j9022vvw69r0vsqnczys0qw3cbyd";
+      name = "mbox-importer-17.04.0.tar.xz";
     };
   };
   messagelib = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/messagelib-16.12.3.tar.xz";
-      sha256 = "1s5r5w231lzy3csljd5qil54ibm9mjs7c9hbw1whqmn4kd0vaz15";
-      name = "messagelib-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/messagelib-17.04.0.tar.xz";
+      sha256 = "0qcrfbzx8mw88wdjzrd8ipj2pi5l14yka0bhrw1zmsm0p1f0n34h";
+      name = "messagelib-17.04.0.tar.xz";
     };
   };
   minuet = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/minuet-16.12.3.tar.xz";
-      sha256 = "15c0mw8qj7r6192h39lvsmiy3pqlfqzari4qjg2x44j5gq02ab3c";
-      name = "minuet-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/minuet-17.04.0.tar.xz";
+      sha256 = "02m2l7d9703j2ci386wy9vxyllxqf177d2bcdhcx5iqlq4194jks";
+      name = "minuet-17.04.0.tar.xz";
     };
   };
   okteta = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/okteta-16.12.3.tar.xz";
-      sha256 = "14wmacbxc5kc3y5y5lsdxgsswi1jdvlxsd0xqcims50xjpb8znpd";
-      name = "okteta-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/okteta-17.04.0.tar.xz";
+      sha256 = "12d2hr8dw6qjhcza9ly3nkglll703cq1ywz7icp4x2xdklsv2qyv";
+      name = "okteta-17.04.0.tar.xz";
     };
   };
   okular = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/okular-16.12.3.tar.xz";
-      sha256 = "1gilr9nviv51pcnmqdfw7834knvyfd11ggdjvinxvbpz61832niv";
-      name = "okular-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/okular-17.04.0.tar.xz";
+      sha256 = "00wqflixzzn0blxd0anrfs1kjhrknny18ia95wxh0zpafvi1ga74";
+      name = "okular-17.04.0.tar.xz";
     };
   };
   palapeli = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/palapeli-16.12.3.tar.xz";
-      sha256 = "13s9ybj8a1f39z66syj88vx8rygdbb969b1d5r01msav3lk8ar3j";
-      name = "palapeli-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/palapeli-17.04.0.tar.xz";
+      sha256 = "1hjspg44py4rqzqr5w6f0lw6nz4ilwgr701s1m1pw4q0f6j80b6i";
+      name = "palapeli-17.04.0.tar.xz";
     };
   };
   parley = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/parley-16.12.3.tar.xz";
-      sha256 = "0vmbn8188brp4bysyzmkgsa8nnn9zdqb7q6x3mi1xg7ralzfjw71";
-      name = "parley-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/parley-17.04.0.tar.xz";
+      sha256 = "0i4nhwz7b7gmnlq72limp6cpsjaccc03i5qr2pdv8hb2336nabc7";
+      name = "parley-17.04.0.tar.xz";
     };
   };
   picmi = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/picmi-16.12.3.tar.xz";
-      sha256 = "0v44n05b6v46qmfrgq6b0q8bifnz5ax1f6sjrg6940q99kp2cxx4";
-      name = "picmi-16.12.3.tar.xz";
-    };
-  };
-  pimcommon = {
-    version = "16.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/pimcommon-16.12.3.tar.xz";
-      sha256 = "179ig6rwxil1ssm7k2cy7ny3vf2dbhsjn39c0ic70r03q3lzbhll";
-      name = "pimcommon-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/picmi-17.04.0.tar.xz";
+      sha256 = "0289qq4f4njv6yb9hg61ap17q2fvaandyxa8kz68v3yc7jlpsvlw";
+      name = "picmi-17.04.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/pim-data-exporter-16.12.3.tar.xz";
-      sha256 = "14xvh2gn3vc3i94fv96xbv7gxnwj8xxg3zkgfdlayajp3sz7c3yw";
-      name = "pim-data-exporter-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/pim-data-exporter-17.04.0.tar.xz";
+      sha256 = "1j8qdr9hdjzj6jn94hq771mnfwspqwb47nrrj25ghbl6d8b19qfd";
+      name = "pim-data-exporter-17.04.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/pim-sieve-editor-16.12.3.tar.xz";
-      sha256 = "03gnq2hlvw92gg8rf2bwrvf83nrgcvy6xanvwn3vcrqjfg55vb1k";
-      name = "pim-sieve-editor-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/pim-sieve-editor-17.04.0.tar.xz";
+      sha256 = "0l7vbgzjrkpvad0q8yhcgx78xcxs0llgmqg7madv06lnxbry02yf";
+      name = "pim-sieve-editor-17.04.0.tar.xz";
     };
   };
-  pim-storage-service-manager = {
-    version = "16.12.3";
+  pimcommon = {
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/pim-storage-service-manager-16.12.3.tar.xz";
-      sha256 = "0ii1f5gv430i8h2c4xdy35rz7w9py53xans8zwgpj6ir6x6gfkb0";
-      name = "pim-storage-service-manager-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/pimcommon-17.04.0.tar.xz";
+      sha256 = "1k04zfmzvjpnjwjr42p4ixkwnl1raxr9mpqb13qhr9ln4qsnsq4h";
+      name = "pimcommon-17.04.0.tar.xz";
     };
   };
   poxml = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/poxml-16.12.3.tar.xz";
-      sha256 = "1cpc49hnslc2iabgnvda7967mmrdzykjydi8py67ycr9k1gx6pm5";
-      name = "poxml-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/poxml-17.04.0.tar.xz";
+      sha256 = "1chl7mizmgvmzhi0pz111p2lkpmh4j4nbn7hfaksmvmvrlrcjj8z";
+      name = "poxml-17.04.0.tar.xz";
     };
   };
   print-manager = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/print-manager-16.12.3.tar.xz";
-      sha256 = "1mjzqq7yhm1s4jbr6nhy1i1lm27134j6g7b04mmzk3hbgd8lkr99";
-      name = "print-manager-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/print-manager-17.04.0.tar.xz";
+      sha256 = "10zkf8azgn79rq9b0amhaanngfd1pv51zr7qy10z5jd62bxxcf8n";
+      name = "print-manager-17.04.0.tar.xz";
     };
   };
   rocs = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/rocs-16.12.3.tar.xz";
-      sha256 = "17iz9ql988mj1vsvywd8w5w7qmbncxal71maf3rldadwmadkvzbl";
-      name = "rocs-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/rocs-17.04.0.tar.xz";
+      sha256 = "0jb7nwg73kagw0mrwhx7nph5m2nsq7220hr5bfcnndw1in5bwnbx";
+      name = "rocs-17.04.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/signon-kwallet-extension-16.12.3.tar.xz";
-      sha256 = "0fnqdcin471hlw694vb6z9ybgw31778rhnryc7zps40kjwfdxhcc";
-      name = "signon-kwallet-extension-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/signon-kwallet-extension-17.04.0.tar.xz";
+      sha256 = "1amvrrwsfh7d9c284ksvqm4x9f4d36abbq2fal4sicplqp4ag4z0";
+      name = "signon-kwallet-extension-17.04.0.tar.xz";
     };
   };
   spectacle = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/spectacle-16.12.3.tar.xz";
-      sha256 = "1fca71a59sgicq9zi8d0im0xpg7iz93s96h3clxxc6p493vsjkx6";
-      name = "spectacle-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/spectacle-17.04.0.tar.xz";
+      sha256 = "0vmmyvbsiffj9g49f39dar6b34rk8badpah3rzq4af0xzhlc0z0y";
+      name = "spectacle-17.04.0.tar.xz";
     };
   };
   step = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/step-16.12.3.tar.xz";
-      sha256 = "0pyvhlfrklc2xxylb0nlnpqx5xi0pp4zyb3xbzj87wmvcw7v5n6r";
-      name = "step-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/step-17.04.0.tar.xz";
+      sha256 = "0j9wlys17rdrnq2l0cprnw4pp2ks439ihyx4v1m4sdrxsvqxz4lw";
+      name = "step-17.04.0.tar.xz";
     };
   };
   svgpart = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/svgpart-16.12.3.tar.xz";
-      sha256 = "0frzqp504dzqwqs9lh544xxa8i6sqi6qj533mqbzkqbjx310ka3w";
-      name = "svgpart-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/svgpart-17.04.0.tar.xz";
+      sha256 = "0yv9a7ndfix41f875hw9fy9snqdanchvqb87rbm09dhc0fniwnir";
+      name = "svgpart-17.04.0.tar.xz";
     };
   };
   sweeper = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/sweeper-16.12.3.tar.xz";
-      sha256 = "1vf4840l233gji4sjkg9gz2pr98kin5sz37kj645z75vikwmk3al";
-      name = "sweeper-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/sweeper-17.04.0.tar.xz";
+      sha256 = "08jbp2kdlchvzmd9kpilypvm9466niyc4cwmya6crnn7khn03c05";
+      name = "sweeper-17.04.0.tar.xz";
     };
   };
   syndication = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/syndication-16.12.3.tar.xz";
-      sha256 = "11qa0jya3fjvhwsq98aag92ha20y7x758fvc4xi3800rbj8nlc58";
-      name = "syndication-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/syndication-17.04.0.tar.xz";
+      sha256 = "1irmjs40ghyx9vx1d5x30x34s8vwrqm7j6xf7m2s7s63jmmsk5w2";
+      name = "syndication-17.04.0.tar.xz";
     };
   };
   umbrello = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/umbrello-16.12.3.tar.xz";
-      sha256 = "1a4jhfmh2p1vsx8702ham550blkjj42ibwigcink6s9cadwk90cl";
-      name = "umbrello-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/umbrello-17.04.0.tar.xz";
+      sha256 = "0dkarqk4a3y4npk2nyyydizll4kmlg1lgddwx49gsvh120fy1zfn";
+      name = "umbrello-17.04.0.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "16.12.3";
+    version = "17.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.3/src/zeroconf-ioslave-16.12.3.tar.xz";
-      sha256 = "0p7kfx7bg3yvd44vg608s2znzfahkihan67zgyf3gmjllbzvp55b";
-      name = "zeroconf-ioslave-16.12.3.tar.xz";
+      url = "${mirror}/stable/applications/17.04.0/src/zeroconf-ioslave-17.04.0.tar.xz";
+      sha256 = "1m149lmjfh6nxkbax2vifirwi6jsp5jqzfai7kcyvzwp60ff6y0z";
+      name = "zeroconf-ioslave-17.04.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix
deleted file mode 100644
index 42565ae7fa8..00000000000
--- a/pkgs/applications/misc/cortex/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchgit, python3 }:
-
-stdenv.mkDerivation {
-  name = "cortex-2015-08-23";
-
-  src = fetchgit {
-    url = "https://github.com/gglucas/cortex";
-    rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639";
-    sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg";
-  };
-
-  buildInputs = [ stdenv python3 ];
-
-  prePatch = ''
-    substituteInPlace cortex --replace "/usr/bin/env python3" "${python3}/bin/python3"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp cortex $out/bin/
-    chmod +x $out/bin/cortex
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://cortex.glacicle.org";
-    description = "An ncurses reddit browser and monitor";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthiasbeyer ];
-    platforms = with platforms; unix;
-  };
-
-}
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index e925885f05f..d2acbbfea5b 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.4.1";
+  version = "0.4.2";
   name = "haxor-news-${version}";
 
   src = fetchurl {
     url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
-    sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr";
+    sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
     colorama
     requests2
     pygments
-    prompt_toolkit_52
+    prompt_toolkit
     six
   ];
 
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 57b844de97b..e134b3d79a2 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.20.2";
+  version = "0.20.5";
 
   goPackagePath = "github.com/spf13/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1dvd9kiqp87cbf027kvyqb282pxs8qm16r1dk74l5drranfvkszy";
+    sha256 = "0gsxsxri5jivvc862a1dapij667726vs55vjqas84lsg1066q5p2";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 8d7eeffad31..98dbb0cbf91 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -3,12 +3,12 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  version = "0.9.2";
+  version = "0.9.5";
   name = "khal-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
-    sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp";
+    sha256 = "0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index 7b9b04c66c8..2faf082197c 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.2";
+  version = "0.7.3";
   name = "mwic-${version}";
 
   src = fetchurl {
     url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1linpagf0i0ggicq02fcvz4rpx7xdpy80ys49wx7fnmz7f3jc6jy";
+    sha256 = "0baa2pnaba954k169p9rpzc66mhz9zqdd3lz9q95rp9dgygvchzn";
   };
 
   makeFlags=["PREFIX=\${out}"];
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 4f95879d5eb..c314a226b26 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -36,9 +36,14 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = let qst = "qsyncthingtray"; in ''
+    runHook preInstall
+
     mkdir -p $out/bin
     install -m755 QSyncthingTray $out/bin/${qst}
     ln -s $out/bin/${qst} $out/bin/QSyncthingTray
+    wrapQtProgram $out/bin/qsyncthingtray
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
@@ -52,6 +57,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     maintainers = with maintainers; [ zraexy peterhoeg ];
     platforms = platforms.all;
-    broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
+    # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
+    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
   };
 }
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 20f8df8da48..e8b3eeda01a 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,28 +1,47 @@
-{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
+{ stdenv, fetchFromGitHub, pkgs, pythonPackages }:
 
-pythonPackages.buildPythonApplication rec {
-  version = "1.14.1";
+with pythonPackages;
+buildPythonApplication rec {
+  version = "1.15.1";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "03106sdsvj4zjjaqqg7qvm3n959plvy08a6n28ir1yf67kwzsx8a";
+    sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  checkPhase = ''
+    py.test
+  '';
+
+  buildInputs = [
+    coverage
+    coveralls
+    docopt
+    mock
+    pylint
+    pytest
+    vcrpy
+  ];
+
+  propagatedBuildInputs = [
+    backports_functools_lru_cache
     beautifulsoup4
+    configparser
+    contextlib2
+    decorator
+    kitchen
     mailcap-fix
-    tornado
+    mccabe
     requests2
     six
-    praw
-    kitchen
-    praw
-  ] ++ lib.optional (!pythonPackages.isPy3k) futures;
+    tornado
+    pyyaml
+  ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = https://github.com/michael-lazar/rtv;
     description = "Browse Reddit from your Terminal";
     license = licenses.mit;
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 6d9e1c9fcf2..19fc62d1238 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.6.0";
   name = "sc-im-${version}";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
     rev = "v${version}";
-    sha256 = "1vdn9p9srvdksxznrn65pfigwrd7brlq8bac3pjfqsvf8gjnzq61";
+    sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj";
   };
 
   buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ];
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index eb26811cfb8..a8c49b9fd4a 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -74,11 +74,8 @@ in buildPythonApplication rec {
   '';
 
   postFixup = ''
-    mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
-    makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser \
+    wrapQtProgram $out/bin/qutebrowser \
       ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''}
-
-    sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 914ca259675..6bceeefc37a 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "1wpzsvvmk19qrwzwj7k12rngry1qriiqnjzq2q2pbpv5w0zb1fz5";
+    sha256 = "6eab65a95c87a989e922aca2b49ba872b50a94e46a8fd4831d1ab41f319d6932";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 2d0d194206d..a4bbe15544a 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "24.4.16";
+  version = "24.4.17";
   sha256 =
     {
-      "x86_64-linux" = "01hnx52ag7wfclxnqzs9m09pnmisz9lczxgg3wm47qmwhagnb8la";
-      "i686-linux"   = "1cr0vfjwn60xdv2kh6kmmgf6g0s2y9mqklbfah59pm7k2yr2pvnf";
+      "x86_64-linux" = "1wjr92vrbxyjbwyqf134h8fp1zi4d5wyyirii545wqadbgg9grh9";
+      "i686-linux"   = "1qsdidpy251irzkv0hx0ch0xnrwq6wq6b22g0n8b9d0a7xi08k7h";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
new file mode 100644
index 00000000000..5f868fc9858
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
+  cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook  }:
+
+buildGoPackage rec {
+  name = "coyim-${version}";
+  version = "v0.3.7_1";
+
+  goPackagePath = "github.com/twstrike/coyim";
+
+  src = fetchFromGitHub {
+    owner = "twstrike";
+    repo = "coyim";
+    rev = "df2c52fe865d38fa27e8a7af1d87612e8c048805";
+    sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ];
+
+  meta = {
+    description = "a safe and secure chat client";
+    homepage = https://coy.im/;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
new file mode 100644
index 00000000000..20abda9ea6f
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -0,0 +1,101 @@
+{ stdenv, fetchurl, dpkg, makeWrapper
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
+, libnotify, nspr, nss, systemd, xorg }:
+
+let
+
+  version = "5.1.0.1";
+
+  rpath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig
+    freetype
+    glib
+
+    gnome2.GConf
+    gnome2.gdk_pixbuf
+    gnome2.gtk
+    gnome2.pango
+
+    gnome2.gnome_keyring
+    
+    libnotify
+    nspr
+    nss
+    stdenv.cc.cc
+    systemd
+
+    xorg.libxkbfile
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXScrnSaver
+    xorg.libxcb
+  ] + ":${stdenv.cc.cc.lib}/lib64";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://repo.skype.com/latest/skypeforlinux-64.deb";
+        sha256 = "18v861x0n2q2jaglap8193sia476dwkwr0ccfzl29mi5ijma24ml";
+      }
+    else
+      throw "Skype for linux is not supported on ${stdenv.system}";
+
+in stdenv.mkDerivation {
+  name = "skypeforlinux-${version}";
+
+  system = "x86_64-linux";
+
+  inherit src;
+
+  buildInputs = [ dpkg makeWrapper ];
+
+  unpackPhase = "true";
+  installPhase = ''
+    mkdir -p $out
+    dpkg -x $src $out
+    cp -av $out/usr/* $out
+    rm -rf $out/opt $out/usr
+    rm $out/bin/skypeforlinux
+
+    # Otherwise it looks "suspicious"
+    chmod -R g-w $out
+  '';
+
+  postFixup = ''
+     patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux"
+
+    ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
+
+    # Fix the desktop link
+    substituteInPlace $out/share/applications/skypeforlinux.desktop \
+      --replace /usr/bin/ $out/bin/ \
+      --replace /usr/share/ $out/share/
+
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Linux client for skype";
+    homepage = "https://www.skype.com";
+    license = licenses.unfree;
+    maintainers = with stdenv.lib.maintainers; [ panaeon ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
+
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 7186917269d..af1829b8622 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -2,7 +2,7 @@
 , curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme
 , libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
 , openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2
-, glib_networking, gsettings_desktop_schemas
+, glib_networking, gsettings_desktop_schemas, libSM, libytnef
 
 # Build options
 # TODO: A flag to build the manual.
@@ -32,23 +32,27 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
-  version = "3.14.1";
+  version = "3.15.0";
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "0df34gj4r5cbb92834hph19gnh7ih9rgmmw47rliyg8b9z01v6mp";
+    sha256 = "0bnwd3l04y6j1nw3h861rdy6k6lyjzsi51j04d33vbpq8c6jskaf";
   };
 
   patches = [ ./mime.patch ];
 
+  hardeningDisable = [ "format" ];
+
   postPatch = ''
     substituteInPlace src/procmime.c \
         --subst-var-by MIMEROOTDIR ${shared_mime_info}/share
   '';
 
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
   buildInputs =
     [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme
-      libetpan perl pkgconfig python wrapGAppsHook glib_networking
+      libetpan perl python glib_networking libSM libytnef
     ]
     ++ optional enableSpellcheck enchant
     ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 694b7541bba..20c3540b7f4 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, autoconf, automake, libtool, makeWrapper, fetchFromGitHub, pkgconfig
-, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib }:
+{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
+, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib
+, hicolor_icon_theme }:
 
 
 stdenv.mkDerivation rec {
@@ -15,18 +16,12 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
-  nativeBuildInputs= [ 
-    autoconf automake libtool makeWrapper 
-    pkgconfig intltool autoconf-archive 
+  nativeBuildInputs= [
+    autoconf automake libtool wrapGAppsHook
+    pkgconfig intltool autoconf-archive
     appstream-glib
   ];
-  buildInputs = [ gtk3 json_glib curl glib ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/transmission-remote-gtk" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    rm $out/share/icons/hicolor/icon-theme.cache
-  '';
+  buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ];
 
   meta = with stdenv.lib;
     { description = "GTK remote control for the Transmission BitTorrent client";
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 7535b6abf3c..667c159838a 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bean-add-2017-01-20";
+  name = "bean-add-2017-04-06";
 
   src = fetchFromGitHub {
     owner = "simon-v";
     repo = "bean-add";
-    rev = "752674259fb9512e076ef2048927fb791ad21507";
-    sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61";
+    rev = "67c3cd345dc370f8cd967a31549c1d0b86b07024";
+    sha256 = "0902lvwmf7k1h6gn3ilwzk20pxphbxsa3rn68jfhhfqpr6xpqf93";
   };
 
   propagatedBuildInputs = with python3Packages; [ python ];
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 953368b7e3b..bfce2cd6ae4 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -107,7 +107,8 @@ stdenv.mkDerivation (rec {
     # We want to do this before getting prefetched stuff to speed things up
     # (prefetched stuff has lots of files)
     find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g'
-    find . -type f | xargs sed -i 's@/bin/bash@/bin/sh@g'
+    find . -type f -not -path "./tools/hotplug/Linux/xendomains.in" \
+      | xargs sed -i 's@/bin/bash@/bin/sh@g'
 
     # Get prefetched stuff
     ${withXenfiles (name: x: ''
@@ -171,6 +172,11 @@ stdenv.mkDerivation (rec {
     ${config.postPatch or ""}
   '';
 
+  postConfigure = ''
+    substituteInPlace tools/hotplug/Linux/xendomains \
+      --replace /bin/ls ls
+  '';
+
   # TODO: Flask needs more testing before enabling it by default.
   #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
   makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]
diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix
index 2644a20d0a5..c28cc35219c 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@@ -1,10 +1,13 @@
-{stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
+{stdenv, darcs, nix, cacert}:
+
+{url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
 
 if md5 != "" then
   throw "fetchdarcs does not support md5 anymore, please use sha256"
 else
 stdenv.mkDerivation {
   name = "fetchdarcs";
+  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
   builder = ./builder.sh;
   buildInputs = [darcs];
 
diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix
new file mode 100644
index 00000000000..a5cdbd150b8
--- /dev/null
+++ b/pkgs/build-support/fetchs3/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, runCommand, awscli }:
+
+{ s3url
+, sha256
+, region ? "us-east-1"
+, credentials ? null # Default to looking at local EC2 metadata service
+, executable ? false
+, recursiveHash ? false
+, postFetch ? null
+}:
+
+let
+  credentialAttrs = stdenv.lib.optionalAttrs (credentials != null) {
+    AWS_ACCESS_KEY_ID = credentials.access_key_id;
+    AWS_SECRET_ACCESS_KEY = credentials.secret_access_key;
+    AWS_SESSION_TOKEN = credentials.session_token ? null;
+  };
+in runCommand "foo" ({
+  buildInputs = [ awscli ];
+  outputHashAlgo = "sha256";
+  outputHash = sha256;
+  outputHashMode = if recursiveHash then "recursive" else "flat";
+} // credentialAttrs) (if postFetch != null then ''
+  downloadedFile="$(mktemp)"
+  aws s3 cp ${s3url} $downloadedFile
+  ${postFetch}
+'' else  ''
+  aws s3 cp ${s3url} $out
+'')
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 96e50773138..eebde886a88 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -132,6 +132,9 @@ wrapProgram() {
     local prog="$1"
     local hidden
     hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
+    while [ -e "$hidden" ]; do
+      hidden="${hidden}_"
+    done
     mv "$prog" "$hidden"
     # Silence warning about unexpanded $0:
     # shellcheck disable=SC2016
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index d3d7561ddfb..99e22215bc7 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python, ... }:
 
 let
-  rev = "1.37.9";
+  rev = "1.37.10";
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in
 stdenv.mkDerivation rec {
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp";
-    sha256 = "0dvay98hlajhwgl5s58sh8s79i4nbcl3gajssgzimk0id8fa0ifx";
+    sha256 = "0zl55jaas3cibjscr5q1q6rgw63wqwyc9iffhvs4xi9g1bk5cnx9";
     inherit rev;
   };
 
   srcFL = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp-clang";
-    sha256 = "1ilrb6p3vybjz0hj8hc80hpm0y01794v488dywwj81khhqahnhcv";
+    sha256 = "0cdvld0lfl3cl7m6yax7f87ip9iq4rmz8icr68l2g8bl2w8qd89j";
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 351e045b50a..f7e8d1be67d 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
 
 let
-  rev = "1.37.9";
+  rev = "1.37.10";
   appdir = "share/emscripten";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "0dmvhw4j9bdqbdknz7ibg2fwzynw4w8ksnj8rkswdmp660889krp";
+    sha256 = "08f3zagxzsj96i09gjg1djd1bmy1gr1ar8n96mzg3ykaygf82d0s";
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 12e7e23e90b..19a538e613e 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -20,12 +20,12 @@
 , enableMultilib ? false
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -224,7 +224,7 @@ stdenv.mkDerivation ({
     ++ (optional langJava boehmgc)
     ++ (optionals langJava [zip unzip])
     ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
     ;
@@ -271,15 +271,15 @@ stdenv.mkDerivation ({
   targetConfig = if cross != null then cross.config else null;
 
   crossAttrs = {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -311,7 +311,7 @@ stdenv.mkDerivation ({
       ${if langAda then " --enable-libada" else ""}
       ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
       ${if cross != null then crossConfigureFlags else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
     '';
   };
  
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index e6f990113cc..714554019e4 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -34,6 +33,7 @@
 , stripped ? true
 , gnused ? null
 , darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -123,12 +123,12 @@ let version = "4.8.5";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -170,8 +170,8 @@ let version = "4.8.5";
            else                " --with-headers=${libcCross.dev}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -293,7 +293,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -382,26 +382,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -431,7 +431,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index eb03148a4b8..3bf279635aa 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -34,6 +33,7 @@
 , stripped ? true
 , gnused ? null
 , darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -125,12 +125,12 @@ let version = "4.9.4";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -171,8 +171,8 @@ let version = "4.9.4";
            else                " --with-headers=${libcCross.dev}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -298,7 +298,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -389,26 +389,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -438,7 +438,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 3e9104a82fb..79c5b805f45 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -36,6 +35,7 @@
 , binutils ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -129,12 +129,12 @@ let version = "5.4.0";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -175,8 +175,8 @@ let version = "5.4.0";
            else                " --with-headers=${getDev libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -237,10 +237,16 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = if stdenv.isDarwin then ''
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
-  '' else null;
+
+    substituteInPlace libgcc/config/t-slibgcc-darwin \
+      --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
+
+    substituteInPlace libgfortran/configure \
+      --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
+  '';
 
   postPatch =
     if (stdenv.isGNU
@@ -308,7 +314,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -398,26 +404,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -446,7 +452,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index b4e588f6b14..57bb336ccbf 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -36,6 +35,7 @@
 , binutils ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -125,12 +125,12 @@ let version = "6.3.0";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -171,8 +171,8 @@ let version = "6.3.0";
            else                " --with-headers=${getDev libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -296,7 +296,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -386,26 +386,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -434,7 +434,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index de3e9ba3ef5..ee56425f00b 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -212,6 +212,7 @@ postInstall() {
     # Move runtime libraries to $lib.
     moveToOutput "lib/lib*.so*" "$lib"
     moveToOutput "lib/lib*.la"  "$lib"
+    moveToOutput "lib/lib*.dylib" "$lib"
     moveToOutput "share/gcc-*/python" "$lib"
 
     for i in "$lib"/lib/*.{la,py}; do
@@ -221,6 +222,7 @@ postInstall() {
     if [ -n "$enableMultilib" ]; then
         moveToOutput "lib64/lib*.so*" "$lib"
         moveToOutput "lib64/lib*.la"  "$lib"
+        moveToOutput "lib64/lib*.dylib" "$lib"
 
         for i in "$lib"/lib64/*.{la,py}; do
             substituteInPlace "$i" --replace "$out" "$lib"
@@ -251,6 +253,16 @@ postInstall() {
         done
     fi
 
+    if type "install_name_tool"; then
+        for i in "$lib"/lib/*.*.dylib; do
+            install_name_tool -id "$i" "$i" || true
+            for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do
+              new_path=`echo "$old_path" | sed "s,$out,$lib,"`
+              install_name_tool -change "$old_path" "$new_path" "$i" || true
+            done
+        done
+    fi
+
     # Get rid of some "fixed" header files
     rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux}
 
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 12eb8b3a542..6b08f279790 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -26,7 +26,6 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , cross ? null
-, binutilsCross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -37,6 +36,7 @@
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
 , flex ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -125,12 +125,12 @@ let version = "7-20170409";
     crossMingw = cross != null && cross.libc == "msvcrt";
     crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
-        gccArch = stdenv.cross.gcc.arch or null;
-        gccCpu = stdenv.cross.gcc.cpu or null;
-        gccAbi = stdenv.cross.gcc.abi or null;
-        gccFpu = stdenv.cross.gcc.fpu or null;
-        gccFloat = stdenv.cross.gcc.float or null;
-        gccMode = stdenv.cross.gcc.mode or null;
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
         withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
         withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
         withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@@ -171,8 +171,8 @@ let version = "7-20170409";
            else                " --with-headers=${getDev libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
           (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
-            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            " --with-as=${binutils}/bin/${cross.config}-as" +
+            " --with-ld=${binutils}/bin/${cross.config}-ld"
           )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
@@ -296,7 +296,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals (cross != null) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -386,26 +386,26 @@ stdenv.mkDerivation ({
     else "install";
 
   crossAttrs = let
-    xgccArch = stdenv.cross.gcc.arch or null;
-    xgccCpu = stdenv.cross.gcc.cpu or null;
-    xgccAbi = stdenv.cross.gcc.abi or null;
-    xgccFpu = stdenv.cross.gcc.fpu or null;
-    xgccFloat = stdenv.cross.gcc.float or null;
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
     xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
     xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
     xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
     xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
     xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
-    AR = "${stdenv.cross.config}-ar";
-    LD = "${stdenv.cross.config}-ld";
-    CC = "${stdenv.cross.config}-gcc";
-    CXX = "${stdenv.cross.config}-gcc";
-    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
-    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
-    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
-    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
-    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
     NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
     dontStrip = true;
@@ -434,7 +434,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${stdenv.cross.config}
+      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index ed6f4717446..006a9f8fbc4 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -99,17 +99,17 @@ in stdenv.mkDerivation (rec {
 
   configureFlags = [
     "CC=${stdenv.ccCross}/bin/${cross.config}-cc"
-    "LD=${stdenv.binutilsCross}/bin/${cross.config}-ld"
-    "AR=${stdenv.binutilsCross}/bin/${cross.config}-ar"
-    "NM=${stdenv.binutilsCross}/bin/${cross.config}-nm"
-    "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib"
+    "LD=${stdenv.binutils}/bin/${cross.config}-ld"
+    "AR=${stdenv.binutils}/bin/${cross.config}-ar"
+    "NM=${stdenv.binutils}/bin/${cross.config}-nm"
+    "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib"
     "--target=${cross.config}"
     "--enable-bootstrap-with-devel-snapshot"
   ] ++
     # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
     lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space";
 
-  buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ];
+  buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ];
 
   dontSetConfigureCross = true;
 
@@ -118,6 +118,6 @@ in stdenv.mkDerivation (rec {
 
     cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
 
-    ld = "${stdenv.binutilsCross}/bin/${cross.config}-ld";
+    ld = "${stdenv.binutils}/bin/${cross.config}-ld";
   };
 })
diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index 06627ce0862..5b241b31ee3 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://github.com/GaloisInc/HaLVM";
     description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen";
+    platforms = ["x86_64-linux"];       # other platforms don't have Xen
     maintainers = with stdenv.lib.maintainers; [ dmjio ];
-    inherit (bootPkgs.ghc.meta) license platforms;
+    inherit (bootPkgs.ghc.meta) license;
   };
 }
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 508ac254f0a..ca788a57c7c 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.1";
+  version = "1.1.2";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "1c96l1bkll0l8c82cfzmph0z38f96r3x68zmggq4s8hhdqgwk8mc";
+    sha256 = "0kngyv5qjjpd93i1b8gn1vw6r8p52lfjrqa2f13nf06v9aqk0vfb";
   };
 
   propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index f2fe7fbca7a..a693afb8b59 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -153,6 +153,6 @@ stdenv.mkDerivation {
     description = "A safe, concurrent, practical language";
     maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
     license = [ licenses.mit licenses.asl20 ];
-    platforms = subtractLists platforms.i686 (platforms.linux ++ platforms.darwin);
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9d689d5394a..14619415348 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -456,16 +456,6 @@ self: super: {
   apiary-session = dontCheck super.apiary-session;
   apiary-websockets = dontCheck super.apiary-websockets;
 
-  # See instructions provided by Peti in https://github.com/NixOS/nixpkgs/issues/23036
-  purescript = super.purescript.overrideScope (self: super: {
-    # TODO: Re-evaluate the following overrides after the 0.11 release.
-    aeson = self.aeson_0_11_3_0;
-    http-client = self.http-client_0_4_31_2;
-    http-client-tls = self.http-client-tls_0_2_4_1;
-    pipes = self.pipes_4_2_0;
-    websockets = self.websockets_0_9_8_2;
-  });
-
   # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
   unlambda = dontHyperlinkSource super.unlambda;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4410e3c4c50..d2c2e27cc65 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 8.11
+  # LTS Haskell 8.12
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -167,7 +167,7 @@ default-package-overrides:
   - app-settings ==0.2.0.11
   - appar ==0.1.4
   - apportionment ==0.0.0.2
-  - arbtt ==0.9.0.12
+  - arbtt ==0.9.0.13
   - arithmoi ==0.4.3.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
@@ -189,6 +189,7 @@ default-package-overrides:
   - attoparsec ==0.13.1.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
+  - attoparsec-iso8601 ==1.0.0.0
   - audacity ==0.0.1.1
   - authenticate ==1.3.3.2
   - authenticate-oauth ==1.6
@@ -222,7 +223,7 @@ default-package-overrides:
   - bento ==0.1.0
   - between ==0.11.0.0
   - bibtex ==0.1.0.6
-  - bifunctors ==5.4.1
+  - bifunctors ==5.4.2
   - bimap ==0.3.2
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
@@ -319,7 +320,7 @@ default-package-overrides:
   - camfort ==0.901
   - carray ==0.1.6.6
   - cartel ==0.18.0.2
-  - case-insensitive ==1.2.0.8
+  - case-insensitive ==1.2.0.9
   - cased ==0.1.0.0
   - cases ==0.1.3.2
   - casing ==0.1.2.1
@@ -327,7 +328,7 @@ default-package-overrides:
   - cassava-conduit ==0.3.5.1
   - cassava-megaparsec ==0.1.0
   - cassette ==0.1.0
-  - cayley-client ==0.4.0
+  - cayley-client ==0.4.1
   - cereal ==0.5.4.0
   - cereal-conduit ==0.7.3
   - cereal-text ==0.1.0.2
@@ -391,7 +392,7 @@ default-package-overrides:
   - colour ==2.3.3
   - comfort-graph ==0.0.2
   - commutative ==0.0.1.4
-  - comonad ==5
+  - comonad ==5.0.1
   - comonad-transformers ==4.0
   - comonads-fd ==4.0
   - compactmap ==0.1.4.2
@@ -402,7 +403,7 @@ default-package-overrides:
   - concurrent-output ==1.7.9
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
-  - conduit ==1.2.9.1
+  - conduit ==1.2.10
   - conduit-combinators ==1.1.1
   - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.15
@@ -564,7 +565,7 @@ default-package-overrides:
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
   - doctemplates ==0.1.0.2
-  - doctest ==0.11.1
+  - doctest ==0.11.2
   - doctest-discover ==0.1.0.7
   - dotenv ==0.3.1.0
   - dotnet-timespan ==0.0.1.0
@@ -595,11 +596,11 @@ default-package-overrides:
   - effin ==0.3.0.2
   - either ==4.4.1.1
   - either-unwrap ==1.1
-  - ekg ==0.4.0.12
+  - ekg ==0.4.0.13
   - ekg-core ==0.1.1.1
-  - ekg-json ==0.1.0.4
+  - ekg-json ==0.1.0.5
   - ekg-statsd ==0.2.1.0
-  - ekg-wai ==0.1.0.0
+  - ekg-wai ==0.1.0.1
   - elerea ==2.9.0
   - elm-bridge ==0.4.0
   - elm-core-sources ==1.0.0
@@ -616,7 +617,7 @@ default-package-overrides:
   - enummapset ==0.5.2.1
   - enummapset-th ==0.6.1.1
   - enumset ==0.0.4
-  - envelope ==0.2.1.0
+  - envelope ==0.2.2.0
   - envparse ==0.4
   - envy ==1.3.0.2
   - epub-metadata ==4.5
@@ -705,13 +706,13 @@ default-package-overrides:
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
-  - foundation ==0.0.6
+  - foundation ==0.0.7
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
   - freenect ==1.2.1
   - freer ==0.2.4.1
-  - freer-effects ==0.3.0.0
+  - freer-effects ==0.3.0.1
   - friendly-time ==0.4
   - frisby ==0.2
   - from-sum ==0.2.1.0
@@ -730,7 +731,7 @@ default-package-overrides:
   - generic-xmlpickler ==0.1.0.5
   - GenericPretty ==1.2.1
   - generics-eot ==0.2.1.1
-  - generics-sop ==0.2.4.0
+  - generics-sop ==0.2.5.0
   - generics-sop-lens ==0.1.2.1
   - geniplate-mirror ==0.7.4
   - getopt-generics ==0.13
@@ -764,11 +765,11 @@ default-package-overrides:
   - gi-webkit ==3.0.11
   - ginger ==0.3.9.1
   - gio ==0.13.3.1
-  - gipeda ==0.3.3.1
+  - gipeda ==0.3.3.2
   - giphy-api ==0.5.2.0
   - git ==0.2.0
   - github ==0.15.0
-  - github-release ==1.0.1
+  - github-release ==1.0.2
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
@@ -778,7 +779,7 @@ default-package-overrides:
   - gitrev ==1.2.0
   - gitson ==0.5.2
   - gl ==0.8.0
-  - glabrous ==0.3.1
+  - glabrous ==0.3.2
   - glaze ==0.2.0.2
   - glazier ==0.7.0.0
   - glazier-pipes ==0.1.4.0
@@ -899,11 +900,11 @@ default-package-overrides:
   - graphviz ==2999.18.1.2
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
-  - groom ==0.1.2
+  - groom ==0.1.2.1
   - groundhog ==0.8
   - groundhog-inspector ==0.8
   - groundhog-mysql ==0.8
-  - groundhog-postgresql ==0.8
+  - groundhog-postgresql ==0.8.0.1
   - groundhog-sqlite ==0.8
   - groundhog-th ==0.8
   - grouped-list ==0.2.1.2
@@ -918,7 +919,7 @@ default-package-overrides:
   - hackage-security ==0.5.2.2
   - hackernews ==1.1.1.0
   - haddock-library ==1.4.3
-  - hailgun ==0.4.1.2
+  - hailgun ==0.4.1.3
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.9.5.1
   - half ==0.2.2.3
@@ -941,7 +942,7 @@ default-package-overrides:
   - hashable-time ==0.2.0.1
   - hashmap ==1.3.2
   - hashtables ==1.2.1.1
-  - haskeline ==0.7.3.1
+  - haskeline ==0.7.4.0
   - haskell-gi ==0.20.1
   - haskell-gi-base ==0.20.2
   - haskell-import-graph ==1.0.1
@@ -1015,7 +1016,7 @@ default-package-overrides:
   - hjpath ==3.0.1
   - hjsmin ==0.2.0.2
   - hjson ==1.3.2
-  - hjsonpointer ==1.1.0.2
+  - hjsonpointer ==1.1.1
   - hjsonschema ==1.5.0.1
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.6.0
@@ -1038,7 +1039,7 @@ default-package-overrides:
   - hostname ==1.0
   - hostname-validate ==1.0.0
   - hourglass ==0.2.10
-  - hpc-coveralls ==1.0.8
+  - hpc-coveralls ==1.0.9
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
@@ -1065,10 +1066,10 @@ default-package-overrides:
   - hsinstall ==1.5
   - hslogger ==1.2.10
   - hslua ==0.4.1
-  - hslua-aeson ==0.1.0.3
+  - hslua-aeson ==0.1.0.4
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.6
+  - HsOpenSSL ==0.11.4.7
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.4.3
@@ -1101,7 +1102,7 @@ default-package-overrides:
   - html-email-validate ==0.2.0.0
   - htoml ==1.0.0.3
   - HTTP ==4000.3.6
-  - http-api-data ==0.3.6
+  - http-api-data ==0.3.7
   - http-client ==0.5.6.1
   - http-client-openssl ==0.2.0.5
   - http-client-tls ==0.3.4.1
@@ -1110,7 +1111,7 @@ default-package-overrides:
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.6.4
-  - http-reverse-proxy ==0.4.3.3
+  - http-reverse-proxy ==0.4.4
   - http-streams ==0.8.4.0
   - http-types ==0.9.1
   - http2 ==1.6.3
@@ -1180,7 +1181,7 @@ default-package-overrides:
   - IntervalMap ==0.5.2.0
   - intervals ==0.7.2
   - intro ==0.1.0.10
-  - invariant ==0.4
+  - invariant ==0.4.1
   - invertible ==0.2.0.2
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
@@ -1214,8 +1215,8 @@ default-package-overrides:
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
   - jni ==0.2.3
-  - jose ==0.5.0.2
-  - jose-jwt ==0.7.5
+  - jose ==0.5.0.3
+  - jose-jwt ==0.7.6
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
   - json ==0.9.1
@@ -1234,7 +1235,7 @@ default-package-overrides:
   - kansas-comet ==0.4
   - katip ==0.3.1.4
   - katip-elasticsearch ==0.3.0.2
-  - kawhi ==0.2.1
+  - kawhi ==0.2.2
   - kdt ==0.2.4
   - keter ==1.4.3.2
   - keycode ==0.2.2
@@ -1334,13 +1335,13 @@ default-package-overrides:
   - mainland-pretty ==0.4.1.4
   - makefile ==0.1.1.0
   - managed ==1.0.5
-  - mandrill ==0.5.3.1
+  - mandrill ==0.5.3.2
   - markdown ==0.1.16
   - markdown-unlit ==0.4.0
   - markov-chain ==0.0.3.4
   - markup ==3.1.0
   - marvin ==0.2.3
-  - marvin-interpolate ==1.1
+  - marvin-interpolate ==1.1.1
   - math-functions ==0.2.1.0
   - mathexpr ==0.3.0.0
   - matplotlib ==0.4.3
@@ -1351,7 +1352,7 @@ default-package-overrides:
   - mbox ==0.3.3
   - mbox-utility ==0.0
   - mcmc-types ==1.0.3
-  - mediabus ==0.3.2.1
+  - mediabus ==0.3.3.0
   - mediabus-rtp ==0.3.2.1
   - median-stream ==0.7.0.0
   - mega-sdist ==0.3.0.2
@@ -1368,7 +1369,7 @@ default-package-overrides:
   - microbench ==0.1
   - microformats2-parser ==1.0.1.6
   - microlens ==0.4.8.0
-  - microlens-aeson ==2.2.0
+  - microlens-aeson ==2.2.0.1
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.8.0
   - microlens-mtl ==0.1.10.0
@@ -1508,7 +1509,7 @@ default-package-overrides:
   - oanda-rest-api ==0.3.0.0
   - objective ==1.1.1
   - ObjectName ==1.1.0.1
-  - octane ==0.18.2
+  - octane ==0.18.3
   - Octree ==0.5.4.3
   - oeis ==0.3.9
   - ofx ==0.4.2.0
@@ -1593,7 +1594,7 @@ default-package-overrides:
   - pinboard ==0.9.12.4
   - pinch ==0.3.0.2
   - pinchot ==0.24.0.0
-  - pipes ==4.3.2
+  - pipes ==4.3.3
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.4
   - pipes-cacophony ==0.4.1
@@ -1718,7 +1719,7 @@ default-package-overrides:
   - rank1dynamic ==0.3.3.0
   - Rasterific ==0.7.2.1
   - rasterific-svg ==0.3.2.1
-  - ratel ==0.3.2
+  - ratel ==0.3.3
   - ratel-wai ==0.2.0
   - rattletrap ==2.1.5
   - raw-strings-qq ==1.1
@@ -1872,7 +1873,7 @@ default-package-overrides:
   - SHA ==1.6.4.2
   - shake ==0.15.11
   - shake-language-c ==0.10.1
-  - shakespeare ==2.0.12.1
+  - shakespeare ==2.0.13
   - shell-conduit ==4.5.2
   - shelly ==1.6.8.3
   - shortcut-links ==0.4.2.0
@@ -1899,7 +1900,7 @@ default-package-overrides:
   - slug ==0.1.6
   - smallcaps ==0.6.0.4
   - smallcheck ==1.1.1
-  - smoothie ==0.4.2.6
+  - smoothie ==0.4.2.7
   - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
   - snap-blaze ==0.2.1.5
@@ -1942,7 +1943,7 @@ default-package-overrides:
   - stack-run-auto ==0.1.1.4
   - stack-type ==0.1.0.0
   - stackage-curator ==0.14.5
-  - state-plus ==0.1.2
+  - state-plus ==0.1.3
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
@@ -1993,7 +1994,7 @@ default-package-overrides:
   - stripe-haskell ==2.2.1
   - stripe-http-streams ==2.2.1
   - stripe-tests ==2.2.1
-  - strive ==3.0.2
+  - strive ==3.0.3
   - stylish-haskell ==0.7.1.0
   - success ==0.2.6
   - sundown ==0.6
@@ -2059,7 +2060,7 @@ default-package-overrides:
   - termcolor ==0.2.0.0
   - terminal-progress-bar ==0.1.1
   - terminal-size ==0.3.2.1
-  - terminfo ==0.4.0.2
+  - terminfo ==0.4.1.0
   - test-fixture ==0.5.0.0
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
@@ -2091,9 +2092,9 @@ default-package-overrides:
   - tfp ==1.0.0.2
   - th-data-compat ==0.0.2.2
   - th-desugar ==1.6
-  - th-expand-syns ==0.4.2.0
+  - th-expand-syns ==0.4.3.0
   - th-extras ==0.0.0.4
-  - th-lift ==0.7.6
+  - th-lift ==0.7.7
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.3
   - th-reify-compat ==0.0.1.1
@@ -2140,7 +2141,7 @@ default-package-overrides:
   - true-name ==0.1.0.2
   - tsv2csv ==0.1.0.2
   - ttrie ==0.1.2.1
-  - tttool ==1.7.0.1
+  - tttool ==1.7.0.2
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
@@ -2224,7 +2225,7 @@ default-package-overrides:
   - validate-input ==0.4.0.0
   - validation ==0.5.4
   - varying ==0.7.0.3
-  - vault ==0.3.0.6
+  - vault ==0.3.0.7
   - vcswrapper ==0.1.5
   - vector ==0.11.0.0
   - vector-algorithms ==0.7.0.1
@@ -2289,7 +2290,7 @@ default-package-overrides:
   - web-routes-hsp ==0.24.6.1
   - web-routes-th ==0.22.6.1
   - web-routes-wai ==0.24.3
-  - webdriver ==0.8.4
+  - webdriver ==0.8.5
   - webdriver-angular ==0.1.11
   - webkitgtk3 ==0.14.2.1
   - webkitgtk3-javascriptcore ==0.14.2.1
@@ -2297,7 +2298,7 @@ default-package-overrides:
   - webrtc-vad ==0.1.0.3
   - websockets ==0.10.0.0
   - websockets-rpc ==0.0.2
-  - websockets-snap ==0.10.2.0
+  - websockets-snap ==0.10.2.1
   - weigh ==0.0.3
   - wikicfp-scraper ==0.1.0.8
   - wild-bind ==0.1.0.3
@@ -2331,7 +2332,7 @@ default-package-overrides:
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.3
   - writer-cps-transformers ==0.1.1.2
-  - wuss ==1.1.3
+  - wuss ==1.1.4
   - X11 ==1.8
   - X11-xft ==0.3.1
   - x509 ==1.6.5
@@ -2374,7 +2375,7 @@ default-package-overrides:
   - yesod-auth ==1.4.17
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
-  - yesod-auth-hashdb ==1.6.0.1
+  - yesod-auth-hashdb ==1.6.1
   - yesod-bin ==1.5.2.2
   - yesod-core ==1.4.33
   - yesod-eventsource ==1.4.1
@@ -2469,9 +2470,7 @@ package-maintainers:
     - git-annex
     - hackage-db
     - hledger
-    - hledger-diff
     - hledger-interest
-    - hledger-irr
     - hledger-ui
     - hledger-web
     - hopenssl
@@ -2517,15 +2516,34 @@ package-maintainers:
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
+  alsa-mixer:                                   [ i686-linux, x86_64-linux ]
+  alsa-pcm:                                     [ i686-linux, x86_64-linux ]
+  alsa-seq:                                     [ i686-linux, x86_64-linux ]
   AWin32Console:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-directfb:                            [ i686-linux, x86_64-linux ]
   d3d11binding:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   DirectSound:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9base:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9d3d:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9d3dx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freenect:                                     [ i686-linux, x86_64-linux ]
+  FTGL:                                         [ i686-linux, x86_64-linux ]
+  gi-ostree:                                    [ i686-linux, x86_64-linux ]
+  hcwiid:                                       [ i686-linux, x86_64-linux ]
   hfsevents:                                    [ i686-linux, x86_64-linux ]
+  HFuse:                                        [ i686-linux, x86_64-linux ]
   hommage-ds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lio-fs:                                       [ i686-linux, x86_64-linux ]
+  midi-alsa:                                    [ i686-linux, x86_64-linux ]
+  pam:                                          [ i686-linux, x86_64-linux ]
+  PortMidi:                                     [ i686-linux, x86_64-linux ]
+  Raincat:                                      [ i686-linux, x86_64-linux ]
   reactivity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rtlsdr:                                       [ i686-linux, x86_64-linux ]
+  rubberband:                                   [ i686-linux, x86_64-linux ]
+  sdl2-mixer:                                   [ i686-linux, x86_64-linux ]
+  sdl2-ttf:                                     [ i686-linux, x86_64-linux ]
+  tokyotyrant-haskell:                          [ i686-linux, x86_64-linux ]
   Win32-console:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-dhcp-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2536,7 +2554,9 @@ dont-distribute-packages:
   Win32-security:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-services:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-services-wrapper:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xattr:                                        [ i686-linux, x86_64-linux ]
   XInput:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmobar:                                       [ i686-linux, x86_64-linux ]
 
   # Depens on shine, which is a ghcjs project.
   shine-varying:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2580,6 +2600,8 @@ dont-distribute-packages:
   accelerate-fftw:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-llvm:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-llvm-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-random:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-typelits:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-utility:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3042,6 +3064,7 @@ dont-distribute-packages:
   bliplib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   blockhash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Blogdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BlogLiterately-diagrams:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BlogLiterately:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3221,6 +3244,8 @@ dont-distribute-packages:
   cctools-workqueue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cedict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cef3-raw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cef3-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cellrenderer-cairo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cerberus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3338,6 +3363,7 @@ dont-distribute-packages:
   closure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloudi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clua:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cluss:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3377,6 +3403,7 @@ dont-distribute-packages:
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   colonnade:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   color-counter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  colour-accelerate:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   colour-space:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3387,6 +3414,7 @@ dont-distribute-packages:
   combobuffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   comfort-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  comic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   commander:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Commando:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   commodities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3999,6 +4027,10 @@ dont-distribute-packages:
   Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-analyzer-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-analyzer-deps:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-analyzer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-analyzer-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-client-haskell:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-merkle-patricia-db:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   eurofxref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4095,6 +4127,7 @@ dont-distribute-packages:
   fficxx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffmpeg-tutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   fibon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ficketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fields:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FieldTrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fieldwise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4308,6 +4341,7 @@ dont-distribute-packages:
   genvalidity-containers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec-aeson:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec-cereal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec-hashable:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-path:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4473,6 +4507,7 @@ dont-distribute-packages:
   gogol-safebrowsing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicecontrol:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicemanagement:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-sheets:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-slides:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4500,6 +4535,7 @@ dont-distribute-packages:
   GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-Examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-GLFW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPipe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-TextureLoad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps2htmlReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4544,6 +4580,7 @@ dont-distribute-packages:
   greg-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gremlin-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grempa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grenade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridbounds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   grid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4664,6 +4701,7 @@ dont-distribute-packages:
   halfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   halive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halma-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamilton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaMinitel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4788,6 +4826,7 @@ dont-distribute-packages:
   haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-go-checkers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-igraph:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-import-graph:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4941,6 +4980,7 @@ dont-distribute-packages:
   heaps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hecc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   heckle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hedgehog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hedi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-pile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5097,10 +5137,12 @@ dont-distribute-packages:
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-irr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibfam:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlibsass:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HList:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HListPP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5114,6 +5156,7 @@ dont-distribute-packages:
   hmatrix-glpk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-nlopt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-repa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-special:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5236,6 +5279,7 @@ dont-distribute-packages:
   hs2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hs2lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hS3:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbackup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher-codespeed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5329,6 +5373,7 @@ dont-distribute-packages:
   hspec-expectations-pretty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-golden-aeson:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-hedgehog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-jenkins:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-monad-control:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-shouldbe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5612,6 +5657,7 @@ dont-distribute-packages:
   ipopt-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iptables-helpers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   iptadmin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IPv6DB:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipython-kernel:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ircbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5664,6 +5710,7 @@ dont-distribute-packages:
   jalaali:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalla:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jarfind:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jarify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   jason:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5755,6 +5802,7 @@ dont-distribute-packages:
   kansas-lava-papilio:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-shake:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  karps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip-elasticsearch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   katip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5910,6 +5958,7 @@ dont-distribute-packages:
   legion-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leksah:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leksah-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lendingclub:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-properties:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6097,6 +6146,7 @@ dont-distribute-packages:
   lui:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   luis-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   luka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  luminance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   luminance-samples:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lushtags:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   luthor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6553,6 +6603,7 @@ dont-distribute-packages:
   nix-eval:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nlopt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores-scripts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   nme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   n-m:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6594,6 +6645,8 @@ dont-distribute-packages:
   numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ranges:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numhask-range:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nussinov78:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nutri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nvim-hs-contrib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6787,6 +6840,7 @@ dont-distribute-packages:
   peparser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perceptron:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peregrin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   period:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6878,6 +6932,7 @@ dont-distribute-packages:
   playlists:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plivo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plocketed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-gtk-ui:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6924,6 +6979,7 @@ dont-distribute-packages:
   PortFusion:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ports:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-acl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  posix-pty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   postcodes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6935,6 +6991,7 @@ dont-distribute-packages:
   postgresql-simple-sop:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-typed-lifted:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest-ws:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7038,6 +7095,7 @@ dont-distribute-packages:
   pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bridge:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bundle-fast:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  purescript:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-http-haskell:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7260,6 +7318,7 @@ dont-distribute-packages:
   rei:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reinterpret-cast:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   relapse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relational-record-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   relative-date:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reload:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7380,6 +7439,7 @@ dont-distribute-packages:
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rtnetlink:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-rpc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rts-loader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7585,6 +7645,7 @@ dont-distribute-packages:
   shaker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakers:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-babel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shakespeare-sass:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shapely-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-buffer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-fields:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7760,6 +7821,7 @@ dont-distribute-packages:
   SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socketed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8312,6 +8374,7 @@ dont-distribute-packages:
   type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeparams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typesafe-precure:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   types-compat:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   typescript-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-settheory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8538,6 +8601,7 @@ dont-distribute-packages:
   webkit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-output:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-page:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8714,6 +8778,7 @@ dont-distribute-packages:
   yeller:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yeshql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-angular-ui:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-articles:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-account-fork:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-basic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-bcrypt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 1a16cf3683f..53772b90dfb 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation (args // {
 
   configurePhase = args.configurePhase or ''
     export STACK_ROOT=$NIX_BUILD_TOP/.stack
-    stack setup
   '';
 
   buildPhase = args.buildPhase or "stack build";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ee906366630..afb4b323fbd 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1377,8 +1377,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.1.0";
-       sha256 = "0072b6a48008d3f3ffb360d7c6ba493f44167a3f9eb5341a9ff25fc6f8dbc78a";
+       version = "1.1.1";
+       sha256 = "45120cf01965a8c3e4b8fdc1bc338ad085971fe4cd2b5f18af11d42a3c780b4f";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -1824,6 +1824,7 @@ self: {
        testHaskellDepends = [ base containers MissingH parsec ];
        description = "A markdown-like markup language designed for blog posts";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -5028,6 +5029,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
@@ -5942,6 +5944,7 @@ self: {
        homepage = "https://github.com/tobbebex/GPipe-Core#readme";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6629,6 +6632,8 @@ self: {
        pname = "Graphalyze";
        version = "0.14.1.1";
        sha256 = "9792207d74f5aff52b3e5b83378db480702b8b5e1b13e65113e2f32e7687ce9f";
+       revision = "1";
+       editedCabalFile = "25847f733dbed8809d4bec1b14c839a41668b997dd9d1b70572f123cb5010e3d";
        libraryHaskellDepends = [
          array base bktrees containers directory fgl filepath graphviz
          old-locale pandoc process random text time
@@ -7160,6 +7165,7 @@ self: {
        homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) fuse;};
 
   "HGE2D" = callPackage
@@ -9633,25 +9639,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
-     , time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.6";
-       sha256 = "1ad6cbb50fc1ecaa98baa6de3660a9b82a9d101f17396b0da9b6c598b1114c4c";
-       libraryHaskellDepends = [
-         base bytestring integer-gmp network time
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vshabanov/HsOpenSSL";
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4_7" = callPackage
     ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
      , time
      }:
@@ -9999,6 +9986,7 @@ self: {
        homepage = "https://github.com/MichelBoucey/IPv6DB";
        description = "A RESTful Web Service for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IcoGrid" = callPackage
@@ -14019,6 +14007,7 @@ self: {
        homepage = "http://github.com/ninegua/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -14781,6 +14770,7 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
   "Random123" = callPackage
@@ -15703,8 +15693,8 @@ self: {
      }:
      mkDerivation {
        pname = "SelectSequencesFromMSA";
-       version = "1.0.2";
-       sha256 = "e0bcbec57109cd8528e2fd511b4ca5ea17cbffad4bac4f7a71bad90e0ba2271c";
+       version = "1.0.3";
+       sha256 = "4cbff4e5e788381c57ecbc1164b762ae0489c8b165fae8fc8be17d0636ff5644";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19331,13 +19321,13 @@ self: {
 
   "accelerate-cublas" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
-     , accelerate-io, accelerate-utility, base, cublas, cuda, random
-     , utility-ht, vector
+     , accelerate-io, accelerate-utility, base, cublas, cuda, hmatrix
+     , pooled-io, random, timeit, utility-ht, vector
      }:
      mkDerivation {
        pname = "accelerate-cublas";
-       version = "0.0";
-       sha256 = "4c27f8f6dca4c6e822cc731fe89ab90712f29acb341ad856791aa97db15199b5";
+       version = "0.1";
+       sha256 = "c6a7a167ccafb7feae7f54d7a0f3cca5df1b404d19fde74abae090d54a67701a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19346,9 +19336,13 @@ self: {
        ];
        executableHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
-         base cublas random
+         base random
        ];
-       homepage = "http://code.haskell.org/~thielema/accelerate-cublas/";
+       benchmarkHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
+         base cuda hmatrix pooled-io random timeit utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/accelerate-cublas/";
        description = "Basic Linear Algebra using native CUBLAS library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19385,8 +19379,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-cufft";
-       version = "0.0.0.1";
-       sha256 = "d78fd117e67ad141910f1a95ec5c82beb351bfe9a144c8cdb36fe94950055c8d";
+       version = "0.0.1";
+       sha256 = "82edc068a682202ac50f07a3414d084cf3e5e50171144c14137f2966452bf270";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19514,15 +19508,15 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-fourier-benchmark";
-       version = "0.0";
-       sha256 = "ea65bce4c026c4ac47a34ed80d5901f2b14d06c94dbe7693acce58a992d5e998";
+       version = "0.0.0.1";
+       sha256 = "37ac3787e7b759a2df2e0c9d1a6a6938402a7fc25ff99266d00aba62c304f67d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          accelerate accelerate-cuda accelerate-cufft accelerate-fftw
          accelerate-fourier base criterion
        ];
-       homepage = "http://code.haskell.org/~thielema/accelerate-fourier-benchmark/";
+       homepage = "http://hub.darcs.net/thielema/accelerate-fourier-benchmark/";
        description = "Compare different implementations of the Fast Fourier Transform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19564,6 +19558,7 @@ self: {
        ];
        description = "Accelerate backend generating LLVM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -19583,6 +19578,7 @@ self: {
        ];
        description = "Accelerate backend generating LLVM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm-ptx" = callPackage
@@ -20333,6 +20329,8 @@ self: {
        pname = "active";
        version = "0.2.0.12";
        sha256 = "55281f8fad2b2776969d04d1769fb99498477b58570e02f7a5c69022e3a8b91e";
+       revision = "1";
+       editedCabalFile = "ce9337ef3740c2b53ab2f5bec6d2019447fda7d7f2c5fe8f68d9930782fb93ff";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -21317,8 +21315,8 @@ self: {
        pname = "aeson-utils";
        version = "0.3.0.2";
        sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f";
-       revision = "4";
-       editedCabalFile = "48548049168c1e48d31414994dcea638dec56dba620c1752b41d4fa975b7020e";
+       revision = "5";
+       editedCabalFile = "ae9f74efc346334bcfc1124785765d9e2c4749da7d247500a3c168b46c4ad76c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -22423,6 +22421,7 @@ self: {
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -22443,6 +22442,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -22478,6 +22478,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
@@ -24710,6 +24711,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "animate" = callPackage
+    ({ mkDerivation, base, hspec, vector }:
+     mkDerivation {
+       pname = "animate";
+       version = "0.0.0";
+       sha256 = "693de5c29775d6b80dc04b9e7c0af9520efbd87632774bacb3217b85ab9ba821";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [ base hspec vector ];
+       homepage = "https://github.com/jxv/animate#readme";
+       description = "Animation for sprites";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "anki-tools" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , exceptions, filepath, mtl, scientific, sqlite-simple, text, time
@@ -25922,36 +25936,6 @@ self: {
      }) {arbb_dev = null;};
 
   "arbtt" = callPackage
-    ({ mkDerivation, aeson, array, base, binary, bytestring
-     , bytestring-progress, containers, deepseq, directory, filepath
-     , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
-     , tasty-golden, tasty-hunit, terminal-progress-bar, time
-     , transformers, unix, utf8-string, X11
-     }:
-     mkDerivation {
-       pname = "arbtt";
-       version = "0.9.0.12";
-       sha256 = "3bdd4171a6d68ff3604eb752d04fdc6e819ab90f021e65ff12f5f6c7e62e87cf";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson array base binary bytestring bytestring-progress containers
-         deepseq directory filepath parsec pcre-light strict
-         terminal-progress-bar time transformers unix utf8-string X11
-       ];
-       executableSystemDepends = [ libXScrnSaver ];
-       testHaskellDepends = [
-         base binary bytestring containers deepseq directory parsec
-         pcre-light process-extras tasty tasty-golden tasty-hunit time
-         transformers unix utf8-string
-       ];
-       homepage = "http://arbtt.nomeata.de/";
-       description = "Automatic Rule-Based Time Tracker";
-       license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.xorg) libXScrnSaver;};
-
-  "arbtt_0_9_0_13" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bytestring
      , bytestring-progress, containers, deepseq, directory, filepath
      , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
@@ -27762,8 +27746,8 @@ self: {
      }:
      mkDerivation {
        pname = "attoparsec-data";
-       version = "0.1.1.2";
-       sha256 = "65ff7d4a796ea2c1991aeda1e288f0ff931e5fb1831d6571faa3cf68a9367b58";
+       version = "1.0.2";
+       sha256 = "4b0931f86f331589344a1bb1f358683f168c2b565d4fd31cc238dfba01a27262";
        libraryHaskellDepends = [
          attoparsec attoparsec-time base base-prelude bytestring scientific
          text time
@@ -27870,13 +27854,15 @@ self: {
 
   "attoparsec-time" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
-     , filepath, text, time
+     , filepath, scientific, text, time
      }:
      mkDerivation {
        pname = "attoparsec-time";
-       version = "0.1.1.1";
-       sha256 = "8d1ae65e5798e451ca692b0492dd58cde17b33c1a1239bb635215728de7419bb";
-       libraryHaskellDepends = [ attoparsec base-prelude text time ];
+       version = "0.1.3";
+       sha256 = "2330fde1031338c51f2da12a2f09a4dbb19f7155fc00b40c76490753f054b118";
+       libraryHaskellDepends = [
+         attoparsec base-prelude scientific text time
+       ];
        testHaskellDepends = [
          base base-prelude directory doctest filepath
        ];
@@ -30103,8 +30089,8 @@ self: {
     ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }:
      mkDerivation {
        pname = "basic-sop";
-       version = "0.2.0.0";
-       sha256 = "8bec41c8501e9db661eea4d789ba167b6d0492c8fa69233826644c388656a891";
+       version = "0.2.0.1";
+       sha256 = "b0c6ffd05c21f7cd6c823bc4462aff90d4ae9dd2407cd7773282a3342338f73b";
        libraryHaskellDepends = [
          base deepseq generics-sop QuickCheck text
        ];
@@ -30834,29 +30820,6 @@ self: {
      }) {};
 
   "bifunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
-     , QuickCheck, semigroups, tagged, template-haskell, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "bifunctors";
-       version = "5.4.1";
-       sha256 = "3746f971f69ce31ced23d12e4785d96985f5c620ac7a26d5f4efead970c43b87";
-       revision = "1";
-       editedCabalFile = "64c592384987528035860a9b2b5d77995f16e9c7d138cf7310e1facd42e36505";
-       libraryHaskellDepends = [
-         base base-orphans comonad containers semigroups tagged
-         template-haskell transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck transformers transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/bifunctors/";
-       description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bifunctors_5_4_2" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
      , QuickCheck, semigroups, tagged, template-haskell, transformers
      , transformers-compat
@@ -30876,7 +30839,6 @@ self: {
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -31860,6 +31822,7 @@ self: {
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
@@ -33905,10 +33868,8 @@ self: {
      }:
      mkDerivation {
        pname = "ble";
-       version = "0.3.1.0";
-       sha256 = "d3ef2722c649903a26ddbc4d78bf8b7121d5f0bac84fc71ebad4c02e8f9e798c";
-       revision = "1";
-       editedCabalFile = "7ff3ee0a435f1d611c4ae67323913260a53fc3e22947c1db00bdf721bba7d45b";
+       version = "0.3.2.1";
+       sha256 = "47632eb6dfe452fc408f206643cc0060804c7b6c378c52d3d3477c765cca6f8e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36566,8 +36527,8 @@ self: {
      }:
      mkDerivation {
        pname = "cab";
-       version = "0.2.16";
-       sha256 = "f9f9f9c178ad486ff29186b519d6993a8429c3fa34a43d8ed42525c20df5585f";
+       version = "0.2.17";
+       sha256 = "07657d004cc43f420904881d83d35ee796116a5ef4966ebaef32a5044245cd52";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38632,8 +38593,8 @@ self: {
      }:
      mkDerivation {
        pname = "case-insensitive";
-       version = "1.2.0.8";
-       sha256 = "27aa610a7e0128c346d4a5cddb5d395a85b0889e4a9912acbb3b9ccbc4e99f68";
+       version = "1.2.0.9";
+       sha256 = "a7de8c4708ff47cd5d4138b74b5fae40cc271eed2635e2fe4da72066fb93d2b8";
        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
@@ -39260,27 +39221,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.4.0";
-       sha256 = "bdd21a245b6db5102d11096746edd85545d150ee835c0324e554d8b812ee6571";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       homepage = "https://github.com/MichelBoucey/cayley-client";
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cayley-client_0_4_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -39433,6 +39373,7 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Raw CEF3 bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cef = null; gtk2 = pkgs.gnome2.gtk;};
 
   "cef3-simple" = callPackage
@@ -39444,6 +39385,7 @@ self: {
        libraryHaskellDepends = [ base cef3-raw ];
        description = "Simple wrapper around cef3-raw";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ceilometer-common" = callPackage
@@ -42295,6 +42237,7 @@ self: {
        homepage = "https://github.com/CloudI/cloudi_api_haskell";
        description = "Haskell CloudI API";
        license = stdenv.lib.licenses.bsdOriginal;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudyfs" = callPackage
@@ -42762,23 +42705,24 @@ self: {
 
   "codec" = callPackage
     ({ mkDerivation, aeson, base, binary, binary-bits, bytestring
-     , data-default-class, mtl, template-haskell, text, transformers
-     , unordered-containers
+     , generic-arbitrary, mtl, profunctors, tasty, tasty-quickcheck
+     , template-haskell, text, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "codec";
-       version = "0.1.1";
-       sha256 = "3351aa3747ae92db463706c527d1723c22c34dc280ccd14e530f1ca1555b6c3a";
+       version = "0.2.1";
+       sha256 = "ffc261b58108c3d90c0b0b68461857d1148208d1a9645916e63241aaa3c25b28";
        libraryHaskellDepends = [
-         aeson base binary binary-bits bytestring data-default-class mtl
-         template-haskell text transformers unordered-containers
+         aeson base binary binary-bits bytestring mtl profunctors
+         template-haskell text transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base binary binary-bits bytestring data-default-class mtl
-         template-haskell text transformers unordered-containers
+         aeson base binary bytestring generic-arbitrary tasty
+         tasty-quickcheck
        ];
        homepage = "https://github.com/chpatrick/codec";
-       description = "First-class record construction and bidirectional serialization";
+       description = "Simple bidirectional serialization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -42877,12 +42821,17 @@ self: {
      }) {};
 
   "codeworld-api" = callPackage
-    ({ mkDerivation, base, blank-canvas, mtl, random, text, time }:
+    ({ mkDerivation, base, blank-canvas, cereal, cereal-text
+     , containers, hashable, mtl, random, text, time
+     }:
      mkDerivation {
        pname = "codeworld-api";
-       version = "0.2.0.0";
-       sha256 = "b6a5d936bdc8aa1f18d949102646990eeaaa26647f81e2c58bf92cb18e2ecdb9";
-       libraryHaskellDepends = [ base blank-canvas mtl random text time ];
+       version = "0.2.1.0";
+       sha256 = "91d8cb2faab4f93e3c498a5eb6c3ba229649d6e4bc4a45fc7452b3720faf9b52";
+       libraryHaskellDepends = [
+         base blank-canvas cereal cereal-text containers hashable mtl random
+         text time
+       ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43350,6 +43299,7 @@ self: {
        homepage = "https://github.com/tmcdonell/colour-accelerate";
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colour-space" = callPackage
@@ -43538,6 +43488,7 @@ self: {
        homepage = "https://oss.xkcd.com/";
        description = "A format for describing comics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comma" = callPackage
@@ -43676,25 +43627,6 @@ self: {
      }) {};
 
   "comonad" = callPackage
-    ({ mkDerivation, base, containers, contravariant, directory
-     , distributive, doctest, filepath, semigroups, tagged, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "comonad";
-       version = "5";
-       sha256 = "78e5b19da5b701d14ceb2ca19191cc6205b2024ff2f71b754f5e949faa19cb2a";
-       libraryHaskellDepends = [
-         base containers contravariant distributive semigroups tagged
-         transformers transformers-compat
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/comonad/";
-       description = "Comonads";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "comonad_5_0_1" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, containers
      , contravariant, distributive, doctest, semigroups, tagged
      , transformers, transformers-compat
@@ -43712,7 +43644,6 @@ self: {
        homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad-extras" = callPackage
@@ -44860,33 +44791,6 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, exceptions
-     , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
-     , mwc-random, QuickCheck, resourcet, safe, split, transformers
-     , transformers-base, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.2.9.1";
-       sha256 = "05a4ea49a56ca27cc47b9138ed840b7aaa0176b0d917e06c1626fb940797dffe";
-       libraryHaskellDepends = [
-         base exceptions lifted-base mmorph monad-control mtl resourcet
-         transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec mtl QuickCheck resourcet safe
-         split transformers
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       homepage = "http://github.com/snoyberg/conduit";
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit_1_2_10" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, exceptions
      , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
      , mwc-random, primitive, QuickCheck, resourcet, safe, split
@@ -44911,7 +44815,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-audio" = callPackage
@@ -49207,17 +49110,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cubicbezier_0_6_0_0" = callPackage
+  "cubicbezier_0_6_0_1" = callPackage
     ({ mkDerivation, base, containers, fast-math, integration, matrices
      , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty
      , tasty-hunit, vector, vector-space
      }:
      mkDerivation {
        pname = "cubicbezier";
-       version = "0.6.0.0";
-       sha256 = "3265ad631316aaba8854f4fbb6cc7f680e4b6a91b58216f88b818d128bbb2b24";
-       revision = "1";
-       editedCabalFile = "4023405ed972ab01de3edd95f9cbf996d9b33be26f35efeb8a287c5fdb8503a7";
+       version = "0.6.0.1";
+       sha256 = "13966701c791e61ae75347a6c78c263da9343febac856989500a614eda0635a3";
        libraryHaskellDepends = [
          base containers fast-math integration matrices microlens
          microlens-mtl microlens-th mtl vector vector-space
@@ -50799,6 +50700,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-emoticons" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-emoticons";
+       version = "0.1.0";
+       sha256 = "016ea335c6ccf77bdf44ac25a23b77cd2f66db0976e48318b50f46783add2e2f";
+       libraryHaskellDepends = [ base ];
+       description = "Combinator emoticons: data-aviary in the flavor of emoticons";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-endian" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50956,6 +50868,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-forest" = callPackage
+    ({ mkDerivation, base, doctest, forest }:
+     mkDerivation {
+       pname = "data-forest";
+       version = "0.1.0.2";
+       sha256 = "01311f85695e8d885298a53f6f1d85ace0b47a0c27dd4eb3d772b418e7baba69";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest forest ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "A simple multi-way tree data structure";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "data-fresh" = callPackage
     ({ mkDerivation, base, free, transformers }:
      mkDerivation {
@@ -55775,8 +55700,8 @@ self: {
     ({ mkDerivation, base, hspec, primitive, ref-tf, vector }:
      mkDerivation {
        pname = "disjoint-set-stateful";
-       version = "0.1.0.0";
-       sha256 = "addb5ab47b17356cd79fd4232db23c2ef09292cfd4c1ef04f2595416df0132f1";
+       version = "0.1.1.0";
+       sha256 = "8511e49c5ebb0467c9da86badd0d1564e02e407a3b3dec8a8781e45b62f4833a";
        libraryHaskellDepends = [ base primitive ref-tf vector ];
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
        homepage = "https://github.com/clintonmead/disjoint-set-stateful";
@@ -57028,32 +56953,6 @@ self: {
      }) {};
 
   "doctest" = callPackage
-    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
-     , filepath, ghc, ghc-paths, hspec, HUnit, process, QuickCheck
-     , setenv, silently, stringbuilder, syb, transformers, with-location
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.11.1";
-       sha256 = "5b6ab30f0bf4061707b7bb33445da4c8a00df3e8b3ed04cf7c86f18a6007ad2a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         hspec HUnit process QuickCheck setenv silently stringbuilder syb
-         transformers with-location
-       ];
-       homepage = "https://github.com/sol/doctest#readme";
-       description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "doctest_0_11_2" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
      , QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -57078,7 +56977,6 @@ self: {
        homepage = "https://github.com/sol/doctest#readme";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -59677,25 +59575,6 @@ self: {
      }) {};
 
   "ekg" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
-     , filepath, network, snap-core, snap-server, text, time
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg";
-       version = "0.4.0.12";
-       sha256 = "f30e8c1e76410c3c76ec8cf59f0e1a381a83d302c02b5a95049238aa50eb9844";
-       libraryHaskellDepends = [
-         aeson base bytestring ekg-core ekg-json filepath network snap-core
-         snap-server text time transformers unordered-containers
-       ];
-       homepage = "https://github.com/tibbe/ekg";
-       description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ekg_0_4_0_13" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, network, snap-core, snap-server, text, time
      , transformers, unordered-containers
@@ -59840,21 +59719,6 @@ self: {
      }) {};
 
   "ekg-json" = callPackage
-    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg-json";
-       version = "0.1.0.4";
-       sha256 = "6afc7c146e4891824bb672af94ef3cade56ebf17cc51a3ca9ffdd2ce4345e479";
-       libraryHaskellDepends = [
-         aeson base ekg-core text unordered-containers
-       ];
-       homepage = "https://github.com/tibbe/ekg-json";
-       description = "JSON encoding of ekg metrics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg-json_0_1_0_5" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
      }:
      mkDerivation {
@@ -59867,7 +59731,6 @@ self: {
        homepage = "https://github.com/tibbe/ekg-json";
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-log" = callPackage
@@ -59964,24 +59827,6 @@ self: {
      }) {};
 
   "ekg-wai" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
-     , filepath, http-types, network, text, time, transformers
-     , unordered-containers, wai, wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "ekg-wai";
-       version = "0.1.0.0";
-       sha256 = "48a7e64ac613caf2eea1db79a20785d66552ea0f6943941468b0b6e44dfa7798";
-       libraryHaskellDepends = [
-         aeson base bytestring ekg-core ekg-json filepath http-types network
-         text time transformers unordered-containers wai wai-app-static warp
-       ];
-       homepage = "https://github.com/tvh/ekg-wai";
-       description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg-wai_0_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, http-types, network, text, time, transformers
      , unordered-containers, wai, wai-app-static, warp
@@ -59997,7 +59842,6 @@ self: {
        homepage = "https://github.com/tvh/ekg-wai";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "electrum-mnemonic" = callPackage
@@ -61180,21 +61024,6 @@ self: {
      }) {};
 
   "envelope" = callPackage
-    ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
-     , text
-     }:
-     mkDerivation {
-       pname = "envelope";
-       version = "0.2.1.0";
-       sha256 = "af8a043b4a1890e927ecc23827c2018d816071cd2cc5344543287897457276fe";
-       libraryHaskellDepends = [ aeson base http-api-data mtl text ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/envelope#readme";
-       description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "envelope_0_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
      , text
      }:
@@ -61207,7 +61036,6 @@ self: {
        homepage = "https://github.com/cdepillabout/envelope#readme";
        description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envparse" = callPackage
@@ -62055,8 +61883,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer";
-       version = "1.0.3";
-       sha256 = "c4144ad2572957cbd33d3c03c6eb68707b31e2e029741cbeb3b530237a6da8a1";
+       version = "1.3.0";
+       sha256 = "a163f72dad9c13ca6309f04a29f0c2ecf2b59b5c5e3f2acbd720c0ce1a4f31a3";
        libraryHaskellDepends = [
          base bimap bytestring containers ethereum-analyzer-deps extra fgl
          graphviz hexstring hoopl text
@@ -62067,50 +61895,52 @@ self: {
        homepage = "https://github.com/ethereumK/ethereum-analyzer";
        description = "A Ethereum contract analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit-combinators
      , directory, ethereum-analyzer, ethereum-analyzer-deps, exceptions
      , hexstring, hflags, http-conduit, json-rpc, monad-logger, mtl
-     , text, unordered-containers, vector
+     , protolude, text, tostring, unordered-containers, vector
      }:
      mkDerivation {
        pname = "ethereum-analyzer-cli";
-       version = "1.0.3";
-       sha256 = "8cd1c6e8e694147b97fcb1ed9f07442018c66dd91b736756b94ae1d5b4810b17";
+       version = "1.3.0";
+       sha256 = "cc00a9d155f683596e484f1f872923cceca2fd0236ad97a077ba113acddb782d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring conduit-combinators ethereum-analyzer-deps
-         exceptions hexstring http-conduit json-rpc text
+         aeson base bytestring conduit-combinators directory
+         ethereum-analyzer ethereum-analyzer-deps exceptions hexstring
+         http-conduit json-rpc monad-logger mtl protolude text tostring
          unordered-containers vector
        ];
        executableHaskellDepends = [
-         base directory ethereum-analyzer ethereum-analyzer-deps hflags
-         monad-logger mtl text
+         base ethereum-analyzer-deps hflags monad-logger protolude
        ];
        homepage = "https://github.com/ethereumK/ethereum-analyzer";
        description = "A CLI frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer-deps" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base16-bytestring
      , binary, bytestring, containers, deepseq, fast-logger, global-lock
-     , monad-logger, nibblestring, split, text
+     , monad-logger, split, text
      }:
      mkDerivation {
        pname = "ethereum-analyzer-deps";
-       version = "0.0.1";
-       sha256 = "2b83d2f3e13d2d85d6662df3c9469e834b9f02d60b737e94a94802ab0c8c7b71";
+       version = "1.3.0";
+       sha256 = "3e86a81365a8b7fd1b02cf1074a3a9a0cadfdc451513df1932b5821294495180";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base16-bytestring binary bytestring
-         containers deepseq fast-logger global-lock monad-logger
-         nibblestring split text
+         containers deepseq fast-logger global-lock monad-logger split text
        ];
        description = "Stripped dependencies of ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer-webui" = callPackage
@@ -62123,8 +61953,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-webui";
-       version = "1.0.3";
-       sha256 = "487dcbd54fbc52682c51e9f52aa98a49e1cb369dad50bb29b2b9a1a94f0f900a";
+       version = "1.3.0";
+       sha256 = "a12ad88e3fad8d7763f2cca074432c543991b0fb96c1acf25f1317e1c97ad739";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62140,6 +61970,7 @@ self: {
        homepage = "https://github.com/ethereumK/ethereum-analyzer";
        description = "A web frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -62622,6 +62453,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exact-cover" = callPackage
+    ({ mkDerivation, base, containers, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "exact-cover";
+       version = "0.1.0.0";
+       sha256 = "e4e7077a009391fe2156b16651d731561c6cab9c774717dff272941473c8d662";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers tasty tasty-hunit ];
+       homepage = "https://github.com/arthurl/exact-cover";
+       description = "Efficient exact cover solver";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exact-pi" = callPackage
     ({ mkDerivation, base, numtype-dk }:
      mkDerivation {
@@ -63455,6 +63301,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible-sp" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "extensible-sp";
+       version = "0.1.0.0";
+       sha256 = "268bb4397b00d44f13095a7632447fd47a5f0c38aebb71c2acbe05f2f4cea168";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/githubuser/extensible-sp#readme";
+       description = "light-weight, extensible sums and products over types and kinds";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "external-sort" = callPackage
     ({ mkDerivation, base, binary, bytestring, EdisonAPI, EdisonCore }:
      mkDerivation {
@@ -64119,8 +63977,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
-       revision = "4";
-       editedCabalFile = "efe4614bc8832765c649a86b4e4a8c26122af3a5a23cad77676e062e3a85f66c";
+       revision = "5";
+       editedCabalFile = "6d7aa462319fe6e02907bf6f2d017e4bc2e9ad929ad8db4417f015972624f8c0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65088,6 +64946,7 @@ self: {
        ];
        description = "update statically hosted file in a push stule through socketed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fields" = callPackage
@@ -67400,6 +67259,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "forma" = callPackage
+    ({ mkDerivation, aeson, base, containers, data-default-class, hspec
+     , mtl, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "forma";
+       version = "0.1.0";
+       sha256 = "4ae9efb4ca4bc806e8d700ad2532d17a3002b532e5fb05fab7d3582842de5881";
+       libraryHaskellDepends = [
+         aeson base containers data-default-class mtl text
+         unordered-containers
+       ];
+       testHaskellDepends = [ aeson base hspec mtl text ];
+       homepage = "https://github.com/mrkkrp/forma";
+       description = "Process forms sent to you in JSON format like a man";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "formal" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers
      , directory, file-embed, HTTP, indents, interpolatedstring-perl6
@@ -67699,25 +67576,6 @@ self: {
      }) {};
 
   "foundation" = callPackage
-    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "foundation";
-       version = "0.0.6";
-       sha256 = "9f0a2e9823146e7d13d1a11522446d43e110d80bde4937214107415f593c0222";
-       libraryHaskellDepends = [ base ghc-prim ];
-       testHaskellDepends = [
-         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/haskell-foundation/foundation";
-       description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "foundation_0_0_7" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -68303,6 +68161,7 @@ self: {
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) freenect; freenect_sync = null; 
          libfreenect = null;};
 
@@ -68329,27 +68188,6 @@ self: {
      }) {};
 
   "freer-effects" = callPackage
-    ({ mkDerivation, base, criterion, free, hlint, mtl, QuickCheck
-     , tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "freer-effects";
-       version = "0.3.0.0";
-       sha256 = "06b67cabe8141468a0bc55d6f39918fd0a037992e760411d116a36a22586d57f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base hlint QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion free mtl ];
-       homepage = "https://github.com/IxpertaSolutions/freer-effects";
-       description = "Implementation of effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "freer-effects_0_3_0_1" = callPackage
     ({ mkDerivation, base, criterion, free, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -68368,7 +68206,6 @@ self: {
        homepage = "https://github.com/IxpertaSolutions/freer-effects";
        description = "Implementation of effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freesect" = callPackage
@@ -69238,8 +69075,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "functor-infix";
-       version = "0.0.4";
-       sha256 = "2dac64ec872867c2365dd6318388c27da561f34ab285852ffba89965d15525d7";
+       version = "0.0.5";
+       sha256 = "f62ea7341afe0f77794966d451bdd203e82efeef9e8aa9760847e05f6ea82e66";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
@@ -69542,6 +69379,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fx" = callPackage
+    ({ mkDerivation, base, base-prelude, transformers }:
+     mkDerivation {
+       pname = "fx";
+       version = "0.7";
+       sha256 = "8c7a2dbffec34d5ef827f4c2dea951260728684f3d89f90c526dcbf4bdd49784";
+       libraryHaskellDepends = [ base base-prelude transformers ];
+       homepage = "https://github.com/nikita-volkov/fx";
+       description = "Horizontally composable effects";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "g-npm" = callPackage
     ({ mkDerivation, base, HTTP, json }:
      mkDerivation {
@@ -70171,6 +70020,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-aeson_0_2_0_9" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl
+     , tagged, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "generic-aeson";
+       version = "0.2.0.9";
+       sha256 = "34c13f91ffa72a1f6d7f43b84fdd19b20db547045eb6164a4119f9a95dcd84cb";
+       libraryHaskellDepends = [
+         aeson attoparsec base generic-deriving mtl tagged text
+         unordered-containers vector
+       ];
+       description = "Derivation of Aeson instances using GHC generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-arbitrary" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -70460,18 +70326,6 @@ self: {
      }) {};
 
   "generics-sop" = callPackage
-    ({ mkDerivation, base, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "generics-sop";
-       version = "0.2.4.0";
-       sha256 = "481f73f122970efc24fe9dea71077e265d260834d975dd41395671d9a86a1863";
-       libraryHaskellDepends = [ base ghc-prim template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Generic Programming using True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generics-sop_0_2_5_0" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generics-sop";
@@ -70481,7 +70335,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop-lens" = callPackage
@@ -70626,6 +70479,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "geniplate-mirror_0_7_5" = callPackage
+    ({ mkDerivation, base, mtl, template-haskell }:
+     mkDerivation {
+       pname = "geniplate-mirror";
+       version = "0.7.5";
+       sha256 = "519b913dac8f56d5b0d93c15881cae63f759270540c634e6f845a31084be729f";
+       libraryHaskellDepends = [ base mtl template-haskell ];
+       homepage = "https://github.com/danr/geniplate";
+       description = "Use Template Haskell to generate Uniplate-like functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "geniserver" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, GenI, http-types, json
      , snap-core, snap-server, text, transformers, utf8-string
@@ -70826,6 +70692,7 @@ self: {
        homepage = "https://github.com/NorfairKing/validity";
        description = "Standard spec's for Hashable instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-path" = callPackage
@@ -72874,6 +72741,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "OSTree bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -73223,29 +73091,6 @@ self: {
      }) {system-glib = pkgs.glib;};
 
   "gipeda" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava
-     , concurrent-output, containers, directory, extra, file-embed
-     , filepath, gitlib, gitlib-libgit2, scientific, shake, split
-     , tagged, text, transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "gipeda";
-       version = "0.3.3.1";
-       sha256 = "be7aafd3390c5d498c39482ff862a302c3bf2d7cecdba4940141297728bbb143";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring cassava concurrent-output containers
-         directory extra file-embed filepath gitlib gitlib-libgit2
-         scientific shake split tagged text transformers
-         unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/nomeata/gipeda";
-       description = "Git Performance Dashboard";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gipeda_0_3_3_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava
      , concurrent-output, containers, directory, extra, file-embed
      , filepath, gitlib, gitlib-libgit2, scientific, shake, split
@@ -73266,7 +73111,6 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "giphy-api" = callPackage
@@ -73852,28 +73696,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.0.1";
-       sha256 = "a0e58b9e855cdf8617ba42436c974776800573951dcf680ec3072651fc10c5b5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "github-release_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -74359,27 +74181,6 @@ self: {
      }) {};
 
   "glabrous" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , cereal, cereal-text, directory, either, hspec, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "glabrous";
-       version = "0.3.1";
-       sha256 = "419c5ec7c93c981ced838d6711e18565883abbb3b229d34a6fc904722e678ec8";
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
-         either text unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory either hspec text unordered-containers
-       ];
-       homepage = "https://github.com/MichelBoucey/glabrous";
-       description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glabrous_0_3_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
@@ -74398,7 +74199,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/glabrous";
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glade" = callPackage
@@ -77802,6 +77602,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Sheets SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-sheets_0_2_0" = callPackage
@@ -79742,6 +79543,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
        description = "Practical Deep Learning in Haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greplicate" = callPackage
@@ -79868,17 +79670,6 @@ self: {
      }) {};
 
   "groom" = callPackage
-    ({ mkDerivation, base, haskell-src-exts }:
-     mkDerivation {
-       pname = "groom";
-       version = "0.1.2";
-       sha256 = "0e820122cad388f31c3ef0815d7ff93b9e95a8fdec0d6c560c379fe0ecfdb010";
-       libraryHaskellDepends = [ base haskell-src-exts ];
-       description = "Pretty printing for well-behaved Show instances";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "groom_0_1_2_1" = callPackage
     ({ mkDerivation, base, haskell-src-exts }:
      mkDerivation {
        pname = "groom";
@@ -79890,7 +79681,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pretty printing for well-behaved Show instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gross" = callPackage
@@ -79991,26 +79781,6 @@ self: {
      }) {};
 
   "groundhog-postgresql" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
-     , containers, groundhog, monad-control, postgresql-libpq
-     , postgresql-simple, resource-pool, resourcet, text, time
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "groundhog-postgresql";
-       version = "0.8";
-       sha256 = "78a5acb35b9b1dae9a9076e41db2dde46198b8e8494baaac98c6fdfc64b77f8d";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder bytestring containers groundhog
-         monad-control postgresql-libpq postgresql-simple resource-pool
-         resourcet text time transformers vector
-       ];
-       description = "PostgreSQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "groundhog-postgresql_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, groundhog, monad-control, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -82716,24 +82486,6 @@ self: {
      }) {};
 
   "hailgun" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, email-validate
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , tagsoup, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "hailgun";
-       version = "0.4.1.2";
-       sha256 = "f0b8e11e2a09d0d737620ed46e8029c5679cfe392c47df4be5ee3ba63a114ff1";
-       libraryHaskellDepends = [
-         aeson base bytestring email-validate exceptions filepath
-         http-client http-client-tls http-types tagsoup text time
-         transformers
-       ];
-       description = "Mailgun REST api interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hailgun_0_4_1_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
      , tagsoup, text, time, transformers
@@ -82749,7 +82501,6 @@ self: {
        ];
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun-send" = callPackage
@@ -83165,6 +82916,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hakyll-favicon" = callPackage
+    ({ mkDerivation, base, filepath, hakyll }:
+     mkDerivation {
+       pname = "hakyll-favicon";
+       version = "0.1.0";
+       sha256 = "f9844e4e2f8284d2bd3da45ab787d0616c4ac04925b9310b73771f8025ad420a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base filepath hakyll ];
+       executableHaskellDepends = [ base hakyll ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/elaye/hakyll-favicon#README.md";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hakyll-filestore" = callPackage
     ({ mkDerivation, base, filestore, hakyll, time, time-locale-compat
      }:
@@ -83389,6 +83155,7 @@ self: {
        homepage = "https://github.com/timjb/halma";
        description = "GTK application for playing Halma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma-telegram-bot" = callPackage
@@ -85552,14 +85319,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskeline_0_7_3_1" = callPackage
+  "haskeline_0_7_4_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , process, terminfo, transformers, unix
      }:
      mkDerivation {
        pname = "haskeline";
-       version = "0.7.3.1";
-       sha256 = "7bec719c44d03cc78eb343f7927b1fc0482380384eed506ecb1644b86c62db22";
+       version = "0.7.4.0";
+       sha256 = "9ad5f556891733171086823ad63fc1e7b6cd9d758ff3f943eadbbdfaead53978";
        configureFlags = [ "-fterminfo" ];
        libraryHaskellDepends = [
          base bytestring containers directory filepath process terminfo
@@ -85585,12 +85352,12 @@ self: {
      }) {};
 
   "haskeline-repl" = callPackage
-    ({ mkDerivation, base, haskeline, mtl }:
+    ({ mkDerivation, ansi-terminal, base, haskeline, mtl }:
      mkDerivation {
        pname = "haskeline-repl";
-       version = "0.1.0.0";
-       sha256 = "1f1b05d615d6e35a98aec2bf705f848ff91f2b668e982f891537c83bbb5930e7";
-       libraryHaskellDepends = [ base haskeline mtl ];
+       version = "0.3.0.0";
+       sha256 = "0de972adbe908b3a6b3b2b681f5f3de0d4bb3deaa112179c643d4736e675e961";
+       libraryHaskellDepends = [ ansi-terminal base haskeline mtl ];
        homepage = "https://github.com/githubuser/haskeline-repl#readme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85953,6 +85720,7 @@ self: {
        homepage = "https://github.com/prateekkumarweb/haskell-go-checkers";
        description = "Go and Checkers game in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-google-trends" = callPackage
@@ -88594,8 +88362,8 @@ self: {
        pname = "hastache";
        version = "0.6.1";
        sha256 = "8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464";
-       revision = "4";
-       editedCabalFile = "10661eb3aea897aae7d81242de0dbba4eb412ee282d3a7343ed88ce626fd6bd8";
+       revision = "5";
+       editedCabalFile = "6e645296912c401a73a346c38a6ce2446d42591b3c602f7c657a626d9a0c8d3b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89564,6 +89332,7 @@ self: {
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
@@ -90146,6 +89915,7 @@ self: {
        homepage = "https://hedgehog.qa";
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis" = callPackage
@@ -91575,13 +91345,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hformat_0_2_0_0" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, hspec, text }:
+  "hformat_0_3_0_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec
+     , text
+     }:
      mkDerivation {
        pname = "hformat";
-       version = "0.2.0.0";
-       sha256 = "a949d752095cdc21a2e48ab4adf068ba67e5e53fa394e6fae9f29fe156dccefb";
-       libraryHaskellDepends = [ base base-unicode-symbols text ];
+       version = "0.3.0.0";
+       sha256 = "daf8636c4b3ac94c7831856123d4a4f94c03d89fa8f9e7e0f56866f622938002";
+       libraryHaskellDepends = [
+         ansi-terminal base base-unicode-symbols text
+       ];
        testHaskellDepends = [ base base-unicode-symbols hspec text ];
        homepage = "http://github.com/mvoidex/hformat";
        description = "Simple Haskell formatting";
@@ -93266,27 +93040,6 @@ self: {
      }) {};
 
   "hjsonpointer" = callPackage
-    ({ mkDerivation, aeson, base, hashable, hspec, http-types
-     , QuickCheck, semigroups, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hjsonpointer";
-       version = "1.1.0.2";
-       sha256 = "fe6826b2ede3ce7541e5c88bda78dd66cc76725f14b06533bb5ecadddcb2cc65";
-       libraryHaskellDepends = [
-         aeson base hashable QuickCheck semigroups text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-types QuickCheck text unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/seagreen/hjsonpointer";
-       description = "JSON Pointer library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hjsonpointer_1_1_1" = callPackage
     ({ mkDerivation, aeson, base, hashable, hspec, http-types
      , QuickCheck, semigroups, text, unordered-containers, vector
      }:
@@ -93305,7 +93058,6 @@ self: {
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjsonschema" = callPackage
@@ -93564,7 +93316,7 @@ self: {
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ gebner peti ];
+       maintainers = with stdenv.lib.maintainers; [ gebner ];
      }) {};
 
   "hledger-iadd" = callPackage
@@ -93631,7 +93383,7 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-lib" = callPackage
@@ -93825,6 +93577,7 @@ self: {
        homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
@@ -94112,6 +93865,7 @@ self: {
        homepage = "https://github.com/peddie/hmatrix-nlopt";
        description = "Interface HMatrix with the NLOPT minimizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
@@ -96253,33 +96007,6 @@ self: {
      }) {};
 
   "hpc-coveralls" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
-     , containers, curl, directory, directory-tree, hpc, HUnit, process
-     , pureMD5, regex-posix, retry, safe, split, transformers
-     }:
-     mkDerivation {
-       pname = "hpc-coveralls";
-       version = "1.0.8";
-       sha256 = "431db6ee058bf459c3e433c2d9ad89f1fcb344590745c3f62d0b744fc7d288b1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal cmdargs containers curl directory
-         directory-tree hpc process pureMD5 retry safe split transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base bytestring Cabal cmdargs containers curl directory
-         directory-tree hpc process pureMD5 regex-posix retry safe split
-         transformers
-       ];
-       testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hpc-coveralls_1_0_9" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
      , containers, curl, directory, directory-tree, hpc, HUnit, process
      , pureMD5, regex-posix, retry, safe, split, transformers
@@ -97533,6 +97260,7 @@ self: {
        homepage = "https://github.com/jakubfijalkowski/hsass";
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsay" = callPackage
@@ -98829,28 +98557,6 @@ self: {
      }) {inherit (pkgs) lua5_1;};
 
   "hslua-aeson" = callPackage
-    ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
-     , ieee754, QuickCheck, quickcheck-instances, scientific, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hslua-aeson";
-       version = "0.1.0.3";
-       sha256 = "f10c7fc9fdcc1c41964eb5ab170ce233be99343eb73ddaff5c175bea5bfcf1ea";
-       libraryHaskellDepends = [
-         aeson base hashable hslua scientific text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base hashable hslua hspec HUnit ieee754 QuickCheck
-         quickcheck-instances scientific text unordered-containers vector
-       ];
-       homepage = "https://github.com/tarleb/hslua-aeson#readme";
-       description = "Glue between aeson and hslua";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hslua-aeson_0_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
      , ieee754, QuickCheck, quickcheck-instances, scientific, text
      , unordered-containers, vector
@@ -98870,7 +98576,6 @@ self: {
        homepage = "https://github.com/tarleb/hslua-aeson#readme";
        description = "Glue between aeson and hslua";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsmagick" = callPackage
@@ -99447,6 +99152,7 @@ self: {
        homepage = "https://github.com/erikd/hspec-hedgehog/";
        description = "Hedgehog support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-jenkins" = callPackage
@@ -101069,30 +100775,6 @@ self: {
      }) {};
 
   "http-api-data" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , doctest, filepath, hashable, hspec, http-types, HUnit, QuickCheck
-     , quickcheck-instances, text, time, time-locale-compat
-     , unordered-containers, uri-bytestring, uuid, uuid-types
-     }:
-     mkDerivation {
-       pname = "http-api-data";
-       version = "0.3.6";
-       sha256 = "46315cdf457553ac3ecaaa3bd2109cbe5bbf41bd561a22a9282b3b460b147641";
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         base bytestring containers hashable http-types text time
-         time-locale-compat unordered-containers uri-bytestring uuid-types
-       ];
-       testHaskellDepends = [
-         base bytestring directory doctest filepath hspec HUnit QuickCheck
-         quickcheck-instances text time unordered-containers uuid
-       ];
-       homepage = "http://github.com/fizruk/http-api-data";
-       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-api-data_0_3_7" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
      , Cabal, containers, directory, doctest, filepath, hashable, hspec
      , http-types, HUnit, QuickCheck, quickcheck-instances, text, time
@@ -101116,7 +100798,6 @@ self: {
        homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -101826,33 +101507,6 @@ self: {
      }) {};
 
   "http-reverse-proxy" = callPackage
-    ({ mkDerivation, async, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, containers
-     , data-default-class, hspec, http-client, http-conduit, http-types
-     , lifted-base, monad-control, network, resourcet, streaming-commons
-     , text, transformers, wai, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "http-reverse-proxy";
-       version = "0.4.3.3";
-       sha256 = "eccfbd44f9f9f8a2a8d70dd4f9a347e4dbe39b38327271fcceeff25f0dd18b81";
-       libraryHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive conduit
-         conduit-extra containers data-default-class http-client http-types
-         lifted-base monad-control network resourcet streaming-commons text
-         transformers wai wai-logger word8
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra hspec
-         http-conduit http-types lifted-base network resourcet
-         streaming-commons transformers wai warp
-       ];
-       homepage = "https://github.com/fpco/http-reverse-proxy";
-       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-reverse-proxy_0_4_4" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -101877,7 +101531,6 @@ self: {
        homepage = "https://github.com/fpco/http-reverse-proxy";
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-server" = callPackage
@@ -106744,8 +106397,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.2.1.0";
        sha256 = "d71d126bf455898492e1d2ba18b2ad04453f8b0e4daff3926a67f0560a712298";
-       revision = "1";
-       editedCabalFile = "642acfbcacd418f194e6fd7bf6d64cbb8efaf625bb0efaaed00504f3ba54c877";
+       revision = "2";
+       editedCabalFile = "972f14c0cf96728583b054eb2b26c2555438094685b562357ef12e1dc4cfc3eb";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -107519,27 +107172,6 @@ self: {
      }) {};
 
   "invariant" = callPackage
-    ({ mkDerivation, array, base, bifunctors, comonad, containers
-     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
-     , semigroups, StateVar, stm, tagged, template-haskell, transformers
-     , transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "invariant";
-       version = "0.4";
-       sha256 = "dccf2790eb545d167623c0133aa0838d714004bfd158e3c9dfaca38497aef316";
-       libraryHaskellDepends = [
-         array base bifunctors comonad containers contravariant ghc-prim
-         profunctors semigroups StateVar stm tagged template-haskell
-         transformers transformers-compat unordered-containers
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/nfrisby/invariant-functors";
-       description = "Haskell 98 invariant functors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "invariant_0_4_1" = callPackage
     ({ mkDerivation, array, base, bifunctors, comonad, containers
      , contravariant, ghc-prim, hspec, profunctors, QuickCheck
      , semigroups, StateVar, stm, tagged, template-haskell, transformers
@@ -107558,6 +107190,27 @@ self: {
        homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "invariant_0_4_2" = callPackage
+    ({ mkDerivation, array, base, bifunctors, comonad, containers
+     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
+     , semigroups, StateVar, stm, tagged, template-haskell, transformers
+     , transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "invariant";
+       version = "0.4.2";
+       sha256 = "5aa744ff09f118b642bcc4910261ed57f109af42eab5d218062f6bc28f54b1d4";
+       libraryHaskellDepends = [
+         array base bifunctors comonad containers contravariant ghc-prim
+         profunctors semigroups StateVar stm tagged template-haskell
+         transformers transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
+       homepage = "https://github.com/nfrisby/invariant-functors";
+       description = "Haskell98 invariant functors";
+       license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -109442,6 +109095,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jarify" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, process
+     , regex-tdfa, temporary, text, zip-archive
+     }:
+     mkDerivation {
+       pname = "jarify";
+       version = "1.0";
+       sha256 = "c74a5fb188916ed823cfe574e61cb36514c75aa413895674cde9fec8f6019376";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base bytestring directory filepath process regex-tdfa temporary
+         text zip-archive
+       ];
+       doHaddock = false;
+       description = "Jarification of Haskell sources";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jason" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, vector
@@ -109929,8 +109603,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.5.0.2";
-       sha256 = "25958a11561f56363bb7dcdcd1ebbc97bf231ee68ed393b117c90fff0cf07abc";
+       version = "0.5.0.3";
+       sha256 = "d1216c4d6736a802d1c28ca8c2c6fbf18e1a237f971a6d1518fc28f440212a58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109952,7 +109626,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "jose_0_6_0_0" = callPackage
+  "jose_0_6_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, concise, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
@@ -109961,8 +109635,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.6.0.0";
-       sha256 = "91766bdc72d524e43d77cf008176ec2eb38fbdf09e1a457dae1faf78e1e7fe97";
+       version = "0.6.0.1";
+       sha256 = "a0e6a3c3683df0eb22a552a5a799e3b2ff3e443ca3bdd423c40251b477d72c1a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109986,30 +109660,6 @@ self: {
      }) {};
 
   "jose-jwt" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
-     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
-     , memory, mtl, QuickCheck, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jose-jwt";
-       version = "0.7.5";
-       sha256 = "53e3e9441b7d6d987920749edd61ab15e6e526856822e7d6c27cab302eedcdea";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring cereal containers cryptonite
-         either memory mtl text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cryptonite doctest either hspec HUnit memory
-         mtl QuickCheck text unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
-       homepage = "http://github.com/tekul/jose-jwt";
-       description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "jose-jwt_0_7_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, criterion, cryptonite, doctest, either, hspec, HUnit
      , memory, mtl, QuickCheck, text, time, unordered-containers, vector
@@ -110030,7 +109680,7 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "jpeg" = callPackage
@@ -110107,8 +109757,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.8.3.0";
-       sha256 = "e1d9838c5481f1dad2a12eecca2d1af0933e02f8f786df6bd1968b865b24f640";
+       version = "0.8.3.1";
+       sha256 = "682ade9ea22c8f3b23a928b8da0754c697e36d6b3569590f40953d499f247bdb";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq filepath ghc-prim http-types lens primitive process ref-tf
@@ -110758,8 +110408,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "7";
-       editedCabalFile = "c3b107899b4297971b6b2cb913b3ace26f6d847844c6a7a6b6fe9f8dc2a9a6f7";
+       revision = "8";
+       editedCabalFile = "2c6fdb7778fcf1f734463094c6a0a500ce885229b1eba3c1fc0f828e99745714";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -110778,8 +110428,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-sop";
-       version = "0.2.0.1";
-       sha256 = "ca02139ca3a5041225f684080067c5ec8c5e0ce3421a5eea9d273db377d005c9";
+       version = "0.2.0.2";
+       sha256 = "2ea0c44acc50087b09b399e917780c7d5a9e7e864c29a3b6512baff523db0785";
        libraryHaskellDepends = [
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
@@ -111741,6 +111391,7 @@ self: {
        homepage = "https://github.com/krapsh/kraps-haskell";
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "karver" = callPackage
@@ -111885,8 +111536,8 @@ self: {
      }:
      mkDerivation {
        pname = "kawhi";
-       version = "0.2.1";
-       sha256 = "ad98cce9b302fae9fca60ba25f9256b5c4db7e3b8340225a8e3041f45af0f677";
+       version = "0.2.2";
+       sha256 = "4e97700861c2113992c656272c6b95a30968352e40199732f6122cb25dadefff";
        libraryHaskellDepends = [
          aeson base bytestring exceptions http-client http-conduit
          http-types mtl safe scientific text
@@ -111896,20 +111547,20 @@ self: {
          scientific smallcheck tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text
        ];
-       homepage = "https://github.com/hamsterdam/kawhi";
+       homepage = "https://github.com/thunky-monk/kawhi";
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "kawhi_0_2_2" = callPackage
+  "kawhi_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
      , http-conduit, http-types, mtl, safe, scientific, smallcheck
      , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
      }:
      mkDerivation {
        pname = "kawhi";
-       version = "0.2.2";
-       sha256 = "4e97700861c2113992c656272c6b95a30968352e40199732f6122cb25dadefff";
+       version = "0.3.0";
+       sha256 = "2321387a3ddaa17c09db3a8e7a41a39f8e211467bd80bccd73791de8fca2a44f";
        libraryHaskellDepends = [
          aeson base bytestring exceptions http-client http-conduit
          http-types mtl safe scientific text
@@ -115862,8 +115513,10 @@ self: {
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.2.1";
-       sha256 = "696c33bc6dd19dbc6320a637359675bfc3090b9ad05d92fd356b4242f8832519";
+       version = "0.1.2.2";
+       sha256 = "2fd6fc409ebad2e2cea15b99da2d8f196ad2d1f773144c0587b199e8def3dcdc";
+       revision = "1";
+       editedCabalFile = "1b18202d64c6f32b490c30b4d845d3e87e0fd3b14617e94a2cdbda2c6ca8f8df";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring canteven-log conduit
          containers data-default-class data-dword directory legion network
@@ -115956,6 +115609,7 @@ self: {
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {bin-package-db = null;};
 
@@ -118359,6 +118013,7 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
   "lio-simple" = callPackage
@@ -119854,8 +119509,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.1.1";
-       sha256 = "6a9c42649e8ebaa3959bed7faccbc22c40d78f0d626ca8c41673284d3ce4ee7c";
+       version = "1.1.2";
+       sha256 = "b66a1eba34ca749932d8525750c911da4c6847ddf5420581037c13f538f52748";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121115,6 +120770,7 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luminance-samples" = callPackage
@@ -121311,6 +120967,8 @@ self: {
        pname = "lzma";
        version = "0.0.0.3";
        sha256 = "af8321c3511bde3e2745093fa3bd74c642e386db7d2e7c43b3a54814f1338144";
+       revision = "1";
+       editedCabalFile = "4d6412e760b11a7a48e7558ed8468a380a313a7bc7c0a37c8872737d375d0979";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -121389,8 +121047,8 @@ self: {
        pname = "lzma-streams";
        version = "0.1.0.0";
        sha256 = "b6c90e493f6c367f79c1cee6c3ed978c3515139bf2c7174ed083a1cf76071af1";
-       revision = "1";
-       editedCabalFile = "7f2c0b8a7b6134789e1e2117ba70d536a050f3cc5cc6a438ab69ffd28785046c";
+       revision = "2";
+       editedCabalFile = "6bad6ae0c18fb12ee70a5d3b430c6fda1eb1a99702196646dd7aa37c8a0f1319";
        libraryHaskellDepends = [ base bytestring io-streams lzma ];
        testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
@@ -122491,30 +122149,6 @@ self: {
      }) {};
 
   "mandrill" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
-     , bytestring, containers, email-validate, http-client
-     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
-     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "mandrill";
-       version = "0.5.3.1";
-       sha256 = "a559a166232461520f4fbb0637db9f922a82fdff819e9e35ee7b0941a7c0c315";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-html bytestring containers
-         email-validate http-client http-client-tls http-types lens mtl
-         old-locale QuickCheck text time unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       description = "Library for interfacing with the Mandrill JSON API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mandrill_0_5_3_2" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
@@ -122536,7 +122170,6 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -123039,23 +122672,6 @@ self: {
      }) {};
 
   "marvin-interpolate" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "marvin-interpolate";
-       version = "1.1";
-       sha256 = "4ab8a4739390bf13b1612f223a671b440d959e8f70c9b2913e35cf1cb9e75656";
-       libraryHaskellDepends = [
-         base haskell-src-meta mtl parsec template-haskell text
-       ];
-       testHaskellDepends = [ base hspec text ];
-       homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
-       description = "Compile time string interpolation a la Scala and CoffeeScript";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "marvin-interpolate_1_1_1" = callPackage
     ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
      , template-haskell, text
      }:
@@ -123070,7 +122686,6 @@ self: {
        homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
        description = "Compile time string interpolation a la Scala and CoffeeScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marxup" = callPackage
@@ -123856,8 +123471,8 @@ self: {
      }:
      mkDerivation {
        pname = "mediabus";
-       version = "0.3.2.1";
-       sha256 = "ac1fc31e78c001a3cf58b7acec59c08b83e063414650f5995e1a590cc728045d";
+       version = "0.3.3.0";
+       sha256 = "c23eba51ac61fe3d8dfd2c03c0f8a6ddb2e68936f513d5d14913a241fe9238ec";
        libraryHaskellDepends = [
          array async base bytestring cereal conduit conduit-combinators
          conduit-extra containers data-default deepseq lens lifted-async
@@ -123917,8 +123532,8 @@ self: {
      }:
      mkDerivation {
        pname = "mediabus-fdk-aac";
-       version = "0.3.2.1";
-       sha256 = "197213a3645fda298d0a7ff9b123445df3464e70b9f2396f093b44119cfeba15";
+       version = "0.4.0.0";
+       sha256 = "c92ccd43789558fdcc299fe1da64354906b064daf7113e46982636d4b09f3d52";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers deepseq
          inline-c lens mediabus monad-logger random resourcet spool tagged
@@ -123930,7 +123545,7 @@ self: {
        ];
        benchmarkHaskellDepends = [
          base conduit criterion deepseq ghc-prim lens mediabus monad-logger
-         vector
+         time vector
        ];
        homepage = "https://github.com/lindenbaum/mediabus-fdk-aac";
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
@@ -124949,29 +124564,6 @@ self: {
      }) {};
 
   "microlens-aeson" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
-     , scientific, tasty, tasty-hunit, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "microlens-aeson";
-       version = "2.2.0";
-       sha256 = "c25b8fefcd321f348c5948a0f65d30ecad4070e3f1f7720bacb022b57c6386d4";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring microlens scientific text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring microlens tasty tasty-hunit text
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/fosskers/microlens-aeson/";
-       description = "Law-abiding lenses for Aeson, using microlens";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "microlens-aeson_2_2_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
      , scientific, tasty, tasty-hunit, text, unordered-containers
      , vector
@@ -125202,6 +124794,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
   "midi-music-box" = callPackage
@@ -128069,6 +127662,8 @@ self: {
        pname = "monoid-extras";
        version = "0.4.2";
        sha256 = "13ff4e055c9656a3e599567cbc4a46ef8617c05534de46909a4239696e34281f";
+       revision = "1";
+       editedCabalFile = "3eb78f74ef1e80bca459e1cf187ab824486002edd0f699016d193c3aa2d8b9da";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Various extra monoid-related definitions and utilities";
@@ -131768,8 +131363,8 @@ self: {
        pname = "netrc";
        version = "0.2.0.0";
        sha256 = "9a5e07efa44f4b715b110aa4f9687e2b75458fb7537a2f4f1a3582c9e2e82a86";
-       revision = "2";
-       editedCabalFile = "81e838434e1cae11b94edbcfb61fee89f847a32e5a745fe59de69e6af9207ac9";
+       revision = "3";
+       editedCabalFile = "92ec853dbc1ef103ad44b6b39c61a905cc9b60cf0514cdd44751c70f533e1ac8";
        libraryHaskellDepends = [ base bytestring deepseq parsec ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
@@ -133477,6 +133072,7 @@ self: {
        homepage = "https://github.com/peddie/nlopt-haskell";
        description = "Low-level bindings to the NLOPT optimization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nlopt;};
 
   "nlp-scores" = callPackage
@@ -134566,6 +134162,7 @@ self: {
        homepage = "https://github.com/tonyday567/numhask";
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-range" = callPackage
@@ -134588,6 +134185,7 @@ self: {
        homepage = "https://github.com/tonyday567/numhask-range";
        description = "see readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nums" = callPackage
@@ -134661,24 +134259,24 @@ self: {
   "nvim-hs" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
      , cereal-conduit, conduit, conduit-extra, containers, data-default
-     , directory, dyre, exceptions, filepath, foreign-store, hslogger
-     , hspec, hspec-discover, HUnit, lifted-base, messagepack
-     , monad-control, mtl, network, optparse-applicative, parsec
+     , deepseq, directory, dyre, exceptions, filepath, foreign-store
+     , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec
+     , messagepack, monad-control, mtl, network, optparse-applicative
      , process, QuickCheck, resourcet, setenv, stm, streaming-commons
      , template-haskell, text, time, time-locale-compat, transformers
      , transformers-base, utf8-string
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.1.0";
-       sha256 = "69d20c6ea113d9a88e68256f7c4017886e88005fca32a3c0c2cba3749ea09bd0";
+       version = "0.2.1";
+       sha256 = "d10758496b4e7e51883a05df07c14f39281a87d946ff2300c05ab81a7ee1a9e4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default directory dyre exceptions
-         filepath foreign-store hslogger lifted-base messagepack
-         monad-control mtl network optparse-applicative parsec process
+         conduit-extra containers data-default deepseq directory dyre
+         exceptions filepath foreign-store hslogger lifted-base megaparsec
+         messagepack monad-control mtl network optparse-applicative process
          resourcet setenv stm streaming-commons template-haskell text time
          time-locale-compat transformers transformers-base utf8-string
        ];
@@ -134687,7 +134285,7 @@ self: {
          ansi-wl-pprint base bytestring cereal cereal-conduit conduit
          conduit-extra containers data-default directory dyre exceptions
          filepath foreign-store hslogger hspec hspec-discover HUnit
-         lifted-base messagepack mtl network optparse-applicative parsec
+         lifted-base megaparsec messagepack mtl network optparse-applicative
          process QuickCheck resourcet setenv stm streaming-commons
          template-haskell text time time-locale-compat transformers
          transformers-base utf8-string
@@ -135012,30 +134610,6 @@ self: {
      }) {};
 
   "octane" = callPackage
-    ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
-     , data-default-class, file-embed, http-client, http-client-tls
-     , overloaded-records, rattletrap, text
-     }:
-     mkDerivation {
-       pname = "octane";
-       version = "0.18.2";
-       sha256 = "4fcd5e5f2b01eee2e382bdf701617129500cce1d4302fa265d52c15edcfa34a0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bimap binary bytestring containers data-default-class
-         file-embed overloaded-records rattletrap text
-       ];
-       executableHaskellDepends = [
-         aeson base binary bytestring http-client http-client-tls
-       ];
-       homepage = "https://github.com/tfausak/octane#readme";
-       description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "octane_0_18_3" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
@@ -135056,7 +134630,7 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "octohat" = callPackage
@@ -137753,6 +137327,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) pam;};
 
   "panda" = callPackage
@@ -137793,8 +137368,8 @@ self: {
        pname = "pandoc";
        version = "1.19.2.1";
        sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801";
-       revision = "2";
-       editedCabalFile = "5dc6d0e5637a60e185b91d0540ba0c729ff9413bb852abd94fe9ac19fa3f1227";
+       revision = "3";
+       editedCabalFile = "0a776d292fd0ab23b9835416f8985a475550319b1d65e6bbe99265b914cefa52";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -137838,6 +137413,8 @@ self: {
        pname = "pandoc-citeproc";
        version = "0.10.4.1";
        sha256 = "6e6b0a89a831f9bfaa33dc0f3dff1792ee1626a5e66e1bd34da9447cd3c7de51";
+       revision = "1";
+       editedCabalFile = "12e0b66b4e3b9e74142163326b50254ed66adbeaae550d08e20cd1cb63db9b01";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138083,8 +137660,8 @@ self: {
        pname = "pandoc-types";
        version = "1.17.0.5";
        sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3";
-       revision = "2";
-       editedCabalFile = "7a12dacfadc507c1e7992acdceeba8a1a12ca682724dd1cc4faefaf985b8c2ea";
+       revision = "3";
+       editedCabalFile = "deb49394bcb5219196ae12342ca2baeeacf50d034767e1dcd25bbd00dc55e643";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -139531,6 +139108,29 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "patat_0_5_1_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+     , bytestring, containers, directory, filepath, highlighting-kate
+     , mtl, optparse-applicative, pandoc, terminal-size, text, time
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "patat";
+       version = "0.5.1.1";
+       sha256 = "c04ea9a62a9bb24c12cd70f96d98517f8d1d65542a1a6ed0461fc5d00cfbe724";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-terminal ansi-wl-pprint base bytestring containers
+         directory filepath highlighting-kate mtl optparse-applicative
+         pandoc terminal-size text time unordered-containers yaml
+       ];
+       homepage = "http://github.com/jaspervdj/patat";
+       description = "Terminal-based presentations using Pandoc";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "patch-combinators" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139545,21 +139145,24 @@ self: {
   "patch-image" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
      , accelerate-cufft, accelerate-fourier, accelerate-io
-     , accelerate-utility, array, base, Cabal, carray, containers
-     , enumset, fft, filepath, gnuplot, hmatrix, JuicyPixels, knead
-     , llvm-extra, llvm-tf, pqueue, tfp, utility-ht, vector
+     , accelerate-utility, array, base, bytestring, Cabal, carray
+     , cassava, containers, enumset, explicit-exception, fft, filepath
+     , gnuplot, hmatrix, JuicyPixels, knead, llvm-extra, llvm-tf
+     , non-empty, pqueue, tfp, unordered-containers, utility-ht, vector
      }:
      mkDerivation {
        pname = "patch-image";
-       version = "0.2";
-       sha256 = "23517289417a46873182c45091da803df80942758b38dca89303c0d066546450";
+       version = "0.3.0.1";
+       sha256 = "1ebfec911d2a0751d69d6ba9aa8f1c3735d664b56346a6b62aacc304753cbcc5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft
          accelerate-fourier accelerate-io accelerate-utility array base
-         Cabal carray containers enumset fft filepath gnuplot hmatrix
-         JuicyPixels knead llvm-extra llvm-tf pqueue tfp utility-ht vector
+         bytestring Cabal carray cassava containers enumset
+         explicit-exception fft filepath gnuplot hmatrix JuicyPixels knead
+         llvm-extra llvm-tf non-empty pqueue tfp unordered-containers
+         utility-ht vector
        ];
        homepage = "http://hub.darcs.net/thielema/patch-image/";
        description = "Compose a big image from overlapping parts";
@@ -140551,20 +140154,21 @@ self: {
      }) {};
 
   "peregrin" = callPackage
-    ({ mkDerivation, base, hspec, pg-harness-client, postgresql-simple
-     , resource-pool, text, transformers
+    ({ mkDerivation, base, bytestring, hspec, pg-harness-client
+     , postgresql-simple, resource-pool, text, transformers
      }:
      mkDerivation {
        pname = "peregrin";
-       version = "0.1.0";
-       sha256 = "9cd335665b1d4e453d88c3dbe3ffb238ebca89890ac7998bc80f6968be2e1ac1";
-       libraryHaskellDepends = [ base postgresql-simple text ];
+       version = "0.2.0";
+       sha256 = "635af1f11b6518980e1aa6beff32cf98e9a14ff035f8bc47b716e95b994d6998";
+       libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        testHaskellDepends = [
          base hspec pg-harness-client postgresql-simple resource-pool text
          transformers
        ];
        description = "Database migration support for use in other libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "perfecthash" = callPackage
@@ -142207,14 +141811,14 @@ self: {
   "pipes" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, test-framework
-     , test-framework-quickcheck2, transformers
+     , test-framework-quickcheck2, transformers, void
      }:
      mkDerivation {
        pname = "pipes";
-       version = "4.3.2";
-       sha256 = "7957bb290db7f1dfad0581f363ab97fcd58f7c0b916e1114464cb9a398b8334a";
+       version = "4.3.3";
+       sha256 = "748d728bba3b00fb908c8e4f338877a33559738f791b94eae6ac1a10b9a2f669";
        libraryHaskellDepends = [
-         base exceptions mmorph mtl transformers
+         base exceptions mmorph mtl transformers void
        ];
        testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
@@ -143658,6 +143262,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative socketed ];
        description = "plot data from stdin through socketed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot" = callPackage
@@ -144538,14 +144143,15 @@ self: {
 
   "pong-server" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, exceptions
-     , hspec, http-types, network, QuickCheck
+     , hspec, http-types, monad-control, network, QuickCheck
      }:
      mkDerivation {
        pname = "pong-server";
-       version = "0.0.3.0";
-       sha256 = "dd84310b20b09d2667dcc1af7b6ecab2a47f19986395049eeebb7ddc86b8c326";
+       version = "0.0.4.2";
+       sha256 = "a359d31ed2bca75ff6159b9094d901d60dcb85f291aeb35e96b9c59abca82fe8";
        libraryHaskellDepends = [
-         base bytestring classy-prelude exceptions http-types network
+         base bytestring classy-prelude exceptions http-types monad-control
+         network
        ];
        testHaskellDepends = [ base hspec network QuickCheck ];
        homepage = "http://github.com/RobertFischer/pong-server#readme";
@@ -144945,6 +144551,7 @@ self: {
        homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {util = null;};
 
   "posix-realtime" = callPackage
@@ -145466,6 +145073,7 @@ self: {
        homepage = "https://gitlab.com/theunixman/postgresql-typed-lifted";
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgrest" = callPackage
@@ -146498,8 +146106,8 @@ self: {
     ({ mkDerivation, base, generics-sop, pretty-show }:
      mkDerivation {
        pname = "pretty-sop";
-       version = "0.2.0.0";
-       sha256 = "931e60782ff551f864b2548fcb39c2e05e502a4b2ef76108a6f66b672c88590f";
+       version = "0.2.0.1";
+       sha256 = "af2460f06064770371fe9d2762eefad3246adf4f014fe700585a9827b986b14e";
        libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
@@ -148828,6 +148436,7 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -151750,25 +151359,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, http-client, http-client-tls, http-types, tasty
-     , tasty-hspec, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "0.3.2";
-       sha256 = "99b838c7d85208cd49fdf733d99ca29baafbb924f9db8a0d45ae88c15fc6ba73";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base tasty tasty-hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_0_3_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, http-client, http-client-tls, http-types, tasty
      , tasty-hspec, text, uuid
@@ -151785,7 +151375,6 @@ self: {
        homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
@@ -151972,6 +151561,20 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "rawfilepath_0_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, unix }:
+     mkDerivation {
+       pname = "rawfilepath";
+       version = "0.2.2";
+       sha256 = "b514ffc9b9b508cc82cd6ed2dce631acc0636ceb0b3be777d853feaa43df0420";
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/xtendo-org/rawfilepath#readme";
+       description = "Use RawFilePath instead of FilePath";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rawr" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize
      , ghc-prim, lens, tasty, tasty-hunit, template-haskell
@@ -154913,6 +154516,7 @@ self: {
        ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-schemas" = callPackage
@@ -156138,8 +155742,8 @@ self: {
        pname = "rest-core";
        version = "0.39";
        sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404";
-       revision = "6";
-       editedCabalFile = "38c82ac051ac1cda463e93d4704be00680ee24fc044eb1cabcf48789306a8635";
+       revision = "7";
+       editedCabalFile = "d678b034006e93f3407bb96b4e56bddc53d1c784714f72c06d0655b4791fe939";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -156191,8 +155795,8 @@ self: {
        pname = "rest-gen";
        version = "0.20.0.0";
        sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
-       revision = "7";
-       editedCabalFile = "8cd3ba2ec87976c3118b1de8d9172104e3a136f0afd9443e935130435fbc4c7d";
+       revision = "8";
+       editedCabalFile = "c2307e61b5976419cb52f3651131d07feebdfe092e2ff25e7a6c9653d4d628f4";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -156251,8 +155855,8 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a";
-       revision = "5";
-       editedCabalFile = "40fd386dc256a7a2b53e188b69b202f6623a5baa93c04ac2fe5c5389adb250f1";
+       revision = "6";
+       editedCabalFile = "213fd569be02903225151d3c78e5d9fc1b55e590bef90f0cb80dc36a92acd68b";
        libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -158064,8 +157668,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.9";
-       sha256 = "f5187739a6c450ed71299c1bb2b077751c45df297d18be8af80e0c8941b6f850";
+       version = "0.1.10";
+       sha256 = "5026d136196d57cb81cf3cb6ac41f7d73224997d75b224ba30beec3ec96c91ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158110,6 +157714,7 @@ self: {
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) rtl-sdr;};
 
   "rtnetlink" = callPackage
@@ -158130,6 +157735,7 @@ self: {
        homepage = "https://gitlab.com/formaltech/rtnetlink-hs";
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtorrent-rpc" = callPackage
@@ -158209,6 +157815,7 @@ self: {
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -158709,8 +158316,10 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy-store";
-       version = "0.9.2";
-       sha256 = "17e37e713a1dc86a50a16589ebc7e087e9896bdfe40918350b6f546a4992007b";
+       version = "0.9.3";
+       sha256 = "007a353d3f8b89affa30eb9479ab0578cf24a4a6c051828cfcc1f1859e7ff519";
+       revision = "1";
+       editedCabalFile = "7978a2a315feb629e1044e6996a765bc046e34e42baf11b5038e79a8952c8066";
        libraryHaskellDepends = [
          array base bytestring containers old-time store store-core
          template-haskell text time vector
@@ -160754,6 +160363,7 @@ self: {
        executableHaskellDepends = [ base data-default-class sdl2 vector ];
        description = "Bindings to SDL2_mixer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) SDL2_mixer;};
 
   "sdl2-ttf" = callPackage
@@ -160772,6 +160382,7 @@ self: {
        executableHaskellDepends = [ base linear sdl2 ];
        description = "Binding to libSDL2-ttf";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
@@ -162110,6 +161721,8 @@ self: {
        pname = "servant";
        version = "0.10";
        sha256 = "e1daa9ba2b759615341345a17a95833729ae3200af12dacec07507a95a4b331e";
+       revision = "1";
+       editedCabalFile = "b2b19327461e3836e98d59d5652fb8ef1935e1e89dd687a621a9d9a98794a272";
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
@@ -162568,6 +162181,8 @@ self: {
        pname = "servant-client";
        version = "0.10";
        sha256 = "55e411ac7e38a5c1b77d8d3c2320369be36a7b7181e27bb5ac4fba308ef93eaa";
+       revision = "1";
+       editedCabalFile = "9863fd0a183528cf4e4db911c074cd97b110781bb382b910089d953e4dd6a685";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
          exceptions generics-sop http-api-data http-client http-client-tls
@@ -163361,6 +162976,8 @@ self: {
        pname = "servant-server";
        version = "0.10";
        sha256 = "99d14d23ea67832401b4bca7e5cb75b8c557e6dc7a8f38870c3b9d701179073d";
+       revision = "1";
+       editedCabalFile = "4332581ae3248c16017f88461abf6eef9fbad2ca86e86a2e8a013f9adc665973";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -163801,6 +163418,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "services" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , http-types, monad-logger, tasty, tasty-hunit, text, wai
+     }:
+     mkDerivation {
+       pname = "services";
+       version = "0.2.0";
+       sha256 = "010218ab69f6b76c05723fae4925789433a54d5503b66f84da1afc6c1043136b";
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers http-types monad-logger
+         text wai
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "https://github.com/seanhess/services#readme";
+       description = "Tools for building services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servius" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , http-types, markdown, shakespeare, text, wai, wai-app-static
@@ -164574,32 +164209,6 @@ self: {
      }) {};
 
   "shakespeare" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
-     , process, scientific, template-haskell, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "shakespeare";
-       version = "2.0.12.1";
-       sha256 = "057d7153a19a4f28a012f30b5d54b9e1296695ff94ccdfa23c28fa82bd3488ac";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim parsec process scientific template-haskell text
-         time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim hspec HUnit parsec process template-haskell
-         text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-       description = "A toolkit for making compile-time interpolated templates";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "shakespeare_2_0_13" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -164622,7 +164231,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -164696,6 +164304,7 @@ self: {
        homepage = "https://github.com/brcha/shakespeare-sass";
        description = "SASS support for Shakespeare and Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shakespeare-text" = callPackage
@@ -165663,6 +165272,41 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "simple_0_11_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, cmdargs, directory, filepath, hspec
+     , hspec-contrib, http-types, mime-types, monad-control, mtl
+     , process, setenv, simple-templates, text, transformers
+     , transformers-base, unordered-containers, vector, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "simple";
+       version = "0.11.2";
+       sha256 = "ef53672eded47626cd125dc0759628fcfead2f2e271a0cae1092d4ff244e0614";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring directory
+         filepath http-types mime-types monad-control mtl simple-templates
+         text transformers transformers-base unordered-containers vector wai
+         wai-extra
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs directory filepath process
+         setenv simple-templates text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring directory
+         filepath hspec hspec-contrib http-types mime-types monad-control
+         mtl simple-templates text transformers transformers-base
+         unordered-containers vector wai wai-extra
+       ];
+       homepage = "http://simple.cx";
+       description = "A minimalist web framework for the WAI server interface";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-actors" = callPackage
     ({ mkDerivation, base, chan-split, contravariant, mtl, transformers
      }:
@@ -165962,7 +165606,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "simple-log_0_8_5" = callPackage
+  "simple-log_0_9_1" = callPackage
     ({ mkDerivation, async, base, base-unicode-symbols, containers
      , data-default, deepseq, directory, exceptions, filepath, hformat
      , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
@@ -165970,8 +165614,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.8.5";
-       sha256 = "f435eafb411f38ab43c09c034bb3829acbbb51adcb96ebb6436d5409a967c9a5";
+       version = "0.9.1";
+       sha256 = "44ede88d2db8e0e9d5f58f9cba379ce42dbd2bd0a6fe2053c476953586f0de7e";
        libraryHaskellDepends = [
          async base base-unicode-symbols containers data-default deepseq
          directory exceptions filepath hformat microlens microlens-platform
@@ -167003,7 +166647,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "skylighting_0_3_2" = callPackage
+  "skylighting_0_3_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html
      , bytestring, case-insensitive, containers, criterion, Diff
      , directory, filepath, HUnit, hxt, mtl, pretty-show, random
@@ -167012,8 +166656,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.3.2";
-       sha256 = "fe48ff596d3971cbb285a1ce677d1527285845feaed16d46fcb49b8ad50767bc";
+       version = "0.3.3";
+       sha256 = "098641785342d15eec56f17d4c782c15c5467c5bc86ba612109325ad50a7ec97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167580,18 +167224,6 @@ self: {
      }) {};
 
   "smoothie" = callPackage
-    ({ mkDerivation, aeson, base, linear, text, vector }:
-     mkDerivation {
-       pname = "smoothie";
-       version = "0.4.2.6";
-       sha256 = "9225877499dd0b4504d91e26403b23f6d8517c097073abf07982fc5041836174";
-       libraryHaskellDepends = [ aeson base linear text vector ];
-       homepage = "https://github.com/phaazon/smoothie";
-       description = "Smooth curves via several interpolation modes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smoothie_0_4_2_7" = callPackage
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
@@ -167601,7 +167233,6 @@ self: {
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smsaero" = callPackage
@@ -169581,6 +169212,7 @@ self: {
        ];
        description = "simpe tool to serve piped data over http and websocket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socketio" = callPackage
@@ -169731,8 +169363,8 @@ self: {
      }:
      mkDerivation {
        pname = "solr";
-       version = "0.4.1";
-       sha256 = "b9499555ee76c3a185384570b8d207f707a9dfa7d3529f06413d76fb164f4016";
+       version = "0.4.2";
+       sha256 = "2a7ece8b981e40b21df2ec385e7f5a5ad49a53d5553684043c9e57482399c71f";
        libraryHaskellDepends = [
          attoparsec-data base base-prelude bytestring
          bytestring-tree-builder case-insensitive contravariant http-client
@@ -172017,6 +171649,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-query" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath
+     , optparse-applicative, process, stackage-types, text, yaml
+     }:
+     mkDerivation {
+       pname = "stackage-query";
+       version = "0.1.0";
+       sha256 = "3280023d2858a244e7dccb2dd1e137972e1b5cfa7ea880613669bb3eca453b61";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal containers directory filepath optparse-applicative
+         process stackage-types text yaml
+       ];
+       homepage = "https://github.com/juhp/stackage-query";
+       description = "Stackage package query";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-sandbox" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit-combinators
      , conduit-extra, directory, filepath, optparse-applicative, process
@@ -172267,19 +171918,6 @@ self: {
      }) {};
 
   "state-plus" = callPackage
-    ({ mkDerivation, base, checkers, mtl, QuickCheck }:
-     mkDerivation {
-       pname = "state-plus";
-       version = "0.1.2";
-       sha256 = "c6ed155137d40262bf8aa38155bd93ecdc4bdbcb4ac83f5b980eeb8545ee377d";
-       libraryHaskellDepends = [ base mtl ];
-       testHaskellDepends = [ base checkers mtl QuickCheck ];
-       description = "MonadPlus for StateT";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "state-plus_0_1_3" = callPackage
     ({ mkDerivation, base, checkers, mtl, QuickCheck }:
      mkDerivation {
        pname = "state-plus";
@@ -173963,8 +173601,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka";
-       version = "2";
-       sha256 = "8273953fc6d54a7e1dc2c3f23c78c8ed6f4986c5e9a46222fc7e6831b2e24432";
+       version = "2.0.1";
+       sha256 = "24f70d15067c5f7ac097b2b0a9f65160b25f1a39f75ea605699ede97f5727589";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base base-prelude base64-bytestring
          bifunctors bytestring bytestring-tree-builder hashable http-media
@@ -174533,25 +174171,6 @@ self: {
      }) {};
 
   "strive" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
-     , http-client, http-client-tls, http-types, markdown-unlit
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "strive";
-       version = "3.0.2";
-       sha256 = "94f1dcef7ded8a27365d448e2db70baa5fafc91fa047dbb35164f82fd84f0b0f";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types template-haskell text time transformers
-       ];
-       testHaskellDepends = [ base bytestring markdown-unlit time ];
-       homepage = "https://github.com/tfausak/strive#readme";
-       description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strive_3_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -174568,7 +174187,6 @@ self: {
        homepage = "https://github.com/tfausak/strive#readme";
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -174823,6 +174441,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stylish-haskell_0_8_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
+     , strict, syb, test-framework, test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.8.0.0";
+       sha256 = "1cb416acfbd730735627a347a09aaec16875c8abf5e0b0220db62551106ef594";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl optparse-applicative strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       homepage = "https://github.com/jaspervdj/stylish-haskell";
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stylized" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -178640,6 +178288,8 @@ self: {
        pname = "tdigest";
        version = "0.1";
        sha256 = "0036b3aebe6556ced3a108579846346c9123d65c9dcd09c1d44435a64e3dc54b";
+       revision = "1";
+       editedCabalFile = "175789781df0bf1f1ba9e5380fe5b61b6238e90efce173ccff0fef73b766e876";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-compat binary deepseq reducers semigroupoids semigroups
@@ -178663,6 +178313,8 @@ self: {
        pname = "tdigest-Chart";
        version = "0";
        sha256 = "74a806695cba25ebc96d80944b832d3423be4175496e319a52b6efc7c5f470a7";
+       revision = "1";
+       editedCabalFile = "592a67f5fa3ca6733298f6a359be9b85b02a33ad2ea18d5a8e317e0ee743f8ee";
        libraryHaskellDepends = [
          base base-compat Chart colour lens semigroupoids semigroups tdigest
        ];
@@ -178825,6 +178477,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tempered" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
+     , process, yaml
+     }:
+     mkDerivation {
+       pname = "tempered";
+       version = "0.1.0.0";
+       sha256 = "13ac4b688e3f377c30f28c5a7ac272c5619b104963875ae14a3634ae0418bb38";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath mtl parsec process yaml
+       ];
+       executableHaskellDepends = [ base containers directory mtl ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/ChrisPenner/tempered#readme";
+       description = "A dead-simple shell interpolation templating utility";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "template" = callPackage
     ({ mkDerivation, base, mtl, text }:
      mkDerivation {
@@ -179284,12 +178956,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "terminfo_0_4_0_2" = callPackage
+  "terminfo_0_4_1_0" = callPackage
     ({ mkDerivation, base, ncurses }:
      mkDerivation {
        pname = "terminfo";
-       version = "0.4.0.2";
-       sha256 = "fea88b28443f5efd316c7699685b3925c0a7613992305f11af03746139d8f856";
+       version = "0.4.1.0";
+       sha256 = "3f53d7b1ae046a3767e6254f07eb7f91ec958a5e1633682677e292e8d7e9ff5d";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ncurses ];
        homepage = "https://github.com/judah/terminfo";
@@ -180011,6 +179683,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-all_0_3_1_0" = callPackage
+    ({ mkDerivation, base, text, text-format, text-show }:
+     mkDerivation {
+       pname = "text-all";
+       version = "0.3.1.0";
+       sha256 = "dec7bfb61c30fd263df65caa200954ea8c1947b2c67bcb023d1b071a45336284";
+       libraryHaskellDepends = [ base text text-format text-show ];
+       homepage = "http://github.com/aelve/text-all";
+       description = "Everything Data.Text related in one package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-and-plots" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, markdown
      , text, unordered-containers
@@ -180544,6 +180229,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-show_3_6" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
+     , bytestring, bytestring-builder, containers, contravariant
+     , criterion, deepseq, deriving-compat, generic-deriving
+     , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck
+     , quickcheck-instances, semigroups, tagged, template-haskell, text
+     , th-lift, transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "text-show";
+       version = "3.6";
+       sha256 = "64bde3e39a2a9b8da0b4de9d53c9cec56b5307786cb6bee12f47f3fdae0b6f3f";
+       libraryHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers contravariant generic-deriving ghc-boot-th ghc-prim
+         integer-gmp nats semigroups tagged template-haskell text th-lift
+         transformers transformers-compat void
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans bifunctors bytestring
+         bytestring-builder containers contravariant deriving-compat
+         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
+         QuickCheck quickcheck-instances semigroups tagged template-haskell
+         text th-lift transformers transformers-compat void
+       ];
+       benchmarkHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers contravariant criterion deepseq generic-deriving
+         ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
+         template-haskell text th-lift transformers transformers-compat void
+       ];
+       homepage = "https://github.com/RyanGlScott/text-show";
+       description = "Efficient conversion of values into Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-show-instances" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
@@ -180578,6 +180300,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-show-instances_3_6" = callPackage
+    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
+     , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
+     , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
+     , process, QuickCheck, quickcheck-instances, random, semigroups
+     , tagged, template-haskell, terminfo, text, text-show, th-orphans
+     , time, transformers, transformers-compat, unix
+     , unordered-containers, vector, xhtml
+     }:
+     mkDerivation {
+       pname = "text-show-instances";
+       version = "3.6";
+       sha256 = "b1b6782c2dee88d2c21c587b247d8cc6394edc5d9c38b31b07f80e99b84e3a84";
+       libraryHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
+         random semigroups tagged template-haskell terminfo text text-show
+         time transformers transformers-compat unix unordered-containers
+         vector xhtml
+       ];
+       testHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec
+         old-locale old-time pretty process QuickCheck quickcheck-instances
+         random semigroups tagged template-haskell terminfo text text-show
+         th-orphans time transformers transformers-compat unix
+         unordered-containers vector xhtml
+       ];
+       homepage = "https://github.com/RyanGlScott/text-show-instances";
+       description = "Additional instances for text-show";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-stream-decode" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text
      }:
@@ -180988,19 +180744,6 @@ self: {
      }) {};
 
   "th-expand-syns" = callPackage
-    ({ mkDerivation, base, containers, syb, template-haskell }:
-     mkDerivation {
-       pname = "th-expand-syns";
-       version = "0.4.2.0";
-       sha256 = "66fed79828e9a13375f0f801f5ecc3763186667228ad91e19919219ff1654db9";
-       libraryHaskellDepends = [ base containers syb template-haskell ];
-       testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/DanielSchuessler/th-expand-syns";
-       description = "Expands type synonyms in Template Haskell ASTs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-expand-syns_0_4_3_0" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
        pname = "th-expand-syns";
@@ -181011,7 +180754,6 @@ self: {
        homepage = "https://github.com/DanielSchuessler/th-expand-syns";
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-extras" = callPackage
@@ -181126,19 +180868,6 @@ self: {
      }) {};
 
   "th-lift" = callPackage
-    ({ mkDerivation, base, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "th-lift";
-       version = "0.7.6";
-       sha256 = "326a2c9dac32506d5b7e5d9f3234c0e7a33a612256e4745bfb8de5a32803ecd1";
-       libraryHaskellDepends = [ base ghc-prim template-haskell ];
-       testHaskellDepends = [ base ghc-prim template-haskell ];
-       homepage = "http://github.com/mboes/th-lift";
-       description = "Derive Template Haskell's Lift class for datatypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-lift_0_7_7" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-lift";
@@ -181149,7 +180878,6 @@ self: {
        homepage = "http://github.com/mboes/th-lift";
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-lift-instances" = callPackage
@@ -181435,8 +181163,8 @@ self: {
        pname = "these";
        version = "0.7.3";
        sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b";
-       revision = "3";
-       editedCabalFile = "acf48c0c351a4d79fc468cb1293e7b4cbc403a53981518c1d578473ce813cc12";
+       revision = "4";
+       editedCabalFile = "dcb32a117a7bc27b64a3721ee35ab1ad82352f10dd5a2234d45d040eef8a70c2";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -181693,6 +181421,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "threepenny-gui_0_7_0_2" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , data-default, deepseq, filepath, hashable, network-uri, safe
+     , snap-core, snap-server, stm, template-haskell, text, transformers
+     , unordered-containers, vault, vector, websockets, websockets-snap
+     }:
+     mkDerivation {
+       pname = "threepenny-gui";
+       version = "0.7.0.2";
+       sha256 = "40223fac07d288cc111ffde1674278989300e525d323c10976f5f83a56b28479";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring containers data-default deepseq
+         filepath hashable network-uri safe snap-core snap-server stm
+         template-haskell text transformers unordered-containers vault
+         vector websockets websockets-snap
+       ];
+       homepage = "http://wiki.haskell.org/Threepenny-gui";
+       description = "GUI framework that uses the web browser as a display";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threepenny-gui-contextmenu" = callPackage
     ({ mkDerivation, base, threepenny-gui }:
      mkDerivation {
@@ -182964,8 +182716,8 @@ self: {
     ({ mkDerivation, async, base, time }:
      mkDerivation {
        pname = "tiny-scheduler";
-       version = "0.1.4.2";
-       sha256 = "aea6a3b9773e92cccfced04626ae9da51307b33a0b9374797c9aa84c9dd52e1f";
+       version = "0.1.4.3";
+       sha256 = "5cf6ffa6ffd8e3ab32a100201b55d859adf637f3f7efafb27180e7e9a2f86c11";
        libraryHaskellDepends = [ async base time ];
        homepage = "https://github.com/functor-soup/tiny-scheduler#readme";
        description = "tiny no-brainer job scheduler";
@@ -183551,6 +183303,7 @@ self: {
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -184443,6 +184196,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "traverse-with-class_1_0_0_0" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "traverse-with-class";
+       version = "1.0.0.0";
+       sha256 = "65a220f1652b68269dfe8cc283a6e9292941eb12bdbd79344e073ba766191fbb";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Generic applicative traversals";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "travis" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit
      , transformers
@@ -185102,30 +184870,6 @@ self: {
      }) {};
 
   "tttool" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , directory, executable-path, filepath, hashable, haskeline, HPDF
-     , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
-     , process, random, split, spool, template-haskell, time, vector
-     , yaml, zlib
-     }:
-     mkDerivation {
-       pname = "tttool";
-       version = "1.7.0.1";
-       sha256 = "b41fc9b2899a625a0a364dd8fc4ef8f7c070ec7cbcbf5ef2acfc256cfb434fe6";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base binary bytestring containers directory executable-path
-         filepath hashable haskeline HPDF JuicyPixels mtl natural-sort
-         optparse-applicative parsec process random split spool
-         template-haskell time vector yaml zlib
-       ];
-       homepage = "https://github.com/entropia/tip-toi-reveng";
-       description = "Working with files for the Tiptoi® pen";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tttool_1_7_0_2" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -185147,7 +184891,6 @@ self: {
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tubes" = callPackage
@@ -186921,20 +186664,22 @@ self: {
      }) {};
 
   "typesafe-precure" = callPackage
-    ({ mkDerivation, base, dlist, hspec, monad-skeleton
-     , template-haskell
+    ({ mkDerivation, autoexporter, base, dlist, hspec, monad-skeleton
+     , template-haskell, th-data-compat
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.2.0.0";
-       sha256 = "f024a0c5a135b2ffbaf4ae97d9614d6f0d09652327061ba134f1c4b38e4b130e";
+       version = "0.3.0.0";
+       sha256 = "4292ba9a6e1c01602e2ebda1a239121d8cab3433205ca965e92c7f5ffd1281b2";
        libraryHaskellDepends = [
-         base dlist monad-skeleton template-haskell
+         autoexporter base dlist monad-skeleton template-haskell
+         th-data-compat
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/igrep/typesafe-precure#readme";
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typescript-docs" = callPackage
@@ -188580,8 +188325,8 @@ self: {
      }:
      mkDerivation {
        pname = "unjson";
-       version = "0.14.1.2";
-       sha256 = "8f06d68b66269385a34d59ee6b68de932e0f4ee9bfb76219d9a278260e0a9d4b";
+       version = "0.14.1.3";
+       sha256 = "43e2329f20d321abcd094e597a4ebb112491c5903051e53d12e448ec25a64ca1";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
          pretty primitive scientific text time unordered-containers vector
@@ -190425,21 +190170,6 @@ self: {
      }) {};
 
   "vault" = callPackage
-    ({ mkDerivation, base, containers, hashable, unordered-containers
-     }:
-     mkDerivation {
-       pname = "vault";
-       version = "0.3.0.6";
-       sha256 = "0b433de60fa3d20e93dce6013293e18089fb3233c34211ffa3f860408866ef48";
-       libraryHaskellDepends = [
-         base containers hashable unordered-containers
-       ];
-       homepage = "https://github.com/HeinrichApfelmus/vault";
-       description = "a persistent store for values of arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vault_0_3_0_7" = callPackage
     ({ mkDerivation, base, containers, hashable, unordered-containers
      }:
      mkDerivation {
@@ -190452,7 +190182,6 @@ self: {
        homepage = "https://github.com/HeinrichApfelmus/vault";
        description = "a persistent store for values of arbitrary types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault-tool" = callPackage
@@ -193453,6 +193182,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-slack-middleware" = callPackage
+    ({ mkDerivation, aeson, base, http-client, http-types, wai }:
+     mkDerivation {
+       pname = "wai-slack-middleware";
+       version = "0.1.0.0";
+       sha256 = "76e46b6de6feecabaad0929a7e5926ac97884749192de1c9befabf0afee646fb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ aeson base http-client http-types wai ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/psibi/wai-slack-middleware#readme";
+       description = "A Slack middleware for WAI";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-static-cache" = callPackage
     ({ mkDerivation, base, bytestring, cityhash, conduit
      , conduit-combinators, containers, http-types, resourcet
@@ -194100,6 +193845,7 @@ self: {
        homepage = "https://github.com/danse/web-output";
        description = "Library to present content to an user via their browser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-page" = callPackage
@@ -194471,31 +194217,6 @@ self: {
      }) {};
 
   "webdriver" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, data-default-class, directory, directory-tree
-     , exceptions, filepath, http-client, http-types, lifted-base
-     , monad-control, network, network-uri, scientific, temporary, text
-     , time, transformers, transformers-base, unordered-containers
-     , vector, zip-archive
-     }:
-     mkDerivation {
-       pname = "webdriver";
-       version = "0.8.4";
-       sha256 = "347f2935e7b9498d1a0391f929b347e295fa8b19a3ea0ac7b81802fda4164f23";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring
-         data-default-class directory directory-tree exceptions filepath
-         http-client http-types lifted-base monad-control network
-         network-uri scientific temporary text time transformers
-         transformers-base unordered-containers vector zip-archive
-       ];
-       homepage = "https://github.com/kallisti-dev/hs-webdriver";
-       description = "a Haskell client for the Selenium WebDriver protocol";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "webdriver_0_8_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, data-default-class, directory, directory-tree
      , exceptions, filepath, http-client, http-types, lifted-base
@@ -194884,24 +194605,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets-snap" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
-     , mtl, snap-core, snap-server, websockets
+  "websockets-rpc_0_1_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty
+     , tasty-quickcheck, text, transformers, unordered-containers
+     , wai-transformers, websockets
      }:
      mkDerivation {
-       pname = "websockets-snap";
-       version = "0.10.2.0";
-       sha256 = "294173c3dbc327ce3873ff310dcd14590d6a1ec05d54ea8d1a0cda0498dbe4a2";
+       pname = "websockets-rpc";
+       version = "0.1.0";
+       sha256 = "010cf07ebf06a5a9caf406dbd88e1697efbbe6f4dd43d0bdc707ac341db4ec4c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring bytestring-builder io-streams mtl snap-core
-         snap-server websockets
+         aeson async base bytestring containers exceptions mtl QuickCheck
+         stm text transformers unordered-containers wai-transformers
+         websockets
        ];
-       description = "Snap integration for the websockets library";
+       testHaskellDepends = [
+         aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
+       ];
+       description = "Simple streaming RPC mechanism using WebSockets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "websockets-snap_0_10_2_1" = callPackage
+  "websockets-snap" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
      , mtl, snap-core, snap-server, websockets
      }:
@@ -196593,21 +196322,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.3";
-       sha256 = "691f03173df3b9af98760f27597318e3d028bef2d65ed58ea9e1fabf11bec8b0";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       homepage = "https://github.com/tfausak/wuss#readme";
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_4" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -196620,7 +196334,6 @@ self: {
        homepage = "https://github.com/tfausak/wuss#readme";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -196966,8 +196679,8 @@ self: {
      }:
      mkDerivation {
        pname = "x86-64bit";
-       version = "0.4.4";
-       sha256 = "4deca451bb872b0ea29851e51c04d88af735dff454e9df38d3dc998c531bc9e2";
+       version = "0.4.5";
+       sha256 = "979d1ae996faac30b5f7e03fe5c6bb4c55f6905d714bf799cba81e95fb28f4b5";
        libraryHaskellDepends = [
          base deepseq monads-tf QuickCheck tardis vector
        ];
@@ -196996,6 +196709,7 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -197811,10 +197525,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-html-conduit-lens";
-       version = "0.3.2.2";
-       sha256 = "bf2b242411168e2287d2189e8c74c4c3751afac03003a852ee6068ce7cc643ac";
-       revision = "1";
-       editedCabalFile = "4673f03cf274523d25c1b07e4fddd6b1729e42a372ef7e1967705b808eda52a8";
+       version = "0.3.2.3";
+       sha256 = "2bb210fb0b3282e3640875d8b9506ce9437db275c7b2a257e3c03eccd1a75ae4";
        libraryHaskellDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
@@ -198329,6 +198041,7 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
 
@@ -199636,6 +199349,7 @@ self: {
        homepage = "https://github.com/matthew-eads/yesod-articles";
        description = "Automatically generate article previews for a yesod site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth" = callPackage
@@ -199797,33 +199511,6 @@ self: {
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , hspec, http-conduit, http-types, monad-logger, network-uri
-     , persistent, persistent-sqlite, pwstore-fast, resourcet, text
-     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.6.0.1";
-       sha256 = "8fe73fb7e4301e02e69cac312227078fd01927c8a006224f7e3fd8a93aa9cb75";
-       libraryHaskellDepends = [
-         aeson base bytestring persistent pwstore-fast text yesod-auth
-         yesod-core yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text unordered-containers wai-extra yesod yesod-auth yesod-core
-         yesod-test
-       ];
-       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yesod-auth-hashdb_1_6_1" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, pwstore-fast, resourcet, text
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 29b294619e6..6a17762a1fe 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -44,9 +44,35 @@ self: let
 
   mkDerivation = makeOverridable mkDerivationImpl;
 
-  callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
-    overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
-  };
+  # manualArgs are the arguments that were explictly passed to `callPackage`, like:
+  #
+  # callPackage foo { bar = null; };
+  #
+  # here `bar` is a manual argument.
+  callPackageWithScope = scope: fn: manualArgs:
+    let
+      # this code is copied from callPackage in lib/customisation.nix
+      #
+      # we cannot use `callPackage` here because we want to call `makeOverridable`
+      # on `drvScope` (we cannot add `overrideScope` after calling `callPackage` because then it is
+      # lost on `.override`) but determine the auto-args based on `drv` (the problem here
+      # is that nix has no way to "passthrough" args while preserving the reflection
+      # info that callPackage uses to determine the arguments).
+      drv = if builtins.isFunction fn then fn else import fn;
+      auto = builtins.intersectAttrs (builtins.functionArgs drv) scope;
+
+      # this wraps the `drv` function to add a `overrideScope` function to the result.
+      drvScope = allArgs: drv allArgs // {
+        overrideScope = f:
+          let newScope = mkScope (fix' (extends f scope.__unfix__));
+          # note that we have to be careful here: `allArgs` includes the auto-arguments that
+          # weren't manually specified. If we would just pass `allArgs` to the recursive call here,
+          # then we wouldn't look up any packages in the scope in the next interation, because it
+          # appears as if all arguments were already manually passed, so the scope change would do
+          # nothing.
+          in callPackageWithScope newScope drv manualArgs;
+      };
+    in stdenv.lib.makeOverridable drvScope (auto // manualArgs);
 
   mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
   defaultScope = mkScope self;
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index f013f6ec372..3fe04e6bde2 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -36,7 +36,7 @@ let
         ./no-sys-dirs.patch
       ]
       ++ optional stdenv.isSunOS ./ld-shared.patch
-      ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ];
+      ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ];
 
     postPatch = ''
       pwd="$(type -P pwd)"
@@ -121,17 +121,16 @@ let
 
 in rec {
 
-  perl = perl522;
-
-  perl520 = common {
-    version = "5.20.3";
-    sha256 = "0jlvpd5l5nk7lzfd4akdg1sw6vinbkj6izclyyr0lrbidfky691m";
-
-  };
+  perl = perl524;
 
   perl522 = common {
-    version = "5.22.2";
-    sha256 = "1hl3v85ggm027v9h2ycas4z5i3401s2k2l3qpnw8q5mahmiikbc1";
+    version = "5.22.3";
+    sha256 = "10q087l1ffdy3gpryr8z540jcnsr0dhm37raicyfqqkyvys1yd8v";
+  };
+
+  perl524 = common {
+    version = "5.24.1";
+    sha256 = "1bqqb5ghfj4486nqr77kgsd8aff6a289jy7n2cdkznwvn34qbhg6";
   };
 
 }
diff --git a/pkgs/development/interpreters/perl/sw_vers.patch b/pkgs/development/interpreters/perl/sw_vers.patch
new file mode 100644
index 00000000000..9d4cd75486e
--- /dev/null
+++ b/pkgs/development/interpreters/perl/sw_vers.patch
@@ -0,0 +1,13 @@
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index afadf53..80b7533 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -329,7 +329,7 @@ EOM
+     # sw_vers output                 what we want
+     # "ProductVersion:    10.10.5"   "10.10"
+     # "ProductVersion:    10.11"     "10.11"
+-        prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
++        prodvers="10.10"
+     case "$prodvers" in
+     10.*)
+       add_macosx_version_min ccflags $prodvers
diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix
index 3ab0de96704..c561a1ed750 100644
--- a/pkgs/development/interpreters/python/cpython/3.3/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix
@@ -50,7 +50,17 @@ in stdenv.mkDerivation {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
-  postPatch = optionalString (x11Support && (tix != null)) ''
+  # Determinism: The interpreter is patched to write null timestamps when compiling python files.
+  # This way python doesn't try to update them when we freeze timestamps in nix store.
+  DETERMINISTIC_BUILD=1;
+  # Determinism: We fix the hashes of str, bytes and datetime objects.
+  PYTHONHASHSEED=0;
+
+  postPatch = ''
+    # Determinism
+    substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
+#     # We do not patch `Lib/importlib/_bootstrap_external.py` because it does not exist.
+  '' + optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   '';
 
@@ -80,12 +90,17 @@ in stdenv.mkDerivation {
       fi
     done
     touch $out/lib/python${majorVersion}/test/__init__.py
+
     ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
     paxmark E $out/bin/python${majorVersion}
 
     # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
     echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
 
+    # Determinism: Windows installers were not deterministic.
+    # We're also not interested in building Windows installers.
+    find "$out" -name 'wininst*.exe' | xargs -r rm -f
+
     # Use Python3 as default python
     ln -s "$out/bin/idle3" "$out/bin/idle"
     ln -s "$out/bin/pip3" "$out/bin/pip"
@@ -93,18 +108,20 @@ in stdenv.mkDerivation {
     ln -s "$out/bin/python3" "$out/bin/python"
     ln -s "$out/bin/python3-config" "$out/bin/python-config"
     ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
-  '';
 
-  postFixup = ''
     # Get rid of retained dependencies on -dev packages, and remove
     # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
     for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
       sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
     done
 
-    # FIXME: should regenerate this.
-    rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
-
+    # Determinism: rebuild all bytecode
+    # We exclude lib2to3 because that's Python 2 code which fails
+    # We rebuild three times, once for each optimization level
+    find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
+    find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
+    find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
   '';
 
   passthru = let
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 58e4f21bb4a..b2a4d849c94 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -132,6 +132,13 @@ in stdenv.mkDerivation {
     ln -s "$out/bin/python3-config" "$out/bin/python-config"
     ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
 
+    # Get rid of retained dependencies on -dev packages, and remove
+    # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
+    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
+      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+    done
+
     # Determinism: rebuild all bytecode
     # We exclude lib2to3 because that's Python 2 code which fails
     # We rebuild three times, once for each optimization level
@@ -140,18 +147,6 @@ in stdenv.mkDerivation {
     find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
   '';
 
-  postFixup = ''
-    # Get rid of retained dependencies on -dev packages, and remove
-    # some $TMPDIR references to improve binary reproducibility.
-    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
-      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
-    done
-
-    # FIXME: should regenerate this.
-    rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
-
-  '';
-
   passthru = let
     pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
   in rec {
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 082f6ff6789..76f445f7a50 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -134,6 +134,13 @@ in stdenv.mkDerivation {
     ln -s "$out/bin/python3-config" "$out/bin/python-config"
     ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
 
+    # Get rid of retained dependencies on -dev packages, and remove
+    # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
+    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
+      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+    done
+
     # Determinism: rebuild all bytecode
     # We exclude lib2to3 because that's Python 2 code which fails
     # We rebuild three times, once for each optimization level
@@ -142,17 +149,6 @@ in stdenv.mkDerivation {
     find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
   '';
 
-  postFixup = ''
-    # Get rid of retained dependencies on -dev packages, and remove
-    # some $TMPDIR references to improve binary reproducibility.
-    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
-      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
-    done
-
-    # FIXME: should regenerate this.
-    rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
-  '';
-
   passthru = let
     pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
   in rec {
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 78e57fef15f..15078619166 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -126,6 +126,13 @@ in stdenv.mkDerivation {
     ln -s "$out/bin/python3-config" "$out/bin/python-config"
     ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
 
+    # Get rid of retained dependencies on -dev packages, and remove
+    # some $TMPDIR references to improve binary reproducibility.
+    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
+    for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do
+      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+    done
+
     # Determinism: rebuild all bytecode
     # We exclude lib2to3 because that's Python 2 code which fails
     # We rebuild three times, once for each optimization level
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 6f7a845b809..f569f53861d 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.10.16";
-  sha256 = "121kqkjsd3vgf8vca8364xl44qa5086h7qy5zs5f1l78ldpbmc57";
+  version = "1.10.18";
+  sha256 = "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 5d8d98af8d3..96175d04a4e 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -42,8 +42,8 @@ let
     ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
 
-  ver_maj = "2.50";
-  ver_min = "3";
+  ver_maj = "2.52";
+  ver_min = "1";
 in
 
 stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999";
+    sha256 = "948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index aa8957b2c7d..f27cccfa27a 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   ver_maj = "3.22";
-  ver_min = "11";
+  ver_min = "12";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "db440670cb6f3c098b076df3735fbc4e69359bd605385e87c90ee48344a804ca";
+    sha256 = "84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index e8cd4f13ece..81b3c558f0b 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.4.4";
+  version = "1.4.5";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "0mfj37qr8fw9mzsvk4296fq8vzq909mwlkl2xrjfrfvc8z5gilim";
+    sha256 = "d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 7343b408dff..361426d1de6 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.32/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.33/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 4b902d4d57e..ebcc4fc7c38 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,595 @@
 
 {
   attica = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/attica-5.32.0.tar.xz";
-      sha256 = "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5";
-      name = "attica-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/attica-5.33.0.tar.xz";
+      sha256 = "1dr5yhg0cy4b6k91mk6w090zjizgxaa808h799m14jqzgj63z5d6";
+      name = "attica-5.33.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/baloo-5.32.0.tar.xz";
-      sha256 = "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1";
-      name = "baloo-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/baloo-5.33.0.tar.xz";
+      sha256 = "174my99i5mggab98l38y2bk27xp25mpz58rl8rhnb3wsbgxcx7iz";
+      name = "baloo-5.33.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/bluez-qt-5.32.0.tar.xz";
-      sha256 = "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh";
-      name = "bluez-qt-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/bluez-qt-5.33.0.tar.xz";
+      sha256 = "0cpkdv4k68f0rcg3j91418i59dmc94qlnv3xk1chq0fdi0cssrri";
+      name = "bluez-qt-5.33.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/breeze-icons-5.32.0.tar.xz";
-      sha256 = "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3";
-      name = "breeze-icons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/breeze-icons-5.33.0.tar.xz";
+      sha256 = "07nb4xq00fw50r4vf10npa2z690rwkmlxdy42lxx3ixci4qw4204";
+      name = "breeze-icons-5.33.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/extra-cmake-modules-5.32.0.tar.xz";
-      sha256 = "1iqakxzr6bcs9wgyi8if1smpq6px0bvlcyddyk0hxhindzl7pn5i";
-      name = "extra-cmake-modules-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/extra-cmake-modules-5.33.0.tar.xz";
+      sha256 = "013adgrz8s0w7a7z2ahkv28cq4c2cy00cw6y8akpkxazqhv5xzzk";
+      name = "extra-cmake-modules-5.33.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/frameworkintegration-5.32.0.tar.xz";
-      sha256 = "022scc4pgl68973wq29l1kc9j9lspvlmpr3bc6zlyg57m8agapwa";
-      name = "frameworkintegration-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/frameworkintegration-5.33.0.tar.xz";
+      sha256 = "01c1jq77hm3v5xi84gn5hymlnnn1igcpz9v49yxgyvnihlblb1ll";
+      name = "frameworkintegration-5.33.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kactivities-5.32.0.tar.xz";
-      sha256 = "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7";
-      name = "kactivities-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kactivities-5.33.0.tar.xz";
+      sha256 = "092gk0zn15qm4pihxf1h4qn2n618wp43k67ffy3saw4fadqmxpsz";
+      name = "kactivities-5.33.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kactivities-stats-5.32.0.tar.xz";
-      sha256 = "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw";
-      name = "kactivities-stats-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kactivities-stats-5.33.0.tar.xz";
+      sha256 = "1269nh4l94b3yxyvzdjw6vb8pxjylrvnrv28vnar8dmx0sbh5jpf";
+      name = "kactivities-stats-5.33.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kapidox-5.32.0.tar.xz";
-      sha256 = "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw";
-      name = "kapidox-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kapidox-5.33.0.tar.xz";
+      sha256 = "162x868dwl92361ss1dxv0gqh8g4apshcgb1ww4nizy239mfj8h0";
+      name = "kapidox-5.33.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/karchive-5.32.0.tar.xz";
-      sha256 = "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4";
-      name = "karchive-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/karchive-5.33.0.tar.xz";
+      sha256 = "0i5grm0dhm9z6fd63ppykd6vl45k5nam4q8w1psrz7vjmr6sd924";
+      name = "karchive-5.33.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kauth-5.32.0.tar.xz";
-      sha256 = "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq";
-      name = "kauth-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kauth-5.33.0.tar.xz";
+      sha256 = "1lfi4w4jgc9m83q6v3jf8p91x12vvcc3g59dlg7dh2agrh07r9y7";
+      name = "kauth-5.33.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kbookmarks-5.32.0.tar.xz";
-      sha256 = "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w";
-      name = "kbookmarks-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kbookmarks-5.33.0.tar.xz";
+      sha256 = "186difbzrpqlbi140ylkzb50d3fmn2pdz8i0r3gbc71726fqld82";
+      name = "kbookmarks-5.33.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcmutils-5.32.0.tar.xz";
-      sha256 = "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9";
-      name = "kcmutils-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcmutils-5.33.0.tar.xz";
+      sha256 = "0n0cmjxlp0kkgrxng2ympnl1v5a1bjr2d9c20hf31xhvmya3y9nd";
+      name = "kcmutils-5.33.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcodecs-5.32.0.tar.xz";
-      sha256 = "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253";
-      name = "kcodecs-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcodecs-5.33.0.tar.xz";
+      sha256 = "1pdijdlrl9p5w6dixqx0lmkzwsk5xarzjhpwh616j2sinfra0w31";
+      name = "kcodecs-5.33.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcompletion-5.32.0.tar.xz";
-      sha256 = "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni";
-      name = "kcompletion-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcompletion-5.33.0.tar.xz";
+      sha256 = "13mv5mm90jv4k56h4n6d7r2a0pax2mhdrm51xd99fjynad129lhi";
+      name = "kcompletion-5.33.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kconfig-5.32.0.tar.xz";
-      sha256 = "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp";
-      name = "kconfig-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kconfig-5.33.0.tar.xz";
+      sha256 = "1inhpil19pv3jjf7mz4f5g367n1ciiixndij10p1zxk5zy46zzmf";
+      name = "kconfig-5.33.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kconfigwidgets-5.32.0.tar.xz";
-      sha256 = "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3";
-      name = "kconfigwidgets-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kconfigwidgets-5.33.0.tar.xz";
+      sha256 = "0sd974r7xrpnhyqabgix0zb1rlis32ijj0wiabbqi4ns0nhhi3qf";
+      name = "kconfigwidgets-5.33.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcoreaddons-5.32.0.tar.xz";
-      sha256 = "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx";
-      name = "kcoreaddons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcoreaddons-5.33.0.tar.xz";
+      sha256 = "1906jscfc2kpd22d7yk88ziy3ky3hcfxy5y593pfzjl41gyhsiyl";
+      name = "kcoreaddons-5.33.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kcrash-5.32.0.tar.xz";
-      sha256 = "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3";
-      name = "kcrash-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kcrash-5.33.0.tar.xz";
+      sha256 = "136wlvaf4r54k8x0z0jvs7l35m0v22y6zqkhc8f91dr1y2ym2jnk";
+      name = "kcrash-5.33.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdbusaddons-5.32.0.tar.xz";
-      sha256 = "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609";
-      name = "kdbusaddons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdbusaddons-5.33.0.tar.xz";
+      sha256 = "1xxbmr88w7hqxsrhjbgic0pn4adkydhv9xd77vwbzjj47123mph2";
+      name = "kdbusaddons-5.33.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdeclarative-5.32.0.tar.xz";
-      sha256 = "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9";
-      name = "kdeclarative-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdeclarative-5.33.0.tar.xz";
+      sha256 = "1333vv6kbdk4sdkkc8lnncgmm3203ca8ybn9nj6ch3zqwyxcaagk";
+      name = "kdeclarative-5.33.0.tar.xz";
     };
   };
   kded = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kded-5.32.0.tar.xz";
-      sha256 = "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6";
-      name = "kded-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kded-5.33.0.tar.xz";
+      sha256 = "02g66ip0d0cwb8grb6f3z1j7178w76pfs2f8d2dl1rax4hnjppd0";
+      name = "kded-5.33.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kdelibs4support-5.32.0.tar.xz";
-      sha256 = "1wan5ad5rhhrwvwjjjd87n790r6d8r118gs2kw49s91pdj3iv9pb";
-      name = "kdelibs4support-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kdelibs4support-5.33.0.tar.xz";
+      sha256 = "1gyyvp4kqnjaf764y2z24jk68h5h0ax1z9h25msczy6bd4ify5v9";
+      name = "kdelibs4support-5.33.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdesignerplugin-5.32.0.tar.xz";
-      sha256 = "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf";
-      name = "kdesignerplugin-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdesignerplugin-5.33.0.tar.xz";
+      sha256 = "1f4f53xag6xbvacpn5j0zrsdwimksnckdza6kswcri5q258yb6ks";
+      name = "kdesignerplugin-5.33.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdesu-5.32.0.tar.xz";
-      sha256 = "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl";
-      name = "kdesu-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdesu-5.33.0.tar.xz";
+      sha256 = "06scns6jgs372xx7fssdj63110nrnvy9dmm1k7gc0pyhn0a5yk8a";
+      name = "kdesu-5.33.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdewebkit-5.32.0.tar.xz";
-      sha256 = "0y7262pqzdx0hxkyqrbawgx99rn6q85m1slr4nbn914kn350xpy0";
-      name = "kdewebkit-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdewebkit-5.33.0.tar.xz";
+      sha256 = "0lxca56ib5pldc6f3z2gw05jbi2kyd9rqp52pgzfs4kgvvs6gblh";
+      name = "kdewebkit-5.33.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdnssd-5.32.0.tar.xz";
-      sha256 = "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw";
-      name = "kdnssd-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdnssd-5.33.0.tar.xz";
+      sha256 = "11pnh18z030zzkiibvd9lfp5i194qwk3pccncc9968nnc0bgghxa";
+      name = "kdnssd-5.33.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kdoctools-5.32.0.tar.xz";
-      sha256 = "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9";
-      name = "kdoctools-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kdoctools-5.33.0.tar.xz";
+      sha256 = "04d48gi5d273x3p7572szlpyiz8iyw1ic53b9jblhyfyp93gvpb9";
+      name = "kdoctools-5.33.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kemoticons-5.32.0.tar.xz";
-      sha256 = "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj";
-      name = "kemoticons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kemoticons-5.33.0.tar.xz";
+      sha256 = "0p9320zln553wi055ql04j8kk329l3wiksprg9rkgzya2gynflyl";
+      name = "kemoticons-5.33.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kfilemetadata-5.32.0.tar.xz";
-      sha256 = "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f";
-      name = "kfilemetadata-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kfilemetadata-5.33.0.tar.xz";
+      sha256 = "1bbw1h8kml8glnck8hh4s13abbksw2fa7g93p25vbhdcyr7zgkr0";
+      name = "kfilemetadata-5.33.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kglobalaccel-5.32.0.tar.xz";
-      sha256 = "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry";
-      name = "kglobalaccel-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kglobalaccel-5.33.0.tar.xz";
+      sha256 = "0hc46vwiz81iqzkrc0qahd7gn71kh5wc32kjvh6h4ijlnfmdih07";
+      name = "kglobalaccel-5.33.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kguiaddons-5.32.0.tar.xz";
-      sha256 = "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb";
-      name = "kguiaddons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kguiaddons-5.33.0.tar.xz";
+      sha256 = "171lvykvznrrqdi1frm9akzx5rsrj04vvav3sv64x7hfsas0a7p1";
+      name = "kguiaddons-5.33.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/khtml-5.32.0.tar.xz";
-      sha256 = "1bkxfldw55khycbpcqpwi86rpv6qyqsndvjncfd5a5knnsynwdyf";
-      name = "khtml-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/khtml-5.33.0.tar.xz";
+      sha256 = "0j9viw8fydh1x548wx39bphk5bf11fyrghshxz14a79rll8w7qmc";
+      name = "khtml-5.33.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/ki18n-5.32.0.tar.xz";
-      sha256 = "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf";
-      name = "ki18n-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/ki18n-5.33.0.tar.xz";
+      sha256 = "02xf9q3vnw8nn2if6a3pfj8v96414j7gnc6097k0wxfyis9i46k1";
+      name = "ki18n-5.33.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kiconthemes-5.32.0.tar.xz";
-      sha256 = "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5";
-      name = "kiconthemes-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kiconthemes-5.33.0.tar.xz";
+      sha256 = "1zys55d7jjjjllyi9p4difnr6xg9580bgcg5pnm966ak6zhj6682";
+      name = "kiconthemes-5.33.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kidletime-5.32.0.tar.xz";
-      sha256 = "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch";
-      name = "kidletime-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kidletime-5.33.0.tar.xz";
+      sha256 = "0z6i224kmj9l15x923pa30mlhjw66chm9v8qvzg1vhmk36jyw789";
+      name = "kidletime-5.33.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kimageformats-5.32.0.tar.xz";
-      sha256 = "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz";
-      name = "kimageformats-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kimageformats-5.33.0.tar.xz";
+      sha256 = "1m9d51pvrc7fa38mp4jn4cdn558nd6kvik3ry6gvv8im67qyq4ga";
+      name = "kimageformats-5.33.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kinit-5.32.0.tar.xz";
-      sha256 = "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn";
-      name = "kinit-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kinit-5.33.0.tar.xz";
+      sha256 = "0v3dcgbi5qwg9nmn668r2v1b257qhmkdb2l3p7hhx06ygypk4yjp";
+      name = "kinit-5.33.0.tar.xz";
     };
   };
   kio = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kio-5.32.0.tar.xz";
-      sha256 = "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin";
-      name = "kio-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kio-5.33.0.tar.xz";
+      sha256 = "1pls5yjkhz7fkawks4c0lmsix0nafv7hyp33yh7dm4hijd8zy5cf";
+      name = "kio-5.33.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kitemmodels-5.32.0.tar.xz";
-      sha256 = "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki";
-      name = "kitemmodels-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kitemmodels-5.33.0.tar.xz";
+      sha256 = "1ma21qydbmj2qr4ib4qv13wip99lq3lm8d6p137bg9x6nqfa4qzn";
+      name = "kitemmodels-5.33.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kitemviews-5.32.0.tar.xz";
-      sha256 = "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws";
-      name = "kitemviews-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kitemviews-5.33.0.tar.xz";
+      sha256 = "1nc07lxh37l1fwz6xmsrcplimgmrna9ij2dq3pnfrxr319c29890";
+      name = "kitemviews-5.33.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kjobwidgets-5.32.0.tar.xz";
-      sha256 = "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984";
-      name = "kjobwidgets-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kjobwidgets-5.33.0.tar.xz";
+      sha256 = "01adg7axi1bp59z1c7xnxg2p1ahhrzxwxrjn3ci805m8ns6d40cz";
+      name = "kjobwidgets-5.33.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kjs-5.32.0.tar.xz";
-      sha256 = "022n2hl1s5kap3pqaz4y28wn5z5qh6jcypz5kini2ic94xf7ydrg";
-      name = "kjs-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kjs-5.33.0.tar.xz";
+      sha256 = "1w0kdxnzcwmgskl4qsw6aq5189yxqyhq9qajihr2yga0hyglf3iv";
+      name = "kjs-5.33.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kjsembed-5.32.0.tar.xz";
-      sha256 = "0h0p4mcvmdgvjv2xd8s4x2i554nh08mc258gxhb41bs6vm3yhiz4";
-      name = "kjsembed-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kjsembed-5.33.0.tar.xz";
+      sha256 = "1vk2m8i315nrys9c4kk3hdlp8hdn2ils0lb8v4nnkvbj3s1f4a8p";
+      name = "kjsembed-5.33.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kmediaplayer-5.32.0.tar.xz";
-      sha256 = "1s86dfzrqxrmbqmxq4yyyy1p507d9ns6d7sy6z67dhykgahacqf4";
-      name = "kmediaplayer-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kmediaplayer-5.33.0.tar.xz";
+      sha256 = "13xpvi0vxd3vva2d64x8l1knj270al4329kwf9xaays66g6gshgs";
+      name = "kmediaplayer-5.33.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/knewstuff-5.32.0.tar.xz";
-      sha256 = "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp";
-      name = "knewstuff-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/knewstuff-5.33.0.tar.xz";
+      sha256 = "1j4jj2k6jngcp98mfxq1cdp7x0j43rgr5gxn9viqp92liak68lsh";
+      name = "knewstuff-5.33.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/knotifications-5.32.0.tar.xz";
-      sha256 = "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y";
-      name = "knotifications-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/knotifications-5.33.0.tar.xz";
+      sha256 = "17ppfwhl3mqd3l4r56whqcxagx6br02hdwlqy7npn32g797hkayd";
+      name = "knotifications-5.33.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/knotifyconfig-5.32.0.tar.xz";
-      sha256 = "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4";
-      name = "knotifyconfig-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/knotifyconfig-5.33.0.tar.xz";
+      sha256 = "0m9fdvbakv0plq3m7sj6wj980wfd3m37cabximz9gmi0zkcadzmw";
+      name = "knotifyconfig-5.33.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kpackage-5.32.0.tar.xz";
-      sha256 = "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r";
-      name = "kpackage-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kpackage-5.33.0.tar.xz";
+      sha256 = "03ls567fj54fzibc8fafffas97abyanl0sn041z51sr7mjp425cs";
+      name = "kpackage-5.33.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kparts-5.32.0.tar.xz";
-      sha256 = "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5";
-      name = "kparts-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kparts-5.33.0.tar.xz";
+      sha256 = "0fd0dqmaf8ksx3czzihjd4z0yg682a9bcy09vdhj2grki7w9fxha";
+      name = "kparts-5.33.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kpeople-5.32.0.tar.xz";
-      sha256 = "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk";
-      name = "kpeople-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kpeople-5.33.0.tar.xz";
+      sha256 = "19vag6ci82jh5lw5c7734rlp89wr7xb0d8as98ykz2wmkk0mqql7";
+      name = "kpeople-5.33.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kplotting-5.32.0.tar.xz";
-      sha256 = "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v";
-      name = "kplotting-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kplotting-5.33.0.tar.xz";
+      sha256 = "0niqhj270l36il3ql6xljg9gbb0yw25ky8wsc7l0021mxvhficri";
+      name = "kplotting-5.33.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kpty-5.32.0.tar.xz";
-      sha256 = "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s";
-      name = "kpty-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kpty-5.33.0.tar.xz";
+      sha256 = "0xcmqdphqy2a44bksqiv8cjlzfkjpbpazfk5f8ml97vdqvwa6qp5";
+      name = "kpty-5.33.0.tar.xz";
     };
   };
   kross = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/portingAids/kross-5.32.0.tar.xz";
-      sha256 = "0mgicb2rfhzp0hr1zckp1qzqzbdx0zy82mcjibrlsp7spmvynw5a";
-      name = "kross-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/portingAids/kross-5.33.0.tar.xz";
+      sha256 = "13dldb4df4spsqr3878bimv009fzq4pdvmwlaw753c0lrp97pd9l";
+      name = "kross-5.33.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/krunner-5.32.0.tar.xz";
-      sha256 = "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr";
-      name = "krunner-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/krunner-5.33.0.tar.xz";
+      sha256 = "0za052rsqf5kaz1c48k63a905b3x953wi6f07m44m6dm38p5ixq8";
+      name = "krunner-5.33.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kservice-5.32.0.tar.xz";
-      sha256 = "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q";
-      name = "kservice-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kservice-5.33.0.tar.xz";
+      sha256 = "0jqq4ahscnqvzv8inhfzb9s6x97s60c4w8chpg16qwc7dqag887h";
+      name = "kservice-5.33.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/ktexteditor-5.32.0.tar.xz";
-      sha256 = "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw";
-      name = "ktexteditor-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/ktexteditor-5.33.0.tar.xz";
+      sha256 = "12fcqcxamkxv38w4j9waqmim7k801v6r6izlyg59iiy56yks4ms5";
+      name = "ktexteditor-5.33.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/ktextwidgets-5.32.0.tar.xz";
-      sha256 = "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r";
-      name = "ktextwidgets-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/ktextwidgets-5.33.0.tar.xz";
+      sha256 = "09rjr3655pbzwgjsmwbjsm7jwrxydl2jwhgbk8ziv1bgcg6cjrjy";
+      name = "ktextwidgets-5.33.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kunitconversion-5.32.0.tar.xz";
-      sha256 = "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin";
-      name = "kunitconversion-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kunitconversion-5.33.0.tar.xz";
+      sha256 = "0bflic2va9bc17q0smc4dzmgh72cjfjjaahhsvvnj54g2qggznkq";
+      name = "kunitconversion-5.33.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kwallet-5.32.0.tar.xz";
-      sha256 = "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa";
-      name = "kwallet-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kwallet-5.33.0.tar.xz";
+      sha256 = "1jpybsksai9gm2bihcgl5m56rjfd0crj9i8j0l2s4vmmzxyflczj";
+      name = "kwallet-5.33.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kwayland-5.32.0.tar.xz";
-      sha256 = "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d";
-      name = "kwayland-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kwayland-5.33.0.tar.xz";
+      sha256 = "18nvdhfijnvzjiy0vjmqvf2nwz64ymxpnhlhs75y1d2ib8rm8qfq";
+      name = "kwayland-5.33.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kwidgetsaddons-5.32.0.tar.xz";
-      sha256 = "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2";
-      name = "kwidgetsaddons-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kwidgetsaddons-5.33.0.tar.xz";
+      sha256 = "1dnspi7zf57lsihdynbik2iwvnhv8098vqyz0rps8s8pnjl7x8k4";
+      name = "kwidgetsaddons-5.33.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kwindowsystem-5.32.0.tar.xz";
-      sha256 = "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1";
-      name = "kwindowsystem-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kwindowsystem-5.33.0.tar.xz";
+      sha256 = "1dj18774rlpxh9p8a07shhb4dzc0zpv4qvmh4j2y4c1g6v7n6b3p";
+      name = "kwindowsystem-5.33.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kxmlgui-5.32.0.tar.xz";
-      sha256 = "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65";
-      name = "kxmlgui-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kxmlgui-5.33.0.tar.xz";
+      sha256 = "1q89xsrdhrsz7jb68hq8r3xdmhz0s19zwvd06skn6cfqx7r32ng0";
+      name = "kxmlgui-5.33.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/kxmlrpcclient-5.32.0.tar.xz";
-      sha256 = "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq";
-      name = "kxmlrpcclient-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/kxmlrpcclient-5.33.0.tar.xz";
+      sha256 = "1zc6pn412day923k22br82xypvk24znb0ns1qsdlmrd2cnmv8l28";
+      name = "kxmlrpcclient-5.33.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/modemmanager-qt-5.32.0.tar.xz";
-      sha256 = "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd";
-      name = "modemmanager-qt-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/modemmanager-qt-5.33.0.tar.xz";
+      sha256 = "098l3plck45bn7lph7mfkm03q18zxl1s8aa3pyh6b69wk45r7j54";
+      name = "modemmanager-qt-5.33.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/networkmanager-qt-5.32.0.tar.xz";
-      sha256 = "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd";
-      name = "networkmanager-qt-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/networkmanager-qt-5.33.0.tar.xz";
+      sha256 = "0pc4n4m93ypx1ryasw8n3bqll7v4yqa3749ir0qi096y5vysdd2m";
+      name = "networkmanager-qt-5.33.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/oxygen-icons5-5.32.0.tar.xz";
-      sha256 = "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf";
-      name = "oxygen-icons5-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/oxygen-icons5-5.33.0.tar.xz";
+      sha256 = "17kp66hra0vfkcvd7fh5q23wr040h0z6di4gdrm2zi1w5jbhw9kn";
+      name = "oxygen-icons5-5.33.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/plasma-framework-5.32.0.tar.xz";
-      sha256 = "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h";
-      name = "plasma-framework-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/plasma-framework-5.33.0.tar.xz";
+      sha256 = "0rqm773n2r6vwmv41x27lr2zmx26s5s27ym3a6qy0w18fr86fxsd";
+      name = "plasma-framework-5.33.0.tar.xz";
     };
   };
   prison = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/prison-5.32.0.tar.xz";
-      sha256 = "0q5cs60293bdm3mynhx39rjsh87mfxngxsqa2fqm2gsqjvlciyvr";
-      name = "prison-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/prison-5.33.0.tar.xz";
+      sha256 = "0hh065294s7sjj34vfwwb8zgagf1sa09l9filadl1ly0ig9f6h1r";
+      name = "prison-5.33.0.tar.xz";
     };
   };
   solid = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/solid-5.32.0.tar.xz";
-      sha256 = "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5";
-      name = "solid-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/solid-5.33.0.tar.xz";
+      sha256 = "0jb8jjv6mhwriqxfkd9fj0b7y1ab6vnwqi53sk4w4vw53d0wkqxm";
+      name = "solid-5.33.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/sonnet-5.32.0.tar.xz";
-      sha256 = "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi";
-      name = "sonnet-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/sonnet-5.33.0.tar.xz";
+      sha256 = "096ybf95rx5ybvl74nlnn9x2yb2j1akn8g8ywv1vwi2ckfpnp3sd";
+      name = "sonnet-5.33.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/syntax-highlighting-5.32.0.tar.xz";
-      sha256 = "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3";
-      name = "syntax-highlighting-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/syntax-highlighting-5.33.0.tar.xz";
+      sha256 = "0nn078sw0bkw1m5vsv02n46sc05blg3qnhxpmph2cikz5y86x9jq";
+      name = "syntax-highlighting-5.33.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.32.0";
+    version = "5.33.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.32/threadweaver-5.32.0.tar.xz";
-      sha256 = "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h";
-      name = "threadweaver-5.32.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.33/threadweaver-5.33.0.tar.xz";
+      sha256 = "16y7irjyyp4smy7nm7j4zc3gk9a046bwxvv51l7rfs7n4z0550ki";
+      name = "threadweaver-5.33.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index e0b4babc970..6aa88a524c0 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -27,7 +27,7 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in
 let
   result = {
     libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
-    libav_11  = libavFun  "11.8"  "d0e93f6b229ae46c49d13ec183b13cfee70a51f0";
+    libav_11  = libavFun  "11.9"  "36ed1329099676ff3c970576e03c6a21f2da2e15";
     libav_12  = libavFun "12"     "4ecde7274621c82a6882b7614d907b28de25cc4e";
   };
 
@@ -41,7 +41,7 @@ let
 
     patches = []
       ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
-      ++ optional (vpxSupport && hasPrefix "11."  version) ./vpxenc-11.6-libvpx-1.5.patch;
+      ;
 
     preConfigure = "patchShebangs doc/texi2pod.pl";
 
diff --git a/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
deleted file mode 100644
index f3c52582b44..00000000000
--- a/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libavcodec/libvpxenc.c	2016-05-01 17:53:17.974517377 +0200
-+++ b/libavcodec/libvpxenc.c	2016-05-01 17:54:30.564923297 +0200
-@@ -70,19 +70,11 @@
- 
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
--    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
--    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
--    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
--    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
--    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
--    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
-     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
-     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
-     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
--    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
-     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
-     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
--    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
-     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
-     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
-     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 1e60a63fe06..961b8a77670 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig,  valadoc}:
 
 stdenv.mkDerivation rec {
-  major = "0.2";
-  minor = "10";
+  major = "0.4";
+  minor = "2";
   version = "${major}.${minor}";
 
   name = "libhttpseverywhere-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
-    sha256 = "235f5b7f96188d800470871774e31696fbde085b63f65bd71434af8e9e6ac8aa";
+    sha256 = "0n850a4adsla6di8dylnadg07wblkdl28abrjvk6fzy8a1kjlx02";
   };
 
   nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     mkdir build
     cd build
-    meson.py --prefix "$out" ..
+    meson --prefix "$out" ..
   '';
 
   buildPhase = ''
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index ea26f480cd1..9a736a38e3f 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -3,11 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "libidn2-0.16";
+  name = "libidn2-${version}";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "https://alpha.gnu.org/gnu/libidn/${name}.tar.gz";
-    sha256 = "13v8kh4d5nfkymai88zlw3h7k4x9khrpdpv97waf4ah8ykzrxb9g";
+    url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
+    sha256 = "1lzi4wng22gyzlgkr8jk75d03f2bnnch5yhmiwb0hram2la6a8qd";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 1db053ef398..408436ca618 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.7.4";
+  name = "libssh-0.7.5";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/210/${name}.tar.xz";
-    sha256 = "03bcp9ksqp0s1pmwfmzhcknvkxay5k0mjzzxp3rjlifbng1vxq9r";
+    url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz";
+    sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l";
   };
 
   postPatch = ''
diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix
new file mode 100644
index 00000000000..cbf675af4da
--- /dev/null
+++ b/pkgs/development/libraries/libytnef/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "libytnef-${version}";
+  version = "1.9.2";
+
+  src = fetchFromGitHub {
+    owner = "Yeraze";
+    repo = "ytnef";
+    rev = "v${version}";
+    sha256 = "1aavckl7rjbiakwcf4rrkhchrl450p3vq3dy78cxfmgg0jqnvxqy";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    inherit (src.meta) homepage;
+    description = "Yeraze's TNEF Stream Reader - for winmail.dat files";
+    license = licenses.gpl2Plus;
+    platform = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index b7a5f1a5c90..e9edda698f4 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.0.3";
+  version = "17.0.4";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed";
+    sha256 = "1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346";
   };
 
   prePatch = "patchShebangs .";
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 91f065fa0eb..d8420f69101 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
 
 let
   ver_maj = "1.40";
-  ver_min = "4";
+  ver_min = "5";
 in
 stdenv.mkDerivation rec {
   name = "pango-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "f8fdc5fc66356dc4edf915048cceeee065a0e0cb70b3b2598f62bda320129a3e";
+    sha256 = "24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9";
   };
 
   outputs = [ "bin" "dev" "out" "devdoc" ];
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 0af6ed8b594..be35032785d 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -214,7 +214,7 @@ stdenv.mkDerivation {
     AGL AppKit ApplicationServices Carbon Cocoa
     CoreAudio CoreBluetooth CoreLocation CoreServices
     DiskArbitration Foundation OpenGL
-    darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv
+    darwin.cf-private darwin.libobjc libiconv
   ]);
 
   buildInputs = [ ]
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 64afde3c53b..315566851fb 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -10,11 +10,11 @@ assert xor (openssl != null) (gnutls != null);
 assert !(xor (openssl != null) (zlib != null));
 
 stdenv.mkDerivation rec {
-  name = "ucommon-6.3.1";
+  name = "ucommon-7.0.0";
 
   src = fetchurl {
     url = "mirror://gnu/commoncpp/${name}.tar.gz";
-    sha256 = "1marbwbqnllhm9nh22lvyfjy802pgy1wx7j7kkpkasbm9r0sb6mm";
+    sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index 8284fd7707f..28575f4c5d5 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, fetchurl, xercesc }:
+{ stdenv, fetchurl, xercesc, getopt }:
 
-stdenv.mkDerivation rec {
+let
+  platform = if stdenv.isLinux then "linux" else
+             if stdenv.isDarwin then "macosx" else
+             throw "Unsupported platform";
+in stdenv.mkDerivation rec {
   name = "xalan-c-${version}";
   version = "1.11";
 
@@ -9,20 +13,21 @@ stdenv.mkDerivation rec {
     sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
   };
 
+  # TODO: should we really be putting outputs in $out/usr? I'd expect -P$out below
   configurePhase = ''
     export XALANCROOT=`pwd`/c
     cd `pwd`/c
     mkdir -p $out/usr
-    ./runConfigure -p linux -c gcc -x g++ -P$out/usr
+    ./runConfigure -p ${platform} -c cc -x c++ -P$out/usr
   '';
 
-  buildInputs = [ xercesc ];
+  buildInputs = [ xercesc getopt ];
 
   meta = {
     homepage = http://xalan.apache.org/;
     description = "A XSLT processor for transforming XML documents";
     license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.jagajaga ];
   };
 }
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index 1932acbd7ed..37936caf2b9 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://santuario.apache.org/;
     description = "C++ Implementation of W3C security standards for XML";
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.jagajaga ];
   };
 }
diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix
new file mode 100644
index 00000000000..a34879e5596
--- /dev/null
+++ b/pkgs/development/python-modules/asn1crypto/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "asn1crypto";
+  version = "0.22.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a";
+  };
+
+  # No tests included
+  doCheck = false;
+
+  meta = {
+    description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP";
+    license = lib.licenses.mit;
+    homepage = https://github.com/wbond/asn1crypto;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
new file mode 100644
index 00000000000..59f66f36d87
--- /dev/null
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -0,0 +1,51 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, mock
+, pytest_27
+, sh
+, coverage
+, docopt
+, requests2
+, git
+}:
+
+buildPythonPackage rec {
+  pname = "coveralls";
+  name = "${pname}-python-${version}";
+  version = "1.1";
+
+  # wanted by tests
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il";
+  };
+
+  buildInputs = [
+    mock
+    sh
+    pytest_27
+    git
+  ];
+
+  # FIXME: tests requires .git directory to be present
+  doCheck = false;
+
+  checkPhase = ''
+    python setup.py test
+  '';
+
+  propagatedBuildInputs = [
+    coverage
+    docopt
+    requests2
+  ];
+
+  meta = {
+    description = "Show coverage stats online via coveralls.io";
+    homepage = https://github.com/coveralls-clients/coveralls-python;
+    license = lib.licenses.mit;
+  };
+}
+
+
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
new file mode 100644
index 00000000000..c6c6137a2d4
--- /dev/null
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }:
+
+buildPythonPackage rec {
+  version = "0.8.1";
+  name = "ezdxf-${version}";
+
+  src = fetchFromGitHub {
+    owner = "mozman";
+    repo = "ezdxf";
+    rev = "v${version}";
+    sha256 = "1c20j96n3rsgzaakfjl0wnydaj2qr69gbnnjs6mfa1hz2fjqri22";
+  };
+
+  buildInputs = [ pytest ];
+  checkPhase = "python -m unittest discover -s tests";
+
+  propagatedBuildInputs = [ pyparsing ];
+
+  meta = with stdenv.lib; {
+    description = "Python package to read and write DXF drawings (interface to the DXF file format)";
+    homepage = https://github.com/mozman/ezdxf/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ hodapp ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix
new file mode 100644
index 00000000000..72917fdd771
--- /dev/null
+++ b/pkgs/development/python-modules/httpbin/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, flask
+, markupsafe
+, decorator
+, itsdangerous
+, six }:
+
+buildPythonPackage rec {
+  pname = "httpbin";
+  version = "0.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054";
+  };
+
+  propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kennethreitz/httpbin;
+    description = "HTTP Request & Response Service";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index 271251b830e..d5251f1fa55 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -10,14 +10,14 @@ buildPythonPackage rec {
   # If you need these, you can just add them to your environment.
 
   name = "hypothesis-${version}";
-  version = "3.6.1";
+  version = "3.7.0";
 
   # Upstream prefers github tarballs
   src = fetchFromGitHub {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     rev = "${version}";
-    sha256 = "1zwr9g4h4jizbvm2d7fywdpcxmw8i1m85h8g72kizah07gk12aq1";
+    sha256 = "1zsv1ggf3g9rrigxl3zd1z8qc6fcj8lmszm8ib1ya4ar6r64x0yz";
   };
 
   buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
new file mode 100644
index 00000000000..a77f6ac9c2f
--- /dev/null
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, isPy27
+, mock
+, ipython
+, jupyter_client
+, pexpect
+, traitlets
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "ipykernel";
+  version = "4.6.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db";
+  };
+
+  buildInputs = [ nose ] ++ lib.optional isPy27 mock;
+  propagatedBuildInputs = [
+    ipython
+    jupyter_client
+    pexpect
+    traitlets
+    tornado
+  ];
+
+  # Tests require backends.
+  # I don't want to add all supported backends as propagatedBuildInputs
+  doCheck = false;
+
+  meta = {
+    description = "IPython Kernel for Jupyter";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
new file mode 100644
index 00000000000..3e8ea048920
--- /dev/null
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, dateutil
+, ipython_genutils
+, decorator
+, pyzmq
+, ipython
+, jupyter_client
+, ipykernel
+, tornado
+, isPy3k
+, futures
+}:
+
+buildPythonPackage rec {
+  pname = "ipyparallel";
+  version = "6.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7eea4780266252fcc987b220a302d589fbb4d6b0569bd131115a20b31891103d";
+  };
+
+  buildInputs = [ nose ];
+
+  propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
+  ] ++ lib.optionals (!isPy3k) [ futures ];
+
+  # Requires access to cluster
+  doCheck = false;
+
+  meta = {
+    description = "Interactive Parallel Computing with IPython";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
new file mode 100644
index 00000000000..0823a76e2a6
--- /dev/null
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -0,0 +1,71 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+# Build dependencies
+, glibcLocales
+# Test dependencies
+, nose
+, pygments
+, isPy27
+, mock
+# Runtime dependencies
+, jedi
+, decorator
+, pickleshare
+, simplegeneric
+, traitlets
+, prompt_toolkit
+, pexpect
+, appnope
+}:
+
+buildPythonPackage rec {
+  pname = "ipython";
+  version = "6.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f429b82b8d9807068da734b15965768bd21b15d0b706340b6d1b4d6f6f5b98a4";
+  };
+
+  prePatch = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace setup.py --replace "'gnureadline'" " "
+  '';
+
+  buildInputs = [ glibcLocales ];
+
+  checkInputs = [ nose pygments ] ++ lib.optional isPy27 mock;
+
+  propagatedBuildInputs = [
+    jedi
+    decorator
+    pickleshare
+    simplegeneric
+    traitlets
+    prompt_toolkit
+    pexpect
+  ] ++ lib.optionals stdenv.isDarwin [appnope];
+
+  LC_ALL="en_US.UTF-8";
+
+  doCheck = false; # Circular dependency with ipykernel
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  # IPython 6.0.0 and above does not support Python < 3.3.
+  # The last IPython version to support older Python versions
+  # is 5.3.x.
+  disabled = pythonOlder "3.3";
+
+  meta = {
+    description = "IPython: Productive Interactive Computing";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ bjornfor jgeerds fridh ];
+  };
+}
diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
new file mode 100644
index 00000000000..dcd5b89b6b8
--- /dev/null
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, nose
+, pytest
+, mock
+, ipython
+, ipykernel
+, traitlets
+, notebook
+, widgetsnbextension
+}:
+
+buildPythonPackage rec {
+  pname = "ipywidgets";
+  version = "6.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7";
+  };
+
+  # Tests are not distributed
+  # doCheck = false;
+
+  buildInputs = [ nose pytest mock ];
+  propagatedBuildInputs = [
+    ipython
+    ipykernel
+    traitlets
+    notebook
+    widgetsnbextension
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = {
+    description = "IPython HTML widgets for Jupyter";
+    homepage = http://ipython.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
new file mode 100644
index 00000000000..3f5d4897537
--- /dev/null
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "jedi";
+  version = "0.10.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test test
+  '';
+
+  # 7 failed
+  #doCheck = false;
+
+  meta = {
+    homepage = https://github.com/davidhalter/jedi;
+    description = "An autocompletion tool for Python that can be used for text editors";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix
new file mode 100644
index 00000000000..a45a4a84a3a
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter_client/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, traitlets
+, jupyter_core
+, pyzmq
+, dateutil
+, isPyPy
+, py
+}:
+
+buildPythonPackage rec {
+  pname = "jupyter_client";
+  version = "5.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fe573880b5ca4469ed0bece098f4b910c373d349e12525e1ea3566f5a14536b";
+  };
+
+  buildInputs = [ nose ];
+  propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py;
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # Circular dependency with ipykernel
+  doCheck = false;
+
+  meta = {
+    description = "Jupyter protocol implementation and client libraries";
+    homepage = http://jupyter.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix
new file mode 100644
index 00000000000..895cdedcb6e
--- /dev/null
+++ b/pkgs/development/python-modules/kitchen/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "kitchen";
+  version = "1.2.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ggv3p4x8jvmmzhp0xm00h6pvh1g0gmycw71rjwagnrj8n23vxrq";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Kitchen contains a cornucopia of useful code";
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ mornfall ];
+  };
+}
diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix
new file mode 100644
index 00000000000..e6d6f1e1d7e
--- /dev/null
+++ b/pkgs/development/python-modules/line_profiler/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cython
+, isPyPy
+}:
+
+buildPythonPackage rec {
+  pname = "line_profiler";
+  version = "2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381";
+  };
+
+  buildInputs = [ cython ];
+
+  disabled = isPyPy;
+
+  meta = {
+    description = "Line-by-line profiler";
+    homepage = https://github.com/rkern/line_profiler;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 1da50341750..6b6be639851 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -11,13 +11,13 @@
 buildPythonPackage rec {
   pname = "llvmlite";
   name = "${pname}-${version}";
-  version = "0.15.0";
+  version = "0.16.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4";
+    sha256 = "ef3bae32482f91742d91571b5225a6943804291eb9405b98090a7b50942ec5e9";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
new file mode 100644
index 00000000000..0fa94854640
--- /dev/null
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, glibcLocales
+, isPy27
+, mock
+, jinja2
+, tornado
+, ipython_genutils
+, traitlets
+, jupyter_core
+, jupyter_client
+, nbformat
+, nbconvert
+, ipykernel
+, terminado
+, requests2
+, pexpect
+}:
+
+buildPythonPackage rec {
+  pname = "notebook";
+  version = "5.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1cea3bbbd03c8e5842a1403347a8cc8134486b3ce081a2e5b1952a00ea66ed54";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+
+  buildInputs = [nose glibcLocales]  ++ lib.optionals isPy27 [mock];
+
+  propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core
+    jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # Certain tests fail due to being in a chroot.
+  # PermissionError
+  doCheck = false;
+  meta = {
+    description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
+    homepage = http://jupyter.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 422fee39641..3ce40f2618a 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,12 +14,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.30.1";
+  version = "0.31.0";
   name = "numba-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
-    sha256 = "66e6254b3002f448fd212c5df4c8a69964dff9b9f315fb733e3c95e7e2b6c8fd";
+    sha256 = "69f8ecacca687e89625abbc9f9ff2b64b3cc8649c284a3bc92f2df6dc82a7c80";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 21a7755c409..212a382a4b0 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -56,7 +56,7 @@ in buildPythonPackage rec {
 
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
-  patchPhase = optionalString isDarwin ''
+  postPatch = optionalString isDarwin ''
     cpp_sdk="${libcxx}/include/c++/v1";
     echo "Adding $cpp_sdk to the setup.py common_include variable"
     substituteInPlace setup.py \
@@ -71,12 +71,11 @@ in buildPythonPackage rec {
 
   # The flag `-A 'not network'` will disable tests that use internet.
   # The `-e` flag disables a few problematic tests.
-
   checkPhase = ''
     runHook preCheck
     # The flag `-w` provides the initial directory to search for tests.
     # The flag `-A 'not network'` will disable tests that use internet.
-    nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' --stop \
+    nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' \
       --verbosity=3
      runHook postCheck
   '';
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index 04964ab03dd..d465c0befe1 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   version = "3.4.3";
   name = "pycryptodome-${version}";
-  namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
new file mode 100644
index 00000000000..a31c9ba35bb
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -0,0 +1,36 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitHub
+, pytest
+, flask
+, decorator
+, httpbin
+, six
+, requests2
+}:
+
+buildPythonPackage rec {
+  name = "pytest-httpbin-${version}";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "kevin1024";
+    repo = "pytest-httpbin";
+    rev = "v${version}";
+    sha256 = "0j3n12jjy8cm0va8859wqra6abfyajrgh2qj8bhcngf3a72zl9ks";
+  };
+
+  checkPhase = ''
+    py.test -k "not test_chunked_encoding"
+  '';
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ flask decorator httpbin six requests2 ];
+
+  meta = {
+    description = "Easily test your HTTP library against a local copy of httpbin.org";
+    homepage = https://github.com/kevin1024/pytest-httpbin;
+    license = lib.licenses.mit;
+  };
+}
+
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index d3fea5a3b43..90b67022c5b 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
 buildPythonPackage rec {
   name = "pytest-${version}";
-  version = "3.0.6";
+  version = "3.0.7";
 
   preCheck = ''
     # don't test bash builtins
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "0h6rfp7y7c5mqwfm9fy5fq4l9idnp160c82ylcfjg251y6lk8d34";
+    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
   };
 
   buildInputs = [ hypothesis ];
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
new file mode 100644
index 00000000000..b09458de568
--- /dev/null
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, isPy27
+, mock
+, traitlets
+, jupyter_core
+, jupyter_client
+, pygments
+, ipykernel
+, pyqt5
+}:
+
+buildPythonPackage rec {
+  pname = "qtconsole";
+  version = "4.3.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209";
+  };
+
+  buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];
+  propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5];
+
+  # : cannot connect to X server
+  doCheck = false;
+
+  meta = {
+    description = "Jupyter Qt console";
+    homepage = http://jupyter.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
new file mode 100644
index 00000000000..60e35d2ade4
--- /dev/null
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, self
+, buildPythonPackage
+, fetchPypi
+, nose
+, numpy
+, scipy
+, pandas
+, patsy
+, cython
+, matplotlib
+}:
+
+buildPythonPackage rec {
+  pname = "statsmodels";
+  version = "0.8.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048";
+  };
+
+  buildInputs = with self; [ nose ];
+  propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib];
+
+  meta = {
+    description = "Statistical computations and models for use with SciPy";
+    homepage = "https://www.github.com/statsmodels/statsmodels";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
new file mode 100644
index 00000000000..c925649b8b2
--- /dev/null
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -0,0 +1,44 @@
+{ buildPythonPackage
+, lib
+, pkgs
+, pyyaml
+, mock
+, contextlib2
+, wrapt
+, pytest_27
+, httpbin
+, pytest-httpbin
+, yarl
+}:
+
+buildPythonPackage rec {
+  version = "1.10.5";
+  name = "vcrpy-${version}";
+
+  src = pkgs.fetchurl {
+    url = "mirror://pypi/v/vcrpy/vcrpy-${version}.tar.gz";
+    sha256 = "12kncg6jyvj15mi8ca74514f2x1ih753nhyz769nwvh39r468167";
+  };
+
+  buildInputs = [
+    pyyaml
+    mock
+    contextlib2
+    wrapt
+    pytest_27
+    httpbin
+    pytest-httpbin
+    yarl
+  ];
+
+  checkPhase = ''
+    py.test --ignore=tests/integration -k "TestVCRConnection.testing_connect"
+  '';
+
+  meta = with lib; {
+    description = "Automatically mock your HTTP interactions to simplify and speed up testing";
+    homepage = https://github.com/kevin1024/vcrpy;
+    license = licenses.mit;
+  };
+}
+
diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
new file mode 100644
index 00000000000..dda58c65f60
--- /dev/null
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, notebook
+, ipywidgets
+}:
+
+buildPythonPackage rec {
+  pname = "widgetsnbextension";
+  name = "${pname}-${version}";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "566582a84642d0c0f78b756a954450a38a8743eeb8dad04b7cab3ca66f455e6f";
+  };
+
+  propagatedBuildInputs = [ notebook ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "IPython HTML widgets for Jupyter";
+    homepage = http://ipython.org/;
+    license = ipywidgets.meta.license; # Build from same repo
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
new file mode 100644
index 00000000000..fe0497bc0e8
--- /dev/null
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, numpy
+, pandas
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "xarray";
+  version = "0.9.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d23bfcc317829570daa1fe8306ad7ff62cd77847bbd68e3ffc53d847bff7c36d";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [numpy pandas];
+
+  checkPhase = ''
+    py.test $out/${python.sitePackages}
+  '';
+
+  meta = {
+    description = "N-D labeled arrays and datasets in Python";
+    homepage = https://github.com/pydata/xarray;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 558b8acf70f..d4dbc6b46d2 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,13 +1,23 @@
-{ lib, python3Packages, fetchurl }:
-python3Packages.buildPythonPackage rec {
-  version = "0.35.0";
-  name = "meson-${version}";
+{ lib, python3Packages }:
+python3Packages.buildPythonApplication rec {
+  version = "0.40.0";
+  pname = "meson";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/m/meson/${name}.tar.gz";
-    sha256 = "0w4vian55cwcv2m5qzn73aznf9a0y24cszqb7dkpahrb9yrg25l3";
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1hb6y5phzd5738rlpz78w8hfzk7sbxj81551mb7bbkkqz8ql1gjw";
   };
 
+  postFixup = ''
+    pushd $out/bin
+    # undo shell wrapper as meson tools are called with python
+    for i in *; do
+      mv ".$i-wrapped" "$i"
+    done
+    popd
+  '';
+
   meta = with lib; {
     homepage = http://mesonbuild.com;
     description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 5a0cb4911e1..b2cf8b5a0ce 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.53";
+  version = "2.56";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "16lgwgp4n161j4vjwkzzdz4v2d6vv62rrqmcfmb6zalyvp6wpj9r";
+    sha256 = "1n0rqvnqv8dsqz8nmcxifg2qqs5hjqvi4bw3a3rjchndqyc3azij";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 770eb9cc78b..ff2d48e1a6e 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "0.22.0";
+  version = "0.23.2";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1hs4fqjj9rg47ipcagpdk3grh7aa0ls3vsxq4q20d5hb43s9n5gs";
+    sha256 = "06vqi78q1wsybr4nsh8xjnqmjynljmb36h21j2ffmni1adxf4syq";
   };
 
   buildInputs = [makeWrapper nodejs];
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index e071edfeb81..4a10015bea8 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless";
 
 with stdenv.lib;
 let
-  version = "0.14.21";
+  version = "0.15.1";
   isHeadless = releaseType == "headless";
 
   arch = if stdenv.system == "x86_64-linux" then {
@@ -25,14 +25,14 @@ let
 
   fetch = rec {
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
-    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz";
+    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
     x64 = {
-      headless = fetchurl        { inherit name url; sha256 = "0bx4fq46781vv9vr0ciyckaskksjrqikvcdv1yz0wj8mrb2j08cw"; };
-      alpha = authenticatedFetch { inherit      url; sha256 = "067p1i5wcxk88kmblyklc4lh8fqjc5pqjdarvhjz420vqmdls7k6"; };
+      headless = fetchurl        { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; };
+      alpha = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha = authenticatedFetch { inherit      url; sha256 = "0iwhachp0z02w19x5y70qy3b0yp79dspawkcygdfna5cfqrybvx6"; };
+      alpha = abort "Factorio 32-bit client is not available for this version.";
     };
   };
 
diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix
index 04b31ac10d3..439f2478a66 100644
--- a/pkgs/games/factorio/fetch.nix
+++ b/pkgs/games/factorio/fetch.nix
@@ -8,6 +8,8 @@
   # URL to fetch.
   url ? ""
 
+, name ? "factorio.tar.gz"
+
   # Login URL.
 , loginUrl ? "https://www.factorio.com/login"
 
@@ -16,11 +18,9 @@
 }:
 
 stdenv.mkDerivation {
-  name = "factorio.tar.gz";
-
   buildInputs = [ curl xidel ];
 
-  inherit url loginUrl username password cacert;
+  inherit name url loginUrl username password cacert;
 
   builder = ./fetch.sh;
 
diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
index 7de7d291289..e5375ef6091 100644
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -6,6 +6,7 @@
 , stdenv
 , coreutils
 , gnugrep
+, targetPlatform
 }:
 
 /* As of this writing, known-good prefix/arch/simulator triples:
@@ -15,7 +16,12 @@
  * x86_64-apple-darwin14  | x86_64 | true
  */
 
-{ prefix, arch, simulator ? false }: let
+let
+
+  prefix = targetPlatform.config;
+  inherit (targetPlatform) arch;
+  simulator = targetPlatform.isiPhoneSimulator or false;
+
   sdkType = if simulator then "Simulator" else "OS";
 
   sdkVer = "10.2";
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index 7cf2bc4f975..e7825a0ebd6 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -30,9 +30,9 @@ let
 
 in stdenv.mkDerivation rec {
 
-  version = "16.60";
+  version = "17.10";
   pname = "amdgpu-pro";
-  build = "${version}-379184";
+  build = "${version}-401251";
 
   libCompatDir = "/run/lib/${libArch}";
 
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
     "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz";
-    sha256 = "1g90sryxw8y4abjgviibq34v3hr82ijgbaiqnxgafrf7g9s5m2yq";
+    sha256 = "004n0df8acjpjz72z3bjxb2a0b7qwln13jlknfn7xxqvhhwwy40a";
     curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx";
   };
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
index 6803cf03289..4733e0580af 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
@@ -1,4 +1,4 @@
-From ad3f6de6d16ea8ee76635dd39875eeab39def6e9 Mon Sep 17 00:00:00 2001
+From 704cef8638ffbdd8de9e57f28b43ea42c685ea87 Mon Sep 17 00:00:00 2001
 From: David McFarland <corngood@gmail.com>
 Date: Sat, 28 Jan 2017 16:57:26 -0400
 Subject: [PATCH 1/4] disable firmware copy
@@ -8,7 +8,7 @@ Subject: [PATCH 1/4] disable firmware copy
  1 file changed, 5 deletions(-)
 
 diff --git a/pre-build.sh b/pre-build.sh
-index 25e718f..e3cd009 100755
+index 622ff13..e3cd009 100755
 --- a/pre-build.sh
 +++ b/pre-build.sh
 @@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
@@ -18,8 +18,8 @@ index 25e718f..e3cd009 100755
 -
 -FW_DIR="/lib/firmware/$KERNELVER"
 -mkdir -p $FW_DIR
--cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/radeon $FW_DIR
--cp -ar /usr/src/amdgpu-pro-16.60-379184/firmware/amdgpu $FW_DIR
+-cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/radeon $FW_DIR
+-cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/amdgpu $FW_DIR
 -- 
-2.11.0
+2.12.2
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
index 86dbea29e08..aa6cbcc118d 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
@@ -1,63 +1,31 @@
-From 52e47be93c7a492730477f590e5eb42e035018bd Mon Sep 17 00:00:00 2001
+From 0ead7017e1db18be971c24c891d4bdcc507deea7 Mon Sep 17 00:00:00 2001
 From: David McFarland <corngood@gmail.com>
 Date: Sun, 29 Jan 2017 18:23:47 -0400
 Subject: [PATCH 2/4] linux-4.9 fixes
 
 ---
- amd/amdgpu/amdgpu_connectors.c          | 8 ++++++++
- amd/amdgpu/amdgpu_ttm.c                 | 4 ++++
+ amd/amdkcl/kcl_io.c                     | 2 ++
  amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++
- include/kcl/kcl_mm.h                    | 4 +++-
- 4 files changed, 23 insertions(+), 1 deletion(-)
+ 2 files changed, 10 insertions(+)
 
-diff --git a/amd/amdgpu/amdgpu_connectors.c b/amd/amdgpu/amdgpu_connectors.c
-index 1b51981..4b43379 100644
---- a/amd/amdgpu/amdgpu_connectors.c
-+++ b/amd/amdgpu/amdgpu_connectors.c
-@@ -168,12 +168,20 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector)
- 		}
- 
- 		/* Any defined maximum tmds clock limit we must not exceed? */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+		if (connector->display_info.max_tmds_clock > 0) {
-+#else
- 		if (connector->max_tmds_clock > 0) {
-+#endif
- 			/* mode_clock is clock in kHz for mode to be modeset on this connector */
- 			mode_clock = amdgpu_connector->pixelclock_for_modeset;
- 
- 			/* Maximum allowable input clock in kHz */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+			max_tmds_clock = connector->display_info.max_tmds_clock * 1000;
-+#else
- 			max_tmds_clock = connector->max_tmds_clock * 1000;
-+#endif
- 
- 			DRM_DEBUG("%s: hdmi mode dotclock %d kHz, max tmds input clock %d kHz.\n",
- 				  connector->name, mode_clock, max_tmds_clock);
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 447529d..252bab4 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -255,7 +255,11 @@ static int amdgpu_verify_access(struct ttm_buffer_object *bo, struct file *filp)
- 
- 	if (amdgpu_ttm_tt_get_usermm(bo->ttm))
- 		return -EPERM;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+	return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp->private_data);
-+#else
- 	return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp);
-+#endif
+diff --git a/amd/amdkcl/kcl_io.c b/amd/amdkcl/kcl_io.c
+index d8f843f..9a1bd9b 100644
+--- a/amd/amdkcl/kcl_io.c
++++ b/amd/amdkcl/kcl_io.c
+@@ -31,4 +31,6 @@ void amdkcl_io_init(void)
+ 	_kcl_io_free_memtype = amdkcl_fp_setup("io_free_memtype", NULL);
  }
- 
- static void amdgpu_move_null(struct ttm_buffer_object *bo,
+ #endif
++#else
++void amdkcl_io_init(void) {}
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */
 diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-index be7aafb..5e11f26 100644
+index 34313a9..44a4a71 100644
 --- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
 +++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -1692,6 +1692,10 @@ static int dm_plane_helper_prepare_fb(
+@@ -1720,6 +1720,10 @@ static int dm_plane_helper_prepare_fb(
+ static int dm_plane_helper_prepare_fb(
  	struct drm_plane *plane,
- 	struct drm_framebuffer *fb,
  	const struct drm_plane_state *new_state)
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 +static int dm_plane_helper_prepare_fb(
@@ -66,9 +34,9 @@ index be7aafb..5e11f26 100644
  #else
  static int dm_plane_helper_prepare_fb(
  	struct drm_plane *plane,
-@@ -1735,6 +1739,10 @@ static void dm_plane_helper_cleanup_fb(
+@@ -1766,6 +1770,10 @@ static void dm_plane_helper_cleanup_fb(
+ static void dm_plane_helper_cleanup_fb(
  	struct drm_plane *plane,
- 	struct drm_framebuffer *fb,
  	const struct drm_plane_state *old_state)
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 +static void dm_plane_helper_cleanup_fb(
@@ -77,21 +45,6 @@ index be7aafb..5e11f26 100644
  #else
  static void dm_plane_helper_cleanup_fb(
  	struct drm_plane *plane,
-diff --git a/include/kcl/kcl_mm.h b/include/kcl/kcl_mm.h
-index a18936d..f068195 100644
---- a/include/kcl/kcl_mm.h
-+++ b/include/kcl/kcl_mm.h
-@@ -8,7 +8,9 @@ static inline int kcl_get_user_pages(struct task_struct *tsk, struct mm_struct *
-                                      int write, int force, struct page **pages,
-                                      struct vm_area_struct **vmas)
- {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+        return get_user_pages(start, nr_pages, write ? FOLL_WRITE : 0, pages, vmas);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-         return get_user_pages(start, nr_pages, write, force, pages, vmas);
- #else
-         return get_user_pages(tsk, mm, start, nr_pages,
 -- 
-2.11.0
+2.12.2
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
index 6856b9ae092..7a11c9bd4ef 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
@@ -1,4 +1,4 @@
-From cc490c71a98b6bbe390fcf777fbe0360d01bf4ca Mon Sep 17 00:00:00 2001
+From b6dd36dd90c5d88ae10b9dbc763d3bacb95ccddb Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 16:46:39 +0100
 Subject: [PATCH 3/4] Change seq_printf format for 64 bit context
@@ -8,18 +8,18 @@ Subject: [PATCH 3/4] Change seq_printf format for 64 bit context
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
-index c43f582..8c4b9f7 100644
+index 74932bf..db4119a 100644
 --- a/amd/amdgpu/amdgpu_sa.c
 +++ b/amd/amdgpu/amdgpu_sa.c
-@@ -427,7 +427,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
  			   soffset, eoffset, eoffset - soffset);
  
  		if (i->fence)
 -#if defined(BUILD_AS_DKMS)
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
  			seq_printf(m, " protected by 0x%08x on context %d",
- 				   i->fence->seqno, i->fence->context);
+ 					i->fence->seqno, i->fence->context);
  #else
 -- 
-2.11.0
+2.12.2
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
index d226504c4e4..cd360e18faa 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
@@ -1,30 +1,15 @@
-From 9970f3107aed7b2b1ff1c5f29129b62cec99980d Mon Sep 17 00:00:00 2001
+From dbf01d3934c52acaaa37f008859f69c5edf19ad5 Mon Sep 17 00:00:00 2001
 From: David McFarland <corngood@gmail.com>
 Date: Mon, 6 Feb 2017 22:13:49 -0400
 Subject: [PATCH 4/4] fix warnings for Werror
 
 ---
- amd/amdgpu/amdgpu_kms.c                 | 2 +-
  amd/amdgpu/amdgpu_ttm.c                 | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm.c       | 2 +-
  amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +-
- 4 files changed, 5 insertions(+), 3 deletions(-)
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/amd/amdgpu/amdgpu_kms.c b/amd/amdgpu/amdgpu_kms.c
-index b7b51ae..bc884f6 100644
---- a/amd/amdgpu/amdgpu_kms.c
-+++ b/amd/amdgpu/amdgpu_kms.c
-@@ -591,7 +591,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
- 
- 			bios = adev->bios + bios_offset;
- 			return copy_to_user(out, bios,
--				min((size_t)size, bios_size - bios_offset))
-+				min(size, bios_size - bios_offset))
- 					? -EFAULT : 0;
- 		}
- 		default:
 diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 252bab4..90f3655 100644
+index 0e30389..890aafa 100644
 --- a/amd/amdgpu/amdgpu_ttm.c
 +++ b/amd/amdgpu/amdgpu_ttm.c
 @@ -1083,6 +1083,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
@@ -41,26 +26,13 @@ index 252bab4..90f3655 100644
  }
 +#endif
  
- static struct ttm_bo_driver amdgpu_bo_driver = {
- 	.ttm_tt_create = &amdgpu_ttm_tt_create,
-diff --git a/amd/display/amdgpu_dm/amdgpu_dm.c b/amd/display/amdgpu_dm/amdgpu_dm.c
-index 3dcb619..5700861 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -121,7 +121,7 @@ static bool dm_check_soft_reset(void *handle)
- 
- static int dm_soft_reset(void *handle)
- {
--	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-+	/* struct amdgpu_device *adev = (struct amdgpu_device *)handle; */
- 
- 	/* XXX todo */
- 	return 0;
+ static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
+ 					    const struct ttm_place *place)
 diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-index 5e11f26..7039542 100644
+index 44a4a71..ae7e707 100644
 --- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
 +++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -913,7 +913,7 @@ static void decide_crtc_timing_for_drm_display_mode(
+@@ -932,7 +932,7 @@ static void decide_crtc_timing_for_drm_display_mode(
  }
  
  static struct dc_target *create_target_for_sink(
@@ -70,5 +42,5 @@ index 5e11f26..7039542 100644
  		const struct dm_connector_state *dm_state)
  {
 -- 
-2.11.0
+2.12.2
 
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index a9cea506c97..720bc34c419 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
     description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam";
     license = licenses.gpl2;
     maintainers = with maintainers; [ womfoo grahamc ];
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
index 69abaf26197..5f8f6c54252 100644
--- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
     homepage = https://support.apple.com/downloads/DL1877;
     license = licenses.unfree;
     maintainers = with maintainers; [ womfoo grahamc ];
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 
 }
diff --git a/pkgs/os-specific/linux/kernel-headers/3.18.nix b/pkgs/os-specific/linux/kernel-headers/3.18.nix
deleted file mode 100644
index 22650747ba2..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/3.18.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ stdenv, fetchurl, perl, cross ? null }:
-
-assert cross == null -> stdenv.isLinux;
-
-let
-
-  version = "3.18.14";
-
-  kernelHeadersBaseConfig =
-    if cross == null
-    then stdenv.platform.kernelHeadersBaseConfig
-    else cross.platform.kernelHeadersBaseConfig;
-
-in
-
-stdenv.mkDerivation {
-  name = "linux-headers-${version}";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1xh0vvn1l2g1kkg54f0mg0inbpsiqs24ybgsakksmcpcadjgqk1i";
-  };
-
-  targetConfig = if cross != null then cross.config else null;
-
-  platform =
-    if cross != null then cross.platform.kernelArch else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.isArm then "arm" else
-    if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
-    abort "don't know what the kernel include directory is called for this platform";
-
-  buildInputs = [perl];
-
-  # FIXME needs gcc 4.9 in bootstrap tools
-  hardeningDisable = [ "stackprotector" ];
-
-  extraIncludeDirs =
-    if cross != null then
-        (if cross.arch == "powerpc" then ["ppc"] else [])
-    else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-
-  buildPhase = ''
-    if test -n "$targetConfig"; then
-       export ARCH=$platform
-    fi
-    make ${kernelHeadersBaseConfig} SHELL=bash
-    make mrproper headers_check SHELL=bash
-  '';
-
-  installPhase = ''
-    make INSTALL_HDR_PATH=$out headers_install
-
-    # Some builds (e.g. KVM) want a kernel.release.
-    mkdir -p $out/include/config
-    echo "${version}-default" > $out/include/config/kernel.release
-  '';
-
-  # !!! hacky
-  fixupPhase = ''
-    ln -s asm $out/include/asm-$platform
-    if test "$platform" = "i386" -o "$platform" = "x86_64"; then
-      ln -s asm $out/include/asm-x86
-    fi
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Header files and scripts for Linux kernel";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
deleted file mode 100644
index 7fdcafa62d9..00000000000
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From de6299c1627d80ea6742a0bef15bdb6981e5cfd7 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Fri, 25 Dec 2015 17:11:40 +0300
-Subject: [PATCH 1/2] drivers_base: fix double Kconfig entry
-
----
- drivers/base/Kconfig | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
-index 946ced4..fc3405e1 100644
---- a/drivers/base/Kconfig
-+++ b/drivers/base/Kconfig
-@@ -163,30 +163,6 @@ config FW_LOADER_USER_HELPER
- 	  no longer required unless you have a special firmware file that
- 	  resides in a non-standard path.
- 
--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
--- 
-2.6.3
-
diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
deleted file mode 100644
index f17ecce92d1..00000000000
--- a/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 65c5b603489d230b1f1775b01ba1529843cfeba6 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Fri, 25 Dec 2015 17:11:56 +0300
-Subject: [PATCH 2/2] mfd: fix dependency for MFD_CROS_EC
-
----
- drivers/mfd/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index f425dce..a62a285 100644
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -61,7 +61,7 @@ config MFD_AAT2870_CORE
- 
- 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.
--- 
-2.6.3
-
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
deleted file mode 100644
index c8e189dcbfc..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchgit, perl, buildLinux, ncurses, openssh, ... } @ args:
-
-# ChromiumOS requires a 64bit build host
-assert stdenv.is64bit;
-
-import ./generic.nix (args // rec {
-  version = "3.14.0";
-  extraMeta.branch = "3.14";
-
-  src = fetchgit {
-    url = "https://chromium.googlesource.com/chromiumos/third_party/kernel";
-    rev = "63a768b40c91c6f3518ea1f20d0cb664ed4e6a57";
-    sha256 = "1gysrjanvnkbvgml7ipjr119bmlqfqn2zz5ca5kjkapwrfm3cb69";
-  };
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-  features.chromiumos = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 6e3a182e0e2..22bdc3594ef 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -123,12 +123,6 @@ rec {
       patch = ./genksyms-fix-segfault.patch;
     };
 
-
-  chromiumos_Kconfig_fix_entries_3_14 =
-    { name = "Kconfig_fix_entries_3_14";
-      patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.14.patch;
-    };
-
   chromiumos_Kconfig_fix_entries_3_18 =
     { name = "Kconfig_fix_entries_3_18";
       patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch;
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 872a1897457..9126a1cdec3 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace include/pathnames.h \
       --replace "/bin/login" "${shadow}/bin/login"
+    substituteInPlace sys-utils/eject.c \
+      --replace "/bin/umount" "$out/bin/umount"
   '';
 
   crossAttrs = {
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 641fb046c6d..fbff511db7c 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchurl, libmnl, kernel ? null }:
 
-# module requires Linux >= 3.18 https://www.wireguard.io/install/#kernel-requirements
-assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
+# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
+assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170409";
+  version = "0.0.20170421";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "065vxxvdsnxk9paqbafi0c622b4qayfh3ps6zzb853qp2i6kniri";
+    sha256 = "03c82af774224cd171d000ee4a519b5e474cc6842ac04967773cf77b26750000";
   };
 
   meta = with stdenv.lib; {
     homepage     = https://www.wireguard.io/;
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
     description  = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
-    maintainers  = with maintainers; [ ericsagnes ];
+    maintainers  = with maintainers; [ ericsagnes mic92 ];
     license      = licenses.gpl2;
     platforms    = platforms.linux;
   };
@@ -35,6 +35,8 @@ let
     KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
     INSTALL_MOD_PATH = "\${out}";
 
+    NIX_CFLAGS = ["-Wno-error=cpp"];
+
     buildPhase = "make module";
   };
 
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index a9df0d29e09..49612b0b461 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, binutilsCross ? null, gccCross ? null
+{ stdenv, fetchurl, binutils ? null, gccCross ? null
 , onlyHeaders ? false
 , onlyPthreads ? false
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation ({
     cd mingw-w64-libraries/winpthreads
   '';
 } else {
-  buildInputs = [ gccCross binutilsCross ];
+  buildInputs = [ gccCross binutils ];
 
   crossConfig = gccCross.crossConfig;
 
diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix
index 286c63d0163..98461d690d9 100644
--- a/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/pkgs/os-specific/windows/mingwrt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
+{stdenv, fetchurl, binutils ? null, gccCross ? null, onlyHeaders ? false}:
 
 let
   name = "mingwrt-3.20";
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
     cp -R include $out
   '';
 } else {
-  buildInputs = [ gccCross binutilsCross ];
+  buildInputs = [ gccCross binutils ];
 
   crossConfig = gccCross.crossConfig;
 
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix
index 2a5af71b5ec..3443fff9668 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/pkgs/os-specific/windows/w32api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz, binutilsCross ? null
+{ stdenv, fetchurl, xz, binutils ? null
 , gccCross ? null, onlyHeaders ? false }:
 
 let
@@ -23,7 +23,7 @@ stdenv.mkDerivation ({
     cp -R include $out
   '';
 } else {
-  buildInputs = [ gccCross binutilsCross ];
+  buildInputs = [ gccCross binutils ];
 
   crossConfig = gccCross.crossConfig;
 
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 579cd9f4a0e..aafb30441d7 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
-  version = "6.0.3";
+  version = "6.1.1";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "0dg5sb2qv2xskvhlrxmidl25kyg1w0dp31a3k8f3las72fhmkpb7";
+    sha256 = "0klb8hxsmgcwjcp20xa7823jm040q7wdqicc6g7s27gjzvbqj800";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index d0a278d2ef0..1f2601ab0d5 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.3.0";
+  version = "7.3.4";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0i2r60gzs382i6b9r9cx60j6d1xnr4hrj773d4mbbf8r7sg1n8r0";
+    sha256 = "0xkwf8n37hwv52rl3dbqkacr1fyxz4bd7gkcmpg0wshnxmyq4vg7";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 8bf9eef6cd0..78cd69714e8 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "alertmanager-${version}";
-  version = "0.5.1";
+  version = "0.6.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    sha256 = "1z0f8jqbd4v00634qcs41h1zb70ahl63svlzn33gavripk84hwzq";
+    sha256 = "04969hqig0llfkvk3b0yqrywcxm6rgd7ph6nn5rx8pnq21i77sqm";
   };
 
   # Tests exist, but seem to clash with the firewall.
@@ -27,6 +27,17 @@ buildGoPackage rec {
        -X ${t}.GoVersion=${stdenv.lib.getVersion go}
   '';
 
+  postBuild = ''
+    $NIX_BUILD_TOP/go/bin/artifacts
+  '';
+
+  postInstall = ''
+    rm $bin/bin/artifacts
+    mkdir -p $bin/share/man/man1 $bin/etc/bash_completion.d
+    cp -v amtool*.1 $bin/share/man/man1
+    cp -v amtool_completion.sh $bin/etc/bash_completion.d
+  '';
+
   meta = with stdenv.lib; {
     description = "Alert dispatcher for the Prometheus monitoring system";
     homepage = https://github.com/prometheus/alertmanager;
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 8eecfa1e276..3395be9b9c1 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.9.8";
+  name = "sipwitch-1.9.15";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "0117c5iid1vrwl7sl3pys2jlinpmx2vfp8wcdwk93m7cc6k9793b";
+    sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];
diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix
new file mode 100644
index 00000000000..a394d584536
--- /dev/null
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }:
+
+stdenv.mkDerivation rec {
+  name = "percona-server-${version}";
+  version = "5.6.35-80.0";
+
+  src = fetchurl {
+    url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz";
+    sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5";
+  };
+
+  buildInputs = [ cmake bison ncurses openssl zlib libaio perl ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DFEATURE_SET=community"
+    "-DBUILD_CONFIG=mysql_release"
+    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+    "-DWITH_SSL=yes"
+    "-DWITH_READLINE=no"
+    "-DWITH_EMBEDDED_SERVER=no"
+    "-DWITH_EDITLINE=bundled"
+    "-DWITH_ZLIB=yes"
+    "-DHAVE_IPV6=no"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DMYSQL_DATADIR=/var/lib/mysql"
+    "-DINSTALL_SYSCONFDIR=etc/mysql"
+    "-DINSTALL_INFODIR=share/mysql/docs"
+    "-DINSTALL_MANDIR=share/man"
+    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+    "-DINSTALL_SCRIPTDIR=bin"
+    "-DINSTALL_INCLUDEDIR=include/mysql"
+    "-DINSTALL_DOCREADMEDIR=share/mysql"
+    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
+    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+    "-DINSTALL_DOCDIR=share/mysql/docs"
+    "-DINSTALL_SHAREDIR=share/mysql"
+  ];
+
+  NIX_LDFLAGS = "-lgcc_s";
+
+  prePatch = ''
+    sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake
+  '';
+  postInstall = ''
+    sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
+    rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a
+    rm $out/share/man/man1/mysql-test-run.pl.1
+  '';
+
+  passthru.mysqlVersion = "5.6";
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.percona.com";
+    description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ grahamc ];
+  };
+}
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3ffe1ab15d9..7eab7ddb072 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -56,7 +56,11 @@ rec {
 
   # Return a modified stdenv that adds a cross compiler to the
   # builds.
-  makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // {
+  makeStdenvCross = stdenv: cross: binutils: gccCross: stdenv // {
+
+    # Overrides are surely not valid as packages built with this run on a
+    # different platform.
+    overrides = _: _: {};
 
     mkDerivation =
       { name ? "", buildInputs ? [], nativeBuildInputs ? []
@@ -87,7 +91,7 @@ rec {
           name = name + "-" + cross.config;
           nativeBuildInputs = nativeBuildInputs
             ++ nativeInputsFromBuildInputs
-            ++ [ gccCross binutilsCross ]
+            ++ [ gccCross binutils ]
             ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
               # without proper `file` command, libtool sometimes fails
               # to recognize 64-bit DLLs
@@ -106,7 +110,7 @@ rec {
           crossConfig = cross.config;
         } // args.crossAttrs or {});
 
-    inherit gccCross binutilsCross;
+    inherit gccCross binutils;
     ccCross = gccCross;
 
   };
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index e322d465520..7fe56725170 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -21,9 +21,7 @@ in bootStages ++ [
     selfBuild = false;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
-    stdenv = vanillaPackages.stdenv // {
-      overrides = _: _: {};
-    };
+    inherit (vanillaPackages) stdenv;
   })
 
   # Run Packages
@@ -35,17 +33,13 @@ in bootStages ++ [
     selfBuild = false;
     stdenv = if crossSystem.useiOSCross or false
       then let
-          inherit (buildPackages.darwin.ios-cross {
-              prefix = crossSystem.config;
-              inherit (crossSystem) arch;
-              simulator = crossSystem.isiPhoneSimulator or false; })
-            cc binutils;
+          inherit (buildPackages.darwin.ios-cross) cc binutils;
         in buildPackages.makeStdenvCross
           buildPackages.stdenv crossSystem
           binutils cc
       else buildPackages.makeStdenvCross
         buildPackages.stdenv crossSystem
-        buildPackages.binutilsCross buildPackages.gccCrossStageFinal;
+        buildPackages.binutils buildPackages.gccCrossStageFinal;
   })
 
 ]
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e80c54e0218..8a517fddad8 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -253,7 +253,7 @@ in rec {
     inherit
       gnumake gzip gnused bzip2 gawk ed xz patch bash
       libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
-      coreutils findutils diffutils patchutils binutils binutils-raw;
+      coreutils findutils diffutils patchutils;
 
     llvmPackages = super.llvmPackages // {
       inherit (llvmPackages) llvm clang-unwrapped;
@@ -262,6 +262,9 @@ in rec {
     darwin = super.darwin // {
       inherit (darwin) dyld Libsystem cctools libiconv;
     };
+  } // lib.optionalAttrs (super.targetPlatform == localSystem) {
+    # Need to get rid of these when cross-compiling.
+    inherit binutils binutils-raw;
   };
 
   stdenvDarwin = prevStage: let pkgs = prevStage; in import ../generic rec {
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index cb94db48f4b..69bcd649059 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -264,18 +264,16 @@ let
           __ignoreNulls = true;
 
           # Inputs built by the cross compiler.
-          buildInputs = if crossConfig != null then buildInputs' else [];
-          propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs' else [];
+          buildInputs = buildInputs';
+          propagatedBuildInputs = propagatedBuildInputs';
           # Inputs built by the usual native compiler.
           nativeBuildInputs = nativeBuildInputs'
-            ++ lib.optionals (crossConfig == null) buildInputs'
             ++ lib.optional
                 (result.isCygwin
                   || (crossConfig != null && lib.hasSuffix "mingw32" crossConfig))
                 ../../build-support/setup-hooks/win-dll-link.sh
             ;
-          propagatedNativeBuildInputs = propagatedNativeBuildInputs' ++
-            (if crossConfig == null then propagatedBuildInputs' else []);
+          propagatedNativeBuildInputs = propagatedNativeBuildInputs';
         } // ifDarwin {
           # TODO: remove lib.unique once nix has a list canonicalization primitive
           __sandboxProfile =
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 154fdefd789..de33ab56598 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -290,15 +290,26 @@ findInputs() {
     fi
 }
 
-crossPkgs=""
-for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
-    findInputs $i crossPkgs propagated-build-inputs
-done
+if [ -z "$crossConfig" ]; then
+    # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
+    # are handled identically to nativeBuildInputs
+    nativePkgs=""
+    for i in $nativeBuildInputs $buildInputs \
+             $defaultNativeBuildInputs $defaultBuildInputs \
+             $propagatedNativeBuildInputs $propagatedBuildInputs; do
+        findInputs $i nativePkgs propagated-native-build-inputs
+    done
+else
+    crossPkgs=""
+    for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
+        findInputs $i crossPkgs propagated-build-inputs
+    done
 
-nativePkgs=""
-for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
-    findInputs $i nativePkgs propagated-native-build-inputs
-done
+    nativePkgs=""
+    for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
+        findInputs $i nativePkgs propagated-native-build-inputs
+    done
+fi
 
 
 # Set the relevant environment variables to point to the build inputs
@@ -759,14 +770,26 @@ fixupPhase() {
 
     # Propagate build inputs and setup hook into the development output.
 
-    if [ -n "$propagatedBuildInputs" ]; then
-        mkdir -p "${!outputDev}/nix-support"
-        echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs"
-    fi
+    if [ -z "$crossConfig" ]; then
+        # Not cross-compiling - propagatedBuildInputs are handled identically to propagatedNativeBuildInputs
+        local propagated="$propagatedNativeBuildInputs"
+        if [ -n "$propagatedBuildInputs" ]; then
+            propagated+="${propagated:+ }$propagatedBuildInputs"
+        fi
+        if [ -n "$propagated" ]; then
+            mkdir -p "${!outputDev}/nix-support"
+            echo "$propagated" > "${!outputDev}/nix-support/propagated-native-build-inputs"
+        fi
+    else
+        if [ -n "$propagatedBuildInputs" ]; then
+            mkdir -p "${!outputDev}/nix-support"
+            echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs"
+        fi
 
-    if [ -n "$propagatedNativeBuildInputs" ]; then
-        mkdir -p "${!outputDev}/nix-support"
-        echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs"
+        if [ -n "$propagatedNativeBuildInputs" ]; then
+            mkdir -p "${!outputDev}/nix-support"
+            echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs"
+        fi
     fi
 
     if [ -n "$setupHook" ]; then
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index fe685a1e77c..3a244675b3a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -298,12 +298,14 @@ in
         */
 
       overrides = self: super: {
-        gcc = cc;
-
         inherit (prevStage)
-          gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
+          gzip bzip2 xz bash coreutils diffutils findutils gawk
           glibc gnumake gnused gnutar gnugrep gnupatch patchelf
           attr acl paxctl zlib pcre;
+      } // lib.optionalAttrs (super.targetPlatform == localSystem) {
+        # Need to get rid of these when cross-compiling.
+        inherit (prevStage) binutils;
+        gcc = cc;
       };
     };
   })
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 613edfafd95..47c61aaad81 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -3,8 +3,8 @@
 let buildFor = toolsArch: (
 
 let
+  lib = import ../../../lib;
   pkgsFun = import ../../..;
-  pkgsNoParams = pkgsFun {};
 
   sheevaplugCrossSystem = {
     crossSystem = rec {
@@ -14,7 +14,7 @@ let
       float = "soft";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.sheevaplug;
+      platform = lib.systems.platforms.sheevaplug;
       openssl.system = "linux-generic32";
       inherit (platform) gcc;
     };
@@ -29,7 +29,7 @@ let
       fpu = "vfp";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.raspberrypi;
+      platform = lib.systems.platforms.raspberrypi;
       openssl.system = "linux-generic32";
       inherit (platform) gcc;
     };
@@ -44,7 +44,7 @@ let
       fpu = "vfpv3-d16";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.armv7l-hf-multiplatform;
+      platform = lib.systems.platforms.armv7l-hf-multiplatform;
       openssl.system = "linux-generic32";
       inherit (platform) gcc;
     };
@@ -57,7 +57,7 @@ let
       arch = "aarch64";
       withTLS = true;
       libc = "glibc";
-      platform = pkgsNoParams.platforms.aarch64-multiplatform;
+      platform = lib.systems.platforms.aarch64-multiplatform;
       inherit (platform) gcc;
     };
   };
@@ -70,8 +70,6 @@ let
 
   pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);
 
-  inherit (pkgs.buildPackages) stdenv nukeReferences cpio binutilsCross;
-
   glibc = pkgs.buildPackages.libcCross;
   bash = pkgs.bash;
   findutils = pkgs.findutils;
@@ -126,11 +124,15 @@ rec {
 
   build =
 
-    stdenv.mkDerivation {
+    pkgs.buildPackages.stdenv.mkDerivation {
       name = "stdenv-bootstrap-tools-cross";
       crossConfig = pkgs.hostPlatform.config;
 
-      buildInputs = [nukeReferences cpio binutilsCross];
+      buildInputs = [
+        pkgs.buildPackages.nukeReferences
+        pkgs.buildPackages.cpio
+        pkgs.buildPackages.binutils
+      ];
 
       buildCommand = ''
         set -x
@@ -261,7 +263,7 @@ rec {
       allowedReferences = [];
     };
 
-  dist = stdenv.mkDerivation {
+  dist = pkgs.buildPackages.stdenv.mkDerivation {
     name = "stdenv-bootstrap-tools-cross";
 
     buildCommand = ''
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 508fc781069..6dce2a38798 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
 , obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
-, hicolor_icon_theme, librsvg
+, hicolor_icon_theme, librsvg, wrapGAppsHook
 , withPulseAudio ? true, libpulseaudio }:
 
 let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
     sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9";
   };
 
-  nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
+  nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ];
 
   buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg
                   gsettings_desktop_schemas hicolor_icon_theme ]
@@ -32,12 +32,8 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
 
-  postFixup = ''
-    makeWrapperArgs="\
-      --prefix PATH ':' ${binPath} \
-      --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
-      --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
-      --prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
+  preFixup = ''
+    makeWrapperArgs="--prefix PATH ':' ${binPath}"
     wrapPythonPrograms
   '';
 
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index 164bc3d55f0..2371e91ae2f 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -1,21 +1,15 @@
-{stdenv, fetchurl, flex, readline}:
+{stdenv, fetchurl, flex, readline, ed, texinfo}:
 
 stdenv.mkDerivation rec {
-  name = "bc-1.06";
+  name = "bc-1.07.1";
   src = fetchurl {
     url = "mirror://gnu/bc/${name}.tar.gz";
-    sha256 = "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf";
+    sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a";
   };
 
-  patches = [ ./readlinefix.patch ];
-
-  preConfigure = ''
-    sed -i 's/program.*save/static &/' bc/load.c
-  '';
-
   configureFlags = [ "--with-readline" ];
 
-  buildInputs = [flex readline];
+  buildInputs = [flex readline ed texinfo];
 
   doCheck = true;
 
diff --git a/pkgs/tools/misc/bc/readlinefix.patch b/pkgs/tools/misc/bc/readlinefix.patch
deleted file mode 100644
index 74a66e90615..00000000000
--- a/pkgs/tools/misc/bc/readlinefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur bc-1.06.orig/bc/scan.l bc-1.06/bc/scan.l
---- bc-1.06.orig/bc/scan.l      2000-09-13 13:25:47.000000000 -0500
-+++ bc-1.06/bc/scan.l   2002-07-09 14:36:34.000000000 -0500
-@@ -143,7 +143,6 @@
- 
- /* Definitions for readline access. */
- extern FILE *rl_instream;
--_PROTOTYPE(char *readline, (char *));
- 
- /* rl_input puts upto MAX characters into BUF with the number put in
-    BUF placed in *RESULT.  If the yy input file is the same as
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 5fcde9bdaeb..aafb865cfac 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -2,18 +2,20 @@
 
 stdenv.mkDerivation rec {
   name    = "grc-${version}";
-  version = "1.10.1";
+  version = "1.11";
 
   src = fetchFromGitHub {
     owner  = "garabik";
     repo   = "grc";
     rev    = "v${version}";
-    sha256 = "1c2ndnbyznb608h3s99fbcyh4qb1ccipxm15lyszrrks0w2llbah";
+    sha256 = "0slxkjg8xf5rg5pqgh4g2p1qxr5m9f6ds7zg7vh2xqzkmwqv18kp";
   };
 
   buildInputs = with python3Packages; [ wrapPython makeWrapper ];
 
   installPhase = ''
+    runHook preInstall
+
     ./install.sh "$out" "$out"
 
     for f in $out/bin/* ; do
@@ -25,13 +27,15 @@ stdenv.mkDerivation rec {
       wrapProgram $f \
         --prefix PATH : $out/bin
     done
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
     description = "Yet another colouriser for beautifying your logfiles or output of commands";
     homepage    = http://korpus.juls.savba.sk/~garabik/software/grc.html;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ lovek323 AndersonTorres ];
+    maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index a5abc8bef83..d1fa9d5bea6 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -6,12 +6,12 @@ let
   pythonPackages = python3Packages;
 in
 pythonPackages.buildPythonApplication rec {
-  version = "0.14.1";
+  version = "0.15.0";
   name = "vdirsyncer-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5";
+    sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index fd470143a3c..58e5e9343a7 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
   pname   = "NetworkManager";
   major   = "1.6";
   version = "${major}.2";
+  # FIXME: this problem is fixed upstream (commit 6a77258f4ec2), remove when upgrading ^^^
+  hardeningDisable = [ "format" ];
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix
new file mode 100644
index 00000000000..b01836e1eb8
--- /dev/null
+++ b/pkgs/tools/package-management/nix-bundle/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, fetchFromGitHub, nix, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "nix-bundle";
+  name = "${pname}-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "13730rfnqjv1m2mky2g0cq77yzp2j215zrvy3lhpiwgmh97vviih";
+  };
+
+  buildInputs = [ nix makeWrapper ];
+
+  binPath = lib.makeBinPath [ nix ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    mkdir -p $out/bin
+    makeWrapper $out/share/nix-bundle/nix-bundle.sh $out/bin/nix-bundle \
+      --prefix PATH : ${binPath}
+  '';
+
+  meta = with lib; {
+    maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.all;
+    description = "Create bundles from Nixpkgs attributes";
+    license = licenses.mit;
+    homepage = https://github.com/matthewbauer/nix-bundle;
+  };
+}
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index eaab261adef..4074229ecf7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -118,6 +118,8 @@ let
         "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
         "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
       ];
+
+    preBuild = "unset NIX_INDENT_MAKE";
   };
 
 in rec {
@@ -125,10 +127,10 @@ in rec {
   nix = nixStable;
 
   nixStable = (common rec {
-    name = "nix-1.11.8";
+    name = "nix-1.11.9";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67";
+      sha256 = "0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1";
     };
 
     # Until 1.11.9 is released, we do this :)
diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix
index 69c0600359f..6b499f3db18 100644
--- a/pkgs/tools/text/proselint/default.nix
+++ b/pkgs/tools/text/proselint/default.nix
@@ -4,6 +4,8 @@ buildPythonApplication rec {
   name = "proselint-${version}";
   version = "0.8.0";
 
+  doCheck = false; # fails to pass because it tries to run in home directory
+
   src = fetchurl {
     url = "mirror://pypi/p/proselint/${name}.tar.gz";
     sha256 = "1g8vx04gmv0agmggz1ml5vydfppqvl8dzjvqm6vqw5rzafa89m08";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bedef3bb39..3be611430f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -153,6 +153,8 @@ with pkgs;
 
   fetchpatch = callPackage ../build-support/fetchpatch { };
 
+  fetchs3 = callPackage ../build-support/fetchs3 { };
+
   fetchsvn = callPackage ../build-support/fetchsvn {
     sshSupport = true;
   };
@@ -1636,7 +1638,7 @@ with pkgs;
   emscripten = callPackage ../development/compilers/emscripten { };
 
   emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
-  emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc ''
+  emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc ''
     # hardening flags break WASM support
     cat > $out/nix-support/add-hardening.sh
   '' emscriptenfastcomp-unwrapped;
@@ -4889,7 +4891,7 @@ with pkgs;
 
   clangSelf = clangWrapSelf llvmPackagesSelf.clang;
 
-  clangWrapSelf = build: callPackage ../build-support/cc-wrapper {
+  clangWrapSelf = build: ccWrapperFun {
     cc = build;
     isClang = true;
     stdenv = clangStdenv;
@@ -4958,8 +4960,8 @@ with pkgs;
         extraBuildCommands = ''
           echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
         '';
-      in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override {
-        stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc);
+      in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override {
+        stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc);
         profiledCompiler = false;
         enableMultilib = true;
       }))
@@ -4975,8 +4977,8 @@ with pkgs;
 
   gccCrossStageStatic = assert targetPlatform != buildPlatform; let
     libcCross1 =
-      if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
-      else if stdenv.cross.libc == "libSystem" then darwin.xcode
+      if targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers
+      else if targetPlatform.libc == "libSystem" then darwin.xcode
       else null;
     in wrapGCCCross {
       gcc = forcedNativePackages.gcc.cc.override {
@@ -4986,10 +4988,10 @@ with pkgs;
         libcCross = libcCross1;
         enableShared = false;
         # Why is this needed?
-        inherit (forcedNativePackages) binutilsCross;
+        inherit (forcedNativePackages) binutils;
       };
       libc = libcCross1;
-      binutils = binutilsCross;
+      inherit (forcedNativePackages) binutils;
       cross = targetPlatform;
   };
 
@@ -4997,7 +4999,7 @@ with pkgs;
   gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapGCCCross {
     gcc = gccCrossStageStatic.gcc;
     libc = windows.mingw_headers2;
-    binutils = binutilsCross;
+    inherit (forcedNativePackages) binutils;
     cross = targetPlatform;
   };
 
@@ -5010,10 +5012,10 @@ with pkgs;
       # <http://hydra.nixos.org/build/4268232>), so don't even try.
       langCC = targetPlatform.config != "i686-pc-mingw32";
       # Why is this needed?
-      inherit (forcedNativePackages) binutilsCross;
+      inherit (forcedNativePackages) binutils;
     };
     libc = libcCross;
-    binutils = binutilsCross;
+    inherit (forcedNativePackages) binutils;
     cross = targetPlatform;
   };
 
@@ -5717,7 +5719,7 @@ with pkgs;
 
   wla-dx = callPackage ../development/compilers/wla-dx { };
 
-  wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper {
+  wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun {
     nativeTools = stdenv.cc.nativeTools or false;
     nativeLibc = stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
@@ -5730,7 +5732,7 @@ with pkgs;
 
   ccWrapperFun = callPackage ../build-support/cc-wrapper;
 
-  wrapCC = wrapCCWith ccWrapperFun stdenv.cc.libc "";
+  wrapCC = wrapCCWith stdenv.cc.libc "";
   # legacy version, used for gnat bootstrapping
   wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {
     nativeTools = stdenv.cc.nativeTools or false;
@@ -6010,7 +6012,7 @@ with pkgs;
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522;
+  inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
@@ -6340,20 +6342,16 @@ with pkgs;
 
   binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw;
 
-  binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; };
+  binutils-raw = callPackage ../development/tools/misc/binutils {
+    # FHS sys dirs presumably only have stuff for the build platform
+    noSysDirs = (targetPlatform != buildPlatform) || noSysDirs;
+    cross = if targetPlatform != hostPlatform then targetPlatform else null;
+  };
 
-  binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
-    inherit noSysDirs;
+  binutils_nogold = lowPrio (binutils-raw.override {
     gold = false;
   });
 
-  binutilsCross = assert targetPlatform != buildPlatform; lowPrio (
-    if targetPlatform.libc == "libSystem" then darwin.cctools_cross
-    else forcedNativePackages.binutils.override {
-      noSysDirs = true;
-      cross = targetPlatform;
-    });
-
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
   bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
   bison = bison3;
@@ -9019,6 +9017,8 @@ with pkgs;
 
   libykneomgr = callPackage ../development/libraries/libykneomgr { };
 
+  libytnef = callPackage ../development/libraries/libytnef { };
+
   libyubikey = callPackage ../development/libraries/libyubikey { };
 
   libzen = callPackage ../development/libraries/libzen { };
@@ -9450,6 +9450,11 @@ with pkgs;
 
   proj = callPackage ../development/libraries/proj { };
 
+  proselint = callPackage ../tools/text/proselint {
+    inherit (python3Packages)
+    buildPythonApplication click future six;
+  };
+
   postgis = callPackage ../development/libraries/postgis { };
 
   protobuf = protobuf2_6;
@@ -10910,6 +10915,9 @@ with pkgs;
 
   mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
 
+  percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
+  percona-server = percona-server56;
+
   riak = callPackage ../servers/nosql/riak/2.2.0.nix {
     erlang = erlang_basho_R16B02;
   };
@@ -10950,7 +10958,11 @@ with pkgs;
 
   neo4j = callPackage ../servers/nosql/neo4j { };
 
-  net_snmp = callPackage ../servers/monitoring/net-snmp { };
+  net_snmp = callPackage ../servers/monitoring/net-snmp {
+    # https://sourceforge.net/p/net-snmp/bugs/2712/
+    # remove after net-snmp > 5.7.3
+    perl = perl522;
+  };
 
   newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
 
@@ -11692,15 +11704,6 @@ with pkgs;
     ];
   };
 
-  linux_chromiumos_3_14 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.14.nix {
-    kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_14
-                      kernelPatches.chromiumos_mfd_fix_dependency
-                      kernelPatches.chromiumos_no_link_restrictions
-                      kernelPatches.genksyms_fix_segfault
-                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
-                    ];
-  };
-
   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
@@ -11915,7 +11918,6 @@ with pkgs;
   };
 
   # ChromiumOS kernels
-  linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14);
   linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18);
   linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest);
 
@@ -12306,7 +12308,7 @@ with pkgs;
 
     w32api = callPackage ../os-specific/windows/w32api {
       gccCross = gccCrossStageStatic;
-      binutilsCross = binutilsCross;
+      binutils = binutils;
     };
 
     w32api_headers = w32api.override {
@@ -12315,7 +12317,7 @@ with pkgs;
 
     mingw_runtime = callPackage ../os-specific/windows/mingwrt {
       gccCross = gccCrossMingw2;
-      binutilsCross = binutilsCross;
+      binutils = binutils;
     };
 
     mingw_runtime_headers = mingw_runtime.override {
@@ -12339,7 +12341,7 @@ with pkgs;
 
     mingw_w64 = callPackage ../os-specific/windows/mingw-w64 {
       gccCross = gccCrossStageStatic;
-      binutilsCross = binutilsCross;
+      binutils = binutils;
     };
 
     mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64 {
@@ -13153,6 +13155,7 @@ with pkgs;
 
   claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
     inherit (gnome3) gsettings_desktop_schemas;
+    inherit (xorg) libSM;
     enableNetworkManager = config.networking.networkmanager.enable or false;
   };
 
@@ -13191,8 +13194,6 @@ with pkgs;
     inherit (gnome2) libgnomeui GConf;
   };
 
-  cortex = callPackage ../applications/misc/cortex { };
-
   csound = callPackage ../applications/audio/csound { };
 
   cinepaint = callPackage ../applications/graphics/cinepaint {
@@ -13213,6 +13214,8 @@ with pkgs;
 
   convchain = callPackage ../tools/graphics/convchain {};
 
+  coyim = callPackage ../applications/networking/instant-messengers/coyim {};
+
   cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { };
 
   csdp = callPackage ../applications/science/math/csdp {
@@ -15248,8 +15251,8 @@ with pkgs;
     qt = qt4;
   };
 
-  # 0.5.7 segfaults when opening the main panel with qt 5.7
-  qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { };
+  # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
+  qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
 
@@ -15467,6 +15470,8 @@ with pkgs;
 
   skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
 
+  skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { };
+
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
 
   skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
@@ -18076,6 +18081,8 @@ with pkgs;
 
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 
+  nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixStable; };
+
   inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
     nix-prefetch-bzr
     nix-prefetch-cvs
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bd28201bb66..7cd58e66b0c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8397,10 +8397,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ModuleBuild = buildPerlPackage rec {
-    name = "Module-Build-0.4214";
+    name = "Module-Build-0.4222";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz";
-      sha256 = "0gywap0dfr8sx4wr6wqc23sjag1b4xsw8l55ai4vhkfg324lhyf5";
+      sha256 = "0q5i03lbx52g22bwvyb04ycky4niq379j1c3fhmlfdj7lzclajz7";
     };
     buildInputs = [ CPANMeta ExtUtilsCBuilder ];
     meta = {
@@ -14942,10 +14942,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   version = buildPerlPackage rec {
-    name = "version-0.9912";
+    name = "version-0.9918";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz";
-      sha256 = "03hv7slgqrmzbbjjmxgvq91bjlbjg5xbp8n4h454amyab2adzw7b";
+      sha256 = "54175c7ead4e2259c2fb2b83440b821e4287842067227e48fb899b5cae52237b";
+    };
+    meta = {
+      description = "Structured version objects";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 355d470ca5d..389e11e1d25 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -175,6 +175,8 @@ in {
     };
   };
 
+  asn1crypto = callPackage ../development/python-modules/asn1crypto { };
+
   # packages defined elsewhere
 
   bap = callPackage ../development/python-modules/bap {
@@ -4386,6 +4388,8 @@ in {
     };
   };
 
+  coveralls = callPackage ../development/python-modules/coveralls { };
+
   coverage = buildPythonPackage rec {
     name = "coverage-4.0.1";
 
@@ -4542,25 +4546,39 @@ in {
 
   cryptography = buildPythonPackage rec {
     # also bump cryptography_vectors
-    name = "cryptography-${version}";
-    version = "1.7.2";
+    pname = "cryptography";
+    name = "${pname}${version}";
+    version = "1.8.1";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/cryptography/${name}.tar.gz";
-      sha256 = "1ad9zmzi31fnz31qfchxcwiydvlxq88xndlgsvzr7m537n5vd347";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190";
     };
 
-    buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
-                    self.iso8601 self.pyasn1 self.pytest_29 self.py self.hypothesis self.pytz ]
+    buildInputs = [ pkgs.openssl self.cryptography_vectors ]
                ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security;
-    propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules pytz ]
-     ++ optional (pythonOlder "3.4") self.enum34;
+    propagatedBuildInputs = with self; [
+      idna
+      asn1crypto
+      packaging
+      six
+    ] ++ optional (pythonOlder "3.4") enum34
+    ++ optional (pythonOlder "3.3") ipaddress
+    ++ optional (!isPyPy) cffi;
+
+    checkInputs = with self; [
+      pytest
+      pretend
+      iso8601
+      pytz
+      hypothesis
+    ];
 
     # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary
     # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't
     # use it. This boils down to them checking compatibility with `getentropy` in two different places,
     # so let's neuter the second test.
-    patchPhase = ''
+    postPatch = ''
       substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"'
     '';
 
@@ -4571,13 +4589,17 @@ in {
 
   cryptography_vectors = buildPythonPackage rec {
       # also bump cryptography
-    name = "cryptography_vectors-${version}";
-    version = "1.7.2";
+    pname = "cryptography_vectors";
+    name = "${pname}${version}";
+    version = "1.8.1";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz";
-      sha256 = "1p5cw3dzgcpzmp81qb9860hn9qlcvr4rnf0fy31fbvhxl7lfxr2b";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6";
     };
+
+    # No tests included
+    doCheck = false;
   };
 
   oslo-vmware = buildPythonPackage rec {
@@ -4788,11 +4810,13 @@ in {
 
 
   idna = buildPythonPackage rec {
-    name = "idna-2.0";
+    pname = "idna";
+    version = "2.5";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/idna/${name}.tar.gz";
-      sha256 = "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab";
     };
 
     meta = {
@@ -4928,6 +4952,9 @@ in {
       sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk";
     };
 
+    # No tests in archive
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/alex/pretend;
       license = licenses.bsd3;
@@ -5166,6 +5193,8 @@ in {
     };
   };
 
+  pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
+
   pytestcache = buildPythonPackage rec {
     name = "pytest-cache-1.0";
     src = pkgs.fetchurl {
@@ -5637,12 +5666,13 @@ in {
   });
 
   dask = buildPythonPackage rec {
-    name = "dask-${version}";
-    version = "0.13.0";
+    pname = "dask";
+    name = "${pname}-${version}";
+    version = "0.14.1";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dask/${name}.tar.gz";
-      sha256 = "1f8r6jj9666cnvx3f8bilcx0017smmlw4i4v2p1nwxshs0k514hs";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "46c8ef9aa41a5755f2194b535bff7fdef1343d3993ab294b198caf95155ec94e";
     };
 
     buildInputs = with self; [ pytest ];
@@ -6120,11 +6150,11 @@ in {
 
   decorator = buildPythonPackage rec {
     name = "decorator-${version}";
-    version = "4.0.10";
+    version = "4.0.11";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/decorator/${name}.tar.gz";
-      sha256 = "9c6e98edcb33499881b86ede07d9968c81ab7c769e28e9af24075f0a5379f070";
+      sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76";
     };
 
     meta = {
@@ -6289,16 +6319,14 @@ in {
 
   dill = buildPythonPackage rec {
     name = "dill-${version}";
-    version = "0.2.5";
+    version = "0.2.6";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dill/${name}.tgz";
-      sha256 = "431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319";
+      url = "mirror://pypi/d/dill/${name}.zip";
+      sha256 = "6c1ccca68be483fa8c66e85a89ffc850206c26373aa77a97b83d8d0994e7f1fd";
     };
 
-    propagatedBuildInputs = with self; [objgraph];
-
-    # failing tests
+    # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0}
     doCheck = false;
 
     meta = {
@@ -6966,6 +6994,8 @@ in {
     };
   };
 
+  ezdxf = callPackage ../development/python-modules/ezdxf {};
+  
   facebook-sdk = buildPythonPackage rec {
     name = "facebook-sdk-0.4.0";
 
@@ -10203,6 +10233,8 @@ in {
     };
   };
 
+  vcrpy = callPackage ../development/python-modules/vcrpy { };
+
   venusian = buildPythonPackage rec {
     name = "venusian-1.0";
 
@@ -12691,23 +12723,7 @@ in {
     };
   });
 
-  httpbin = buildPythonPackage rec {
-    name = "httpbin-0.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/httpbin/${name}.tar.gz";
-      sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054";
-    };
-
-    propagatedBuildInputs = with self; [ flask markupsafe decorator itsdangerous six ];
-
-    meta = {
-      homepage = https://github.com/kennethreitz/httpbin;
-      description = "HTTP Request & Response Service";
-      license = licenses.mit;
-    };
-
-  };
+  httpbin = callPackage ../development/python-modules/httpbin { };
 
   httplib2 = buildPythonPackage rec {
     name = "httplib2-0.9.2";
@@ -13057,96 +13073,11 @@ in {
     };
   };
 
-  ipykernel = buildPythonPackage rec {
-    version = "4.5.2";
-    name = "ipykernel-${version}";
+  ipykernel = callPackage ../development/python-modules/ipykernel { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipykernel/${name}.tar.gz";
-      sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462";
-    };
+  ipyparallel = callPackage ../development/python-modules/ipyparallel { };
 
-    buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
-    propagatedBuildInputs = with self; [
-      ipython
-      jupyter_client
-      pexpect
-      traitlets
-      tornado
-    ];
-
-    # Tests require backends.
-    # I don't want to add all supported backends as propagatedBuildInputs
-    doCheck = false;
-
-    meta = {
-      description = "IPython Kernel for Jupyter";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
-
-  ipyparallel = buildPythonPackage rec {
-    version = "6.0.0";
-    name = "ipyparallel-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipyparallel/${name}.tar.gz";
-      sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6";
-    };
-
-    buildInputs = with self; [ nose ];
-
-    propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
-    ] ++ optionals (!isPy3k) [ futures ];
-
-    # Requires access to cluster
-    doCheck = false;
-
-    meta = {
-      description = "Interactive Parallel Computing with IPython";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-
-  };
-
-  ipython = buildPythonPackage rec {
-    version = "5.3.0";
-    name = "ipython-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipython/${name}.tar.gz";
-      sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d";
-    };
-
-    prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
-      substituteInPlace setup.py --replace "'gnureadline'" " "
-    '';
-
-    buildInputs = with self; [ nose pkgs.glibcLocales pygments ] ++ optionals isPy27 [mock];
-
-    propagatedBuildInputs = with self;
-      [ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
-      simplegeneric traitlets requests2 pathlib2 pexpect ]
-      ++ optionals stdenv.isDarwin [appnope];
-
-    LC_ALL="en_US.UTF-8";
-
-    doCheck = false; # Circular dependency with ipykernel
-
-    checkPhase = ''
-      nosetests
-    '';
-    meta = {
-      description = "IPython: Productive Interactive Computing";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ bjornfor jgeerds fridh ];
-    };
-  };
+  ipython = callPackage ../development/python-modules/ipython { };
 
   ipython_genutils = buildPythonPackage rec {
     version = "0.2.0";
@@ -13173,28 +13104,7 @@ in {
   };
 
 
-  ipywidgets = buildPythonPackage rec {
-    version = "5.2.2";
-    name = "ipywidgets-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipywidgets/${name}.tar.gz";
-      sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2";
-    };
-
-    # Tests are not distributed
-    doCheck = false;
-
-    buildInputs = with self; [ nose pytest ];
-    propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ];
-
-    meta = {
-      description = "IPython HTML widgets for Jupyter";
-      homepage = http://ipython.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  ipywidgets = callPackage ../development/python-modules/ipywidgets { };
 
   ipaddr = buildPythonPackage rec {
     name = "ipaddr-2.1.10";
@@ -13278,9 +13188,9 @@ in {
       license = with licenses; [ lgpl21 ];
     };
   };
-  
+
   iso-639 = callPackage ../development/python-modules/iso-639 {};
-  
+
   iso3166 = callPackage ../development/python-modules/iso3166 {};
 
   iso8601 = buildPythonPackage rec {
@@ -13325,30 +13235,7 @@ in {
 
   jabberbot = callPackage ../development/python-modules/jabberbot.nix {};
 
-  jedi = buildPythonPackage (rec {
-    name = "jedi-0.9.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jedi/${name}.tar.gz";
-      sha256 = "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v";
-    };
-
-    buildInputs = [ self.pytest ];
-
-    checkPhase = ''
-      py.test test
-    '';
-
-    # 7 failed
-    doCheck = false;
-
-    meta = {
-      homepage = https://github.com/davidhalter/jedi;
-      description = "An autocompletion tool for Python that can be used for text editors";
-      license = licenses.lgpl3Plus;
-      maintainers = with maintainers; [ garbas ];
-    };
-  });
+  jedi = callPackage ../development/python-modules/jedi { };
 
   jellyfish = buildPythonPackage rec {
     version = "0.5.2";
@@ -13487,32 +13374,7 @@ in {
     inherit (pkgs.jsonnet) name src;
   };
 
-  jupyter_client = buildPythonPackage rec {
-    version = "5.0.0";
-    name = "jupyter_client-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jupyter_client/${name}.tar.gz";
-      sha256 = "2766f9c2deb9ae826e65d53a56a36d69b184f63d0dcb7710835273327126bc5b";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq dateutil] ++ optional isPyPy py;
-
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    # Circular dependency with ipykernel
-    doCheck = false;
-
-    meta = {
-      description = "Jupyter protocol implementation and client libraries";
-      homepage = http://jupyter.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  jupyter_client = callPackage ../development/python-modules/jupyter_client { };
 
   jupyter_core = buildPythonPackage rec {
     version = "4.3.0";
@@ -13717,17 +13579,7 @@ in {
     };
   };
 
-  kitchen = buildPythonPackage (rec {
-    name = "kitchen-1.1.1";
-    disabled = isPy3k;
-
-    meta.maintainers = with maintainers; [ mornfall ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/kitchen/kitchen-1.1.1.tar.gz";
-      sha256 = "0ki840hjk1q19w6icv0dj2jxb00966nwy9b1jib0dgdspj00yrr5";
-    };
-  });
+  kitchen = callPackage ../development/python-modules/kitchen/default.nix { };
 
   pylast = buildPythonPackage rec {
     name = "pylast-${version}";
@@ -13928,26 +13780,7 @@ in {
     };
   };
 
-  line_profiler = buildPythonPackage rec{
-    version = "1.0";
-    name = "line_profiler-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/line_profiler/${name}.tar.gz";
-      sha256 = "a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900";
-    };
-
-    buildInputs = with self; [ cython ];
-
-    disabled = isPyPy;
-
-    meta = {
-      description = "Line-by-line profiler";
-      homepage = https://github.com/rkern/line_profiler;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  line_profiler = callPackage ../development/python-modules/line_profiler { };
 
   linode = buildPythonPackage rec {
     name = "linode-${version}";
@@ -14059,7 +13892,7 @@ in {
     };
   };
 
-  llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;};
+  llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_39;};
 
   lockfile = buildPythonPackage rec {
     pname = "lockfile";
@@ -14209,17 +14042,19 @@ in {
     src = pkgs.file.src;
 
     patchPhase = ''
-      substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.so'"
+      substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.${if stdenv.isDarwin then "dylib" else "so"}'"
     '';
 
-    buildInputs = with self; [ python pkgs.file ];
+    buildInputs = with self; [ pkgs.file ];
 
     preConfigure = "cd python";
 
+    # No test suite
+    doCheck = false;
+
     meta = {
       description = "A Python wrapper around libmagic";
       homepage = http://www.darwinsys.com/file/;
-      broken = true;
     };
   };
 
@@ -15154,6 +14989,9 @@ in {
       sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2";
     };
 
+    # No tests in archive
+    doCheck = false;
+
     meta = {
       homepage = http://github.com/mrocklin/multipledispatch/;
       description = "A relatively sane approach to multiple dispatch in Python";
@@ -15734,16 +15572,28 @@ in {
   };
 
   netaddr = buildPythonPackage rec {
-    name = "netaddr-0.7.18";
-    doCheck = !isPy35;  # https://github.com/drkjam/netaddr/issues/117
+    pname = "netaddr";
+    version = "0.7.19";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/netaddr/${name}.tar.gz";
-      sha256 = "06dxjlbcicq7q3vqy8agq11ra01kvvd47j4mk6dmghjsyzyckxd1";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd";
     };
 
     LC_ALL = "en_US.UTF-8";
-    buildInputs = [ pkgs.glibcLocales ];
+    buildInputs = with self; [ pkgs.glibcLocales pytest ];
+
+    checkPhase = ''
+      py.test netaddr/tests
+    '';
+
+    patches = [
+      (pkgs.fetchpatch {
+        url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch;
+        sha256 = "08rn1s3w9424jhandy4j9sksy852ny00088zh15nirw5ajqg1dn7";
+      })
+    ];
 
     meta = {
       homepage = https://github.com/drkjam/netaddr/;
@@ -16099,35 +15949,7 @@ in {
     buildInputs = with self; [ nose ];
   };
 
-  notebook = buildPythonPackage rec {
-    version = "4.4.1";
-    name = "notebook-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/notebook/${name}.tar.gz";
-      sha256 = "dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-
-    buildInputs = with self; [nose pkgs.glibcLocales]  ++ optionals isPy27 [mock];
-
-    propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect];
-
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    # Certain tests fail due to being in a chroot.
-    # PermissionError
-    doCheck = false;
-    meta = {
-      description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
-      homepage = http://jupyter.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  notebook = callPackage ../development/python-modules/notebook { };
 
   notify = pkgs.stdenv.mkDerivation (rec {
     name = "python-notify-0.1.1";
@@ -16281,13 +16103,13 @@ in {
     # Therefore we create a separate env for it.
     scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
   in buildPythonPackage rec {
-    version = "0.5.21.3";
+    version = "0.5.25";
     name = "Nuitka-${version}";
 
     # Latest version is not yet on PyPi
     src = pkgs.fetchurl {
       url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
-      sha256 = "1i2069hxb94q9kkwcbky59fin8hk1vlj90lwgmrdhn1srvig1cq3";
+      sha256 = "11psz0pyj56adv4b3f47hl8jakvp2mc2c85s092a5rsv1la1a0aa";
     };
 
     buildInputs = with self; stdenv.lib.optionals doCheck [ vmprof pyqt4 ];
@@ -18206,6 +18028,9 @@ in {
     checkPhase = ''
       nosetests -v $out/${python.sitePackages}
     '';
+    postPatch = ''
+      substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" ""
+    '';
   };
 
   paho-mqtt = buildPythonPackage rec {
@@ -18978,8 +18803,6 @@ in {
      };
   };
 
-  proselint = callPackage ../tools/text/proselint { };
-
   pylibconfig2 = buildPythonPackage rec {
     name = "pylibconfig2-${version}";
     version = "0.2.4";
@@ -19373,10 +19196,10 @@ in {
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "1.0.13";
+    version = "1.0.14";
 
     src = pkgs.fetchurl {
-      sha256 = "33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776";
+      sha256 = "cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f";
       url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
     };
     checkPhase = ''
@@ -19796,11 +19619,11 @@ in {
   };
 
   pygit2 = buildPythonPackage rec {
-    name = "pygit2-0.24.0";
+    name = "pygit2-0.25.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pygit2/${name}.tar.gz";
-      sha256 = "01c155ls0h5pvpdkrk8ld6fscshmz4fchcwxrg488dbij1zdjxms";
+      sha256 = "0wf5rp0fvrw7j3j18dvwjq6xqlbm611wd55aphrfpps0v1gxh3ny";
     };
 
     preConfigure = ( if stdenv.isDarwin then ''
@@ -22331,28 +22154,7 @@ in {
     };
   };
 
-  qtconsole = buildPythonPackage rec {
-    version = "4.2.1";
-    name = "qtconsole-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/q/qtconsole/${name}.tar.gz";
-      sha256 = "1vqqx9hdvrg2d336wjyw0vr5b5v97kflkqqvr7ryicr8als7vv15";
-    };
-
-    buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
-    propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5];
-
-    # : cannot connect to X server
-    doCheck = false;
-
-    meta = {
-      description = "Jupyter Qt console";
-      homepage = http://jupyter.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  qtconsole = callPackage ../development/python-modules/qtconsole { };
 
   quantities = buildPythonPackage rec {
     name = "quantities-0.10.1";
@@ -25130,29 +24932,7 @@ in {
     };
   };
 
-  statsmodels = buildPythonPackage rec {
-    name = "statsmodels-${version}";
-    version = "0.6.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/statsmodels/${name}.tar.gz";
-      sha256 = "be4e44374aec9e848b73e5a230dee190ac0c4519e1d40f69a5813190b13ec676";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib];
-
-    meta = {
-      description = "Statistical computations and models for use with SciPy";
-      homepage = "https://www.github.com/statsmodels/statsmodels";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-
-    # Many tests fail when using latest numpy and pandas.
-    # See also https://github.com/statsmodels/statsmodels/issues/2602
-    doCheck = false;
-  };
+  statsmodels = callPackage ../development/python-modules/statsmodels { };
 
   python_statsd = buildPythonPackage rec {
     name = "python-statsd-${version}";
@@ -27183,27 +26963,7 @@ EOF
     };
   };
 
-  widgetsnbextension = buildPythonPackage rec {
-    name = "widgetsnbextension-${version}";
-    version = "1.2.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/w/widgetsnbextension/${name}.tar.gz";
-      sha256 = "c618cfb32978c9517caf0b4ef3aec312f8dd138577745e7b0d4abfcc7315ce51";
-    };
-
-    propagatedBuildInputs = with self; [ notebook ];
-
-    # No tests in archive
-    doCheck = false;
-
-    meta = {
-      description = "IPython HTML widgets for Jupyter";
-      homepage = http://ipython.org/;
-      license = self.ipywidgets.meta.license; # Build from same repo
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
 
   willie = buildPythonPackage rec {
     name = "willie-${version}";
@@ -27345,29 +27105,7 @@ EOF
     };
   });
 
-  xarray = buildPythonPackage rec {
-    name = "xarray-${version}";
-    version = "0.9.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/x/xarray/${name}.tar.gz";
-      sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [numpy pandas];
-
-    checkPhase = ''
-      py.test $out/${python.sitePackages}
-    '';
-
-    meta = {
-      description = "N-D labeled arrays and datasets in Python";
-      homepage = https://github.com/pydata/xarray;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  xarray = callPackage ../development/python-modules/xarray { };
 
   xlwt = callPackage ../development/python-modules/xlwt { };
 
@@ -31915,10 +31653,10 @@ EOF
   packet-python = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "packet-python";
-    version = "1.31";
+    version = "1.33";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/c3/1b/ea71ec9d6eeab92b783d23dd62e71e9296f9699bc7d457450859803929f0/${name}.tar.gz";
-      sha256 = "1z1zmrajfw01jr3mafimq7dvsb1rs978zln9xfd6fbqkp3vm9hc0";
+      url = "https://pypi.python.org/packages/eb/82/f0506bd964501f958ac6a37e843ccb7bd9e712732886258314d55f0ec710/packet-python-1.33.tar.gz";
+      sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3";
     };
     propagatedBuildInputs = with self; [ requests ];
 
@@ -32002,6 +31740,10 @@ EOF
       license = [ licenses.bsd2 licenses.asl20 ];
       maintainers = with maintainers; [ bennofs ];
     };
+
+    checkPhase = ''
+      py.test
+    '';
   };
 
   pypandoc = buildPythonPackage rec {
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index d8e190cfd4b..f6e7f41ed88 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -110,8 +110,8 @@ let
   in {
     stdenv = super.stdenv // {
       inherit (buildPlatform) platform;
-    } // lib.optionalAttrs (targetPlatform != buildPlatform) {
-      cross = targetPlatform;
+    } // lib.optionalAttrs (hostPlatform != buildPlatform) {
+      cross = hostPlatform;
     };
     inherit (buildPlatform) system platform;
   };