summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-11-11 09:23:16 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-11-11 09:25:07 +0100
commit8559b6db82e91963a8805aa01e9b4ef234ad38db (patch)
treef6c7212f62d9d5d6ec3f0654e177237054269c6e
parentac522cbe95c909507cb113d1f7133d80b9c381a1 (diff)
parent2b2088ef32d2b111d15a4f04e2211e3784e4111d (diff)
downloadnixpkgs-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar
nixpkgs-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.gz
nixpkgs-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.bz2
nixpkgs-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.lz
nixpkgs-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.xz
nixpkgs-8559b6db82e91963a8805aa01e9b4ef234ad38db.tar.zst
nixpkgs-8559b6db82e91963a8805aa01e9b4ef234ad38db.zip
Merge branch 'master' into staging
A couple thousand rebuilds from master.
-rw-r--r--lib/licenses.nix1
-rw-r--r--lib/maintainers.nix1
-rw-r--r--nixos/lib/make-disk-image.nix14
-rw-r--r--nixos/modules/installer/tools/nixos-prepare-root.sh25
-rw-r--r--nixos/modules/services/search/solr.nix2
-rw-r--r--nixos/modules/tasks/network-interfaces.nix8
-rw-r--r--pkgs/applications/audio/qsynth/default.nix2
-rw-r--r--pkgs/applications/display-managers/slim/default.nix2
-rw-r--r--pkgs/applications/editors/nedit/default.nix2
-rw-r--r--pkgs/applications/editors/rstudio/default.nix7
-rw-r--r--pkgs/applications/graphics/xzgv/default.nix2
-rw-r--r--pkgs/applications/kde/fetch.sh2
-rw-r--r--pkgs/applications/kde/srcs.nix2232
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
-rw-r--r--pkgs/applications/misc/copyq/cmake-modules.patch12
-rw-r--r--pkgs/applications/misc/copyq/default.nix14
-rw-r--r--pkgs/applications/misc/ebook2cw/configfile.patch11
-rw-r--r--pkgs/applications/misc/ebook2cw/default.nix31
-rw-r--r--pkgs/applications/misc/electron-cash/default.nix18
-rw-r--r--pkgs/applications/misc/gosmore/default.nix2
-rw-r--r--pkgs/applications/misc/llpp/default.nix10
-rw-r--r--pkgs/applications/misc/mrxvt/default.nix2
-rw-r--r--pkgs/applications/misc/sdcv/default.nix45
-rw-r--r--pkgs/applications/misc/sdcv/sdcv.cpp.patch12
-rw-r--r--pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin19
-rw-r--r--pkgs/applications/misc/sdcv/utils.hpp.patch10
-rw-r--r--pkgs/applications/misc/st/default.nix3
-rw-r--r--pkgs/applications/misc/xfe/default.nix2
-rw-r--r--pkgs/applications/misc/yakuake/default.nix7
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix17
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch11
-rw-r--r--pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch34
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.nix18
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix770
-rw-r--r--pkgs/applications/networking/browsers/vimprobable2/default.nix2
-rw-r--r--pkgs/applications/networking/linssid/default.nix2
-rw-r--r--pkgs/applications/office/mendeley/default.nix6
-rw-r--r--pkgs/applications/science/logic/potassco/clingo.nix24
-rw-r--r--pkgs/applications/science/logic/potassco/clingo.upstream6
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-secret/default.nix36
-rw-r--r--pkgs/applications/video/lxdvdrip/default.nix2
-rw-r--r--pkgs/applications/video/mjpg-streamer/default.nix2
-rw-r--r--pkgs/applications/virtualization/OVMF/default.nix2
-rw-r--r--pkgs/applications/virtualization/tini/default.nix9
-rw-r--r--pkgs/build-support/fetchgit/private.nix33
-rw-r--r--pkgs/data/fonts/libertinus/default.nix37
-rw-r--r--pkgs/data/fonts/source-sans-pro/default.nix2
-rw-r--r--pkgs/data/fonts/source-serif-pro/default.nix2
-rw-r--r--pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch26
-rw-r--r--pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch13
-rw-r--r--pkgs/desktops/gnome-3/core/vte/ng.nix11
-rw-r--r--pkgs/development/compilers/avra/default.nix2
-rw-r--r--pkgs/development/compilers/coreclr/default.nix9
-rw-r--r--pkgs/development/compilers/ghcjs/stage2.nix6
-rw-r--r--pkgs/development/compilers/ghdl/default.nix2
-rw-r--r--pkgs/development/compilers/llvm/3.4/llvm.nix17
-rw-r--r--pkgs/development/compilers/llvm/3.5/llvm.nix17
-rw-r--r--pkgs/development/go-modules/generic/default.nix2
-rw-r--r--pkgs/development/interpreters/php/default.nix14
-rw-r--r--pkgs/development/java-modules/maven-hello/default.nix2
-rw-r--r--pkgs/development/libraries/atkmm/default.nix2
-rw-r--r--pkgs/development/libraries/audio/vamp/default.nix2
-rw-r--r--pkgs/development/libraries/dirac/default.nix2
-rw-r--r--pkgs/development/libraries/jasper/default.nix4
-rw-r--r--pkgs/development/libraries/liblo/default.nix2
-rw-r--r--pkgs/development/libraries/libvisual/default.nix2
-rw-r--r--pkgs/development/libraries/libwacom/default.nix2
-rw-r--r--pkgs/development/libraries/libxls/default.nix2
-rw-r--r--pkgs/development/libraries/protobufc/generic.nix2
-rw-r--r--pkgs/development/libraries/sblim-sfcc/default.nix2
-rw-r--r--pkgs/development/libraries/stlport/default.nix2
-rw-r--r--pkgs/development/libraries/ti-rpc/default.nix2
-rw-r--r--pkgs/development/libraries/xlslib/default.nix2
-rw-r--r--pkgs/development/misc/loc/default.nix2
-rw-r--r--pkgs/development/node-packages/node-packages-v4.nix2
-rw-r--r--pkgs/development/node-packages/node-packages-v6.nix2
-rw-r--r--pkgs/development/ocaml-modules/ocamlfuse/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/sqlexpr/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/sqlite3EZ/default.nix2
-rw-r--r--pkgs/development/python-modules/APScheduler/default.nix2
-rw-r--r--pkgs/development/python-modules/aiodns/default.nix2
-rw-r--r--pkgs/development/python-modules/alembic/default.nix2
-rw-r--r--pkgs/development/python-modules/apipkg/default.nix2
-rw-r--r--pkgs/development/python-modules/appdirs/default.nix2
-rw-r--r--pkgs/development/python-modules/asgi_ipc/default.nix2
-rw-r--r--pkgs/development/python-modules/asgi_redis/default.nix2
-rw-r--r--pkgs/development/python-modules/astroid/default.nix2
-rw-r--r--pkgs/development/python-modules/bitcoin-price-api/default.nix2
-rw-r--r--pkgs/development/python-modules/bkcharts/default.nix4
-rw-r--r--pkgs/development/python-modules/botocore/default.nix44
-rw-r--r--pkgs/development/python-modules/cycler/default.nix2
-rw-r--r--pkgs/development/python-modules/dask/default.nix2
-rw-r--r--pkgs/development/python-modules/dateutil/default.nix2
-rw-r--r--pkgs/development/python-modules/dogpile.cache/default.nix2
-rw-r--r--pkgs/development/python-modules/flake8/default.nix2
-rw-r--r--pkgs/development/python-modules/guessit/2.0.nix2
-rw-r--r--pkgs/development/python-modules/guessit/default.nix2
-rw-r--r--pkgs/development/python-modules/gunicorn/default.nix2
-rw-r--r--pkgs/development/python-modules/incremental/default.nix2
-rw-r--r--pkgs/development/python-modules/ipython/default.nix4
-rw-r--r--pkgs/development/python-modules/mplleaflet/default.nix2
-rw-r--r--pkgs/development/python-modules/multipledispatch/default.nix2
-rw-r--r--pkgs/development/python-modules/nbconvert/default.nix2
-rw-r--r--pkgs/development/python-modules/path.py/default.nix2
-rw-r--r--pkgs/development/python-modules/phpserialize/default.nix2
-rw-r--r--pkgs/development/python-modules/pycassa/default.nix2
-rw-r--r--pkgs/development/python-modules/pyemd/default.nix2
-rw-r--r--pkgs/development/python-modules/pyproj/default.nix2
-rw-r--r--pkgs/development/python-modules/pywinrm/default.nix2
-rw-r--r--pkgs/development/python-modules/reikna/default.nix2
-rw-r--r--pkgs/development/python-modules/reportlab/default.nix43
-rw-r--r--pkgs/development/python-modules/robotsuite/default.nix2
-rw-r--r--pkgs/development/python-modules/s3transfer/default.nix53
-rw-r--r--pkgs/development/python-modules/setuptools/default.nix2
-rw-r--r--pkgs/development/python-modules/six/default.nix2
-rw-r--r--pkgs/development/python-modules/testtools/default.nix2
-rw-r--r--pkgs/development/python-modules/transaction/default.nix2
-rw-r--r--pkgs/development/python-modules/treq/default.nix2
-rw-r--r--pkgs/development/python-modules/unidecode/default.nix2
-rw-r--r--pkgs/development/python-modules/zconfig/default.nix2
-rw-r--r--pkgs/development/python-modules/zodb/default.nix2
-rw-r--r--pkgs/development/python-modules/zodbpickle/default.nix2
-rw-r--r--pkgs/development/python-modules/zope_testrunner/default.nix2
-rw-r--r--pkgs/development/tools/build-managers/bazel/default.nix15
-rw-r--r--pkgs/development/tools/build-managers/icmake/default.nix4
-rw-r--r--pkgs/development/tools/sqsh/default.nix2
-rw-r--r--pkgs/development/web/remarkjs/node-packages.nix2
-rw-r--r--pkgs/games/freeciv/default.nix4
-rw-r--r--pkgs/games/steam/chrootenv.nix1
-rw-r--r--pkgs/misc/mxt-app/default.nix2
-rw-r--r--pkgs/misc/screensavers/i3lock-pixeled/default.nix1
-rw-r--r--pkgs/misc/vim-plugins/default.nix2
-rw-r--r--pkgs/misc/xosd/default.nix2
-rw-r--r--pkgs/os-specific/darwin/cf-private/default.nix8
-rw-r--r--pkgs/os-specific/darwin/opencflite/default.nix2
-rw-r--r--pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix47
-rw-r--r--pkgs/os-specific/linux/firmware/zd1211/default.nix2
-rw-r--r--pkgs/os-specific/linux/mingetty/default.nix2
-rw-r--r--pkgs/os-specific/linux/mstpd/default.nix2
-rw-r--r--pkgs/os-specific/linux/ndiswrapper/default.nix2
-rw-r--r--pkgs/os-specific/linux/procps/watch.nix2
-rw-r--r--pkgs/servers/monitoring/uchiwa/bower-packages.nix4
-rw-r--r--pkgs/servers/monitoring/uchiwa/src.nix4
-rwxr-xr-xpkgs/servers/monitoring/uchiwa/update.sh42
-rw-r--r--pkgs/servers/radicale/default.nix4
-rw-r--r--pkgs/servers/rpcbind/default.nix2
-rw-r--r--pkgs/servers/tt-rss/default.nix2
-rw-r--r--pkgs/servers/unifi/default.nix4
-rw-r--r--pkgs/servers/web-apps/selfoss/default.nix2
-rw-r--r--pkgs/shells/lambda-mod-zsh-theme/default.nix2
-rw-r--r--pkgs/shells/nix-zsh-completions/default.nix2
-rw-r--r--pkgs/shells/zsh-autosuggestions/default.nix2
-rw-r--r--pkgs/tools/admin/aws_shell/default.nix42
-rw-r--r--pkgs/tools/admin/awscli/default.nix68
-rw-r--r--pkgs/tools/cd-dvd/lsdvd/default.nix2
-rw-r--r--pkgs/tools/filesystems/fatresize/default.nix2
-rw-r--r--pkgs/tools/filesystems/fuseiso/default.nix2
-rw-r--r--pkgs/tools/filesystems/smbnetfs/default.nix2
-rw-r--r--pkgs/tools/graphics/lprof/default.nix2
-rw-r--r--pkgs/tools/misc/bepasty/default.nix2
-rw-r--r--pkgs/tools/misc/bibutils/default.nix2
-rw-r--r--pkgs/tools/misc/diffoscope/default.nix4
-rw-r--r--pkgs/tools/misc/quota/default.nix2
-rw-r--r--pkgs/tools/misc/rkflashtool/default.nix2
-rw-r--r--pkgs/tools/misc/timidity/default.nix2
-rw-r--r--pkgs/tools/misc/wakatime/default.nix15
-rw-r--r--pkgs/tools/networking/sshpass/default.nix2
-rw-r--r--pkgs/tools/networking/urlwatch/default.nix6
-rw-r--r--pkgs/tools/networking/wrk/default.nix2
-rw-r--r--pkgs/tools/security/doas/default.nix31
-rw-r--r--pkgs/tools/security/radamsa/default.nix2
-rw-r--r--pkgs/tools/security/rng-tools/default.nix2
-rw-r--r--pkgs/tools/system/lr/default.nix14
-rw-r--r--pkgs/tools/system/smartmontools/default.nix4
-rw-r--r--pkgs/tools/text/xml/jing-trang/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix19
-rw-r--r--pkgs/top-level/perl-packages.nix122
-rw-r--r--pkgs/top-level/python-packages.nix342
180 files changed, 2539 insertions, 2244 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 1bb153ce4c3..cbd737dc57f 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -219,6 +219,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
   ffsl = {
     fullName = "Floodgap Free Software License";
     url = http://www.floodgap.com/software/ffsl/license.html;
+    free = false;
   };
 
   free = {
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 93edea1e40e..a29d4d308e8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -358,6 +358,7 @@
   linus = "Linus Arver <linusarver@gmail.com>";
   lluchs = "Lukas Werling <lukas.werling@gmail.com>";
   lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
+  lo1tuma = "Mathias Schreck <schreck.mathias@gmail.com>";
   loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 9fa848301f6..865be297c06 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -64,7 +64,7 @@ let
     ${channelSources}
   '';
 
-  prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
+  prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot libfaketime config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
 
   # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
   # image building logic. The comment right below this now appears in 4 different places in nixpkgs :)
@@ -86,7 +86,7 @@ let
       offset=0
     ''}
 
-    mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
+    faketime -f "1970-01-01 00:00:01" mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
   
     root="$PWD/root"
     mkdir -p $root
@@ -124,7 +124,15 @@ let
     fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure
 
     echo "copying staging root to image..."
-    cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
+    # If we don't faketime, we can end up with timestamps other than 1 on the nix store, which
+    # will confuse Nix in some situations (e.g., breaking image builds in the target image)
+    # N.B: I use 0 here, which results in timestamp = 1 in the image. It's weird but see
+    # https://github.com/lkl/linux/issues/393. Also, running under faketime makes `cptofs` super
+    # noisy and it prints out that it can't find a bunch of files, and then works anyway. We'll
+    # shut it up someday but trying to do a stderr filter through grep is running into some nasty
+    # bug in some eval nonsense we have in runInLinuxVM and I'm sick of trying to fix it.
+    faketime -f "1970-01-01 00:00:00" \
+      cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
   '';
 in pkgs.vmTools.runInLinuxVM (
   pkgs.runCommand name
diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh
index 0bd70d2d349..ed5af234fec 100644
--- a/nixos/modules/installer/tools/nixos-prepare-root.sh
+++ b/nixos/modules/installer/tools/nixos-prepare-root.sh
@@ -31,16 +31,16 @@ if ! test -e "$mountPoint"; then
 fi
 
 # Create a few of the standard directories in the target root directory.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
-mkdir -m 01777 -p $mountPoint/tmp
-mkdir -m 0755 -p $mountPoint/tmp/root
-mkdir -m 0755 -p $mountPoint/var
-mkdir -m 0700 -p $mountPoint/root
+install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
+install -m 01777 -d $mountPoint/tmp
+install -m 0755 -d $mountPoint/tmp/root
+install -m 0755 -d $mountPoint/var
+install -m 0700 -d $mountPoint/root
 
 ln -sf /run $mountPoint/var/run
 
 # Create the necessary Nix directories on the target device
-mkdir -m 0755 -p \
+install -m 0755 -d \
     $mountPoint/nix/var/nix/gcroots \
     $mountPoint/nix/var/nix/temproots \
     $mountPoint/nix/var/nix/userpool \
@@ -48,7 +48,7 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/nix/db \
     $mountPoint/nix/var/log/nix/drvs
 
-mkdir -m 1775 -p $mountPoint/nix/store
+install -m 1775 -d $mountPoint/nix/store
 
 # All Nix operations below should operate on our target store, not /nix/store.
 # N.B: this relies on Nix 1.12 or higher
@@ -80,7 +80,7 @@ if [ ! -x $mountPoint/@shell@ ]; then
     echo "Error: @shell@ wasn't included in the closure" >&2
     exit 1
 fi
-mkdir -m 0755 -p $mountPoint/bin
+install -m 0755 -d $mountPoint/bin
 ln -sf @shell@ $mountPoint/bin/sh
 
 echo "setting the system closure to '$system'..."
@@ -89,17 +89,16 @@ nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set
 ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system
 
 # Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel.
-mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
-mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
-mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
+install -m 0755 -d $mountPoint/nix/var/nix/profiles
+install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user
+install -m 0755 -d $mountPoint/nix/var/nix/profiles/per-user/root
 
 if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then
     echo "copying channel..."
     nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet
 fi
-mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
+install -m 0700 -d $mountPoint/root/.nix-defexpr
 ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
 
 # Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
 touch $mountPoint/etc/NIXOS
-
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index 33d74e89723..90140a337ed 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -15,8 +15,6 @@ let
       sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p";
     };
 
-    buildPhases = [ "unpackPhase" "installPhase" ];
-
     installPhase = ''
       mkdir -p $out/lib
       cp common/lib/*.jar $out/lib/
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 1741d2c7e1f..b7e85e402aa 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -923,7 +923,9 @@ in
     assertions =
       (flip map interfaces (i: {
         assertion = i.subnetMask == null;
-        message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
+        message = ''
+          The networking.interfaces."${i.name}".subnetMask option is defunct. Use prefixLength instead.
+        '';
       })) ++ (flip map interfaces (i: {
         # With the linux kernel, interface name length is limited by IFNAMSIZ
         # to 16 bytes, including the trailing null byte.
@@ -934,7 +936,9 @@ in
         '';
       })) ++ (flip map slaveIfs (i: {
         assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null;
-        message = "The networking.interfaces.${i.name} must not have any defined ips when it is a slave.";
+        message = ''
+          The networking.interfaces."${i.name}" must not have any defined ips when it is a slave.
+        '';
       })) ++ [
         {
           assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId);
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 77c0ba9b2d4..49d9e80be11 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation  rec {
 
   meta = with stdenv.lib; {
     description = "Fluidsynth GUI";
-    homepage = http://sourceforge.net/projects/qsynth;
+    homepage = https://sourceforge.net/projects/qsynth;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index c75a8976b3f..5d06c2221b3 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_LINK = "-lXmu";
 
   meta = {
-    homepage = http://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
+    homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index a15b557f0e5..39d96775ebc 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/nedit;
+    homepage = https://sourceforge.net/projects/nedit;
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index a5049e4236b..b508521790b 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl,
-R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
+{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl
+, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk
+, gnumake, makeWrapper, pandoc
 }:
 
 let
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
 
-  buildInputs = [ boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid ];
+  buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ];
 
   src = fetchurl {
     url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
index a15ffee3d4a..69ab67dffb7 100644
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps}
   '';
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/xzgv/;
+    homepage = https://sourceforge.net/projects/xzgv/;
     description = "Picture viewer for X with a thumbnail-based selector";
     license = licenses.gpl2;
     maintainers = [ maintainers.womfoo ];
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index b4f190de136..1542b9c2519 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.08.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 5e3c5b18b77..2edfb0d79bb 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
 
 {
   akonadi = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadi-17.08.2.tar.xz";
-      sha256 = "1cd9ca3vifg6xsqsm8s9mzdkiavx7divwwjxk2vhb7pj8zxrnl45";
-      name = "akonadi-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadi-17.08.3.tar.xz";
+      sha256 = "01sn0c5b679v76djpd7rx3cgzn3idpsjc3m3wgrvjzfyqs18f2al";
+      name = "akonadi-17.08.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadi-calendar-17.08.2.tar.xz";
-      sha256 = "0a26li0m4swvr74vw10vwqg6m33wb74zsrjxym5g8j16y87sw660";
-      name = "akonadi-calendar-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-17.08.3.tar.xz";
+      sha256 = "1w14a27k0hw4i9vnv2bkh12jpvb6jh31i6jd4hxaxvvmmjwl68b6";
+      name = "akonadi-calendar-17.08.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadi-calendar-tools-17.08.2.tar.xz";
-      sha256 = "1y9iidqh1ssxp6mjzd4zjzsma3rvm2z1hfqjbs6sm2r1r3x3560q";
-      name = "akonadi-calendar-tools-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-tools-17.08.3.tar.xz";
+      sha256 = "19b5my6svq32nwagkq5p0al7mzf844d4pp0764irgdcfk6ciakkw";
+      name = "akonadi-calendar-tools-17.08.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadiconsole-17.08.2.tar.xz";
-      sha256 = "19bxs8ds9klyqv7xhvnh3wy5ndll6qlhfvnw5cv10yf03ahf1lhb";
-      name = "akonadiconsole-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadiconsole-17.08.3.tar.xz";
+      sha256 = "1ccmdarzb60f22ypnfmr1gzrc7byw08c2h3zhni9g1jab327i2vk";
+      name = "akonadiconsole-17.08.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadi-contacts-17.08.2.tar.xz";
-      sha256 = "0b2zm7a1zbsxgb23cz78alhs2x364jaz8qcq8nl49qp7ydp44wn1";
-      name = "akonadi-contacts-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadi-contacts-17.08.3.tar.xz";
+      sha256 = "0fh9rja4dlvambx6ig4gszgr26rrxfhmgdn0541fsg5hpkpifsx9";
+      name = "akonadi-contacts-17.08.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadi-import-wizard-17.08.2.tar.xz";
-      sha256 = "1ynyjmzw8zg72hkxls0rw3p7hsvgm7y41mii28fc18qdx8qcj8vw";
-      name = "akonadi-import-wizard-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadi-import-wizard-17.08.3.tar.xz";
+      sha256 = "1hza7bl6anzxp32dpw79v73lgqssmdw32qhkinnacws7x9kcvpag";
+      name = "akonadi-import-wizard-17.08.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadi-mime-17.08.2.tar.xz";
-      sha256 = "1pnxmljgsmdkv2rhg7ml6qy1q2j2gx4cswkakbga8fr2cds5fmjc";
-      name = "akonadi-mime-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadi-mime-17.08.3.tar.xz";
+      sha256 = "1374wvyh29ba5s60m8przch5rmxvxzc2kjfw1gxhkrl7k8hfi4k8";
+      name = "akonadi-mime-17.08.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadi-notes-17.08.2.tar.xz";
-      sha256 = "1n9rrlczsgax0hddsqx4x8h9w49ki56lpa72y2fi2hd0hqv7bdf1";
-      name = "akonadi-notes-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadi-notes-17.08.3.tar.xz";
+      sha256 = "0bnr6j8pqqx6hg8hq51yzaky5hyym5lxyj9rwcsmm75x2c29wxb7";
+      name = "akonadi-notes-17.08.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akonadi-search-17.08.2.tar.xz";
-      sha256 = "0h8pcwv4svywf8sh698g6f3x15prcmz4nyxr92ab3x14k5na26v2";
-      name = "akonadi-search-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akonadi-search-17.08.3.tar.xz";
+      sha256 = "16d6v2d1irh02kd4dcvjhv17sqkps4xq4dpa4x1wb3q5qzxhmqcr";
+      name = "akonadi-search-17.08.3.tar.xz";
     };
   };
   akregator = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/akregator-17.08.2.tar.xz";
-      sha256 = "0ij4zxkwiai01cyzdai68c56j86r7b6nkijhmzhgvhv2mj9gi5bg";
-      name = "akregator-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/akregator-17.08.3.tar.xz";
+      sha256 = "1jd48yj9sl4z46qfk3qkm98q33f1qblsyjdr7ff8znxkg2pw5xg6";
+      name = "akregator-17.08.3.tar.xz";
     };
   };
   analitza = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/analitza-17.08.2.tar.xz";
-      sha256 = "02rmgyl9sh4d3kf4412p1zgcmcmcb66drqf73fxf6cdb5addbzk3";
-      name = "analitza-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/analitza-17.08.3.tar.xz";
+      sha256 = "1j0z63sfah2ypjb3szcr7dqndw18lcy8l9440q8kzq0gyl83cn3v";
+      name = "analitza-17.08.3.tar.xz";
     };
   };
   ark = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ark-17.08.2.tar.xz";
-      sha256 = "1my3y6zsfw54c4kcbsl93ixig9b07cprgq47712v47niyqnihk92";
-      name = "ark-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ark-17.08.3.tar.xz";
+      sha256 = "1qz333nd23x4ldx675cxs7ka2vz45xmkfsakdg8m3x26i7jnl86x";
+      name = "ark-17.08.3.tar.xz";
     };
   };
   artikulate = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/artikulate-17.08.2.tar.xz";
-      sha256 = "0hw10djgnx8wsrs307j9hsh9famaaljdpr20dmf2ng3594hppxw1";
-      name = "artikulate-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/artikulate-17.08.3.tar.xz";
+      sha256 = "13hg9cjdwhfya57xan96ma55msani0lx7v55zh0hv0jab9fxgv1n";
+      name = "artikulate-17.08.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/audiocd-kio-17.08.2.tar.xz";
-      sha256 = "0ivnl5aq553whgwnw6282vvj065hms34v1q1hl8l12k08rb8l2jl";
-      name = "audiocd-kio-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/audiocd-kio-17.08.3.tar.xz";
+      sha256 = "0n1xfypn2m56iw65p52yfbbqn17c6kc1x8syh35ifg9c1147y8ar";
+      name = "audiocd-kio-17.08.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/baloo-widgets-17.08.2.tar.xz";
-      sha256 = "1qw0clwkcki6hg1hxxzb6h4nh6db7zw3ncl4hyf5550q973i2gl1";
-      name = "baloo-widgets-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/baloo-widgets-17.08.3.tar.xz";
+      sha256 = "031yhv8ivqzr63maylsin60hfv45awry6xigfy0kfqj06q63944g";
+      name = "baloo-widgets-17.08.3.tar.xz";
     };
   };
   blinken = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/blinken-17.08.2.tar.xz";
-      sha256 = "1qs6nbxqrp0lmwf0z30i0r8h32r1a6a18k6sk78ja52vqkr7872h";
-      name = "blinken-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/blinken-17.08.3.tar.xz";
+      sha256 = "15nnsyqy73inqqys1r8khh1vvl24ljmgjpxlqg8vlfb6d8dsc8yx";
+      name = "blinken-17.08.3.tar.xz";
     };
   };
   blogilo = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/blogilo-17.08.2.tar.xz";
-      sha256 = "0ai91d5ydmw3yfv997hlrvky88v4aqcg7hacd3mizl23clqij4c9";
-      name = "blogilo-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/blogilo-17.08.3.tar.xz";
+      sha256 = "18vbvs5cih9vcxfqsia35q8bzc4ldzaajvnv9iqmisg060fxfwi9";
+      name = "blogilo-17.08.3.tar.xz";
     };
   };
   bomber = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/bomber-17.08.2.tar.xz";
-      sha256 = "1z6w6hh2f1k8skx87j11i6p34lcnh2c99gv2lvpd37z9gxbf0sjw";
-      name = "bomber-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/bomber-17.08.3.tar.xz";
+      sha256 = "1rmjlhyc46jxjsc303zl56c3k15q1qvp4yfl78v5l2pwmk8vdxzn";
+      name = "bomber-17.08.3.tar.xz";
     };
   };
   bovo = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/bovo-17.08.2.tar.xz";
-      sha256 = "0vz9pfslj9f2g51yvdw8hasn92n0rn0gy4rd2f0xcfk2ifq2bwd1";
-      name = "bovo-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/bovo-17.08.3.tar.xz";
+      sha256 = "1npzzjgzhgbv7pnz3j9if2c5qa5b9ghzj7llp8yndf6dz31qibps";
+      name = "bovo-17.08.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/calendarsupport-17.08.2.tar.xz";
-      sha256 = "0zrazkcdm2m9rxdbgwcmidlxwnj1v4lnchf0d21i267dnck87m8x";
-      name = "calendarsupport-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/calendarsupport-17.08.3.tar.xz";
+      sha256 = "1ii3h42jkskrizg29ii17jkdxgsqs3lwzsd7ypgw1k8gk9fyyqxh";
+      name = "calendarsupport-17.08.3.tar.xz";
     };
   };
   cantor = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/cantor-17.08.2.tar.xz";
-      sha256 = "14hn1980z8wsr446r94scd3wdy83myy4wklxl24bynxpwiwxzv99";
-      name = "cantor-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/cantor-17.08.3.tar.xz";
+      sha256 = "0yz71lxwzl5r9k2fzs4iyhyx811rc77m6n1lqagd2c29hnnchn9w";
+      name = "cantor-17.08.3.tar.xz";
     };
   };
   cervisia = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/cervisia-17.08.2.tar.xz";
-      sha256 = "0h56dfy27nf14dqz20f7chjzyhsdricxdrxxkw839r593k25fipd";
-      name = "cervisia-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/cervisia-17.08.3.tar.xz";
+      sha256 = "0272zf51rn1a9k796fspp456zq6j21bddfn7r350pd6ra19ay7j8";
+      name = "cervisia-17.08.3.tar.xz";
     };
   };
   dolphin = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/dolphin-17.08.2.tar.xz";
-      sha256 = "1m3v7z0k47r3fzl4w4nsldslw0z6sy1zn3mn3ssc03jhgqnj3grs";
-      name = "dolphin-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/dolphin-17.08.3.tar.xz";
+      sha256 = "02bb66411jy03s4wicalnsl6sxmslhdb3wxsqh7sdyh63llna5b5";
+      name = "dolphin-17.08.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/dolphin-plugins-17.08.2.tar.xz";
-      sha256 = "12mp7qf8aharyk8hqr8igwqnxraxy3nmad99mxkyny6wlkha459l";
-      name = "dolphin-plugins-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/dolphin-plugins-17.08.3.tar.xz";
+      sha256 = "1s2rjrvfs5i87gx3fsz0mqdr7106ds5747wq6n2sfzjkvippygay";
+      name = "dolphin-plugins-17.08.3.tar.xz";
     };
   };
   dragon = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/dragon-17.08.2.tar.xz";
-      sha256 = "0h9h2axwjqqvqla6mfml3bvk7gp36kij7swl96gsn7sy4ch0ydbz";
-      name = "dragon-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/dragon-17.08.3.tar.xz";
+      sha256 = "0fxzwfg0l7lnsswb51h8gmh4wngmng9sgm5nhn6wmwhfbhbzgagq";
+      name = "dragon-17.08.3.tar.xz";
     };
   };
   eventviews = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/eventviews-17.08.2.tar.xz";
-      sha256 = "0gd7jmwidh9fngjbn8m6jhymzxv8qdxv3ksnawcamjxxd2k951c1";
-      name = "eventviews-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/eventviews-17.08.3.tar.xz";
+      sha256 = "0j1r833kzf9sparvqnfn8r7klf4j0z8jwrgclf87rggmx0dn2v4y";
+      name = "eventviews-17.08.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ffmpegthumbs-17.08.2.tar.xz";
-      sha256 = "0bycdr60jnr0a121fr9alvma5zbkqm6wj45h81jvggdvmnrg7inh";
-      name = "ffmpegthumbs-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ffmpegthumbs-17.08.3.tar.xz";
+      sha256 = "19bkpc316wlhswgrbszpj65lrzsdp443c1174hqknm0srvp6fbvv";
+      name = "ffmpegthumbs-17.08.3.tar.xz";
     };
   };
   filelight = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/filelight-17.08.2.tar.xz";
-      sha256 = "0q7cn7hbmwg6km96yc3m1yd64nsnav8q9yjiri2k3p6v6if1042h";
-      name = "filelight-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/filelight-17.08.3.tar.xz";
+      sha256 = "06j6api909shraflfpn0cyvxaa57s2dq178kshkfv5yppxjpfpja";
+      name = "filelight-17.08.3.tar.xz";
     };
   };
   granatier = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/granatier-17.08.2.tar.xz";
-      sha256 = "17ymbyzkgkwcinf65hzy3ny1zzg6p88bcg6kix1pbdmhmw4nhhj0";
-      name = "granatier-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/granatier-17.08.3.tar.xz";
+      sha256 = "1z2gs73k8ymz09x72hvyylwqs6pxbnivz86hbb9pb1mlb7x5fgvs";
+      name = "granatier-17.08.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/grantlee-editor-17.08.2.tar.xz";
-      sha256 = "1385wcf2y3jjj9csp6p7iqyrlv0wxq32dkhdf33y80j29xnrckzp";
-      name = "grantlee-editor-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/grantlee-editor-17.08.3.tar.xz";
+      sha256 = "1cb77qmzzk64mkbzvywksvpfqw88mwmg7sqrni4apsasvg9mvygx";
+      name = "grantlee-editor-17.08.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/grantleetheme-17.08.2.tar.xz";
-      sha256 = "1i1x8d7hkhzqbn4c1q0snni8x2dw1hlxkc0zw8hfyfppc9a1x5ha";
-      name = "grantleetheme-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/grantleetheme-17.08.3.tar.xz";
+      sha256 = "0zag5gmaqi068hw8s71ascj7s8clg1sickrfpzjf3nhcf6y669rp";
+      name = "grantleetheme-17.08.3.tar.xz";
     };
   };
   gwenview = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/gwenview-17.08.2.tar.xz";
-      sha256 = "0kw48xwinvyix23m1h4ark91w6nygr0a9kisdj3ighw29dqbqryx";
-      name = "gwenview-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/gwenview-17.08.3.tar.xz";
+      sha256 = "05c96y5yrdgh7228bw3agn344g02hylnb2fw8crjcdapsiya4v1w";
+      name = "gwenview-17.08.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/incidenceeditor-17.08.2.tar.xz";
-      sha256 = "1jdwk67pxk9dwraq187wg58y0sgxwr5d18506fykrs7gv68p8dsl";
-      name = "incidenceeditor-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/incidenceeditor-17.08.3.tar.xz";
+      sha256 = "0qfcycivlgzjx8j4b2bd4qjp3x8wbiax477bmz56sfv7q0vp1dgm";
+      name = "incidenceeditor-17.08.3.tar.xz";
     };
   };
   jovie = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/jovie-17.08.2.tar.xz";
-      sha256 = "0wh0wk653fzlaxkxjbsm305wqmvdy88vw7qr81mh9ziyfj4qpm7p";
-      name = "jovie-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/jovie-17.08.3.tar.xz";
+      sha256 = "1a4v97p3yfwr5zn5qkfkw1ln7liz47f3bnhdb6yzzi03s5xfrk1z";
+      name = "jovie-17.08.3.tar.xz";
     };
   };
   juk = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/juk-17.08.2.tar.xz";
-      sha256 = "0i1zh8asbzjg7s6qq26fwc1g5g9ivnppba0xnhz5c3y0nmz0g3i1";
-      name = "juk-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/juk-17.08.3.tar.xz";
+      sha256 = "0735rdrn80akfb8viq8y77kxa28y1rg5infp26q7cy5cd4r6fvsi";
+      name = "juk-17.08.3.tar.xz";
     };
   };
   k3b = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/k3b-17.08.2.tar.xz";
-      sha256 = "1n7fw4zhsjc5bxxva420m8k0lmbx4whq8ay1ckianarjc8jm5dwx";
-      name = "k3b-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/k3b-17.08.3.tar.xz";
+      sha256 = "0kshb3j4djb9npkia0m0ffyrwja3drsyxw7hpgyxxswik6kwbvgk";
+      name = "k3b-17.08.3.tar.xz";
     };
   };
   kaccessible = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kaccessible-17.08.2.tar.xz";
-      sha256 = "1phfz8n6gs9g216qhwmjhcrr0qpfk2q7bxxx68f86zzfv6b4fhjd";
-      name = "kaccessible-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kaccessible-17.08.3.tar.xz";
+      sha256 = "0sfrs57npp4y1yyw16chgrvyp6bnf4jymffblj5h7pb4bv0xlsmk";
+      name = "kaccessible-17.08.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kaccounts-integration-17.08.2.tar.xz";
-      sha256 = "0v4ikcapq0vdfhj0v5c202yfbg1b82jbl74rpcw7lap7xjdxshgi";
-      name = "kaccounts-integration-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kaccounts-integration-17.08.3.tar.xz";
+      sha256 = "0cir87m7f8sf70vvr8sxfhklgxigvv6npijphbbim7fnzc4z37m0";
+      name = "kaccounts-integration-17.08.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kaccounts-providers-17.08.2.tar.xz";
-      sha256 = "1ir4s03ccf8mw56z2f293q4pb2rnh8rp0bs05nq93jjsxap3ssxn";
-      name = "kaccounts-providers-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kaccounts-providers-17.08.3.tar.xz";
+      sha256 = "1y3ykj4q6m14q2lskliv0qy0ml0j9i9svhq06g2j25zd5wwlhbp5";
+      name = "kaccounts-providers-17.08.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kaddressbook-17.08.2.tar.xz";
-      sha256 = "0smihkmhi10c0khid3ziiwvbrlk3ihw7f1a2mf1pc62gmagf6iva";
-      name = "kaddressbook-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kaddressbook-17.08.3.tar.xz";
+      sha256 = "1dq3lgrvg7s65mc2x2sgkwpz623ygb0by0y571dqjaz219j03955";
+      name = "kaddressbook-17.08.3.tar.xz";
     };
   };
   kajongg = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kajongg-17.08.2.tar.xz";
-      sha256 = "0607606yisch8s0ffv67fhpn8b5chi0y9h4giasc2s8m67zzjsvz";
-      name = "kajongg-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kajongg-17.08.3.tar.xz";
+      sha256 = "00xb764nxzihz9kh7a82cm7slrj78zjl3s5qb90s03y375q4bha6";
+      name = "kajongg-17.08.3.tar.xz";
     };
   };
   kalarm = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kalarm-17.08.2.tar.xz";
-      sha256 = "17sh27h6c1p0h1r6rfpqmh1pfd7clnwslhnj4rfxhvh95svdqgam";
-      name = "kalarm-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kalarm-17.08.3.tar.xz";
+      sha256 = "0rmdxx59iykn6f746dw9p0dyk96wds4kqr6w2y8fscp889i05g2a";
+      name = "kalarm-17.08.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kalarmcal-17.08.2.tar.xz";
-      sha256 = "00bfr9xsyg3r8nmvsana2n9m8ynhw1wcvx7dw3pazxf3f1sn5qvc";
-      name = "kalarmcal-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kalarmcal-17.08.3.tar.xz";
+      sha256 = "0g4vxkjkc38p2aigmfr2q2qd6x8pr4fj53jkvjq314vqg9sbak9c";
+      name = "kalarmcal-17.08.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kalgebra-17.08.2.tar.xz";
-      sha256 = "0f7zz9xxqckrkzmfga4ap117wix2ib4lpjq75blk43951qpnwwcw";
-      name = "kalgebra-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kalgebra-17.08.3.tar.xz";
+      sha256 = "0hcrl205z2m5108g1kgxnmkrrg6x2m2p59cmdkbsd0ly0jnfc9w2";
+      name = "kalgebra-17.08.3.tar.xz";
     };
   };
   kalzium = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kalzium-17.08.2.tar.xz";
-      sha256 = "1b27rx0ws6bikqa9gdr8d4mfqwsgcin5nl2m7svzdz27mb463iwc";
-      name = "kalzium-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kalzium-17.08.3.tar.xz";
+      sha256 = "142lcm1d7v8xknmqg00cgdz3iaydr6c9wblpij3wykffd53x7ind";
+      name = "kalzium-17.08.3.tar.xz";
     };
   };
   kamera = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kamera-17.08.2.tar.xz";
-      sha256 = "19id26637w39b6dlsvhllnnpvcphh20mvva1394pw386s2irdrca";
-      name = "kamera-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kamera-17.08.3.tar.xz";
+      sha256 = "0zrny1f27z0drsna2lpw9sr4y7z479lys3vzcysgf1fv8b8jdjdh";
+      name = "kamera-17.08.3.tar.xz";
     };
   };
   kanagram = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kanagram-17.08.2.tar.xz";
-      sha256 = "1zs1ww5w9sd9qzapl2shmfarhxsqpm8cifpw17vknwcp1w4qjwpj";
-      name = "kanagram-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kanagram-17.08.3.tar.xz";
+      sha256 = "1v5k67dw47i3n8635w1sc63n7f63hd9wvb44yxaw88clk46acn0k";
+      name = "kanagram-17.08.3.tar.xz";
     };
   };
   kapman = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kapman-17.08.2.tar.xz";
-      sha256 = "0wl6zhm7cyb4ii475nh7pjz1pprccimpvdx5yxph4n99wri4xjd9";
-      name = "kapman-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kapman-17.08.3.tar.xz";
+      sha256 = "0gici0v3ya16nk0b33cm5n95gdfhjqpy8wjg5y8bj12dby1d0n2w";
+      name = "kapman-17.08.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kapptemplate-17.08.2.tar.xz";
-      sha256 = "0b92kamyvw81bxvxly16kd1kcyn8l48cvk4hp0kqfxv5drr0y2sp";
-      name = "kapptemplate-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kapptemplate-17.08.3.tar.xz";
+      sha256 = "16j1lx6rp0lqmcd8fyaishc0i2670v0map270z9575101338cyvm";
+      name = "kapptemplate-17.08.3.tar.xz";
     };
   };
   kate = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kate-17.08.2.tar.xz";
-      sha256 = "1m4dh9v1y8a3398wd3qv2qcz1lqjnji62cswnw8ch4hxmns6lib2";
-      name = "kate-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kate-17.08.3.tar.xz";
+      sha256 = "1yjzhf0a1skxz6iipac3z1p2wswn8bfjfr3k8qb6lhwlhbapc33x";
+      name = "kate-17.08.3.tar.xz";
     };
   };
   katomic = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/katomic-17.08.2.tar.xz";
-      sha256 = "1l8nvsm6mfsb1bvwhj77qicq010vmif8y046d2mc5sgw6xhg6xw5";
-      name = "katomic-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/katomic-17.08.3.tar.xz";
+      sha256 = "0y00la43lc1352fipzglyvaf1cqalf0vkygg8r9vizm8vycp7hp9";
+      name = "katomic-17.08.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kblackbox-17.08.2.tar.xz";
-      sha256 = "0i5zy6zm8w4i5hljmv1qyhrr5iv7m5qr854f6j0iyvam33f68gdh";
-      name = "kblackbox-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kblackbox-17.08.3.tar.xz";
+      sha256 = "18lz0nb8zp95higssscgcr2cj1ni71bckk1wazyryxkmmmqk2rdn";
+      name = "kblackbox-17.08.3.tar.xz";
     };
   };
   kblocks = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kblocks-17.08.2.tar.xz";
-      sha256 = "1qh2lcg9293icya06jwa01vri8y1m99jir7d0zxpwlm6rndrkca5";
-      name = "kblocks-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kblocks-17.08.3.tar.xz";
+      sha256 = "1nf3ws0dzzwqc87v6jqi1x5zm7w56cgfingr5plpp3cj8wv8jnvw";
+      name = "kblocks-17.08.3.tar.xz";
     };
   };
   kblog = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kblog-17.08.2.tar.xz";
-      sha256 = "1095qs877zjip4899fisgyssp1n3j8rxpxkd7dc6ms4b82xnrz19";
-      name = "kblog-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kblog-17.08.3.tar.xz";
+      sha256 = "0cnbn0wmva8xm2i05w5pdikw5mbx3z6mim3k98v2r954qml7xqdk";
+      name = "kblog-17.08.3.tar.xz";
     };
   };
   kbounce = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kbounce-17.08.2.tar.xz";
-      sha256 = "0bkmk26spmlq607ycmyc5sfzi7rknim0d39fdvmn915xy7dps2l1";
-      name = "kbounce-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kbounce-17.08.3.tar.xz";
+      sha256 = "12yj5jmpvhj5cxr4i818lp9cbcrdrvq9r7s202nzx5znxs11bbf6";
+      name = "kbounce-17.08.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kbreakout-17.08.2.tar.xz";
-      sha256 = "02c4ldyxd6hcffivp1n8k5q42dibwpcf4xdp856zkaf9hk40ssjz";
-      name = "kbreakout-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kbreakout-17.08.3.tar.xz";
+      sha256 = "14d4cx91vv8bvvpjwbrwcvjczzs8j58yzazsfgqwhrj47cwhya43";
+      name = "kbreakout-17.08.3.tar.xz";
     };
   };
   kbruch = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kbruch-17.08.2.tar.xz";
-      sha256 = "0v8c63mxpd10nnbxiyfghbbjm97q37w9z08dzlys996nychmw0ba";
-      name = "kbruch-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kbruch-17.08.3.tar.xz";
+      sha256 = "0jxlybkmzs24482fmy7hhk2apyq26fpdblpnpdbqnydz95707475";
+      name = "kbruch-17.08.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kcachegrind-17.08.2.tar.xz";
-      sha256 = "04dh0a33z7i1nf07bhc05gm1jr4wvv4a86l9avk6dgja0pag6j30";
-      name = "kcachegrind-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kcachegrind-17.08.3.tar.xz";
+      sha256 = "0xmnpbli7ndlv0532hpnqgvbkpw8y176jydhs6hy73ywwm416mvs";
+      name = "kcachegrind-17.08.3.tar.xz";
     };
   };
   kcalc = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kcalc-17.08.2.tar.xz";
-      sha256 = "1k1l3qj4mdm8b0qbjp09hk4zd0y9qwzp062a0r428mvvcmrvpylw";
-      name = "kcalc-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kcalc-17.08.3.tar.xz";
+      sha256 = "0ck1hjv1v9fj7ckl4blpmfxzjx61ihc6av71m710nk7iv6gncsfm";
+      name = "kcalc-17.08.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kcalcore-17.08.2.tar.xz";
-      sha256 = "1j3vr2ycwsgahngwhvkv747b5rr062sx6xi35bj9anmkhpbs9kwi";
-      name = "kcalcore-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kcalcore-17.08.3.tar.xz";
+      sha256 = "0iy6dwzrcwzhjcz8yajp4mvbxr6vkxp4bnbnh9k2zvxgmg4y63h5";
+      name = "kcalcore-17.08.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kcalutils-17.08.2.tar.xz";
-      sha256 = "02f5vr0l41kv6g92jj9g8yz5y422qvlgd3jbx3gmsagxxyvl5gss";
-      name = "kcalutils-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kcalutils-17.08.3.tar.xz";
+      sha256 = "1vs6qnv31s01i7wb7kz86v17z0wrymcclmwx2hj7vl4jqr532zdq";
+      name = "kcalutils-17.08.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kcharselect-17.08.2.tar.xz";
-      sha256 = "1nmsn0kibd318dnka96lisplcggrvcgsivrqk322mw9wg6xhg5i9";
-      name = "kcharselect-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kcharselect-17.08.3.tar.xz";
+      sha256 = "1ib3rqd43yprnp07vvmg029a44dimisycv030j3qd87r3yw06phs";
+      name = "kcharselect-17.08.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kcolorchooser-17.08.2.tar.xz";
-      sha256 = "0v8x3y2gxp8cm3m1dh8rjpxjnypfvrxm41vrqsz9p8lcs616zg6w";
-      name = "kcolorchooser-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kcolorchooser-17.08.3.tar.xz";
+      sha256 = "17aa2k8z7i7ds2s3ampkci4n0003rsbx4fj3l773ylb11fyl3b2f";
+      name = "kcolorchooser-17.08.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kcontacts-17.08.2.tar.xz";
-      sha256 = "1agwvi3lnmdz9fhqg6i029jpcwys4zsk2k5rpzjdqaf7bvccb9cl";
-      name = "kcontacts-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kcontacts-17.08.3.tar.xz";
+      sha256 = "0dsx0bgf6rcqrl31xcklh368lr93pn2ylipw81svpnqya1ry31dk";
+      name = "kcontacts-17.08.3.tar.xz";
     };
   };
   kcron = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kcron-17.08.2.tar.xz";
-      sha256 = "1diqgcnlbq9x6w3sj4lk1i3kbi4g5w4j1knkc4qqjz3a6kfaqk60";
-      name = "kcron-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kcron-17.08.3.tar.xz";
+      sha256 = "0xmd25dfhpkaa6zzmc7xdfn4fv0awfqjv2r166hmqd32gnx70bry";
+      name = "kcron-17.08.3.tar.xz";
     };
   };
   kdav = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdav-17.08.2.tar.xz";
-      sha256 = "0cyh8qnzcnb7qnyjbyy73bj78kqjq853aaz7fskg2f3bk2bq5fkf";
-      name = "kdav-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdav-17.08.3.tar.xz";
+      sha256 = "1v7xclq8qz4pmvp1asavammlfwi2pg1y0fabapqpnglx194rbwic";
+      name = "kdav-17.08.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdebugsettings-17.08.2.tar.xz";
-      sha256 = "0i62w45flirca09bkwxkyyr4zhvzi4rxq7l6xh4liinl1n9kdf7w";
-      name = "kdebugsettings-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdebugsettings-17.08.3.tar.xz";
+      sha256 = "1gfcnwpmx6dd12d9kycf0khi5s85932b1wvyw1mr5dhlqyyqf1s4";
+      name = "kdebugsettings-17.08.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-dev-scripts-17.08.2.tar.xz";
-      sha256 = "1prk2j5y8rcz3xkhw2fnfhsky9jnk25akdg2whvz4zpvfvxn5jcw";
-      name = "kde-dev-scripts-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-dev-scripts-17.08.3.tar.xz";
+      sha256 = "1dydd198jfcjm58m5qk071kx18gbgnbwf9mcx20ibanq17cdh3px";
+      name = "kde-dev-scripts-17.08.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-dev-utils-17.08.2.tar.xz";
-      sha256 = "0zzf1w6avjwzyr8p73jqidzzfgx7gpiksmgnfqm4nf91snfg7pp4";
-      name = "kde-dev-utils-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-dev-utils-17.08.3.tar.xz";
+      sha256 = "184sx4i5k8rnx5572460v2jnd0abdr2i5gp74khbjlgagkdvcj07";
+      name = "kde-dev-utils-17.08.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdeedu-data-17.08.2.tar.xz";
-      sha256 = "17jh5m5h64z6gkwblpq7jdsa4653bakz1mgy6qlyjlh8nljlf6wk";
-      name = "kdeedu-data-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdeedu-data-17.08.3.tar.xz";
+      sha256 = "12vy656ng14gq93cw30bwdg15jvwr6qvlsjk0vfmljvcbc9171ww";
+      name = "kdeedu-data-17.08.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdegraphics-mobipocket-17.08.2.tar.xz";
-      sha256 = "008qp18m720759wj1bjm1z2nig1vafjcz8wifjgqdn3drn35qqvg";
-      name = "kdegraphics-mobipocket-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-mobipocket-17.08.3.tar.xz";
+      sha256 = "1rfi44lh25knc0jf02fazh6s4wy1h8m76i9njcjxbjrz7x518cfj";
+      name = "kdegraphics-mobipocket-17.08.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdegraphics-thumbnailers-17.08.2.tar.xz";
-      sha256 = "11qf9dnqzw634iilmbfi9sy20w228y72w2aasjw7kg1l7y4y3y07";
-      name = "kdegraphics-thumbnailers-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-thumbnailers-17.08.3.tar.xz";
+      sha256 = "0irsa4x6pi5jq36yz1kgkdv8946w05mr19afydpz1jpa2knhkc6i";
+      name = "kdegraphics-thumbnailers-17.08.3.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ar-17.08.2.tar.xz";
-      sha256 = "1m5qi2qw4ndqzshg7bbi3mkvxpk0dj453bngm7qzmp9bgwpbgk3b";
-      name = "kde-l10n-ar-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ar-17.08.3.tar.xz";
+      sha256 = "0j06r39gam92bxm25vc8x7bxm6143pww42d9ala13akh3gh56wmy";
+      name = "kde-l10n-ar-17.08.3.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ast-17.08.2.tar.xz";
-      sha256 = "1y2qahv1d40k16s9xjckc51szzm8n2nhdy5bjqpakxv3iqy2yqvz";
-      name = "kde-l10n-ast-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ast-17.08.3.tar.xz";
+      sha256 = "1kmv0ajbd9dws1al4qx9k2hnsqf2dwkj2ww12xn3flrqg71kgnpb";
+      name = "kde-l10n-ast-17.08.3.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bg-17.08.2.tar.xz";
-      sha256 = "0h0ls4k1jyj8w2qh688nv43p6xxad3amh4gslg4xxk30scl58pay";
-      name = "kde-l10n-bg-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bg-17.08.3.tar.xz";
+      sha256 = "0dv2hdki9mbc6kq6b1gzpqijgq31ffz4la9aprzj57mk4l14vkp1";
+      name = "kde-l10n-bg-17.08.3.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bs-17.08.2.tar.xz";
-      sha256 = "1n2hw8835hf87d4sihnbryh702h6vh2z65s15lsrk5l760jdvyg7";
-      name = "kde-l10n-bs-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bs-17.08.3.tar.xz";
+      sha256 = "0makcag2kjns6528ldrjr52r412yi1y947lqq5db8ya6i8bxlsl2";
+      name = "kde-l10n-bs-17.08.3.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca-17.08.2.tar.xz";
-      sha256 = "18g4vs2r63p25a0i8ggyv3gi7df54z1hv140lg44k5g4pffbzv0z";
-      name = "kde-l10n-ca-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca-17.08.3.tar.xz";
+      sha256 = "13n0y9rmcnaka5hnmjp6x99pdvx19bb5f7m0wmnkkq0v8xs0cr53";
+      name = "kde-l10n-ca-17.08.3.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-17.08.2";
+    version = "ca_valencia-17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca@valencia-17.08.2.tar.xz";
-      sha256 = "0p7ykdkfxkqm6fa8y95j3jsmqlnkxfsigi457h8yhvikjvlym9an";
-      name = "kde-l10n-ca_valencia-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca@valencia-17.08.3.tar.xz";
+      sha256 = "0h4iznjvzy4lvb91vpb4f7jlrvi3a9z56i7j3xm0ihf1qmgxxzmj";
+      name = "kde-l10n-ca_valencia-17.08.3.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-cs-17.08.2.tar.xz";
-      sha256 = "13qxxh1rxv25i53r6744hyr7n7nhvhnxwb425caq0z8cl0y727xi";
-      name = "kde-l10n-cs-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-cs-17.08.3.tar.xz";
+      sha256 = "0dadsgmg7pvagpq0nj4hs889zvk2lw085wlv2mw6jfminjav4c2d";
+      name = "kde-l10n-cs-17.08.3.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-da-17.08.2.tar.xz";
-      sha256 = "1nqfmq3scmka10fqvd4q62klrsly0zxk5maqp914r2kq9a4761sr";
-      name = "kde-l10n-da-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-da-17.08.3.tar.xz";
+      sha256 = "04w1clqk3p0zkv01406iwkwp572vwfpn94x8g7hxraaz2rzs2qnf";
+      name = "kde-l10n-da-17.08.3.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-de-17.08.2.tar.xz";
-      sha256 = "0q0sqzsd9qig05qapa6psizcayfcr68jkz07wv1z0lsij6hbv81w";
-      name = "kde-l10n-de-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-de-17.08.3.tar.xz";
+      sha256 = "1cxpdwvpymf1yqgs54v6f8hgxwyblv0i0zpm5w5wrimmg8lnbrc8";
+      name = "kde-l10n-de-17.08.3.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-el-17.08.2.tar.xz";
-      sha256 = "1g07qwgc5mm3x6diab934cfl9acl0baa5x1d1139c84x65d5iisx";
-      name = "kde-l10n-el-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-el-17.08.3.tar.xz";
+      sha256 = "1csskz68dsrlvkr5iri8w0wx2g5h7db18dpnlcmbl076l9ds9nmv";
+      name = "kde-l10n-el-17.08.3.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-17.08.2";
+    version = "en_GB-17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-en_GB-17.08.2.tar.xz";
-      sha256 = "03v7q53ng095rsc5h13d7ysakcr3ansvq259xw8ksqwnp3yzgivf";
-      name = "kde-l10n-en_GB-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-en_GB-17.08.3.tar.xz";
+      sha256 = "1vf6h68biiqr9vzqlig34z47clkdk6ncr3mhan7rajsk1dlp6qwy";
+      name = "kde-l10n-en_GB-17.08.3.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eo-17.08.2.tar.xz";
-      sha256 = "1w79dmbja6aga6z8wz5pisd9r6g5gdcbqyzf8nlj2yjvijdv19h5";
-      name = "kde-l10n-eo-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eo-17.08.3.tar.xz";
+      sha256 = "0a7wk6xfhq7zj02zjadnp7ml97r5vvgjvlm5yajz6l4q5l0vsdnn";
+      name = "kde-l10n-eo-17.08.3.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-es-17.08.2.tar.xz";
-      sha256 = "0j2y55iql56wwzfmfm5c0c3f64lqr74hqzqf5bcckhh6svjiwb9m";
-      name = "kde-l10n-es-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-es-17.08.3.tar.xz";
+      sha256 = "1b7jzccicb58s3v796x0k2fwyfq8qmqyb5b26y5x9xknk7mv3fkz";
+      name = "kde-l10n-es-17.08.3.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-et-17.08.2.tar.xz";
-      sha256 = "0d7c3ij74iskf9hbfjjl48jfpgihlg8fjabcak34bklcf1h8qrl9";
-      name = "kde-l10n-et-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-et-17.08.3.tar.xz";
+      sha256 = "1d10yq8d5fjhgc0zvz3izl1c15i9g8vw5kgs2mvciwhaj6sqgk78";
+      name = "kde-l10n-et-17.08.3.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eu-17.08.2.tar.xz";
-      sha256 = "164851achb1p4yaw4x6sq83ibl6gj4iqh4771nc847rywgmq48dh";
-      name = "kde-l10n-eu-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eu-17.08.3.tar.xz";
+      sha256 = "1r6nyjibagqfk4s1c2sylxlsq3jv7vhc01bbwpdl314rhcv67lkq";
+      name = "kde-l10n-eu-17.08.3.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fa-17.08.2.tar.xz";
-      sha256 = "030wwv8527yhn6k6jmjb790d05gz493dnhr759zv1yg0r1r14lsi";
-      name = "kde-l10n-fa-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fa-17.08.3.tar.xz";
+      sha256 = "0slrrsp8wgh33zv779mqdf3km4h88mzqfzdds08g8hr3mimp8ibj";
+      name = "kde-l10n-fa-17.08.3.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fi-17.08.2.tar.xz";
-      sha256 = "1rvpkdssy346aijdb183j6fnpg7wqac2svg19rjnz40rg1sbqs5g";
-      name = "kde-l10n-fi-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fi-17.08.3.tar.xz";
+      sha256 = "10axj320my3bgfqn1rpwpn4nii3bh39afsvqkbz6xh01sci4z47w";
+      name = "kde-l10n-fi-17.08.3.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fr-17.08.2.tar.xz";
-      sha256 = "0i9525dvns41gvgdi3q760fivhjq8c81hsx6rmnp5gxwj2bp8nb9";
-      name = "kde-l10n-fr-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fr-17.08.3.tar.xz";
+      sha256 = "0gqmq0hwxmj2awjyhhy81nwrks4mlqdnbfinxsrsj1kmklsx8pdg";
+      name = "kde-l10n-fr-17.08.3.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ga-17.08.2.tar.xz";
-      sha256 = "0a7ym789nqjngx0sjirxb19q0wzbh250kwsrjad5nw810syk2k8d";
-      name = "kde-l10n-ga-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ga-17.08.3.tar.xz";
+      sha256 = "0p7jy5sh2x1fc6mfacs1f5brq86hw6xk7bccc30k5c8b0kfbvdf4";
+      name = "kde-l10n-ga-17.08.3.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-gl-17.08.2.tar.xz";
-      sha256 = "1n0f4hs3qkraxc05ga2z4mzr425n5386f5wrd9crsw0pmsm24nm6";
-      name = "kde-l10n-gl-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-gl-17.08.3.tar.xz";
+      sha256 = "185yw84i04llag4kpi3lmmy9niis2z3rd5ch2x7y4jyq3kdpwhi4";
+      name = "kde-l10n-gl-17.08.3.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-he-17.08.2.tar.xz";
-      sha256 = "1bk8ms9jspyphxki8fl2i8fy4b2xsx3bi55fhpah9r10fb3prccx";
-      name = "kde-l10n-he-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-he-17.08.3.tar.xz";
+      sha256 = "0dx0mvl4vapkyir8a0a1dgv2h1hjsr5n2ykjihk21ykf7axvqqd4";
+      name = "kde-l10n-he-17.08.3.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hi-17.08.2.tar.xz";
-      sha256 = "1wfjj9xdnyq94h5g3054mvwn7vd9v1n1myxclxfqszbym1lp9f6h";
-      name = "kde-l10n-hi-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hi-17.08.3.tar.xz";
+      sha256 = "0f6p7bwvvqj7jdaqsn4nxjsb5cdna9q4cp59wfy05ppi685qqp4v";
+      name = "kde-l10n-hi-17.08.3.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hr-17.08.2.tar.xz";
-      sha256 = "070cbkpvvpxhi2kvmf97wazxn2x7jvrzwadfxwp8r6h1bxgpiq5f";
-      name = "kde-l10n-hr-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hr-17.08.3.tar.xz";
+      sha256 = "0yd4sqfa59ca57ig55x46fp59pjxby6ha5bhkzhcd1d2baa4a672";
+      name = "kde-l10n-hr-17.08.3.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hu-17.08.2.tar.xz";
-      sha256 = "1g77mh1av10h24hkqim86ik23nqxj6an4r4swzxl3ncibdx1x02f";
-      name = "kde-l10n-hu-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hu-17.08.3.tar.xz";
+      sha256 = "1s3vgjslnffxivrx69dnz4c2iyjf2awv51k8bbbfjw271422wvfg";
+      name = "kde-l10n-hu-17.08.3.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ia-17.08.2.tar.xz";
-      sha256 = "1d83558mvki39sffhrha6z3dgs1giwpbk27yi759fbc4k07w28pv";
-      name = "kde-l10n-ia-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ia-17.08.3.tar.xz";
+      sha256 = "1jpvla8h5ji9lcdhk7rinixkyr6wax30wp9wvqqqd8p9dp18i0cp";
+      name = "kde-l10n-ia-17.08.3.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-id-17.08.2.tar.xz";
-      sha256 = "0c1pfxc25izgrikbmp2afmi1j5i9gp9g3hkxn8c1znmwi4a0jp9n";
-      name = "kde-l10n-id-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-id-17.08.3.tar.xz";
+      sha256 = "191x45jv4bzkglyng7fp3fblcbirp9k94h9r54sk32idwqkiwngx";
+      name = "kde-l10n-id-17.08.3.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-is-17.08.2.tar.xz";
-      sha256 = "1jdh25rs37438acxkpb6bmwwyl4z310jv2k4dxcb3f7ml4szkg4k";
-      name = "kde-l10n-is-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-is-17.08.3.tar.xz";
+      sha256 = "1h3pw9rnssf6wh1n5r01gqnz7riqz6hismndd67xw4pnq7vqpjkm";
+      name = "kde-l10n-is-17.08.3.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-it-17.08.2.tar.xz";
-      sha256 = "015wj5xhi3mni6mcc2xv16vn18rmimfzi971jgg8xjd9z7z53fd7";
-      name = "kde-l10n-it-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-it-17.08.3.tar.xz";
+      sha256 = "0n4ivcyjcb47h3455wnzhnlkf26h29r2f9j1dgw9rw32aczb8l68";
+      name = "kde-l10n-it-17.08.3.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ja-17.08.2.tar.xz";
-      sha256 = "0vvvq1zfhj3c5xidrvfh372x4azxic3c8lhy43rn4wjalcmhyzi0";
-      name = "kde-l10n-ja-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ja-17.08.3.tar.xz";
+      sha256 = "0qxf7c8l61xwkhn81phyw4849frzrc032fnbphlgq1nc9kqygara";
+      name = "kde-l10n-ja-17.08.3.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-kk-17.08.2.tar.xz";
-      sha256 = "14vhxnchnlmz8ljh21vdrdirygkgkhmqpnnlmrz9pmqay7r8bzpk";
-      name = "kde-l10n-kk-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-kk-17.08.3.tar.xz";
+      sha256 = "0wlzv9kgpa2ah2j8dd4vn5gr9jkbmzl6ph3lm5mr7rf0pl14qws2";
+      name = "kde-l10n-kk-17.08.3.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-km-17.08.2.tar.xz";
-      sha256 = "0q82bvy359szsfa423rb3b65wbgnmvyk839blr9pzjp3gvhxiza2";
-      name = "kde-l10n-km-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-km-17.08.3.tar.xz";
+      sha256 = "07arvlwxq59xjlgmf348rdrm1gfbzx9yds6qj667mrbk7h1n5ibr";
+      name = "kde-l10n-km-17.08.3.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ko-17.08.2.tar.xz";
-      sha256 = "1v4bjws17mz022n3r49z7rz1pdmqa4dsffj7pm60ixi6p5y3gvk2";
-      name = "kde-l10n-ko-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ko-17.08.3.tar.xz";
+      sha256 = "0cw6v0iqq79hc4llw37s630gf36npc7ngsihqlia4y3pn4mzabwf";
+      name = "kde-l10n-ko-17.08.3.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lt-17.08.2.tar.xz";
-      sha256 = "0f09kkaghydq4b0fs59vz4h8q8j84qnqaqqaljc3vq05ih3849n5";
-      name = "kde-l10n-lt-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lt-17.08.3.tar.xz";
+      sha256 = "0mv31nqdxp9wcnwch0sqrgz5pp1y3gmv25p8jvbrfrivpbkmhwv3";
+      name = "kde-l10n-lt-17.08.3.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lv-17.08.2.tar.xz";
-      sha256 = "0aw8lpdh6y126gbwkfm408lz84kwd44wi3ryi5ascxadklmgcydw";
-      name = "kde-l10n-lv-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lv-17.08.3.tar.xz";
+      sha256 = "0lyh2lj1h5ihhy22hh0is3s3qd8x88wgbwrqkq9802vksy7f587l";
+      name = "kde-l10n-lv-17.08.3.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-mr-17.08.2.tar.xz";
-      sha256 = "10670r4fmvd1030rnlyl1s1ixiy380jg84h3ayv3m270rydpwn4c";
-      name = "kde-l10n-mr-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-mr-17.08.3.tar.xz";
+      sha256 = "1zpciw63xk0s6jpkw4fpw0d17fcc4h1fdl6v1d3w3c1rs7dmmw9y";
+      name = "kde-l10n-mr-17.08.3.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nb-17.08.2.tar.xz";
-      sha256 = "0cajcnk3clz175y2vhihpj33lcq5qmd0mgcl0srz5n28978v85wk";
-      name = "kde-l10n-nb-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nb-17.08.3.tar.xz";
+      sha256 = "024ii25iz8lf2g6k1nrr1lmian3wzq4ljx3y8ss1vz244m047xss";
+      name = "kde-l10n-nb-17.08.3.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nds-17.08.2.tar.xz";
-      sha256 = "0r5zpc48sywkqb227kf963p01w1x7r828pr0dsy711h5wwwbnj93";
-      name = "kde-l10n-nds-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nds-17.08.3.tar.xz";
+      sha256 = "0bp9ap276z86mxldasq6cdskrwkh48z9yfrblgffhh94941i0gcn";
+      name = "kde-l10n-nds-17.08.3.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nl-17.08.2.tar.xz";
-      sha256 = "02hz160xsacsbimwqva7f5fp2zk7nnngj349v0vhyx85fk2s5hd7";
-      name = "kde-l10n-nl-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nl-17.08.3.tar.xz";
+      sha256 = "00mzrk682r30i8x3navpad3b9jm15h5mp81v92q5cmcmblvvaw0l";
+      name = "kde-l10n-nl-17.08.3.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nn-17.08.2.tar.xz";
-      sha256 = "005779r53bfzxrir56nxly5c38bzcjs20y690m3g7y4kfvlyas0d";
-      name = "kde-l10n-nn-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nn-17.08.3.tar.xz";
+      sha256 = "0d45g2n7hvk7p2n84674fqdnsz26hk0scczr6w3kzb2zk95x5734";
+      name = "kde-l10n-nn-17.08.3.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pa-17.08.2.tar.xz";
-      sha256 = "0475yxyzs6m35hbhk6y68s86sfvwb838ji4ycjwg5164ml6p9x7f";
-      name = "kde-l10n-pa-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pa-17.08.3.tar.xz";
+      sha256 = "0sg35fmw0rs3nzyrhkfvh8b5nm86w5qkjgic4ymrib0grjxbdjcj";
+      name = "kde-l10n-pa-17.08.3.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pl-17.08.2.tar.xz";
-      sha256 = "13v729a2cpp1spk8zlvynf41naifks5skacgdxx7pnz3z5nq34ih";
-      name = "kde-l10n-pl-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pl-17.08.3.tar.xz";
+      sha256 = "0sk19zh9ykldm66d51k8pkmyql5cfxvgpzp8q3c3n9g60cdx510x";
+      name = "kde-l10n-pl-17.08.3.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt-17.08.2.tar.xz";
-      sha256 = "13v7ahpp9yz197qggq6lwgyln2z4cszk4g46jc9c4qg1wq954cch";
-      name = "kde-l10n-pt-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt-17.08.3.tar.xz";
+      sha256 = "135g0wq2cfkgvwv1y1w9wnnz2bsdf5sdijqnvazkb6j3is4fz2pw";
+      name = "kde-l10n-pt-17.08.3.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-17.08.2";
+    version = "pt_BR-17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt_BR-17.08.2.tar.xz";
-      sha256 = "19qd7cm96hjbh4bwgy9r00i7fdzrsivjss00vd502s2620wxj8mh";
-      name = "kde-l10n-pt_BR-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt_BR-17.08.3.tar.xz";
+      sha256 = "0ww3rhijqs1h9ihszkqvxdi0d4185zpm336837741nwqg601dik0";
+      name = "kde-l10n-pt_BR-17.08.3.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ro-17.08.2.tar.xz";
-      sha256 = "15jyjdvksqvhr7hkkfkb2mp7rkkidq7r15iibphi04d7nf5rgh7h";
-      name = "kde-l10n-ro-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ro-17.08.3.tar.xz";
+      sha256 = "1d45j7xx1mzzgjwqw5svhkcb5v0hqbbzcwg1x1j7xqcggdlx4075";
+      name = "kde-l10n-ro-17.08.3.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ru-17.08.2.tar.xz";
-      sha256 = "1vk54wih1bv85ixl4zv229hi7yvfnljndlfaslzfq2ff0r3j5iyf";
-      name = "kde-l10n-ru-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ru-17.08.3.tar.xz";
+      sha256 = "10py3cz4mpgcaskrsbbr26arg01c3im26zqmjcdwjnkgp8s780pj";
+      name = "kde-l10n-ru-17.08.3.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sk-17.08.2.tar.xz";
-      sha256 = "0n4j3cp9zh2r2jyy2mksm5qx1xxkb847q8vlx896q26cbzc2sl5k";
-      name = "kde-l10n-sk-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sk-17.08.3.tar.xz";
+      sha256 = "01607982ms2smr05nslp79x6fjqhvlpjdkkv8fs4vwxvii9wd77w";
+      name = "kde-l10n-sk-17.08.3.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sl-17.08.2.tar.xz";
-      sha256 = "05dpfmqcdclkkdk58q3dz9h4m5gyfdp0a47pj3wlp8gagn6lrll1";
-      name = "kde-l10n-sl-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sl-17.08.3.tar.xz";
+      sha256 = "10ljgz3jrgbgb06ijq1sp46qc3d7dbyz8dql56zcgz1pbv6pyxqz";
+      name = "kde-l10n-sl-17.08.3.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sr-17.08.2.tar.xz";
-      sha256 = "1yavz6rfymg9ggb8xa7wrhr774482i7l7f110mbxb0hpp0rb37l4";
-      name = "kde-l10n-sr-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sr-17.08.3.tar.xz";
+      sha256 = "1m12x7w0m4n97crmy9ad6szx92z3cqsvm6fbh99naaaf033962jn";
+      name = "kde-l10n-sr-17.08.3.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sv-17.08.2.tar.xz";
-      sha256 = "1hznlqyr93zbhp11s4q6x8ad0rscikqdxmgaw9i8h1wjiy926psy";
-      name = "kde-l10n-sv-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sv-17.08.3.tar.xz";
+      sha256 = "1qqry4xakc4qp140jr5306xfp58d33rxp44mrvmdngzh30bqs6g2";
+      name = "kde-l10n-sv-17.08.3.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-tr-17.08.2.tar.xz";
-      sha256 = "1mmi73sfrzqhwwj2pb7p1bklm0cgprs8mg73k7v1nvzxfj5mm3xl";
-      name = "kde-l10n-tr-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-tr-17.08.3.tar.xz";
+      sha256 = "1as31vjsig32s31qxnx6ykfgpyya3s362ml576ndiyrj84znzby0";
+      name = "kde-l10n-tr-17.08.3.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ug-17.08.2.tar.xz";
-      sha256 = "0b4qzcp08y6hv7184sxl305rl92y38h68ljs7kbmszggy33fw0xq";
-      name = "kde-l10n-ug-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ug-17.08.3.tar.xz";
+      sha256 = "1jx2g5xczybfz9915py30g9rqds0191bsaywnj241nzqizy20csz";
+      name = "kde-l10n-ug-17.08.3.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-uk-17.08.2.tar.xz";
-      sha256 = "1jvrkc765s0dmbbh6yrfwp0nq3zr8kirp88ddnxv1jn4xk1wj60c";
-      name = "kde-l10n-uk-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-uk-17.08.3.tar.xz";
+      sha256 = "14c30x7j8inswccjfb3yslwxjp0ispp1wzq6j4nl5zzj24lkicf8";
+      name = "kde-l10n-uk-17.08.3.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-wa-17.08.2.tar.xz";
-      sha256 = "1jnca594pbvhm6bpqkpaibpn3bh1ady1px1cjqljm3v2173gqgsh";
-      name = "kde-l10n-wa-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-wa-17.08.3.tar.xz";
+      sha256 = "0mz0g6hf4z59vb4i0zkvmyx85mxz7fpwi6yyng03iqzlbpdq0qj7";
+      name = "kde-l10n-wa-17.08.3.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-17.08.2";
+    version = "zh_CN-17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_CN-17.08.2.tar.xz";
-      sha256 = "1szwwhd5jsafbnma968crz7x3l6r56qyx253119c0v7hribh2lh0";
-      name = "kde-l10n-zh_CN-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_CN-17.08.3.tar.xz";
+      sha256 = "1l60z9wicf5ka9ik5b85qh0z3n7g9msjv3ckwzm2kj41q9r30559";
+      name = "kde-l10n-zh_CN-17.08.3.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-17.08.2";
+    version = "zh_TW-17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_TW-17.08.2.tar.xz";
-      sha256 = "1v4qlh63l02689mjbxq3q6ljpij1ryr0z51lmymab65bk7vxh2mw";
-      name = "kde-l10n-zh_TW-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_TW-17.08.3.tar.xz";
+      sha256 = "1br778qbxnbsrdpvd34g2m3xc1v725ib4689kw5g36pm1jlf55h0";
+      name = "kde-l10n-zh_TW-17.08.3.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.37";
+    version = "4.14.38";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz";
-      sha256 = "0c74yg01r802j5jwl270w9sfkkhsn2fz26xhk5w44a1gycdlm7jf";
-      name = "kdelibs-4.14.37.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdelibs-4.14.38.tar.xz";
+      sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
+      name = "kdelibs-4.14.38.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdenetwork-filesharing-17.08.2.tar.xz";
-      sha256 = "0pz2zblg8hly141xkcrqs6hnv76zq5isbvyzdad6sjngjn4spcyc";
-      name = "kdenetwork-filesharing-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdenetwork-filesharing-17.08.3.tar.xz";
+      sha256 = "0vy2cyd9ifxrqw9zk4hyidiprd7730q7hm1gc44l6b4siimxyb4x";
+      name = "kdenetwork-filesharing-17.08.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdenlive-17.08.2.tar.xz";
-      sha256 = "0a0qadvxy9b2drpj2k163wfg73020qfclkl47krqgrn2mdvibr92";
-      name = "kdenlive-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdenlive-17.08.3.tar.xz";
+      sha256 = "1nh6cmxkr47zlpvcrjm8dfylsdmncb5qhyvb86rypr1qqmbifg5x";
+      name = "kdenlive-17.08.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdepim-addons-17.08.2.tar.xz";
-      sha256 = "036zs71aqr749n2cjv61y1xhgg16lsh07lx1kdqcqwyi8qgk7c1m";
-      name = "kdepim-addons-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdepim-addons-17.08.3.tar.xz";
+      sha256 = "1r0qgrliw2g82vgj63l00x0visjclxh2fafngl8ga4dk411nfg4x";
+      name = "kdepim-addons-17.08.3.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdepim-apps-libs-17.08.2.tar.xz";
-      sha256 = "14m7qxvpfdq53amigysqj4y26j8y8c45j7k4j9gv90amlh716ss1";
-      name = "kdepim-apps-libs-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdepim-apps-libs-17.08.3.tar.xz";
+      sha256 = "0706ndzw315szab2qg30x7a6f50iv439rrpdpy321q7ay5fm0f2p";
+      name = "kdepim-apps-libs-17.08.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdepim-runtime-17.08.2.tar.xz";
-      sha256 = "0yvrgi8rgwpvzkhzc5zdqyhqxs0czfqqc4dsgprg27a06lb7i3lz";
-      name = "kdepim-runtime-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdepim-runtime-17.08.3.tar.xz";
+      sha256 = "0qc6kkc5rsg9l5plciass6p1ym7arlp6yk7x5ycy53k7fbsh4ak7";
+      name = "kdepim-runtime-17.08.3.tar.xz";
     };
   };
   kde-runtime = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kde-runtime-17.08.2.tar.xz";
-      sha256 = "00bjnbpx2lbjl7nz9z118yanwqmgjmy0nvq4bgxz7i4b68aw17xb";
-      name = "kde-runtime-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kde-runtime-17.08.3.tar.xz";
+      sha256 = "15nfkfz2wwlr1rp93sl1kmxl35wpnlf86225ihl43nhwn6pihb38";
+      name = "kde-runtime-17.08.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdesdk-kioslaves-17.08.2.tar.xz";
-      sha256 = "0h1bv0dbi3a8b1q5dj999k28llckgxsf8055fw5fsbx6q2h0rq23";
-      name = "kdesdk-kioslaves-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdesdk-kioslaves-17.08.3.tar.xz";
+      sha256 = "11akksc09mzxnjiqcsxwgwcxzcjpw50cr277lp7p6rx1hdbwlk7a";
+      name = "kdesdk-kioslaves-17.08.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdesdk-thumbnailers-17.08.2.tar.xz";
-      sha256 = "0z20hc8ssw439sdc8w2fzkaihzcag8sflymizwgf6x8c7awi4y2v";
-      name = "kdesdk-thumbnailers-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdesdk-thumbnailers-17.08.3.tar.xz";
+      sha256 = "1hhsskrhkq3z6phjkvc43gzsmx0apcpr4sjr9zqqfy847zqsvfm2";
+      name = "kdesdk-thumbnailers-17.08.3.tar.xz";
     };
   };
   kdf = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdf-17.08.2.tar.xz";
-      sha256 = "0pfw8br46475h2v34nc0pnz94icrlivc3xcaxrf3w6x0wypmnhxs";
-      name = "kdf-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdf-17.08.3.tar.xz";
+      sha256 = "1s291c4g51y92wplrqkl528py83xfviyvv1qjyp3c7nyf6g2jvwq";
+      name = "kdf-17.08.3.tar.xz";
     };
   };
   kdialog = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdialog-17.08.2.tar.xz";
-      sha256 = "03lb5h8lbravayx5fddbzb6xgi9dabcyqpld3h32ykw4v26wlb1v";
-      name = "kdialog-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdialog-17.08.3.tar.xz";
+      sha256 = "1n6n06sqgq1s2781pnsbfyczc68l5xx6l0idymj3pmniz3q4svp8";
+      name = "kdialog-17.08.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kdiamond-17.08.2.tar.xz";
-      sha256 = "1fkldch162m4awk6j7xx61lh8h9i5cb9x38gndz4imvwmyvfqijn";
-      name = "kdiamond-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kdiamond-17.08.3.tar.xz";
+      sha256 = "1czhmxs3k7mx82r1k88h8riwn9jxlz6w60mi4jx8b29qcm532f53";
+      name = "kdiamond-17.08.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/keditbookmarks-17.08.2.tar.xz";
-      sha256 = "0dfyp8macmqhczk7b60dc15wqw8wzpbp6wlm6cdibdw7hlia9hfl";
-      name = "keditbookmarks-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/keditbookmarks-17.08.3.tar.xz";
+      sha256 = "115ys7703m611dw6ap2kqv4rgzxp15dsscg1y2gx09afc8fg2i62";
+      name = "keditbookmarks-17.08.3.tar.xz";
     };
   };
   kfilereplace = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kfilereplace-17.08.2.tar.xz";
-      sha256 = "02iwzcn5lm1riv1pg9d5s20q60f569qpx1wdbz1181r6806fsi37";
-      name = "kfilereplace-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kfilereplace-17.08.3.tar.xz";
+      sha256 = "1ksv9igzq65wgsam6ynbbzzyriacbk7y48dzh190p8k2bdf6gij6";
+      name = "kfilereplace-17.08.3.tar.xz";
     };
   };
   kfind = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kfind-17.08.2.tar.xz";
-      sha256 = "06c3ba95h6lzfwlj4svwlrijbv0d8c5siljiradiam65zai2bfpd";
-      name = "kfind-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kfind-17.08.3.tar.xz";
+      sha256 = "16f27ykh52vphq6wjyi1vy6vrzshj0cawmc8fy7y1j5yzzdkx1hk";
+      name = "kfind-17.08.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kfloppy-17.08.2.tar.xz";
-      sha256 = "0icvsbxcxxg8lyzvzbga34an968gzwpd23zssbfy8flym95ci890";
-      name = "kfloppy-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kfloppy-17.08.3.tar.xz";
+      sha256 = "1d5xn0rxc92k60hc1860mji8dzq932gg4by42gylwldcvgdija14";
+      name = "kfloppy-17.08.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kfourinline-17.08.2.tar.xz";
-      sha256 = "1d4bfl81v4v512ixi1vbfbvz8vbmn1acfxjazlhk8xjjj0ky3yb2";
-      name = "kfourinline-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kfourinline-17.08.3.tar.xz";
+      sha256 = "1bxzlx55i6vbk8cmpx38g1xdx0swqwd73lw5z584affw464ps1n9";
+      name = "kfourinline-17.08.3.tar.xz";
     };
   };
   kgeography = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kgeography-17.08.2.tar.xz";
-      sha256 = "16fgkp16bhpcibf8q0ivp9zsw8ws44icg34c3r8p5fbggfnkzqk6";
-      name = "kgeography-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kgeography-17.08.3.tar.xz";
+      sha256 = "19k39rjm9lwbv3p6iifam80li5bhw4xf2g4i4hj0h7gyrj9gb1mp";
+      name = "kgeography-17.08.3.tar.xz";
     };
   };
   kget = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kget-17.08.2.tar.xz";
-      sha256 = "1n6ky1bvr24hj3d6s1lfmyybr73q9p59w80fpzbx5v8c8l2g40w0";
-      name = "kget-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kget-17.08.3.tar.xz";
+      sha256 = "01z3ij4iv3kgwy0fcnrf4qpfgapflx1pgv2hiaykgsj6ij24fx6a";
+      name = "kget-17.08.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kgoldrunner-17.08.2.tar.xz";
-      sha256 = "085ydmcmaiahzq32gasc5ihbxg25glpc9alqzhd4flzvqf646xmx";
-      name = "kgoldrunner-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kgoldrunner-17.08.3.tar.xz";
+      sha256 = "1k09pw7lm17702p0lliyl767zwk4n3gkkzj441cq3fqjnwm93lx4";
+      name = "kgoldrunner-17.08.3.tar.xz";
     };
   };
   kgpg = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kgpg-17.08.2.tar.xz";
-      sha256 = "1nrz2p6h13wi4vk4mrpcjkksrr6brj1aap4mf1rpj0g1mhrhwqly";
-      name = "kgpg-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kgpg-17.08.3.tar.xz";
+      sha256 = "1g06n6i9qqvalmpg2zan7qg7j7dp4rn152pashs3jxij29n1bw7h";
+      name = "kgpg-17.08.3.tar.xz";
     };
   };
   khangman = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/khangman-17.08.2.tar.xz";
-      sha256 = "17qmsixr4ic86imdrw0z9lyjhnw00ycnxyyrzb736cw7s4jnnick";
-      name = "khangman-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/khangman-17.08.3.tar.xz";
+      sha256 = "1fny78d3vaaz67css4i14pnvkm5p586ib8mwrs2rglc931c89dqq";
+      name = "khangman-17.08.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/khelpcenter-17.08.2.tar.xz";
-      sha256 = "0n4rdw606rhc3fs7kqg28dh8ay7q3ihiaraay8by3bk5dqby8r8k";
-      name = "khelpcenter-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/khelpcenter-17.08.3.tar.xz";
+      sha256 = "089aahdr1yibff4y0l78m0wzz7m0mc090g4fp4aj4gp56wz6i5jn";
+      name = "khelpcenter-17.08.3.tar.xz";
     };
   };
   kholidays = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kholidays-17.08.2.tar.xz";
-      sha256 = "03acmrw577lbs5h8az4wiw0dlmxmjiqak8pvm7w0ssmd2mrkggl2";
-      name = "kholidays-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kholidays-17.08.3.tar.xz";
+      sha256 = "17razwvskf6i5hidlfp98bmfrijp8hn5gxrqcjxc49wpkhlj70jm";
+      name = "kholidays-17.08.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kidentitymanagement-17.08.2.tar.xz";
-      sha256 = "1ylv4qcsry9m8zjddgpxb93yfmzbf0aikvf4m7j040272z2as6q9";
-      name = "kidentitymanagement-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kidentitymanagement-17.08.3.tar.xz";
+      sha256 = "0k926vwdhrk4ilpn0zhkcn26j1h7nqlzzi9mimybz1sp4fzxa83v";
+      name = "kidentitymanagement-17.08.3.tar.xz";
     };
   };
   kig = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kig-17.08.2.tar.xz";
-      sha256 = "19jm98rlfvzsqip8vdi8gf1hynfkizjn61j4p1srgaciffx5l8zb";
-      name = "kig-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kig-17.08.3.tar.xz";
+      sha256 = "0wf03fm7fpph52ilxckz02ikn6mq486ps8p8byq2vvfwh6z0w6wg";
+      name = "kig-17.08.3.tar.xz";
     };
   };
   kigo = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kigo-17.08.2.tar.xz";
-      sha256 = "04qlqghgnnyqcvc1f3s4l9as4pma1g09jdgy48jwxlbg1h60m48z";
-      name = "kigo-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kigo-17.08.3.tar.xz";
+      sha256 = "1k850vmsifvab14aaqkivgrw8794yhvn7d10c5ib2zf6447cl8m5";
+      name = "kigo-17.08.3.tar.xz";
     };
   };
   killbots = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/killbots-17.08.2.tar.xz";
-      sha256 = "1xpigas92xn911jm0zrq47hpnxxr4lb9bvv9f5b6i7k9z8p9m8zl";
-      name = "killbots-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/killbots-17.08.3.tar.xz";
+      sha256 = "0ds391xx2d792069kl998f84qym26964ph5bja6bwkhgvws84r9g";
+      name = "killbots-17.08.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kimagemapeditor-17.08.2.tar.xz";
-      sha256 = "13z3z4pjgky4bh5js79rnsbzcxj0ksh4wdqx3fgmjs5mzbaka5gg";
-      name = "kimagemapeditor-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kimagemapeditor-17.08.3.tar.xz";
+      sha256 = "0clzk2d63hy1vvkdpxa1j5pp7y28x467wd9zfvv6k2vw703ghqlx";
+      name = "kimagemapeditor-17.08.3.tar.xz";
     };
   };
   kimap = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kimap-17.08.2.tar.xz";
-      sha256 = "0klpqy092hfqrvmm4nx3blwjnkybhg9zji500ckid90kv547ffmb";
-      name = "kimap-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kimap-17.08.3.tar.xz";
+      sha256 = "0c5inldmlwc5x2q1vhvj0wv61h6986m068a2k4xrrbirpb4pcwls";
+      name = "kimap-17.08.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kio-extras-17.08.2.tar.xz";
-      sha256 = "1pblk8vi2gcvyjw71pwihpd9n4qlhcksfs3py8mcll1pz2ijbz6n";
-      name = "kio-extras-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kio-extras-17.08.3.tar.xz";
+      sha256 = "0gq187435yd0251znqicpcn0r89aar7a64bjpf6x0zhdlli8n9jc";
+      name = "kio-extras-17.08.3.tar.xz";
     };
   };
   kiriki = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kiriki-17.08.2.tar.xz";
-      sha256 = "1w83ggi02ibhgsmyw5s9cnjjqgx0zwbakf42l1dif9882svg38h7";
-      name = "kiriki-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kiriki-17.08.3.tar.xz";
+      sha256 = "1cbijn0358gpr21yfab84gybf5vqxwilwbhfl6nj8qmppp2bpjqd";
+      name = "kiriki-17.08.3.tar.xz";
     };
   };
   kiten = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kiten-17.08.2.tar.xz";
-      sha256 = "0rdkwv4njdpv1air697gwlzx843ddqwa7kl15i012307jfgkbkj4";
-      name = "kiten-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kiten-17.08.3.tar.xz";
+      sha256 = "0v00q9hs94p5r6x7s7i12814pfydd5y1bzp6sm5x0vx1ixdnkx89";
+      name = "kiten-17.08.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kjumpingcube-17.08.2.tar.xz";
-      sha256 = "0q4y35ffq48yc2h843vv970rg4h8miy5pbsxkkrflwljcarwxv65";
-      name = "kjumpingcube-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kjumpingcube-17.08.3.tar.xz";
+      sha256 = "13ifm6drw4m1dzssfalazmnsr5f8z9gla3aypb9ny1xm9ahlgfwh";
+      name = "kjumpingcube-17.08.3.tar.xz";
     };
   };
   kldap = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kldap-17.08.2.tar.xz";
-      sha256 = "1p0ydrhji8cb4fmciyazy44d2nz6mhcl1brqn4ridv98hqa2ybpc";
-      name = "kldap-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kldap-17.08.3.tar.xz";
+      sha256 = "0bnx5fc48ppsykpqwjgsqjd7s4azgzk82k9xgaw566nxqqvgpzsv";
+      name = "kldap-17.08.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kleopatra-17.08.2.tar.xz";
-      sha256 = "0g5qg0kg1d0cza3689ppvj4hdhqdsxjcn8hc9cfpsapz28is8yk4";
-      name = "kleopatra-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kleopatra-17.08.3.tar.xz";
+      sha256 = "0vglphfxq37pxdrrchgzkdlzlzr18qlfwy9g64njyddnsv48pfx8";
+      name = "kleopatra-17.08.3.tar.xz";
     };
   };
   klettres = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/klettres-17.08.2.tar.xz";
-      sha256 = "1n1z4nj3rqiyqz0ysr6fvhygayvxfyljg3z6f0y6f70n9r5n999m";
-      name = "klettres-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/klettres-17.08.3.tar.xz";
+      sha256 = "14jxbvil45hc2kqky7yhxrgzpv4094lk9ri0j05i1av6784s9555";
+      name = "klettres-17.08.3.tar.xz";
     };
   };
   klickety = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/klickety-17.08.2.tar.xz";
-      sha256 = "1haqc96jivnb93vhzmd9kp446p32gmkpf5zys5ix20r6lbsywgd9";
-      name = "klickety-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/klickety-17.08.3.tar.xz";
+      sha256 = "01hqf41m8pviziq1x562rd85357kkfgd0x0ba1vasimjddg6v6qa";
+      name = "klickety-17.08.3.tar.xz";
     };
   };
   klines = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/klines-17.08.2.tar.xz";
-      sha256 = "1v5gqyyc6vl3s44w9v34q0g27fxf85kkk9i188j48q0kiblbxq8d";
-      name = "klines-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/klines-17.08.3.tar.xz";
+      sha256 = "1s0krcqbqii9fqrymm4bb9ssznzyv8bijk5lcngwgxs24igl0g4d";
+      name = "klines-17.08.3.tar.xz";
     };
   };
   klinkstatus = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/klinkstatus-17.08.2.tar.xz";
-      sha256 = "1nfflb850mr1cd065lwryx6rd47w5bamg7sznvrhzjzqzrq6sm0x";
-      name = "klinkstatus-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/klinkstatus-17.08.3.tar.xz";
+      sha256 = "0bv5ahcnss6ziccx9mmvf5bdsff9drjqpmq9ln51524bjn4x58ic";
+      name = "klinkstatus-17.08.3.tar.xz";
     };
   };
   kmag = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmag-17.08.2.tar.xz";
-      sha256 = "16i4cysa77dmxvkhpvhja4v315nnj1i5m9pd8a62j32gkrq54cpr";
-      name = "kmag-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmag-17.08.3.tar.xz";
+      sha256 = "0dadzzrmd982y7apjk783wm5q302y03ydai74pzyqy0awnjdm09d";
+      name = "kmag-17.08.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmahjongg-17.08.2.tar.xz";
-      sha256 = "06f0wrjnlqgsh4n5kf7by5calrg2p0chm0c5b6wf4k311wb1cy65";
-      name = "kmahjongg-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmahjongg-17.08.3.tar.xz";
+      sha256 = "09j2pmqc66zi851fsl4ijrcgq3y35arx9272p6z07bg0z9ja5vgb";
+      name = "kmahjongg-17.08.3.tar.xz";
     };
   };
   kmail = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmail-17.08.2.tar.xz";
-      sha256 = "0fxxys8fxal6f4grbnl5niwf80kg62zymlbsp3hk7iihis6zqq59";
-      name = "kmail-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmail-17.08.3.tar.xz";
+      sha256 = "1ibpq0alnk70ha1smfyw8gc91k5q4x1gw7zddwgzw1pjr4v1bqdc";
+      name = "kmail-17.08.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmail-account-wizard-17.08.2.tar.xz";
-      sha256 = "1qf78p18pfyl7axm447q8zcrji53h6mvahampkqgmsybp35c7fd7";
-      name = "kmail-account-wizard-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmail-account-wizard-17.08.3.tar.xz";
+      sha256 = "0mkw6skpf9kc2h34ww85g18cljln77n5dsg5cyfyqc3i52m1halk";
+      name = "kmail-account-wizard-17.08.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmailtransport-17.08.2.tar.xz";
-      sha256 = "0gzvvszwaqpckig8293m734gbyzx5v8sl9k9n1hi1cnwblsnn7aj";
-      name = "kmailtransport-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmailtransport-17.08.3.tar.xz";
+      sha256 = "0cfyzvsn5x03i6kprqm7y6j6qsfys4yz2s3f4wb5igpdm25nclq1";
+      name = "kmailtransport-17.08.3.tar.xz";
     };
   };
   kmbox = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmbox-17.08.2.tar.xz";
-      sha256 = "01ip8j5yj09gzzgynjqnxxxyv5d69rnnvq8mgwnpm6cxyh7lc8pv";
-      name = "kmbox-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmbox-17.08.3.tar.xz";
+      sha256 = "0mf0005fs15vgmmikdsa44ig4hxrnysl13mrn168crk96h3sk8qi";
+      name = "kmbox-17.08.3.tar.xz";
     };
   };
   kmime = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmime-17.08.2.tar.xz";
-      sha256 = "1ai3czsl60rf0sqqbmvr34nz5q2dz7i5y818rrar52r7fdn93wba";
-      name = "kmime-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmime-17.08.3.tar.xz";
+      sha256 = "17ziw8g1wdys4iy2yqavqy7wj4kw617m80fg77zlf1cscswhg23d";
+      name = "kmime-17.08.3.tar.xz";
     };
   };
   kmines = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmines-17.08.2.tar.xz";
-      sha256 = "0k563bsd0yczcm4h5wvq2f5i029ah9wwv2f0qjwyrbzqxcl50xi0";
-      name = "kmines-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmines-17.08.3.tar.xz";
+      sha256 = "14b0klnlbxkvln3q9fliw6cijc2xmsfmvm6sfikdzzgj59jcylzp";
+      name = "kmines-17.08.3.tar.xz";
     };
   };
   kmix = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmix-17.08.2.tar.xz";
-      sha256 = "06rqnlrl2l91inllzn8jksg74sldjyghjg06vv49ly6jqyc04aqh";
-      name = "kmix-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmix-17.08.3.tar.xz";
+      sha256 = "0fd38banrbgpp8g5gz09w6wny8mdi9szvddl1rv7yx67zf112g67";
+      name = "kmix-17.08.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmousetool-17.08.2.tar.xz";
-      sha256 = "1y568g0s88h0i67j9x083nqj7nyfsn4vyb149j97fm7d4iifbm2s";
-      name = "kmousetool-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmousetool-17.08.3.tar.xz";
+      sha256 = "0y2zavs442wpz438p1kyzrqlv9qgvxd4l5gw1pmmx8lkvjjdi91v";
+      name = "kmousetool-17.08.3.tar.xz";
     };
   };
   kmouth = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmouth-17.08.2.tar.xz";
-      sha256 = "0qbbqb0wb3pzz7xv6jvghm2fmgxkvwmyiyjc9m1yzbmrdzqj1rig";
-      name = "kmouth-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmouth-17.08.3.tar.xz";
+      sha256 = "0gzc6apskfpvih7aap5mfv45q3pg70nfis1vh5ywidia36wbf26i";
+      name = "kmouth-17.08.3.tar.xz";
     };
   };
   kmplot = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kmplot-17.08.2.tar.xz";
-      sha256 = "1ccnlbgzvx2b1sdzrvzpmnnk4g8r7rvpczm1xjyk62r7mdbffp97";
-      name = "kmplot-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kmplot-17.08.3.tar.xz";
+      sha256 = "1ann38zzzd5pds889mc5vw8xw80qlpm9l9nmkczkqyhkfvwxd605";
+      name = "kmplot-17.08.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/knavalbattle-17.08.2.tar.xz";
-      sha256 = "1b0s28ybl1p62issc3rvl41zhn94y0y9aflpqkjfg6592zjc304g";
-      name = "knavalbattle-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/knavalbattle-17.08.3.tar.xz";
+      sha256 = "1zj6pki0v3p4xg25ivl45mb877p5xh47d066442pahkf8l3wnsh5";
+      name = "knavalbattle-17.08.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/knetwalk-17.08.2.tar.xz";
-      sha256 = "0b9zqa3xgwkcfrnyxd026vd47hpf9i7j5xmx1b756rqm9yr531r5";
-      name = "knetwalk-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/knetwalk-17.08.3.tar.xz";
+      sha256 = "0i32f54z5hinafy1v5s1j8ahnbw30721lxa2mvh5qcbr21fan3mc";
+      name = "knetwalk-17.08.3.tar.xz";
     };
   };
   knotes = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/knotes-17.08.2.tar.xz";
-      sha256 = "02i25f43dwmlwx1yhhws0zvrvqf92zhw8868hbfxz0y1lq04navx";
-      name = "knotes-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/knotes-17.08.3.tar.xz";
+      sha256 = "0ly9gpji3nl3i53nzqd5z27li8qnc1asfv1d1kawchz077da02xy";
+      name = "knotes-17.08.3.tar.xz";
     };
   };
   kolf = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kolf-17.08.2.tar.xz";
-      sha256 = "1m0dn1v68y7vsranlv690hx3dyffzkjmnqzbvyaad72kldq0qw0l";
-      name = "kolf-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kolf-17.08.3.tar.xz";
+      sha256 = "1wc6x1hgkniwzb53bcph3alk0fxlb91s6j39blhync6713x8b4g0";
+      name = "kolf-17.08.3.tar.xz";
     };
   };
   kollision = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kollision-17.08.2.tar.xz";
-      sha256 = "01z6yfr882hh00bga3iwcyiwxzyigxc2ddd6r8a3s6h7cpi4ik1x";
-      name = "kollision-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kollision-17.08.3.tar.xz";
+      sha256 = "14ama8cfi4d7whgck0gywm7869gpargq1lrkq8ik4k914pharkzi";
+      name = "kollision-17.08.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kolourpaint-17.08.2.tar.xz";
-      sha256 = "15bfzw03dh40m51fh1zwbrzqb5g2qjryznaaymjmzamgx08ldm4n";
-      name = "kolourpaint-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kolourpaint-17.08.3.tar.xz";
+      sha256 = "1y44q14f6brdmccnmf8143kjjqais8ps15z31dpx2935qzjxw8sc";
+      name = "kolourpaint-17.08.3.tar.xz";
     };
   };
   kompare = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kompare-17.08.2.tar.xz";
-      sha256 = "1l2rdv8sddhf2z0vnn591aarzq5nqbhi58cnnpdwb5px99kasnyv";
-      name = "kompare-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kompare-17.08.3.tar.xz";
+      sha256 = "0fi3s02rsaa3xl7j69lq2qvg9jn9hxdp44ns89q94s06rqkbjyr1";
+      name = "kompare-17.08.3.tar.xz";
     };
   };
   konqueror = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/konqueror-17.08.2.tar.xz";
-      sha256 = "1c0fpbjba9bq515v3vbzj80jclx8kcy9khzvgaxasdmd9d01yvid";
-      name = "konqueror-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/konqueror-17.08.3.tar.xz";
+      sha256 = "1b2hs0fp0a51y87dl8rnv47b8kzjylsps9nczgi8zsipg03z9ja7";
+      name = "konqueror-17.08.3.tar.xz";
     };
   };
   konquest = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/konquest-17.08.2.tar.xz";
-      sha256 = "15mmavbkndzzfa3zzsqxh53wi2489dqr8iw25iaj3pcbjzkn75rd";
-      name = "konquest-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/konquest-17.08.3.tar.xz";
+      sha256 = "1k5s9cvlsx3j2774i6p6xx2sfg75aafj9a4imvm7mzvn3gvmkm3q";
+      name = "konquest-17.08.3.tar.xz";
     };
   };
   konsole = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/konsole-17.08.2.tar.xz";
-      sha256 = "0a7ks2an76jwkapy9rjhf29q9h4z212yf9bvx5757lj5qn5pwxq2";
-      name = "konsole-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/konsole-17.08.3.tar.xz";
+      sha256 = "07v9nbikzpanpggglp07slkbn6h0cl2anz7735f9b0lg55fydv42";
+      name = "konsole-17.08.3.tar.xz";
     };
   };
   kontact = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kontact-17.08.2.tar.xz";
-      sha256 = "19hkppf2jwky73v73j4c2ppah7va4yrsv40ivw50k51s68s60b4a";
-      name = "kontact-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kontact-17.08.3.tar.xz";
+      sha256 = "1hj6vgvn73bzf43ckk4cm24m1n0a4c9c6p14q95hbfbcp5bdra1i";
+      name = "kontact-17.08.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kontactinterface-17.08.2.tar.xz";
-      sha256 = "1gws8vl7s8jyqqbb37yw6gn85sqpfra8jzmin53j4wj4s8rdir5y";
-      name = "kontactinterface-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kontactinterface-17.08.3.tar.xz";
+      sha256 = "1ncy0fz0jyklckimm9jjfv2j88aibk49ismz5z6xlasn44vn7l9c";
+      name = "kontactinterface-17.08.3.tar.xz";
     };
   };
   kopete = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kopete-17.08.2.tar.xz";
-      sha256 = "01km2qsf12z8sbsbg8d4ng9izaphlsfqhr29dqryf1kqrwcv6amb";
-      name = "kopete-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kopete-17.08.3.tar.xz";
+      sha256 = "1v5gmh521si3zbxgcm9m4rcp0csqy52xgvpjpb8j7iq9m0fcqv7q";
+      name = "kopete-17.08.3.tar.xz";
     };
   };
   korganizer = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/korganizer-17.08.2.tar.xz";
-      sha256 = "1anmc4bfd8pdf22vprw3x82fi2f19wh7xy5xwf144kqhwbyqk7ch";
-      name = "korganizer-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/korganizer-17.08.3.tar.xz";
+      sha256 = "1nsj03h1r5mnz2dvdmydvqz2fspgw2ybs5z05gg0f903sq1gz80l";
+      name = "korganizer-17.08.3.tar.xz";
     };
   };
   kpat = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kpat-17.08.2.tar.xz";
-      sha256 = "09ck09ywhl2ywlv90ipgxs45xiwcc3sxvfmgviqxvky513kkx7mn";
-      name = "kpat-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kpat-17.08.3.tar.xz";
+      sha256 = "0l5s5rrn67lbf8hjqyyxvxij935pb1fd9x9dlskxyc2w7n6acmn2";
+      name = "kpat-17.08.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kpimtextedit-17.08.2.tar.xz";
-      sha256 = "15w338kwdrkag08zyg8dzkwfg25zh67bbwsfxa6ra40hdj1azz8p";
-      name = "kpimtextedit-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kpimtextedit-17.08.3.tar.xz";
+      sha256 = "1xyfzvmsfikx2xnhgwx9wkdhvfq72f3mz67hlw2jsbm3ir889ysb";
+      name = "kpimtextedit-17.08.3.tar.xz";
     };
   };
   kppp = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kppp-17.08.2.tar.xz";
-      sha256 = "016rgayrxccmvn7pw40x12dv3qi781m2rbcbz8lkprdglzzavfrz";
-      name = "kppp-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kppp-17.08.3.tar.xz";
+      sha256 = "00y19x306r3pnax1b2cv8bndd6vq1qp30r1hrgw8npy5mm4mn8jw";
+      name = "kppp-17.08.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kqtquickcharts-17.08.2.tar.xz";
-      sha256 = "186rqlwjpa43z9qi8m2xkyc739plq7cmvn6jkzgl4k21pkfbgx9f";
-      name = "kqtquickcharts-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kqtquickcharts-17.08.3.tar.xz";
+      sha256 = "0w8hlnhdgqrmad4ii07f9hsyx6vlaqnvlc54prnah1bqzymvc2ms";
+      name = "kqtquickcharts-17.08.3.tar.xz";
     };
   };
   krdc = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/krdc-17.08.2.tar.xz";
-      sha256 = "1yv8z3hhhwrcy58lkaifnqkq38p9gs9sc6dhd3i6fpn1bci1j72a";
-      name = "krdc-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/krdc-17.08.3.tar.xz";
+      sha256 = "13rmn1p495dzx49d1y22na25vrpzk9mcc2axg412pv038iphf8id";
+      name = "krdc-17.08.3.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kremotecontrol-17.08.2.tar.xz";
-      sha256 = "0f31zbf7yc59jvdm7ivb0g7wwh5mmdk26kyjqw8dg46hg29k1p79";
-      name = "kremotecontrol-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kremotecontrol-17.08.3.tar.xz";
+      sha256 = "1p23q7bvppv8fabvpwi793zplb4kry8njczma7c4nya4mkdk9370";
+      name = "kremotecontrol-17.08.3.tar.xz";
     };
   };
   kreversi = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kreversi-17.08.2.tar.xz";
-      sha256 = "1zrhaxnkjirkwjmbqjpagx6jijqdvb8khfhv7pwxij2q5ia9k7d8";
-      name = "kreversi-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kreversi-17.08.3.tar.xz";
+      sha256 = "0ma0y1n38hw5rawzazlaqfa4vsawgvaq8j2pa5n7z23nwckh19wd";
+      name = "kreversi-17.08.3.tar.xz";
     };
   };
   krfb = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/krfb-17.08.2.tar.xz";
-      sha256 = "1554ziphhwck62cyfq60nwiivxb9vvc7l03iz5ncwj1apgmrj9m8";
-      name = "krfb-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/krfb-17.08.3.tar.xz";
+      sha256 = "1k7rziw0l0bdjxi5i92w1zsjbakzbklc95dyn2jsnm36jljjqpv1";
+      name = "krfb-17.08.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kross-interpreters-17.08.2.tar.xz";
-      sha256 = "0g5p25s1r1i60dlgsh9kwpq851cxhmprj6z00b91z6hj46v2zzx8";
-      name = "kross-interpreters-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kross-interpreters-17.08.3.tar.xz";
+      sha256 = "1pqlm14xr9p18dfh8pczg8fjskpvzxh5s5n7nxj9q31yz6kbxzrb";
+      name = "kross-interpreters-17.08.3.tar.xz";
     };
   };
   kruler = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kruler-17.08.2.tar.xz";
-      sha256 = "0c1sdb3nihpi3p82s49g9k86ivnr499b3jdzrqh6hfcr6dbhi8x6";
-      name = "kruler-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kruler-17.08.3.tar.xz";
+      sha256 = "1qizjvysfnh5x3fa8hav3y9pyaiq8hpwi1grw9dd921cbb16cww4";
+      name = "kruler-17.08.3.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ksaneplugin-17.08.2.tar.xz";
-      sha256 = "0zp898jb1vc5zliidhn5v4lqlqmmpn33fxarm5br9ks4zpqzam0y";
-      name = "ksaneplugin-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ksaneplugin-17.08.3.tar.xz";
+      sha256 = "0y7f269wv0alcvx906nill92nzlld5b1sg6q3xki89b6b9fgliig";
+      name = "ksaneplugin-17.08.3.tar.xz";
     };
   };
   kscd = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kscd-17.08.2.tar.xz";
-      sha256 = "1p79dwp0gwdffhz5dhdpcyc8hrzs0ks8kxzhrrxksazc25wh3l8y";
-      name = "kscd-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kscd-17.08.3.tar.xz";
+      sha256 = "08r9zhp7d7xf8iyi56hvlm5vyjqrjpj9dc8ynda0n7hyngxrbvm0";
+      name = "kscd-17.08.3.tar.xz";
     };
   };
   kshisen = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kshisen-17.08.2.tar.xz";
-      sha256 = "1kbyhxc5kp7s3if6lb39wjx1yxrwzkavf5vrlm0xynwzr560n6ar";
-      name = "kshisen-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kshisen-17.08.3.tar.xz";
+      sha256 = "18nwnxn7i0p2b78cxv8ppsl4lrzdm4ck6hqqdf738npli271shq0";
+      name = "kshisen-17.08.3.tar.xz";
     };
   };
   ksirk = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ksirk-17.08.2.tar.xz";
-      sha256 = "0q19yvghp6fgdpjgs9qc3rxqm4ahf5h2dbnw32v3c1hv095dfvi0";
-      name = "ksirk-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ksirk-17.08.3.tar.xz";
+      sha256 = "1601fh93jcy7x622hpvdrb9ddb262n9ivakxli054cz2bq3dbpim";
+      name = "ksirk-17.08.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ksnakeduel-17.08.2.tar.xz";
-      sha256 = "1gbsf3fmkpl438wq7xpvmyanm6p7knnyxvbvbd0my288xb4l3xf5";
-      name = "ksnakeduel-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ksnakeduel-17.08.3.tar.xz";
+      sha256 = "1a7xki783799ala0zx1jngvhsky994sk32xyza2lfir5ym1w0pkm";
+      name = "ksnakeduel-17.08.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kspaceduel-17.08.2.tar.xz";
-      sha256 = "13pbg1pwl25qlyb9kha08gnpbx6njclld8zlasvpym2c4db5cxx2";
-      name = "kspaceduel-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kspaceduel-17.08.3.tar.xz";
+      sha256 = "1wskg788mc51dh3hv0d7hrqyy14gnzzw2sqhc0pd65jj8hra7kh2";
+      name = "kspaceduel-17.08.3.tar.xz";
     };
   };
   ksquares = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ksquares-17.08.2.tar.xz";
-      sha256 = "1l2pgm3rj3cl7jgc1q7rjbv3kmi6zm4jh29r1q7zhfsiwin0sfz5";
-      name = "ksquares-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ksquares-17.08.3.tar.xz";
+      sha256 = "04bc3ppiai39v8dq02r7nzr4nvpzjj90glg6qssxqyxwrz18kk20";
+      name = "ksquares-17.08.3.tar.xz";
     };
   };
   kstars = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kstars-17.08.2.tar.xz";
-      sha256 = "1l1bjqwhvzw5czlfjg4zqk48bva9xlrn53grlbl2yywzvmn5jhgy";
-      name = "kstars-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz";
+      sha256 = "0i165snb4wnw2kzbhcawgwwqppgq5fmw23rqa4q2k3alaz9smcdn";
+      name = "kstars-17.08.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ksudoku-17.08.2.tar.xz";
-      sha256 = "0hb4901gx81ra8mcrcsqbdhjqxfd1s5sxal4xhg72yd80qsg1da1";
-      name = "ksudoku-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ksudoku-17.08.3.tar.xz";
+      sha256 = "1dmqss272z7s7vbh71zg7s5drn66a2yyrv53f34yk3d93mhk8dq2";
+      name = "ksudoku-17.08.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ksystemlog-17.08.2.tar.xz";
-      sha256 = "16fiprkbkpnnc17qkgsd4w8givk6ny3kflb8pc87f2zs2vw6dfad";
-      name = "ksystemlog-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ksystemlog-17.08.3.tar.xz";
+      sha256 = "0smhbdpj2xf9q8l8cjhk4x80qq6apn6mmf7dna9hznp6nd6jrsgv";
+      name = "ksystemlog-17.08.3.tar.xz";
     };
   };
   kteatime = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kteatime-17.08.2.tar.xz";
-      sha256 = "1cxxcaqzpjp6n8afrg1rw61grvmmla36r979761p3w0hwpgdrln3";
-      name = "kteatime-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kteatime-17.08.3.tar.xz";
+      sha256 = "0pp08b2rjz329kdaqq5a490r353n346ah0ag6wfxmpchqy11lr3r";
+      name = "kteatime-17.08.3.tar.xz";
     };
   };
   ktimer = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktimer-17.08.2.tar.xz";
-      sha256 = "0vi9lrjazw8vq811qgcd7wyfkd2n60drszii8gx7w9jq8f0hkvfp";
-      name = "ktimer-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktimer-17.08.3.tar.xz";
+      sha256 = "15k1rfih9k7zpcsdyiwl60jmp1w1svwb8c6cykjzqpc9acyfpba5";
+      name = "ktimer-17.08.3.tar.xz";
     };
   };
   ktnef = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktnef-17.08.2.tar.xz";
-      sha256 = "012c1xsqj1ilq7w0shh22nmvkh1l56sn3ycg6xsigchk203im17d";
-      name = "ktnef-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktnef-17.08.3.tar.xz";
+      sha256 = "0fh0ybb3nijhxhkwcmcygw413blkmra83az1jhkmlpp6q5459jin";
+      name = "ktnef-17.08.3.tar.xz";
     };
   };
   ktouch = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktouch-17.08.2.tar.xz";
-      sha256 = "0zrqmhag522ri8d56hlrrdmgfh6ywswahs7mss61dbyig5bpfy4g";
-      name = "ktouch-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktouch-17.08.3.tar.xz";
+      sha256 = "0z21wb82m3sds4sjkkadb48zxcfj1qbab07i3cs3g3a730zdj5ld";
+      name = "ktouch-17.08.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-accounts-kcm-17.08.2.tar.xz";
-      sha256 = "0nkji06d23y7qa505r3971r83w8pnf1jrz5l3k9di1s0x93cd2lm";
-      name = "ktp-accounts-kcm-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-accounts-kcm-17.08.3.tar.xz";
+      sha256 = "17h75xkavyl2920j57nm6zp81l70ksyjndrrrqxv8clig1bqfc89";
+      name = "ktp-accounts-kcm-17.08.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-approver-17.08.2.tar.xz";
-      sha256 = "07mismz8srzwy7bkfh1gqzrxbj40xavnahhf8dhbskqn4sw8j50q";
-      name = "ktp-approver-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-approver-17.08.3.tar.xz";
+      sha256 = "0dvwwpy50ixylacrxnfh4aqpsbc4nfsqkwr358917w5mambfji42";
+      name = "ktp-approver-17.08.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-auth-handler-17.08.2.tar.xz";
-      sha256 = "0ncbmvld2v6wz9zknrj699pixxjlk7kk22xj9q0q6ay3cdiivcf2";
-      name = "ktp-auth-handler-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-auth-handler-17.08.3.tar.xz";
+      sha256 = "0pm0bvivwlaq083sql74qq5wrlm7wix1k9i4cr3fck73am9h526b";
+      name = "ktp-auth-handler-17.08.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-call-ui-17.08.2.tar.xz";
-      sha256 = "12k5qar1v0faqqsmzvqb8932hndk8kzhc5dkib1kccq7g068br2v";
-      name = "ktp-call-ui-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-call-ui-17.08.3.tar.xz";
+      sha256 = "1kwprh9g97hraywjcv2ppddaxh7cw6gsy4zs8mjvh0zpnn3cy7xm";
+      name = "ktp-call-ui-17.08.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-common-internals-17.08.2.tar.xz";
-      sha256 = "1423sd43xyjzs0fbpvs6nsd1rgfd8ffgmpzbyal1s2f3rb4hfk8h";
-      name = "ktp-common-internals-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-common-internals-17.08.3.tar.xz";
+      sha256 = "10r5flyy4vph1x39dp2mskqksnf5h0qvskl31ln65vz9m8zrhq3w";
+      name = "ktp-common-internals-17.08.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-contact-list-17.08.2.tar.xz";
-      sha256 = "1g07v4am7m3qyq2b8bidxdgz2iwilzsq5nigzxag44nx3kc5n269";
-      name = "ktp-contact-list-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-list-17.08.3.tar.xz";
+      sha256 = "04j2swlqwzppxsbqnwyrz60lgi9l8d7x8hf4xmmhrv1al6vzmb5q";
+      name = "ktp-contact-list-17.08.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-contact-runner-17.08.2.tar.xz";
-      sha256 = "145mbfpbzsrpqpk260jq44yiawj02fw27rr70b8j8az6jffjd1i2";
-      name = "ktp-contact-runner-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-runner-17.08.3.tar.xz";
+      sha256 = "1sh0arsy3z413ng0b89sc6a4rh2rnh50k2mhkrdzcvfbwlf74bhw";
+      name = "ktp-contact-runner-17.08.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-desktop-applets-17.08.2.tar.xz";
-      sha256 = "0kj2k78pcyswykqlh0clvh475f1c62910bxhnk03533fxrgdib3v";
-      name = "ktp-desktop-applets-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-desktop-applets-17.08.3.tar.xz";
+      sha256 = "03m834rh9v6ash8vm1cs2jpyxma6jaag61h5a51s3ykp0rgv984c";
+      name = "ktp-desktop-applets-17.08.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-filetransfer-handler-17.08.2.tar.xz";
-      sha256 = "10v0j46fdbmgciznwrxvb6wn037535w4sinvhn7r2myhf7vsvpah";
-      name = "ktp-filetransfer-handler-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-filetransfer-handler-17.08.3.tar.xz";
+      sha256 = "0vpl977p9lv58p04v6f9v0g4fda7xkhdggf3n4sjnwhis3n0nnx6";
+      name = "ktp-filetransfer-handler-17.08.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-kded-module-17.08.2.tar.xz";
-      sha256 = "03p75jdh0q3709rcc5m2iv75rjphjsbgr40kaphakv57xk5wdhqv";
-      name = "ktp-kded-module-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-kded-module-17.08.3.tar.xz";
+      sha256 = "0mzzbi50ad2z11wi77957fhmwmqnqhfwjll4s7bj4fq6i3kpncmb";
+      name = "ktp-kded-module-17.08.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-send-file-17.08.2.tar.xz";
-      sha256 = "15pyjxhcg7hl0p3bq11w3mrn10i3q0man6rqp7w6vqlq19bjndl3";
-      name = "ktp-send-file-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-send-file-17.08.3.tar.xz";
+      sha256 = "1al9w5n0w6i3x0izylx2jviakj3j19izlys9j7phc2gnm99g8mfa";
+      name = "ktp-send-file-17.08.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktp-text-ui-17.08.2.tar.xz";
-      sha256 = "1my2k34adf95alppq4n69apin72bnl8n84mj7b61pndjiixh4q7b";
-      name = "ktp-text-ui-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktp-text-ui-17.08.3.tar.xz";
+      sha256 = "1ib9hskw3qdrpnb0caj12wqkzg0vh2i9wlx582zchn4k4hqkwsxw";
+      name = "ktp-text-ui-17.08.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/ktuberling-17.08.2.tar.xz";
-      sha256 = "02vwy4zbzj80a9233107xgqa52r3pi4hgnvi6cpbdq9cmvcxw7fq";
-      name = "ktuberling-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/ktuberling-17.08.3.tar.xz";
+      sha256 = "1jvyg09c5458m066sd0x6p2z41rpgbdvkgmw1f6wiybqwxg82h43";
+      name = "ktuberling-17.08.3.tar.xz";
     };
   };
   kturtle = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kturtle-17.08.2.tar.xz";
-      sha256 = "0vx7im20yk1172cb5g7z7mkhbsbx78ad9azs5d23rsv9fpzwikc2";
-      name = "kturtle-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kturtle-17.08.3.tar.xz";
+      sha256 = "1ral1y1s2jsc8zm1bwiliblywlpsb7q79cjqafz31r6cb72rkcs4";
+      name = "kturtle-17.08.3.tar.xz";
     };
   };
   kubrick = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kubrick-17.08.2.tar.xz";
-      sha256 = "0f9smvasgnjswx6jvhw4b7q58k47y1mv48vzygdx61zz1jyxjr8n";
-      name = "kubrick-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kubrick-17.08.3.tar.xz";
+      sha256 = "02hzlkqrb55dc45zgqx3r58r7syb3kr2dfwws3s96j5i4q1bp5p8";
+      name = "kubrick-17.08.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kwalletmanager-17.08.2.tar.xz";
-      sha256 = "1a2q58wjb816fb0wfr4d7i790jxxwbfw9fpk1g8lkfk3kbvdgsnj";
-      name = "kwalletmanager-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kwalletmanager-17.08.3.tar.xz";
+      sha256 = "1ggrswys6ip3lxj6qjy32i36rlmzn2cxddjildlb2b2hk6c3k36r";
+      name = "kwalletmanager-17.08.3.tar.xz";
     };
   };
   kwave = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kwave-17.08.2.tar.xz";
-      sha256 = "1szn09swm8072x2mhy9q1szjm32pgg8agga1r2chf3jxc5iah2h3";
-      name = "kwave-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kwave-17.08.3.tar.xz";
+      sha256 = "0gxmmz5ry6gjfrxwksrxvqyff8f3p807q5s4rcpfh975f10ixqqi";
+      name = "kwave-17.08.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/kwordquiz-17.08.2.tar.xz";
-      sha256 = "0i7jl7rb4bxkifvpf6dsscbvwsay9a5jvvbkkajcwfr1v5r2w969";
-      name = "kwordquiz-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/kwordquiz-17.08.3.tar.xz";
+      sha256 = "0bzfil8pml6jmc0zgszxybyxvkdgzzq37l97z2qvhmjw8pfk0zsr";
+      name = "kwordquiz-17.08.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libgravatar-17.08.2.tar.xz";
-      sha256 = "0zsxijykxxa4lg939wzv0vxh8jr6smmdd0zip8bimvdc4x2k6dv1";
-      name = "libgravatar-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libgravatar-17.08.3.tar.xz";
+      sha256 = "0xx9xik5xcg9gs2hjf0z24v7bqqf5qk8x0743qlspyc35i8jq7hx";
+      name = "libgravatar-17.08.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkcddb-17.08.2.tar.xz";
-      sha256 = "0hlk2302cnpk896fmaq7p5ph7baxi3dz673qpy8f9hlcbj5k4j35";
-      name = "libkcddb-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkcddb-17.08.3.tar.xz";
+      sha256 = "0yhs9acv87i8635dw79hpsiywgxcbnaa4vx0l95v50r3v2pknx7h";
+      name = "libkcddb-17.08.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkcompactdisc-17.08.2.tar.xz";
-      sha256 = "0fimkf94xd7v2cv2ixs38x4bpsrrfk4n36i7qbpakrvnw60q0rk4";
-      name = "libkcompactdisc-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkcompactdisc-17.08.3.tar.xz";
+      sha256 = "0r0w7qwi1pqcs9fv5rnpf7d2zjvaqd3yj2x12z2vc81qz4vrdr19";
+      name = "libkcompactdisc-17.08.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkdcraw-17.08.2.tar.xz";
-      sha256 = "140wq3h13gz3sv4d67i1pnrlzghy22zxf7ads0wia0iq85s7247m";
-      name = "libkdcraw-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkdcraw-17.08.3.tar.xz";
+      sha256 = "0hnbphkdmz3yd0callcwk2bqnkr2i9ljck63rz6yn4adnfdclkad";
+      name = "libkdcraw-17.08.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkdegames-17.08.2.tar.xz";
-      sha256 = "1131q3i7a4xz5rmcp820hjqp9bmv2wdbq6afp01572lbn9dryvir";
-      name = "libkdegames-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkdegames-17.08.3.tar.xz";
+      sha256 = "1sc6y01z0alxdgrm3rlki6n5a3gblrim7cbxj9xbsghy6s8s3pn0";
+      name = "libkdegames-17.08.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkdepim-17.08.2.tar.xz";
-      sha256 = "04n4gj2rfafkb1k2c9yq9zshmy70ag415gmc24y7js82s20jh7y8";
-      name = "libkdepim-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkdepim-17.08.3.tar.xz";
+      sha256 = "19njszdhca7lk6cmkj4nnvj8zk7nakb9gq8bg34dqhhiq3nc6si5";
+      name = "libkdepim-17.08.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkeduvocdocument-17.08.2.tar.xz";
-      sha256 = "0scj7l554zqxax4i2lg8qbw11ansrl2hp422b8348lzmcdcndsyp";
-      name = "libkeduvocdocument-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkeduvocdocument-17.08.3.tar.xz";
+      sha256 = "0q978wn4brcszlf47iqnc93fqgcsvfcw2292n2hapf0cv8j8vzbm";
+      name = "libkeduvocdocument-17.08.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkexiv2-17.08.2.tar.xz";
-      sha256 = "0251w8y36d7k9wnm52ycbz4yr0310bkr7msnfs6828npfzynmy6i";
-      name = "libkexiv2-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkexiv2-17.08.3.tar.xz";
+      sha256 = "0j906k63j30sajb70kqglhz9lhai98bh9x2bcwma711b2f30q2r2";
+      name = "libkexiv2-17.08.3.tar.xz";
     };
   };
   libkface = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkface-17.08.2.tar.xz";
-      sha256 = "1x9vg4dadgcxawprqxzv6glnl9b2b5qxvq7rvnr2vi4a5p0j3kkf";
-      name = "libkface-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkface-17.08.3.tar.xz";
+      sha256 = "0im9k72rxpk17m8ckl06rvylsxwjhgh3yxji1visvxljwkdscbmx";
+      name = "libkface-17.08.3.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkgapi-17.08.2.tar.xz";
-      sha256 = "1rpixzydg9421gblywyj8798d786yw9qfm7dnkn7dkzbm44pfrl4";
-      name = "libkgapi-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkgapi-17.08.3.tar.xz";
+      sha256 = "1yw00c16g2h59x5wzaaicv8b9dvdhbp0mqv49m8krnw07awh7isz";
+      name = "libkgapi-17.08.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkgeomap-17.08.2.tar.xz";
-      sha256 = "1s0bhv4f97241k98ss1laki04z7gcx47apps06gl0px3xgmzfyk7";
-      name = "libkgeomap-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkgeomap-17.08.3.tar.xz";
+      sha256 = "0k0ndgwwm78z8hybyi0clfpkvmrpaj9b3xyda57c410m73fbdr0m";
+      name = "libkgeomap-17.08.3.tar.xz";
     };
   };
   libkipi = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkipi-17.08.2.tar.xz";
-      sha256 = "1hgmiazsy80hxfgc0y01wg1nzz33q8l0iw6g1sl8cxkgb06hkw93";
-      name = "libkipi-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkipi-17.08.3.tar.xz";
+      sha256 = "0c0bhw0wpm6y21wj15cs73150dh0vxddl4lypj3xjpknxspiv32x";
+      name = "libkipi-17.08.3.tar.xz";
     };
   };
   libkleo = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkleo-17.08.2.tar.xz";
-      sha256 = "0qk4mf2sgji2pc3jjd0bxan7d40f7qkg9c3sgbrxvcy3jg3vdly5";
-      name = "libkleo-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkleo-17.08.3.tar.xz";
+      sha256 = "1nyf7c1q7dngk28852lkhz3h1cvi5xy4ydshkm376h32ps905yb7";
+      name = "libkleo-17.08.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkmahjongg-17.08.2.tar.xz";
-      sha256 = "1jibrvwy0147lwx09n19k1nj2vnssqwyc3slx6b0z3l23apa7vdw";
-      name = "libkmahjongg-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkmahjongg-17.08.3.tar.xz";
+      sha256 = "1w7fzvp44dl74m5pl206mrwxpj3fh4fd0fwfinxps616jx1q76fd";
+      name = "libkmahjongg-17.08.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libkomparediff2-17.08.2.tar.xz";
-      sha256 = "0xc00yh2v7dhnsr70ndiql6rid8yjqdh968qbmpc5jlhhk00ws80";
-      name = "libkomparediff2-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libkomparediff2-17.08.3.tar.xz";
+      sha256 = "01bd04av3jnsc2kxirfi4d8k2baaskdk2kasmbih1gml2mw9sbff";
+      name = "libkomparediff2-17.08.3.tar.xz";
     };
   };
   libksane = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libksane-17.08.2.tar.xz";
-      sha256 = "0ilysa21wadnv4kcyi4g268l8mzyab7m31wq8plc1hxbi1wjb72l";
-      name = "libksane-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libksane-17.08.3.tar.xz";
+      sha256 = "1skmqiw3j8jsdaj2haridslkx27wf55swjkzgjk4cxsk96j7y4ib";
+      name = "libksane-17.08.3.tar.xz";
     };
   };
   libksieve = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/libksieve-17.08.2.tar.xz";
-      sha256 = "0ypa7inmndq9k08gbcliwvx5x2q7z9dwx236wvq0zww0sjgnbdyx";
-      name = "libksieve-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/libksieve-17.08.3.tar.xz";
+      sha256 = "1nphwghis0mmmb92nr4f5d364nd5jyi1has9dc1hx6qz8p0wphwg";
+      name = "libksieve-17.08.3.tar.xz";
     };
   };
   lokalize = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/lokalize-17.08.2.tar.xz";
-      sha256 = "024awg6xhncgzvg88n57waxcw9i5k1cmp3f16l4ic93wrk8ga8c9";
-      name = "lokalize-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/lokalize-17.08.3.tar.xz";
+      sha256 = "0d4ym1vif1ggdlbs2k3ralc6lsm81xnlfp3z3mlkvg0vv77sfbra";
+      name = "lokalize-17.08.3.tar.xz";
     };
   };
   lskat = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/lskat-17.08.2.tar.xz";
-      sha256 = "1lc99vik1bi474wwjr9pkfd9xhxs2rw6rcb72a3bq4ks83m3kmf0";
-      name = "lskat-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/lskat-17.08.3.tar.xz";
+      sha256 = "07vhmk03z2jw6mlfv5mdhzafcqa06skzm6ssk70y3whkwkck385b";
+      name = "lskat-17.08.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/mailcommon-17.08.2.tar.xz";
-      sha256 = "1g9dr7ilw65zpjvr12hkambk691zynv9xgg9kcya1krmh50hdi53";
-      name = "mailcommon-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/mailcommon-17.08.3.tar.xz";
+      sha256 = "1zgy8sjng40w8m0b8fdy62p9sng7nld84py1k8zjw8mzhqqzqxs5";
+      name = "mailcommon-17.08.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/mailimporter-17.08.2.tar.xz";
-      sha256 = "1xy07wlvvg5rs9534llsd6amaxk2sylx8lfzr22s17fcpr0rl71s";
-      name = "mailimporter-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/mailimporter-17.08.3.tar.xz";
+      sha256 = "0h3wsbca2lhw1zjv2l1q6fhdwnx9kznyiykcn7jgzsh6f7grzqa8";
+      name = "mailimporter-17.08.3.tar.xz";
     };
   };
   marble = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/marble-17.08.2.tar.xz";
-      sha256 = "1yvhmmfgflsknlx0ffpj82clkd4py6kalf9dcf04f3lfw0k559fm";
-      name = "marble-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/marble-17.08.3.tar.xz";
+      sha256 = "0qmzy9b1gd40xzw4i978315dxf1ay1937wplb9nc670gmlrqnzy2";
+      name = "marble-17.08.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/mbox-importer-17.08.2.tar.xz";
-      sha256 = "1g8zvg4xxpnic1qf020zcyy6bijz4a094xzdxyx64lq7wp1bi269";
-      name = "mbox-importer-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/mbox-importer-17.08.3.tar.xz";
+      sha256 = "1nlzjvzwp4jalqbql39q9lszfxg9cba5bcbi4wgiv580pyq38h28";
+      name = "mbox-importer-17.08.3.tar.xz";
     };
   };
   messagelib = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/messagelib-17.08.2.tar.xz";
-      sha256 = "0wb371cb7glwvwhmk76r5ziq821b87d8cq9fy4pgxlj1wvsny2km";
-      name = "messagelib-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/messagelib-17.08.3.tar.xz";
+      sha256 = "1nxi79dyavjvgn83bjjrdwg0ry298ib126dxyl7inx7qgc4nhddn";
+      name = "messagelib-17.08.3.tar.xz";
     };
   };
   minuet = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/minuet-17.08.2.tar.xz";
-      sha256 = "1x9h3k8dpn40119s1vxpnkj78glx0hajfg9wh7jnm70phasn1jci";
-      name = "minuet-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/minuet-17.08.3.tar.xz";
+      sha256 = "1jg47mb5wnpw60is5zmdrqhjwsq6bnd5vw0pfiiw1arws50rv2h6";
+      name = "minuet-17.08.3.tar.xz";
     };
   };
   okteta = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/okteta-17.08.2.tar.xz";
-      sha256 = "1f1gpyyd1xcdii34hjhflqaxfnk3clnin2ihb6fpkbz5fz2020bq";
-      name = "okteta-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/okteta-17.08.3.tar.xz";
+      sha256 = "1zs0g5mnlj2fd0wipxgajnvbl5s24a37v6zdkixck5fmvlj6g14v";
+      name = "okteta-17.08.3.tar.xz";
     };
   };
   okular = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/okular-17.08.2.tar.xz";
-      sha256 = "0mkyqg5n870zc2ryxgwyrf9n57gn5jfj9wvlwc405h5q8zf5fvy5";
-      name = "okular-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/okular-17.08.3.tar.xz";
+      sha256 = "1zalj2v9fgxc50b339i3j4n3gpf87pjnnqbgvkmd041apsv6jbnk";
+      name = "okular-17.08.3.tar.xz";
     };
   };
   palapeli = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/palapeli-17.08.2.tar.xz";
-      sha256 = "1smp7an5b059hp5d8bjwq65d11zkfbfcr1kkapbljamg1ydd4y21";
-      name = "palapeli-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/palapeli-17.08.3.tar.xz";
+      sha256 = "1i689gycqlpi83wfy9l2dqzdypaizdx7cx069fbm4akv8r4xfjfz";
+      name = "palapeli-17.08.3.tar.xz";
     };
   };
   parley = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/parley-17.08.2.tar.xz";
-      sha256 = "15m4vsmk9s4dh5rv7x2vdcy8kbi334nms79aj8yvx01nlipv7m79";
-      name = "parley-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/parley-17.08.3.tar.xz";
+      sha256 = "0crrf7k8p9rz72q4zfbyxxfza5dm0z4nhhc4jqafra8vvbjyja2j";
+      name = "parley-17.08.3.tar.xz";
     };
   };
   picmi = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/picmi-17.08.2.tar.xz";
-      sha256 = "01fqrd9za748m6gxbq3i3yvvmz2qkf3kln14wwl69hc29b6ikk0k";
-      name = "picmi-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/picmi-17.08.3.tar.xz";
+      sha256 = "0zj3ang96rwzpjr3y8lig1dhqxd2ipcs3q873plra0lxmlhnzq6b";
+      name = "picmi-17.08.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/pimcommon-17.08.2.tar.xz";
-      sha256 = "01jh4c55yk4wmi3i7f81hgs0bgqxpm8fccvg51z2k05swdm7x10b";
-      name = "pimcommon-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/pimcommon-17.08.3.tar.xz";
+      sha256 = "0d1avdhm78kfjvl8sybjqsmp7k1wl961bqlzgbxk9wq6411p9r8r";
+      name = "pimcommon-17.08.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/pim-data-exporter-17.08.2.tar.xz";
-      sha256 = "1xnv07lvhbb12qp0jcrd39l54gsgnifdn1ibzxh7fnbdrv3iqxqv";
-      name = "pim-data-exporter-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/pim-data-exporter-17.08.3.tar.xz";
+      sha256 = "0afn6rjz7vmz9q16a487ssns6nj7sbqbz4ydbhh1i3c8xhlnxg1m";
+      name = "pim-data-exporter-17.08.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/pim-sieve-editor-17.08.2.tar.xz";
-      sha256 = "0fnm055sx18ripf5vhpiqi628vkvvgyhaw4xw7hz6hbmv8f3qsma";
-      name = "pim-sieve-editor-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/pim-sieve-editor-17.08.3.tar.xz";
+      sha256 = "0fw976hdrvw68025bs1bff47d4cs95ws7p4viacmz4na9m0cag7n";
+      name = "pim-sieve-editor-17.08.3.tar.xz";
     };
   };
   poxml = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/poxml-17.08.2.tar.xz";
-      sha256 = "1hkw1m3w5v12c8vm9wdksrb9q92lki3m97949h91zmdr7lc3s3sd";
-      name = "poxml-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/poxml-17.08.3.tar.xz";
+      sha256 = "0vgh77rdqp8pq5k20794fl8m12azx6r2pkl0rijmwar2ln5k0k25";
+      name = "poxml-17.08.3.tar.xz";
     };
   };
   print-manager = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/print-manager-17.08.2.tar.xz";
-      sha256 = "1gcr265bzj3knhqflyj12zza3cd94vgny8bxqqk7xbs2mii0pjsd";
-      name = "print-manager-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/print-manager-17.08.3.tar.xz";
+      sha256 = "0ncda47pk225hn45rv1wwibn0s974mm4s5fpi54hyanba6ganll5";
+      name = "print-manager-17.08.3.tar.xz";
     };
   };
   rocs = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/rocs-17.08.2.tar.xz";
-      sha256 = "0y0d64fdy22kx0bpbh9wkpxg8zqg24y02ww32h3p52zxyxcx7zf1";
-      name = "rocs-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/rocs-17.08.3.tar.xz";
+      sha256 = "1nvwjxsfqccrig25m9qkivrjn302g6blb6h2p3q1qnlszcw8b9wd";
+      name = "rocs-17.08.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/signon-kwallet-extension-17.08.2.tar.xz";
-      sha256 = "1fnhzbd5akvr9cmwfpxv7dy9bd8z7lcqzpyh9m84gdw1ppgzqypp";
-      name = "signon-kwallet-extension-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/signon-kwallet-extension-17.08.3.tar.xz";
+      sha256 = "0hpalgz4xfd9qh5mxgrs638v0as4x0a5133caci6lwaydrhgwrxg";
+      name = "signon-kwallet-extension-17.08.3.tar.xz";
     };
   };
   spectacle = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/spectacle-17.08.2.tar.xz";
-      sha256 = "1wv8ld3s69v00gvlk6r49v86z5l2xy243ily917v8c1imzvz6xhj";
-      name = "spectacle-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/spectacle-17.08.3.tar.xz";
+      sha256 = "18z0sqd38146nc73kmwvshjxl0wgm1fh4zzxai1hcp7yiipndzm6";
+      name = "spectacle-17.08.3.tar.xz";
     };
   };
   step = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/step-17.08.2.tar.xz";
-      sha256 = "0llag76b39vf20rbm8zgvs4hh3pynb85a2gbbgxb3v4kvg9nj9zk";
-      name = "step-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/step-17.08.3.tar.xz";
+      sha256 = "1gnsfn2iz2lax30pdyqvm6s5b8zjsn4gs031dlr1xgsd98c1xq87";
+      name = "step-17.08.3.tar.xz";
     };
   };
   svgpart = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/svgpart-17.08.2.tar.xz";
-      sha256 = "10xmbck1kwp0hhg5k8v9ay2bh36xvvpz1mnixydmsyrc0x9n2zh4";
-      name = "svgpart-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/svgpart-17.08.3.tar.xz";
+      sha256 = "07i3ny0bl1fjfia2rbrb7n4qycdpz4gjpvx6v540ghq58dy7nfgw";
+      name = "svgpart-17.08.3.tar.xz";
     };
   };
   sweeper = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/sweeper-17.08.2.tar.xz";
-      sha256 = "1sr1fw4ny09ch0hmgn4npd6hfvgc52xfwmys1kid7hi8lwrsn7g5";
-      name = "sweeper-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/sweeper-17.08.3.tar.xz";
+      sha256 = "0jymkz024ywss8y2xpyndpr7pk89v7bbgr5anpnywfkgx3lv06xn";
+      name = "sweeper-17.08.3.tar.xz";
     };
   };
   syndication = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/syndication-17.08.2.tar.xz";
-      sha256 = "165fcw486qxlq5lmab7qa9bc7pkc3jfc4xqx1m5k4rgwapfk0sv9";
-      name = "syndication-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/syndication-17.08.3.tar.xz";
+      sha256 = "0yakzq927prd9pd1g7gld90pz1cxjwzic2c2cw9bw17x19yr748h";
+      name = "syndication-17.08.3.tar.xz";
     };
   };
   umbrello = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/umbrello-17.08.2.tar.xz";
-      sha256 = "0prwsw8qwcgia98kjvh9xbv3cdnh24fqk2zl59diighw11q2dnsk";
-      name = "umbrello-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/umbrello-17.08.3.tar.xz";
+      sha256 = "1g149nkp02b1sgsq83r0p3vfii8jsc4kx79znglcjlf20dg89j70";
+      name = "umbrello-17.08.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.08.2";
+    version = "17.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.08.2/src/zeroconf-ioslave-17.08.2.tar.xz";
-      sha256 = "0bki5dz2n8psja4mfj65hshaz7qdniyx7r72kv8xn8xk0vj292x3";
-      name = "zeroconf-ioslave-17.08.2.tar.xz";
+      url = "${mirror}/stable/applications/17.08.3/src/zeroconf-ioslave-17.08.3.tar.xz";
+      sha256 = "14prm7qjqh4xrgdxzbs8z8a8p2jjf2amcx7r1qx62fkhfbh6gw01";
+      name = "zeroconf-ioslave-17.08.3.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index ab106f6dcd9..d81e9ed4bbe 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.10.0";
+  version = "3.12.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "01vb5xjis9ldva7rg1f720lwys5frkj00z8x7cajqwxliilhvais";
+    sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq";
   };
 
   patches = [
diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch
deleted file mode 100644
index f21105763de..00000000000
--- a/pkgs/applications/misc/copyq/cmake-modules.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d910299e..69888477 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -99,6 +99,7 @@ endif()
- 
- # Qt modules
- if (WITH_QT5)
-+    find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script)
-     qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules})
- else()
-     set(QT_USE_QTNETWORK TRUE)
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 4fd30c547b5..37afea2bb6f 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,27 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git
 , webkitSupport ? true
 }:
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "3.0.3";
+  version = "3.1.2";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
+    sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl";
   };
 
-  patches = [
-    ./cmake-modules.patch
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    git qt5.full libXfixes libXtst
-  ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
+    git qtbase qtscript libXfixes libXtst
+  ] ++ stdenv.lib.optional webkitSupport qtwebkit;
 
   meta = with stdenv.lib; {
     homepage    = https://hluk.github.io/CopyQ;
diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/misc/ebook2cw/configfile.patch
new file mode 100644
index 00000000000..c7aafe5227a
--- /dev/null
+++ b/pkgs/applications/misc/ebook2cw/configfile.patch
@@ -0,0 +1,11 @@
+--- a/ebook2cw.c	2017-11-08 19:52:58.298131348 -0700
++++ b/ebook2cw.c	2017-11-08 19:53:02.588231067 -0700
+@@ -136,7 +136,7 @@
+ 	char isomap[256][4]; 		/* by these strings */
+ 	char utf8map[256][8];
+ 
+-	char configfile[1025];
++	char configfile[2048];
+ 
+ 	char id3_author[80],
+ 		id3_title[80],
diff --git a/pkgs/applications/misc/ebook2cw/default.nix b/pkgs/applications/misc/ebook2cw/default.nix
new file mode 100644
index 00000000000..cce10258cf3
--- /dev/null
+++ b/pkgs/applications/misc/ebook2cw/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchsvn, lame, libvorbis }:
+
+stdenv.mkDerivation rec {
+
+  name = "ebook2cw-${version}";
+  version = "0.8.2";
+
+  src = fetchsvn {
+    url = "svn://svn.fkurz.net/ebook2cw/tags/${name}";
+    sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw";
+  };
+
+  buildInputs = [ lame libvorbis ];
+
+  patches = [ ./configfile.patch ];
+
+  postPatch = ''
+    substituteInPlace Makefile --replace gcc cc
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Convert ebooks to Morse MP3s/OGGs";
+    homepage = http://fkurz.net/ham/ebook2cw.html;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ earldouglas ];
+  };
+
+}
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index a45ab59ace8..56c1a8168a8 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  version = "2.9.3";
+  version = "2.9.4";
   name = "electron-cash-${version}";
 
-  src = fetchFromGitHub {
-    owner = "fyookball";
-    repo = "electrum";
-    rev = version;
-    sha256 = "1r39b5ag5fipzgr84pzb53cfm8a4dy53257608754dwr1gfpma3v";
+  src = fetchurl {
+    url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
+    # Verified using official SHA-1 and signature from
+    # https://github.com/fyookball/keys-n-hashes
+    sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh";
   };
 
   propagatedBuildInputs = with python2Packages; [
@@ -42,8 +42,8 @@ python2Packages.buildPythonApplication rec {
     mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out
     rm -rf $out/lib/python2.7/site-packages/nix
 
-    substituteInPlace $out/share/applications/electron.desktop \
-      --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u"
+    substituteInPlace $out/share/applications/electron-cash.desktop \
+      --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
   '';
 
   doInstallCheck = true;
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 5d13c18edc3..8936d3f222f 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
       
   meta = with stdenv.lib; {
     description = "Open Street Map viewer";
-    homepage = http://sourceforge.net/projects/gosmore/;
+    homepage = https://sourceforge.net/projects/gosmore/;
     maintainers = with maintainers; [
       raskin
     ];
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index ee06ea1ad6c..837a221be94 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -6,18 +6,17 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
 let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
 in stdenv.mkDerivation rec {
   name = "llpp-${version}";
-  version = "25-git-2017-01-18";
+  version = "26b";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
-    rev = "22740b9bca1c60ef18cf90538994ce4981539901";
-    sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4";
+    rev = "v${version}";
+    sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj";
     fetchSubmodules = false;
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
-  buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl
-    openjpeg mujs openssl freetype ncurses ];
+  buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
 
   dontStrip = true;
 
@@ -32,7 +31,6 @@ in stdenv.mkDerivation rec {
   buildPhase = ''
     sh ./build.sh build
   '';
-#        --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
 
   installPhase = ''
     install -d $out/bin $out/lib
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index 06f8b78c2bc..3f7ce3cc5d5 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     	Multitabbed lightweight terminal emulator based on rxvt. 
 	Supports transparency, backgroundimages, freetype fonts, ...
     ";
-    homepage = http://sourceforge.net/projects/materm;
+    homepage = https://sourceforge.net/projects/materm;
     license = "GPL";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index a538e53276b..bf2de3a5f1b 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -1,35 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, glib, gettext }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }:
 
 stdenv.mkDerivation rec {
-  name= "sdcv-0.4.2";
-
-  meta = {
-    homepage = http://sdcv.sourceforge.net/;
-    description = "Console version of StarDict program";
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-  };
-
-  src = fetchurl {
-    url = "mirror://sourceforge/sdcv/${name}.tar.bz2";
-    sha256 = "1cnyv7gd1qvz8ma8545d3aq726wxrx4km7ykl97831irx5wz0r51";
+  name = "sdcv-${version}";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "Dushistov";
+    repo = "sdcv";
+    rev = "v${version}";
+    sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0";
   };
 
   hardeningDisable = [ "format" ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ glib gettext readline ];
 
-  patches = ( if stdenv.isDarwin
-              then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ]
-              else [ ./sdcv.cpp.patch ] );
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib gettext ];
-
-  preBuild = ''
-    sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp
+  preInstall = ''
+    touch locale
   '';
 
   NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"
     + stdenv.lib.optionalString stdenv.isDarwin " -lintl";
-}
 
+  meta = with stdenv.lib; {
+    homepage = https://dushistov.github.io/sdcv/;
+    description = "Console version of StarDict";
+    maintainers = with maintainers; [ lovek323 ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch b/pkgs/applications/misc/sdcv/sdcv.cpp.patch
deleted file mode 100644
index 6f835f16e45..00000000000
--- a/pkgs/applications/misc/sdcv/sdcv.cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/utils.hpp
-+++ b/src/utils.hpp
-@@ -2,6 +2,9 @@
- #define _UTILS_HPP_
- 
- #include <string>
-+#include <stdio.h>
-+#include <cstdlib>
-+
- using std::string;
- 
- extern bool stdio_getline(FILE *in, string &str);
diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin b/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin
deleted file mode 100644
index 2ee9a24e034..00000000000
--- a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/sdcv.cpp
-+++ b/src/sdcv.cpp
-@@ -27,13 +27,13 @@
- #include <cstdlib>
- #include <cstdio>
- #include <clocale>
-+#include <string>
-+#include <vector>
-+#include <memory>
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
- #include <getopt.h>
--#include <string>
--#include <vector>
--#include <memory>
- 
- #include "libwrapper.hpp"
- #include "readline.hpp"
diff --git a/pkgs/applications/misc/sdcv/utils.hpp.patch b/pkgs/applications/misc/sdcv/utils.hpp.patch
deleted file mode 100644
index c08641abd6b..00000000000
--- a/pkgs/applications/misc/sdcv/utils.hpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/utils.hpp
-+++ b/src/utils.hpp
-@@ -2,6 +2,7 @@
- #define _UTILS_HPP_
- 
- #include <string>
-+#include <cstdlib>
- using std::string;
- 
- extern bool stdio_getline(FILE *in, string &str);
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index f44ed8a1a3e..59e67fc65e2 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -25,7 +25,8 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://st.suckless.org/;
+    homepage = https://st.suckless.org/;
+    description = "Simple Terminal for X from Suckless.org Community";
     license = licenses.mit;
     maintainers = with maintainers; [viric andsild];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index bf1fdbb9a8a..78e1d15481b 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov.
       Xfe aims to be the filemanager of choice for all the Unix addicts!
     '';
-    homepage = http://sourceforge.net/projects/xfe/;
+    homepage = https://sourceforge.net/projects/xfe/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 8db48a7b3e6..0eb33c845c3 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -18,15 +18,14 @@
 , qtx11extras
 }:
 
-let
+mkDerivation rec {
   pname = "yakuake";
-  version = "3.0.3";
-in mkDerivation rec {
+  version = "3.0.4";
   name = "${pname}-${version}";
 
     src = fetchurl {
       url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "ef51aa3325916d352fde17870cf706397e41105103e4c9289cc4032a1b8609a7";
+      sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh";
     };
 
     buildInputs = [
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 42d606ae224..82c2c6aa53f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -144,9 +144,12 @@ let
       ./patches/chromium-gcc5-r3.patch
       ./patches/chromium-glibc2.26-r1.patch
     ]
-      ++ optionals (versionAtLeast version "63") [
+      ++ optionals (versionRange "63" "64") [
       ./patches/chromium-gcc5-r4.patch
-      ./patches/constexpr-fix.patch
+      ./patches/include-math-for-round.patch
+    ]
+      ++ optionals (versionAtLeast version "64") [
+      ./patches/gn_bootstrap_observer.patch
     ]
       ++ optional enableWideVine ./patches/widevine.patch;
 
@@ -157,6 +160,9 @@ let
           'return sandbox_binary;' \
           'return base::FilePath(GetDevelSandboxPath());'
 
+      sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
+        chrome/browser/shell_integration_linux.cc
+
       sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
         device/udev_linux/udev?_loader.cc
 
@@ -265,6 +271,13 @@ let
           "${target}"
       '' + optionalString (target == "mksnapshot" || target == "chrome") ''
         paxmark m "${buildPath}/${target}"
+      '' + optionalString (versionAtLeast version "63") ''
+        (
+          source chrome/installer/linux/common/installer.include
+          PACKAGE=$packageName
+          MENUNAME="Chromium"
+          process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
+        )
       '';
       targets = extraAttrs.buildTargets or [];
       commands = map buildCommand targets;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7aa02e2c574..911b55b115f 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -35,7 +35,7 @@ let
   };
 
   desktopItem = makeDesktopItem {
-    name = "chromium";
+    name = "chromium-browser";
     exec = "chromium %U";
     icon = "chromium";
     comment = "An open source web browser from Google";
diff --git a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
new file mode 100644
index 00000000000..f1207439bb4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
@@ -0,0 +1,11 @@
+--- a/tools/gn/bootstrap/bootstrap.py   2017-11-07 23:06:09.000000000 +0000
++++ b/tools/gn/bootstrap/bootstrap.py   2017-11-08 12:17:16.569216182 +0000
+@@ -481,6 +481,7 @@
+       'base/metrics/sample_vector.cc',
+       'base/metrics/sparse_histogram.cc',
+       'base/metrics/statistics_recorder.cc',
++      'base/observer_list_threadsafe.cc',
+       'base/path_service.cc',
+       'base/pending_task.cc',
+       'base/pickle.cc',
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
new file mode 100644
index 00000000000..530493dcd0f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
@@ -0,0 +1,34 @@
+From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Fri, 13 Oct 2017 15:49:32 +0200
+Subject: [PATCH] IWYU: Include math.h for round(3).
+
+math.h was being implicitly included, which can break the build with
+alternative libc implementations.
+
+Bug: None
+Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
+Reviewed-on: https://webrtc-review.googlesource.com/9384
+Reviewed-by: Tommi <tommi@webrtc.org>
+Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
+Cr-Commit-Position: refs/heads/master@{#20292}
+---
+ p2p/base/port.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc
+index a1b478d11..81aa0aadb 100644
+--- a/third_party/webrtc/p2p/base/port.cc
++++ b/third_party/webrtc/p2p/base/port.cc
+@@ -10,6 +10,8 @@
+ 
+ #include "p2p/base/port.h"
+ 
++#include <math.h>
++
+ #include <algorithm>
+ #include <vector>
+ 
+-- 
+2.15.0
+
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 0cf6df0e5cc..8f87fe7dddd 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
-    sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q";
-    version = "63.0.3239.18";
+    sha256 = "068jaws7lqwlw3g62d2cv7i44p6zvdnizdqd56hfs4wj08k068db";
+    sha256bin64 = "009ckf3gh039dwdf8rj494ra4qp0kijgzkrxianda1r7cqz1c3ys";
+    version = "63.0.3239.30";
   };
   dev = {
-    sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
-    sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k";
-    version = "63.0.3239.18";
+    sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x";
+    sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg";
+    version = "64.0.3260.2";
   };
   stable = {
-    sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9";
-    sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x";
-    version = "62.0.3202.75";
+    sha256 = "0sclvs11kn60ibc66wfan0xdcsr2s8vkvbq759h86w9gq86pcycz";
+    sha256bin64 = "05lbrzd37q57mx9rii995l9z42a4aa0jh55ia615sqmzr56a7fdr";
+    version = "62.0.3202.89";
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index bd23ac6baf8..2f3e8c40a3e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "58.0b1";
+  version = "58.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ach/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ach/firefox-58.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "c76b0c8d0774eabdd49abdb211312da230ca467711ab3e4700bf683246986aef8bbae8eda45126bbb6c610db8bd5d12f8e35877956879fe02edb216f16449c58";
+      sha512 = "6ffa1c861a68b6bd7e65b0883c734baa1161c3ff827cff2fabd2e38b5de64bf973034f40958471c12fbaec806978a74b3e2a5a4c2e23caf87dbe747cf75d0a1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/af/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/af/firefox-58.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "d72db113a55e6d70cf467c1aedf24df07d9f4f5d74f3c67f3474ba3c8f959a52164a345d19b6c43e5c7ddcceefd639a9153950f5f30c945f3ba87d15ea23a66b";
+      sha512 = "4bf2e416ff864e6062a76c14d70d60da9c3c3261b2d401e4e0cb1abdec77f0c21878b36b863f3d11316e6114e358af200b762c4f1c7cb7cc84cb12c8c95d240e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/an/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/an/firefox-58.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "ad347d9d9a8cac45a5f369a4fb8284893b60b7a94b2daf4d67273410b0ecacd53d0040f78aed43405b5a99e30cdff1eeb986b7c1ad13cbf3807dae915f4dfe9f";
+      sha512 = "d1136b831820dd7f9bcd2d5d20d68ba66bdccc610bc9d26b59937b2ba017fff7fa1be1d616ff5586e136a16d1a2023255eb430d78ab7c97f35bad2b6172056b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ar/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ar/firefox-58.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "9eb1d698f2ad84a4e8046b511272fc88d66d5142c72dce817cfa00814f4bb5320c314bbcc36f74acd774bb9bec0ae57a09ab0c46def2fdf4e1f225d467c1987c";
+      sha512 = "ab9dc901df22fe84d01cfbc7b251ffb50eea784c2cff1a38c404b75ac58349f312ca7b602c107ea8b08bab7dee292b99ca33d3651fe43479357b57ef2d36a07f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/as/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/as/firefox-58.0b2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "d9315adfac80bbdd4af955f7f7f19d14d3209d7fdb1df538dace2264b39901a94b5d79f8944ed1509de15168058eab44a43de46d2c90c1707853ff2e4401a116";
+      sha512 = "f7af5fc1e80cbca6227266c5f7945c665499f5be36436e7135721d67efcfb3d2b101e1749c03101ef491c231f96cc746a6bbae25fc5818f1790d61f59e4fdf2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ast/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ast/firefox-58.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "3dc39b449c5eb3b877cfaff84534dc9d1acb3921d03ab2b520c5f02d1b8d2a09843976cb89954da1b99eab353e1960185580a70cb1d222dc42aed052361c4c28";
+      sha512 = "ac9fe13f073358dd71f81583e6d831617be46b65781da099fac48db37a942c31bfad3b72422ef8a14e65c5de28939cdfbb1c580f3db5cdd54819a0da0257e151";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/az/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/az/firefox-58.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "6329d4265be5662d4e7286ee3147dd14896eae75738a6e29548fcd7daa86c1021a00e44508efa8ed686e58f1a927115f01e797472848b1782c90410031672227";
+      sha512 = "05e30463e29723157815f91c02f7d6e323fad0443d59ef9b6abe2110998170894aa95467d5f05f78daa43fdf05f3e72af5c9656134529aadc9cf165b201acbe1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/be/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/be/firefox-58.0b2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "978062dcf2f6991c5e9f0a7b23ae65c1d3b79c526d27ac86be8f1190a866491857cc2f3d93f444a2c5654df327c53ebc05fc30e6c9e3ef2f766c55274202cc3c";
+      sha512 = "5aeac6d316409651180bb00de74ceb48bf8bffeb027491c1d42830390aa11d64d13e6748a6bd5519c5132d902e0bdb06dab35ae76d6ecf2a8e769503587c7660";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bg/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bg/firefox-58.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "eda16736abc407eba700e6cc6eb865e97091c89772df9d23d8514b2c05d1197c014586cf03e3732a839dc6ff0e031f85008c12144736145f7ef94b89b7761e41";
+      sha512 = "6cce86d49c53498611c85505b5996c6db92b5a5aca9319b18ea0e5ab19dee2842cc4ca036ccd9b1bb7131aa539e38037c0363281e170182ad81e59141150f20f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bn-BD/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-BD/firefox-58.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "fd5980c7127464fcb4153d52096df9b4fc784fea4a3216265451394fa73800207c9df91a098860819bd4aad1acb0c04965dd196d41b0dcca70071b51a20e4437";
+      sha512 = "b177f5531f887bea5a8b47da45a4ec1477a9adfe48de02ede1aa49761fedaff4ab06603ea004ccfc0991e9598982077dc2f30945e1042ad8098d8cd6eed7fa41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bn-IN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-IN/firefox-58.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "f82ddf7e43f17d836a7c8e9fa5a9eaf1c8956ee9b879ece444bdb0a4e98380c07c45cb168cdfdf8080d26ff330c0d71921d6fc65d1e59a7bd4e89fea6c2ba7d5";
+      sha512 = "5475cc9261e666aa11915f70599a281dc5bbba7a88527646fc932b6272b70a936186077254d147c68bec28fee4f79859567256c327043ffa5504feedc76e3eb9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/br/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/br/firefox-58.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "6e98d54e5fcc89da576648c666a9788e1843c57879d3bcfe81e6f92c5a6386c7fb606e35a1d5b6d45a6c6208122f36f127754747b4b0a75b1b0ef9f8ebb1ec6d";
+      sha512 = "ace1027ea7d5115ce7654a8b12609c4c78da5a6dbf8a08544d467d4a8766f39df557659c9c54fd2ee613c403ac523cf4fa8fe241544112e7c7999c572f45d656";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/bs/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bs/firefox-58.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "1d418dc9092188a40ec3ad5b168685840fe3da5444222a076324f38d71d332cfe9cba0b6497287e231252f7db4017ed31d3f004fff7425d801babd485ab13807";
+      sha512 = "d8256bcaca634f53c60fa8fc4189c68fc14dc1aa7941beeb28692f76e4ed62465290fb0234236a684ac489634f71577dfd5d5e613d710f1e191cb3021b2971a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ca/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ca/firefox-58.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "8482b0b9552915cc839f560a6a884511e6470673684877fbff233e6af23067a9e5a04589a255f885f90efc1fa00ff826bd65e6b53d4993c4eba793b578d898cd";
+      sha512 = "0fee3a02c437015679460682325c7fadb211bd5d4a3f5f1ee04c978eefb0694ccae7b840801a9453f8ca0d383079fc0481cc157741281ba09be32a1012ceb2d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cak/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cak/firefox-58.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "1f701c6a9946686f92439b354476c96254c8a57def972966a6b3f54136f259bc377f1f95801abd1e2e42785c2650f62dd449f01a305147ea2f788eaffb348b88";
+      sha512 = "ece5f44da4de5370701ca57f6d3bfa68df19568ef07ad515a2937a49b77e63ab9752ac9d31b1da837e914ccf9805528e7727e04765cb77909e33c576358c6912";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cs/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cs/firefox-58.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "11159a760106742340387a75637929eb1d7df32a811720ad509cdbd7c58cacb6b50621dba012bccf72f4960cb13fb19152512d9bcd83b2f17dcfffbf10d4976b";
+      sha512 = "48fea82e0062a91b89e868c0f3baef3869987b9465314d40f9df109b573c24d826bd87a474e81d43b5aa9dd02cc1968f438c4c93924c06ddc133dcca592ab095";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/cy/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cy/firefox-58.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "387d647ed24ec9d7f77a6dc38796868a6324db960f7b8077e2b53387a1837edbccad0675eb9d4bf7a68d2ecb7bc60fc8840217d49865a05b1c4f5235479a8a65";
+      sha512 = "15cf8a4ee6016f4dc81cc1a4287ec1b7d26fe8eab613087bb3b95c7feac4adf89fc25777961682e5f85a158a5c1afe3d41d8c5bdc455a0ce0739c59885d0a2ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/da/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/da/firefox-58.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "60e94f82dc68b5251b084e69be480e5fb281483d1355696328888d620f3b9e404abbb990c80d43a28acaf0df062948231fdd17ebf1dc9205cd1b74d962278bf0";
+      sha512 = "7e66d426d4837999faef4f8259c30720a39448b81ccaced2698be4051311cd7b7fec08eb0ebd738af7bef3474ad4059e2e90e9c8d12d829c8cbe7d758296343d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/de/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/de/firefox-58.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "a1699568157938780c4105888b528db7ef2277c8a5e1afc6a55382fe57b2009d7eb00351c2b993ebc3294df75bc452016a5c35e3428b4b548483a0fc4a1f2013";
+      sha512 = "cda87407ecd86d825dcc15dfea4c1dd2f56d3bcaa6af2cbdbb8b209ea280c60dbb72b68db71f84e94783f7c263ad4dec503603b650411c72b38c1a5a470deefa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/dsb/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/dsb/firefox-58.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "dea6a3e68356cfb47db8a6e7347437e88c9349113e73268964776ca8a1399671d648e426151cbec939b3b3b8691d8b2869536d853f0390d5ae4cfb982c2eef50";
+      sha512 = "db9da2c7397d64d1d5944f6dab29b29325b6773f85af1a4d5e87d06dcc580cc1157b4f7092e7fd9bde250f332d26983b7ac2c7662b240f4e97f2ee1404ad4b1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/el/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/el/firefox-58.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b0eba65b07508dd2f96846bdf7b4a71b6668d8ae38cbddcd842b7e08fbd1769087b32f05cee00d8a471adac7c63845ba93b34d906092c9778776066610c788d6";
+      sha512 = "51c02952a6a1f94f25dae1de9138a9a39203eec9b02c3f90084e319f8e3e17c436937dc5525709229db22a27de5f79abc1cdd8502631b6ba280770d91151d5d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-GB/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-GB/firefox-58.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "3fc478ed384adabde913525d2afcec4f3d029c85a102144b6ba7549543429530d3970edee5bf14ac069f122e2709dcac2462f572faa9c2ebffa322101929a914";
+      sha512 = "b5925d08497647afb8f6cb6bfe5ea5fd899e55ed77f3709ae007e2359d1b7c38fd5e7cedc56f12d68e660b5d9f10c56bd65cccb92a645d25cc617f188da88a65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-US/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-US/firefox-58.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "5afe0a59430e9241a58af0926d5d73151355e9d64a8c8f562ca0369199824d10a1a4bc2de84102e96a8aa5921d83d9b630f49d9ed998ac4506dd481dc06264d2";
+      sha512 = "b40a42713892b760d659c4fe5ca002b8ccb5309319b57d89b5f9af37c84a021ad67601f5c7f5b02a445dec7a00d671a28df6ab701775f59b1a7be7dda93d673e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/en-ZA/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-ZA/firefox-58.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "c84deb7d082259e29dd2ae7964c0ab585d3bee0d2be7c1042babc122356d067792166eabf2fed8a55c7f688c23ee7f6125d7c89a3b0948546091a54b4a136ae1";
+      sha512 = "1765b79663475ff97dacaf441cf127256be5097205f52f3ecd5648b5d15087a9e43fc97e165cec714d452a3c802d798b89650eb3e9b33c00e739a1ca2684dfd2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/eo/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eo/firefox-58.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "76c714ce1840b4dcab54bd675d74bd93fd8f76a45f90e526b2e0c55a2fd8882e6b8c9c8e4f559ec575338eeeea2ec7f3ff75629a276eda0051e898256b0f2add";
+      sha512 = "e1d30c41b6ba56604539a5b527effd16c7a40f85691fafc04d8e006f2d09c9531f70f5e3305aea8eff8840487acd87657a0aae66a3275d5b64ce84ee151ba3e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-AR/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-AR/firefox-58.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b049c2e42a4868da6eacd1d5c0d945203acd6d3ed3803d2257b504df4ea7288765b6b6922d3b73397b0fd8b54a990b0340d4722a0ee3171a55e3a566c5a2bbce";
+      sha512 = "6830e829c86a4860a3ae461e16d4d63feeb141cdf65fdeb29c4cdd4e4fbd1887a5425b81eae9a34a28d750fbe27e70f065acd70d0cffa6c9d1cfede023e43f07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-CL/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-CL/firefox-58.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "48c2b419d67c26c6c6b5ce1e8b6d12dcd5bf8c084176d4c8afb3f45d17f50817a38a85e509fbc7cded4e00f659067c3e34080f58c22f74ba1e19e83cb58a415a";
+      sha512 = "ea55c8fda45368ab7adc12891c3cc19d27124e8740ccbcda6b2b7edecd3310dfe068344f856d97b5c8cff066427dd21baf2d242397ef249a7590d01989be274b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-ES/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-ES/firefox-58.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "2ae19907f1d812268b3c49247d902b061f9caced2fa87a19ef40c88de48cff7b68d26577b30ce7f1b8f94f0e1924f32205230bc503f226c4a85497da834ac740";
+      sha512 = "ba2776ad1a474183d828fc73c4a3e3f8036159c8ba08ea8b6bcfe562aac0808adc015c94f4375dab850fa61df6ce94d6bb684e028db07385486ecc2964f9834e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/es-MX/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-MX/firefox-58.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "e82f465b33114ad11628c06fbc0c0102e682d8e8277e3900888aa05481a3cbc4e707545ebf5b7fbd0eaef12e824135b437bd51676cc9299ddda1969c4d4bcf2d";
+      sha512 = "14b755e01ce982a3aacab5cc70c086c877f16df8b46e46aca46faf0950eeab61e2cbc90de0f9dc452c6f27f8e4367e4fd70209491721c04a88af9fe8edf92b10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/et/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/et/firefox-58.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "6c7802262a3042a78d25ed5774db69079ebea48e540847a70c0f8bdaec7e87aee5ca4ea31110ea54db14058d4f7f7a0fd12a5100e2c66f9f4c1b591d17abbcf9";
+      sha512 = "d211c2958e9927c2852801331ced3986a5a9f75b9fe3d734a5b380e807a6f91e3c328c48817e21b43ca2b6fc48986f80f5d5f3cf4c0bd03257c046b5a930c985";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/eu/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eu/firefox-58.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ae43f9ed41f67610a1394cd27225585904f1efec63b2b8149a16515eceff0e2921cf8ee18c1555d69972af8b0fda71180a2e6872e9abae3cebd642693aa281be";
+      sha512 = "d9f53b988a86a48df41a691742975096343a3b4905e5ae78ec9bfe5580ff71cc56457fbfad2fa8512d3a3124989532f21caddfb920d886c6891b2a1d82e26b6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fa/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fa/firefox-58.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "f5ca6891883c09f292a4939c0443bd5bda8b292e7f432d81c32d1fd5e5d4c15a7d649ea6d430a618b72522ffa53319c2b5a32c028ff2a619e0f68bfee7420dff";
+      sha512 = "43ad5afa9cca9944203c33ef053bc86cc36e50497992ecbb7959edce25d54d588b736f56684af04fba8f10750b450a613ca4008715ec5edc2cc70d31a5288296";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ff/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ff/firefox-58.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "0a3e6d06e0e61c1bfba7ebca1a80fc7615210a148c48d89acc04f8b9ef2050a7ceb9aa7c92b9d888a376f668e4b6f1c0d40a752ba3de185548a3ac1630d9260d";
+      sha512 = "64a11c61a3104e5fa06c802e25ebb293e9fbe58b3d4af50a36a9919d213d75ecb1e1aff8d164f111398b0e4efb46a2574d05f23f39ffe845729e0fe18ec27720";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fi/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fi/firefox-58.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5213bbbb4620cd718741f4c1f31e37addaa72bf3947a81255d556c6ebcfa2def8c830f4b9d73ef472acd28fd7efaff064fe96a67b1f276f6901353ed420bfe72";
+      sha512 = "0c739ae31197dc3c9c10a40ee97eb4bd623ac3551f67bd2dd0527a4e6efabb47bab6c31c15925925d5670611b82de921e0d068491819b9a580c8062cd0a794cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fr/firefox-58.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "6e4c02cecae55b7930521384482b9b5edc8480fcc103ac762960a8af4230e7eb52ca5d17d3fd71fa559b49c5b2d0eee2bdce150f486969f77f71a483d8cd04f6";
+      sha512 = "7fa98e4e5fd8174043d6d85ee63aa22130a9191dabd40ad8935f233559eeb2dc46bdf27047975251f4d843770f900eb1756161e2d5dfd91e95c4b03b0841af82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/fy-NL/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fy-NL/firefox-58.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "7263eb28bbeab70a833e28984108dc125868b1f1fc0cf3c1d37c3e1694b0512c028368363c28a1c0a48e87cadba366f7ce91509783805a6fe6f8ad7e298b27f1";
+      sha512 = "412827dd52dc04d0a342bc0ae0871108264048b13f3476af0295b9304efea3eb24719b5ed034407dd25f7d7faef635ed08056b12de78d6fb1ec0a30acc1a1392";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ga-IE/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ga-IE/firefox-58.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c64a0c0889e10d6463e02323e386142113afaabeff1b772d5411dfc747e09803911b161fe4332d36becbcd45bf0f1b5e000aba2e099c5bcbfc39b3e5d300e072";
+      sha512 = "02272dfcf04b9ee4bf6ea5f1b03f59892526e0df14cab0dfa1b090678e9ea45a76962bbbb35ab5ee13a6bc919bb5849d5e401f8157f0e5119c265a53759177d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gd/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gd/firefox-58.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "70ee658038c2c2d8c9c12cd45993daa5226d35a8ef974cdd14649cf5cd3a6abc149f56eaadefef01d98daca0b5686a65b17300b5cfcea704c9942cf827e29aaf";
+      sha512 = "64a89548064d36cbca0a0572319e979a565470b4cc63aef5005f520e58f37e7a54e7ab5380ee5e0947d1a1b051825a5fe223a8ad5cfc833636ae9f9653b33779";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gl/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gl/firefox-58.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "73400f4ca91de506d18cefff5ac33847c1caf05770d0fac1481a58a3cd709eb96337f6f5f9a77635e18202f007f736e815fbe60ead23dd64a537ab6c67028c20";
+      sha512 = "b69ab34709258444c957dc55f55bfcfe5965b31e984fb911d2fb8b8499a62044c5d24e68e93880454b09888f68e3e80c68c0e37a424de53786fcbe1ea8142ab0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gn/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gn/firefox-58.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "c5310f699ebe8f28f0ae3b07b5569c202aba5f2641ae6a365c4bc581780d12b736b8cbd2f7dab7b4b5ab4a8853af3cf004b3306ab47b71c50f428f2471c6d2c0";
+      sha512 = "25f3c7753bfe47a5198e770def91596f904f5b4de0658ee49c2209afbcf53fda35c8058465ae21876aa733daf35bf58c14f464f2e125996e27952759671cf351";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/gu-IN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gu-IN/firefox-58.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "34e9331c90ab69f43867ed77520d820386a3c9e5b116b6e0851b7a264d6a632fe69080d2885819afaf7c434ecca8324a2a67b2af4d3dfb0dd737a6f147d41077";
+      sha512 = "f20a7cf31dca9f635b96b5a95b24fef039f3a856e64a34b681d75e19e1f997bf41f7a8a49163ec1a63ea2d2a500eba174a3e8f5c931e4b7b9ec0857c908c5aca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/he/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/he/firefox-58.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "b3e2155264ddc8ebeab870e3c865aba4c7c04325e526134c0132efd503b825d4bfaea4389e39412e047b18eea1abd6249754c4571c690c6a4276f8a7ad627840";
+      sha512 = "c2de1b8b8cd2af04efb78b432b865df564fdb70e41b3ae7ee17bd66f438bd8ae60b49774265ae9efc3e5e17d8ff947f50de4872e6004e497b3ad073c096d5110";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hi-IN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hi-IN/firefox-58.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "03ba58309941b1a209e2d162374abbd46c4fdfae505ec6b51a20a41e306d8c0d5070ebd7eb882ff63010f41aaa11be589e91c567b2efde702732051eb31e3104";
+      sha512 = "9f513d17bc01dd34b1a07939d8d4858b5c525d99a0bab1eb7ed5f205de3442e3f9dea90e5bf2a7743f6b624757dd3b182ad976d5b32771e99b8c62b016aab594";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hr/firefox-58.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "c41bab3259faddc4cda80d24f9b28bdb888078547c1fe63b7f7016748e930da158ce20707e78cd15342b6a38d37d0166094cfffbeef08f6266aee6ce80380783";
+      sha512 = "0f43806af6aca2980e358fb7bb39b2970d9d7c32175ff9dd4a3af5765866fb68a1e4a5ea7071aaaeef4a70b502c5df86dd88e9a4fb5e6db00f5e11f9d99b324e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hsb/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hsb/firefox-58.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "479436f7066df5ecda4e284a8b3b1d453385d9dda69b4b04cd1532f369dfc6ede9de9cae0218594b46dbf1feb0c44b8e5fdfe8084b9627524fd16ec3981fad68";
+      sha512 = "4397b1ff3a113f7591ea8c2211fb7b15edc3af9d2d8883a720eb68d5f19024488262818795d9f14b67c91649337e8884ea12d6dff6fcd0650c31d2f917cef493";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hu/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hu/firefox-58.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "4ded7381906f90f5660c81025d5ad1dd27e4c9bc49f464c84a05904d2c7a8c860f7576cc9f0f65e9666cc894084a539cece48f6242fad69d6f8f265f2b3f35b4";
+      sha512 = "d7dd0be61fe7ac795817b7e2eca9f9ce1c312e49e851e068b410fb9076fb83bfb82928eaf7e1bb11f7647890a0b74dd16b93ede8e8672f7a70e9d0482a859646";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/hy-AM/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hy-AM/firefox-58.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "1e90907b9280b33faebaf770ee5e148f35a3d6d79f2c3d19b8d1834c84e09a6dabe965e3f9585dc357e145e0b8272225fc90c27ec507aad7dfda0aaf0c26db89";
+      sha512 = "a924053e4df4b5e036dd25e3f663239bce6e6879e0cd0060fe62a5f06c573bfbd25ded2be37940c14a13c493ff421127245dea88ef183ca9f496bc8a89d1eeb9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/id/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/id/firefox-58.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "f2eb5f44cbe8c20e6716bd2db644f54768c6ccdbac15acbdc8268f95383545b3f9d9e74092dedf886bd3dc02b56fc9f0f468d1cd1205ddc5fedd361b557213ef";
+      sha512 = "cd83da2536a067120783df1a5a04ef3e16aa87a47fbfc4c50d0009983652506e10688f05e2da66034051fbe8518754e025489b29e013cb07b9829dfb2c70cff6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/is/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/is/firefox-58.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d1397242c59aeca21ff98f8b3e158fb496c6813de0a73ea5454602888caf71dbcf33d2847a99a224fece4fd60e24b6b4c0c7d1b68f9df0088eddd6011e64c9b8";
+      sha512 = "87e6c6111b9a30de82235201e9d341cf2ceed3d4599d94815d807edb252dea937d7870cfd229d7fb47af8c822201567f3ab990b15731f9fef243edbbb5ff918c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/it/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/it/firefox-58.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "468070735cbf093381640627ffe594efd0504e9a87ae2547fcb0d132e44d2ef3abb98861452f177d0d901ad8586b55c44189fff7b2dfb99d25a7d2055eb8410c";
+      sha512 = "bfded5c6a7aabd2120cc56c756d900b2b71766d4ea6cc6c5cc9905ec14068cc98f10a8ee54862f8223b6d7ae43b09346dae87e5b146df8bae1a63dc84686ec69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ja/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ja/firefox-58.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "7cef74da3ff145b1b02a6b60f8f4b4933f427fd5268c4fac0cff31d0d09ec75f123a97ef08d3b5e8ce2d45bf44ac0d3fcdae0d0ab844608998fc51fb1805986f";
+      sha512 = "e74df1de9adccd46ac36675084a16c7d07bfa48025802ef3c932b291bba76955de14f52282bf2cce2d69a355393e97aea946cbd3314c5cc97e699afa610c2afe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ka/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ka/firefox-58.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "febbd32b794d70c4e1a41a793f69dafd230dddecaba329c65f34ff49cfe779d63e7bf53326a0a286206f51742199776190704c8e7c1f0fa0aa663a5cd2153f26";
+      sha512 = "fd729433c08e2c569e0c72859d38f70fd62293b5f1a97bb41ee01950845c4480c6f48e80cec6ffd9fd81d34e357d2fbfd67515a44c9db02acd5f79acb55886f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kab/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kab/firefox-58.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "caedabf8a7cc8cc54e46b6e9d7933fa7b04953dc4fd19311d097c350a8219938d3819ea34fde869f24a0f932677411114955670b179c7037b4c61ddf6b2674d3";
+      sha512 = "edb999b2b27885422defea989e41c845b0f7a50d47e4f6e7ff2690fae9b911b9c0dd93e40a7420b1920790b5443800990836999e3044457acddb55781fb8a7a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kk/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kk/firefox-58.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "44f92252326591941edccbe19f62a46728fb332bb9c83c5a5904f62e9f886ef55c792cefda9ff47136c2e90ca01059f71679417a559eb257464b2a1ee3fbd261";
+      sha512 = "21eba1ee7a9fa51cb9967ecb4250fa305e3e516d0d69285a90b1ccecda6add2793fa035ef434626f4d9620374e91f1db4d8489a1454e4d611a529e693e46d09b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/km/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/km/firefox-58.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "a3f09ec1af9c65a046ad84fc25a67cf4d5c81d16e7700ff3923d192e73846789b256ffce375436f10c563f0d31bbde6af690f8d36545412c6911329cd1315f46";
+      sha512 = "565028e6aa408c734684518d7f3d033639ebf6ab3dbc74b682f291933f1141fbb7b758b0c1e8fed555067db0981e8a4f5d5c4e2e9c53d2ad066b8df269ff489f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/kn/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kn/firefox-58.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "c8192e86a04c82b02a8232cee724a870e70990d0a706177c1937897dd82e8b4d1b87f3723e8227ad266ab4bb75393bb1bd799d3d094c5d63a38bfd356f8ab0c6";
+      sha512 = "1f6dd3187c140ece200c16a4e80ff848131165603fcb38385842e8feeec5fd13db3d1ae415a8f428f2d22f20289a856bb3afc96d853cb9e31c5d1445a1a63dda";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ko/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ko/firefox-58.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "87b23fd57f68d60e55a01303a7ea7e4cc49cc017416eb582ecc6ced589f841504425c60e5b2b45f9d7bc17cfc0c5b8a6aae36b08314583d011bda59f96dc687d";
+      sha512 = "103a51778565afbd6423a043340e9bad47156fad51776106aa0342fca022ca6481f7b13b8f2a51d2e9e8b1982f50f377ade1d73bf6b152dd61c329fd3456a1ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lij/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lij/firefox-58.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "a96df7d83aa66c52e73682fec0d06433a32c75a9d60ec225be4a29768ab245e3263f253c15f5001615ebd9cb2bce19a8c7ad9994c17801ca59a573986f4c3f97";
+      sha512 = "4c92f4803f094bb5d64c58c6d8315e51e764fc80c1886e9c18a58f93a93f8794a00a4319ed90ba60ecc9ec4dbcc37f3e8960a8b67261673806a19c8bfac8d989";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lt/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lt/firefox-58.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ad89134d5104eee908b67faf1cf6770d9c40091de1da2382f67f224e16527e63a705d7a1ed0a5fcdfbff68813bb3d6de4a17d69e150cd702cc886d761ab2749f";
+      sha512 = "83dcc50c0f7eb41ca6fb41a1b036b80a8ab4993334a632e60b9523eb8a4306db427beaf2527bc4bdd1143ebe6c0f4b406b1b9768ef8f3c03ce375e33cae6cc11";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/lv/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lv/firefox-58.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "d28affbb7c92d56a3de7cdb06db345d73e0aa877b683b242ed88450471b7ca63e43e211e167041ddcfb10e408d6b7dacad09c102fa59465d337fd557ff8c6c1b";
+      sha512 = "27daf42869ae64f31d8d83f52e9d3f951e1277352276eb8436c2885e1a1de023b3985a0057687dca48ba69aed0ef03cf27770099e45a0fed5461de8cbaa0205c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mai/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mai/firefox-58.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "4296967ff83a31e5470bd0fb354208030a5bc3b2fd7d8358f0de6df22bb50a2636188ba54194ea534dd34244e1e036f1d525bb6a397633b2c1749e78160c5eea";
+      sha512 = "9b7c38d7d23f6604963f280132b16c0a949530d7df88f47a5328d1ced1bfe4cf8f12fd6540b54a4608aa0efe09f35f870f18c49d4a8cf1a95e800b541f534b79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mk/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mk/firefox-58.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "bb6c4a0320911ee062ad5fd2d10c2b121fbed1bff2de3f7014b8d0e4b5962814e52bd6d8e96ac4c88aef07bfc18964dbc24659c32b475a18a888723327ce6b8d";
+      sha512 = "1cb4b8304888fb9a4adadcf23b0c624c1ece8fb96a972f6d788f1b8936f05f8ab331df7bb949a4883673d193238a80919f728b985e0a9601f7c59c519fcf9501";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ml/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ml/firefox-58.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "c20dd470b07c46e105b4a3689797b25294a2f445825d7c3b9e55dca277fdb134003889f625fbf02807f56b04451223dc61b376337f0483f3b62e94e1b89d2382";
+      sha512 = "e801dbb5f71922d09563149bb12461d4661eb877bb862f04fea418b9fd488dfb871deb97c131aa680d551de5d46e2801545d01f17fde06179290e12288e5f74f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/mr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mr/firefox-58.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "d1baed0c6dddec7f0f8bc731e8928eea02d5e6fda10adba7a329cdbe08cc3afb8527c47756b9db07ab812cb6bdbd2439680e001b2614ce1e8afa23b5091ff642";
+      sha512 = "41eff5af28b452069fed8c8408dfe47b46ce192b6d0a996c6c5b0600e862424580c50251fbfbaaeed64d387367413f69ee2ed9819bebebf9fa67b2ff50e4417d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ms/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ms/firefox-58.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "c9162c9c22a07cbd8ac6a3aec1ee218925821e24c9f41965d11ce221b21cd99f77f8e91f0c7426d272c418de11d3d51ede0f89ac6710a9d05f50cd558e59f094";
+      sha512 = "544e03a7a03b26a5b2f9da0284325234149faa5bafda74895f6ea29743471e302cc33b5398bb5d3e0f2d14dc82b6e8a8d02927e2a2e2c2364b3e2d1f20bc3354";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/my/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/my/firefox-58.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "46b6758c2368780e6d0619a501d753ae51da65c55391aba72fb7eb2462c56afb5903afc04a274de68ee90afb98543f16536ab86cfc71219fecdcaf5b92fef41b";
+      sha512 = "28dc75be5d3eccdff87eb738a909195b5832cd4deeab9f4f29915e372462e24c9160e0dad4ec9fc80cd14179bd1eb08e79ed96afed74ce053a43731b0a95ffbf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nb-NO/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nb-NO/firefox-58.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "92f72a819c65e299e5f42bf08ddba7a87037da4bcf7f40f4a175c2813a4d16407e30fb767161a8bf33762848e5c1649293cfca40e77ac7f127d024593f9e936d";
+      sha512 = "6c9dbe11b53af3ef09b9520df28c2ae606fc8ef552518b8bbe3816a871333a061f504b113e05086ecf590041182e3baa134bf6d84a45b6a5eb3c2fa43cbeaf8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ne-NP/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ne-NP/firefox-58.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "bd18c5c1c106cc37fc041722150131896665132427a5562acacf36772e6f77e34735a5c0799c8292feadd2ff5b91f5373937ac9f780b130c02707c63c9d10ace";
+      sha512 = "80b819ade71f4ba3034d04d3f5178b1f4221ef5930d5f5429c5cf255ade70ccfeda42d87da3f4e227446576405362dcade34db285addf1bc2474404d98f96a94";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nl/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nl/firefox-58.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "f1b1ac149e1ee37cbf54e355364f6788c638f46f4ec82541728c6f641cfefc4c5369ec541723e91ed5c75abd8a86048780375370eca9aa6fd91beda1b153168e";
+      sha512 = "a617fcf15d972552b2cb659fadf695ab5ef6953c7c81273ca7cfb5ef02d681c80d245ffa62c25a0ef6a894c9f1413245c50bff375c97e34b8a16ae30fcdf217d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/nn-NO/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nn-NO/firefox-58.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "7c2f8035101ac0b197095d5c7cf1117bbb82727ff328b7752b0cba8d707a519c385f37d987190226b1fcf8256dfc70e103bbd558814e62b8dcdab1f2477dfc64";
+      sha512 = "e124e1b983dae9ce9b595423949767980289169b9b3609033c34176bd8d6fec9e7cb13504a8d03c0d42359aaf045fbe0ba66aadf0566acbc80840861676ae9ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/or/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/or/firefox-58.0b2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "1983452f6208949a0fd412712aae93f49f051d730b4f73ad95dc77086b745f39cc35e765f270f6d4c2094df10d99348c9aa745cf765e731a947ab99b48676921";
+      sha512 = "f7b8643f83ef6ccc0d6d3de8629808372625d7cd75d0bed8d8993d4fcfbf37764bb29ab1b2a2d3519cb6e5fe2d43af33e407a6295b1f770cef4672f20f1aa9ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pa-IN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pa-IN/firefox-58.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "1c86552ea21ae1c6a7d9745fa72e9e52754544b0f145e87cba1e5df6a719d524295331c6dd691ec5402cdc46fff14e68a7260da2ad7ebf56bdcdc8c9fc793fba";
+      sha512 = "f3cfeb091d875fa35f2b76d5fd33c4766fc3d37dd4041b23e400e223d6be4e791a797cf95f534b935e6f40c28ba58b4394fed28c3beca7a097eb5616feb02924";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pl/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pl/firefox-58.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "0b2df8461171913f2d6a3621c74ba497617e9512572e5fde0b5e0ae54f514e083b42134b38fc3e380be444196965a078fedd199ad3115070cb1d69f20f6540a5";
+      sha512 = "a0f5e040ce4614d82f5ff7fb5b6e16920299290840a961b8e71c5fcf9c9aad88092d519739b21bbd330d03aefeb25cb0c8ddb9d75792297b970ec741043c6ff5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pt-BR/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-BR/firefox-58.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "86e7c61df3bc0c1cc00bd4eab4ae9a9d307490c6c871792d8afd27208fa93c5ae4b39564caced53102d8ec5f2c7275889c23378f6bfaf4f44c1244b5c661dcc8";
+      sha512 = "d9de5bd80a4658a4b7fbda8b22dcea6104a77034e62ac66ee4906c2f71f9048c9f8f3b85bce38a0a4c6f9d0243e23ad4ccd6db8ccadcd3a1d79a034554b5035c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/pt-PT/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-PT/firefox-58.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "36e9e0fbddafbed694acdb37e46a2665b1bdead88fddf7b4859e33d48e6dffc904106a3c760619886981aa6cd642153dd203110269834d6183d0a09de6f7c6d6";
+      sha512 = "ee24357ea59c9936f8bd4f2ccab32d73012b9bdc0f6416350a30a0c3a726a817eff5a275f689dce78c0256816f644b56e68ce8642632ff2394bb89719873962d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/rm/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/rm/firefox-58.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "eb0e746a428912e1d15e20e2929fb6d3fd92b2954baa5e717e393fa0449d9c15e8396ae0c2aac50213b1320347869c923c5fe29153bce1182102971d69560946";
+      sha512 = "3fc05929e41b1da505831fd29ddc590b11c8cc68d656e6a29ceb36a8d4f1718d3e2c651bbe57dc6587d6cce08a71b2131e6310e3ea688f2950a5edf4dda5f14f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ro/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ro/firefox-58.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "a38120e5e5aa2202ce215a938619323565ca00021cee6f66eb8d5ebd25164e3ec4fd2e4bb13a0c2d95c9b215adfe2f663f62170fc61dcd156d49615d2c1a5329";
+      sha512 = "8d204165cb4a8b4861f2bdfdee197a621db698c767443ecfe25751345fb651be01d3d2d18de8cba10e684f203a6276ee71ed5b1b99a43d1df943a9b5147e2fd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ru/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ru/firefox-58.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "acea191b728bf9be9c979be2b869dffb5d37649ebcc2511695c85daba41a8e7e3481fdbc474cd70017c75e08a054fa068a09ac52ba11cdc3803bdbfa4a94f548";
+      sha512 = "7b12852be30cba66d33b345fb8976d1edca871eac490d3c49f0ed89c48a772d48a4094dc1e52a32e103a3196f6bb12264b3fe46bf53a14ca0e5ed3eb49164d0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/si/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/si/firefox-58.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "8f79244bea0d018ddedc32bbfd0fa057782d0bc88e99f82850f711dd753201f3903c588a1b065743750bdf09f6119e1af0720bccdb5f0e8e74c73e99ed267f6f";
+      sha512 = "7079174fdf891f983d0415cb802470899af11e792e3abdc00f8503116a007cec1177fc71f96f8b0b8d15576d2046690824d152cf7b5577f5cfbe0aece16c36d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sk/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sk/firefox-58.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6d54dffe631bd5cb1042daf577b6695d643d87f9fa332b24d7461b61c1871034195eb931726f2f35a76cfc5f3cffcbd44c34f9b5fff4ae9435b2518e8f6143c3";
+      sha512 = "820e8465d6b9bae28a572cf7ee3d2b8594fdb6fe54879151ab327f93a1313cb2019687ac335ecdb64c5047421832db50c05b01b0b52303a0cf71d4a320900557";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sl/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sl/firefox-58.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "85d6480d65f110bdb3bcc1c7187541d2c7a652629f57f42c5640c84f29632624fbbcd6ef70de804cdde9b903e1b6a81739297dbb7235b1cbc8877c77feab787f";
+      sha512 = "d1e55e5cb55c1894a39ec3eb11657c1ffb491f165af8e645f28d2af6e3ae481a04177345a76e91b769a68fcb2a84dc425363c153820be564ad015eaf27ba77d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/son/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/son/firefox-58.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "956ce25b91bc64e72a5160f185076d5afa51ed4a8a70ddbe20a0ad5ea372c9ded252ba5b29b355ecb7d7ffbf53f58da82f082f389dd178993059d911a3d8248c";
+      sha512 = "1b46e24fab45edf3aa81535f282b73c8b7e5975b6f329f751a3f3300c7bb01fc77e08660eb01158473bc1c8ce2c1cb831da316d39ef4e89370b26d6fddd68fd3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sq/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sq/firefox-58.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "7b2429c1ad8ff0febea367d6f9b049fd9d29ee74be2418777dfee396949d54d05f976964d801b5a67a83bc34558e3a6940297fce135b76d0fa4df4bf220569fc";
+      sha512 = "3e6ac70fb3f1c7dd7617caf254abd3f4c725019d56d6ccb15a8dffb6d5e5046ade6e6b50be8cf8239208a4c4458063c435de63ba7e9c6de4b93ebf3d3b7a8ca5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sr/firefox-58.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "fa728c7049659aa6d2f0570ae037b20bc01eb15e8fa1315ff8766c7b4b93f2d7147ff8af5ed78a55ea73c57324b6c5882de77c905c984b55a3d1180e87444a8f";
+      sha512 = "fe2164cd54ec4ae280432e26310be2ff167a990a578ec1b6ddbdbdc14563c0e49f87dcd6358b745aaf6acb258b385dae97afb2a1fd6106e5dc269a0845740114";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/sv-SE/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sv-SE/firefox-58.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "9b1cd04b974a0952a5525f33ba8fa1195b6cf874849fc84ef8c037acf4af1497e7041057b8ea0b362f5bf57df944002f2cfb06d2004eb7114a2491d7bae2cca6";
+      sha512 = "c79e3ff3c3a2cecde79e2e5b24bb9806df816a4a1fc3d0f0aae67471e4b107bbdcf6686414fad8e3626799f12f8d818023f0b71bb393b1770eff38d6169d70c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ta/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ta/firefox-58.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "28578f38c1c6a38edaa5120dc772901ff7db0e752501ba5e949c6d64b2477e6c1edf59df1ead5356652f5f5f550c3520a75db65ab4c8ee430fa9c8fd62f76fb5";
+      sha512 = "8266408b1f4e0fc2b96c0cde463619675f7038824c3ebb2c97186e79736431b77b35e0ae62fe09064fe631f07b77eb19becf6e435d4fbc096f41020bec291384";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/te/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/te/firefox-58.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "3317b9857651cdad4dd3886a4a778889f62df6981d40c9c28e4ca09cfe879adaad2502108d7085048ed233be4328a7bdc24d264cf7a5e0955b573e271054a01f";
+      sha512 = "110dcbd4c13f9d917f78094914a25c8f7d80d44aee9553421130dc526c0d6c29bbead1e5fb2f778d955bf65436d983fea429de6f73b9328066541841f7475e02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/th/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/th/firefox-58.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "171da97ebff3276da07ea3ed3b3e9fd3a09e1ff7b443e0bc6f9a31098515eb48c604a5491cae701a9ee9e8d23f788a5e2bc095cadc9060a014aab3b157dee825";
+      sha512 = "1533d96c6f0e23f38c113515e7fff3caf99915035050cddab0ca021b176d7184b80e9bd5ac79d809a0d31b3be987f9e31367874b4c35adbcf62a2ce685d41338";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/tr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/tr/firefox-58.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "d33e3b109238f1ec24cb4301e89c039bb2a7002bda379aafb1a46fd3621268d10bfb446ff9c81f3d96101c11ae946e74b359970f588a4d40af360057f6bc2537";
+      sha512 = "da6ce35769007f140b9732d7d429def5267f733d8674a7a80b11aa89aaa7514743a61d1f22210bb7368416f570d7f0748609b31ac72ab80ffe0ef7fea3397bb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/uk/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uk/firefox-58.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "b28fb0f609d33dcb5d7d9331a3a89979779fa284fe1a0ceac6badfb4549ea830d181d52f2f8d25c888b448b0e7400bc99bf829e185fdc06680bf81efd5f9b843";
+      sha512 = "df03b9d2bc39c4d620d1886dc1d22eb70289fe8d6fd7ef429beb8170a95b5fb1fa15526b9b68bf774a3f09170d0573f642173a6302f8dc9acc41bd9f2604773b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/ur/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ur/firefox-58.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "1d15aa7b5ba212e0b2f7520f4a0c4c7f9d53be840a971852485ab3491b28c0d81f0425f32774cd90508eb74d42175f3ba76f3f20f21c182a276b21090062a9b8";
+      sha512 = "a0914042713f9fb91e52e35eafe4b6a666b670e951b4e6c3ed3945804a5640d06c5634eda943927a84ba274871242a4495b754280e4c601fd69c9e054f1b8175";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/uz/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uz/firefox-58.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "bc750432a94d68897a2a39b425946aeb65e3a9980ce05dbca143615360b45d7f8afd0523ba9bfc4769d41a52ebe554e74d81981391a36b0a812a2938bb0df91d";
+      sha512 = "22eb91f33b22b43a81cb0039aa2f11bccf6d83433897d0607d5a52c127366a3b75c18d1df2ab985090a724b278bc703e80370b8ac765bd891981620b0ae36a4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/vi/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/vi/firefox-58.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "71088078c930889f1747f087d6424743df809fcf62c833470c3222002c1037e5a91d6a2c81e08d39527c673e4d5e807e40c85ae63a7917796af8e9f1e0ea6b6a";
+      sha512 = "e6801f622d134be7811212ee8ed47bec259eea1463baeac098ec59e5687cd2ebe42d77d42fa0b18f4a054c7a392efcb6121ddba000323998901f46ace3a7fe4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/xh/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/xh/firefox-58.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c64f34d50755e61487d9280ec60659dd8fc883effe88d61d73416ce740ed5205bff1e107844f04c658aa495bde5add5d10fd8d171312913e2dabf351ade7b481";
+      sha512 = "0c0ec3f3112ba5cb7a8df9c9c69714dfc585539b4a13632bba94c8e58b7e5a44a25ec4206c7d656fb31c883454a337e5c3cf24ba67d758fbe9841207c4b84249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/zh-CN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-CN/firefox-58.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3e86e76898a2587d079384ebff6a511c6d8a212a1a4632c224de9a1259020358d0ccb2acd1383949f0f6610c284dcb2a942c6aa483ce61d82a8bdb22a6d95ee1";
+      sha512 = "789602749a56379b7edba5bf5ea9acd1d950782408f07f0ecf505575ef5cc94f580a601d26c4225c40d49eced4d844fe4213be2df52c83db7788b4a42fc10952";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-x86_64/zh-TW/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-TW/firefox-58.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "f560cfec6fb0999be49da6c27df85086a1dcb9f88d1467008c417ce47c596cc4616d5971eec40db5e112d1a57cb135ae12e9fafbc4d20b903c3e77dcf23eb826";
+      sha512 = "44b7d87e066ffd2cb83c33dda0ea3edb18cb0439c3ffb45d78fc07109e370b6b8cb7e95379423162928e9f81d5be773377716af774f8b3378d9214049bc73917";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ach/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ach/firefox-58.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "d322b206a5c7e8873d9c161984a95730b91ed900d81b9ef53b0464192cfa52dda02a684a6bb615bbb109f1f6d93f50236dd36147acb681fbb3be8e08332e6d5c";
+      sha512 = "586c8cb8baaea42e694dd5f9886df52c4a34ec8224863127bd3b87bbe2594420b90a644c7b414b85db98714eaaecae88d8b91fe78351cf0e113dcef89d3e0087";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/af/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/af/firefox-58.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "68b112350d8f8b4ca5499e04193ffb0a8871e8089bad80cec0e232f72aad4561ac9f44a33ef65b9014fce830a878cfa9975cc6408a70d7e62878453895e3e557";
+      sha512 = "5d66112bd0b361b7a064efc184bf51d498a61a58ac97ff4a6d542b7c6be6f1802ec7da9cf89fc554f8d3e8ecea28d3d1c694cf47b628a15ddce6bb24589be525";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/an/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/an/firefox-58.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "69954435c30b30c77896cf195658e32465b93c7c2795f60ddcecf837b85aac4be27bf739250412bed286a9148754edaea29229593d0fd1f0dfdc02ac7918789f";
+      sha512 = "3726fa3ebc4d21b02a7165d12b0ef8fe2c3ab5b204fdcf6e8b71994ff48897631dfd220708da0365cb875de8b6e20ea0db416654d0de471989f8cc57f427e64a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ar/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ar/firefox-58.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "962d6b22c1513c2d1e148e30b93aaff1a768e6f7aad5e2d2fa3403e47db1712daf14a32be51b5e2de74e789bc7db3cb3a7d82d24392f0af10c2d313f899a69c2";
+      sha512 = "ba99e30e7cd10dad54df7331087a2667d8ee1397c1b184f7deee3ed15f7c6d6b111592e74be320808bf67846d1cb7278270a47cdaf9db1d0fd671387371a203c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/as/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/as/firefox-58.0b2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "8f1278ec528108c4b93c734aecac9a1cc28f5c459a76aabcbb2f03cb467299db858c89e167e8b576b74f58950979cc7c4d4c1fc563151abd1b1c50c4d89ba2e8";
+      sha512 = "db6035cc1b2a6c04ae79e4179dc5f1a64a910a0c8646e8cb93af63460b5d8bb5a07369b93dd4c703d09a39693a07c3bfb913e4ba6d45aaf3e125c407b38f6d6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ast/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ast/firefox-58.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "bc79681e1256efbb3ffaf0faeb53f8336c6c3be90f94fd815670563298adfc6e4bcad5936fd7988aca49d4ad069abbb0e9769458455b5b8d338c3d0d36a93d0f";
+      sha512 = "42496b6755ef735527419453fab12497a8d6762d176faa8b0af7338c2e62cba2f2560ba0f7a22d6eaf10badeb2caeb6367773b19d2717c1bdad64149d74d0f98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/az/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/az/firefox-58.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "9a7360b36c18ef4668ded6eef44030e99e488e404e083bf63c1a47bda13ebe1b8674fdbbf39f2e4ceb3fba832c0e78ed3e280d036b6cbfae3b662a716dde8c23";
+      sha512 = "c16fe3c909a0793cd91f320f94fe309e1f0b559cc84fb01ece5bfe455a1854701b259821f79fa6db8cdb6dd630a477e55e51793947661e0b3fb8aa26f3c4e22b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/be/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/be/firefox-58.0b2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "083df6a06d92174d1f9b0c8348d668e8834e03b4c1cac657f7cb4981167926f4d851f7f6b2071c077b99a1f5a2f717d16531092cf01b8c01320afcc69043d990";
+      sha512 = "5bc3b984ad38f105a922d1c614e1783d32a84956848f51797d4f1b3b5b9daafeff0730d103bb27313840b07ee97be73c30d6674a527f57ea7d95542742a06a00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bg/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bg/firefox-58.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "cc38cfa3f2f7bb99d4c4c25bc90d5756500ed3aadbd517e3bf6cb1e700cf8c5216cae2683e9ee801613375ba8442b75efff14fa17057c9e5cc0129a813a5260d";
+      sha512 = "50f64269f264fe1c31970b43d6a0a8860a563154b8913b9a6d186398a6e6d80baf37bc0f091a6ff49115d44d01fca550cf1d65c16dc77d6498a236595be2779e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bn-BD/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-BD/firefox-58.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "3137e5f268b52d400a67bcb9652a3d446879e5b68ce1ad5bfe0653e1f630dcab7294a9ac060c2a9238634df13274b948e95d3549065b471db6bc33e7ab03a8f6";
+      sha512 = "be9cf4bfba0a65d491a586a1ea2ed6a2dd1946bfa715401763b3067c3388b02a86a1d53a7295ea6ed6b47cabdfa342d0f0ac6598e62f396baff74db5858f0c8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bn-IN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-IN/firefox-58.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "40c279e62742135fa246f2f005677cfebe2e1530ffa832c435d3b7248edcb9ab28c9f82ff5a9118f05da98a0b93de02f5d66059cbac935243b6b7824dccd10cf";
+      sha512 = "f448f52a639102c82396633f62741861cb2a3a0434a0e7185c8ed6e70b24153e606a5ed22ff003ea7ac2aaf6996135e7094e5d0226bbb8f143f0f3871daf5ad1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/br/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/br/firefox-58.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "07fffb9c815a1a3299e3adf5016b2f9f4f405907f567124ba9e05dcfe7e098efffbf0cb4cc7b5ac3df171e9705331ea33cb02ce8c78d8c35766f13a328f52174";
+      sha512 = "f52471ee4b82c820813accebfd6563494d41ce7949449ecfbb86da45c0a4f36c0894b830ac33f96894b02e6785cb8389a965d638f75cdd04018730cbae41c7d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/bs/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bs/firefox-58.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "f7f591e6783fdcd7de3a5e33dc43580937f88381458ab774b86688a7c76943afe717026b75ad003c041df426e22638fb085ebb640f459110f5f37f195fee73c1";
+      sha512 = "9df7d37a1cd531c43cdba491ac5fb844c20f335058858cda88bd9934bea097d9d170e18b3b29ef0fbe5ca2808469b75a4eab767b37ed2e29ac7cf2141ade8f38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ca/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ca/firefox-58.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "0ad04e6f72ad6df7cba03008ca5053f162c94d0e0109fe3d2d49e80546561f010f890bff3fb632ebf91edcd71bfac3f743614759ef3207eb19f1278ae2283561";
+      sha512 = "43fb2e6b9945a4586070d433fe080cd2b9b8c0923c12ca084d6d21dc3e22164f470a3c791b5af181aedbe1d76e78cee3981c7fd1872f45815a8db267a9ccd74c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cak/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cak/firefox-58.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "1be5b051151eec3e46d9d8a5da1a44569bf56ce160a49041be51ad25c5081d019014a7c2a2861e654c39f8fc918c308450827ad68f409161a07e15de44f14b1d";
+      sha512 = "7a76be4291a5d3f6bf150f09701df4390d7f74c0046694a220f4511468a815404713062ad560f75d35643548065a2340bc70c439e23ae14272fbc20375f5901d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cs/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cs/firefox-58.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "6362cbc640673f6c93c073f116fc98efaf5ec417a5f6754eaa28d750b4c239e12da5b89eadb7a1f163237daafea2b1fb3db211cf00d2062fc9272865472e4a04";
+      sha512 = "d0a8c61960d2289b5402f718db28a6ff355fcdbcda77124949c420c3023b57595559305dc763165550f0453ae0e4a01cbbd3fc37e6af9540c80f857c8b4da00a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/cy/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cy/firefox-58.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "d72e0eeaa88a03af2f8d10b329d5d734841aa45f05f6c283e2774a7a80625c638b59bf579ab0609385557e911f319701a073e6982f5319df717f786e11475df0";
+      sha512 = "85d9dd9fbaa72ff350d464015f2ca2e810a66d2917f19a7830ef50548ea3b5de1a4e818fcdacaaf9e5c7009cef391bfd3818e196d89483abc43a1badadcfd41b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/da/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/da/firefox-58.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "7585f369e94b4f2f0ecc9f2ecfaa059c0295ee96e13cdd93f94a6558d99764bf20b248a47cb1ea97cd4f7f14c37bddebf4e1f1f396df5384795321656882d790";
+      sha512 = "f7a87024c27c0b7fcdaf5cee4c31235043c1c506003e04c71e60792dbc9a4cb3fdb972b335c3b6eb10fc9774b36dbb2f6b415ca90f4547c6979bf4568876075b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/de/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/de/firefox-58.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "94610bb17c0164a9b39fecd5c108f08b44c98a7493f9db16305cfd1dce95eac8565d57dabf3335c674b92a45dd8590f95f4d0046bc132b724710cd1338d712de";
+      sha512 = "b4f1fabe3de50583afcdc27a3599dfe9d2a08f2e8b1942aa0045df6059e9686d2f2f1fb3462c2e21d9e6fa1ef5a7849bffe2cbfe1d18bc70879a98ce8fad8718";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/dsb/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/dsb/firefox-58.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "1508bfb8bb5d2756ebe39a9e778b45baee849c6109022475e9106ab79a03ee49986421b809dab70d924fa0edc6613c877150de334738cb3f9a9c53ce3d524ce8";
+      sha512 = "0d85cd11ad6c28c87d6df4dd9f5f16dfc37f885b1686ff85ea051bddd6f5b2db43db0a6b2f71998eed707533416b6af5e4dba209b43586a76e74c03ba26cecdf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/el/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/el/firefox-58.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "660a1f30c682ae84aa75d7519e76cb9e2c30978a5195a9e194f734c7b37ed2b12fb216a50c44c0278aa11c51e426b7b85a81363d263dc49a41dd7935db4bc49a";
+      sha512 = "014ff2a89bd240bd32399732647b4c0cbb47ddb9e5a7705be56eee3df8c8b2c95339be61ed35893c4a4fe03afbff3e48c9e03d44f0cedd5c3694ead76d4ddd19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-GB/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-GB/firefox-58.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "3e52290ebcc54803162781fb2b87389819537b6e1ad671c8bd95185372ea8dbce11a7cd40ab6d71130effba71155c16be729d0cf74bb39e0aca3d1547cd096b9";
+      sha512 = "e8746eac5d253cb2e5968b0d2da6b596a3b14baa967622528d03db684f9b507cbcde59fc0ed6ceb64d4eaf5e1767abf1fd8e8b651bfbec1beb9b7a5019c8ae4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-US/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-US/firefox-58.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "f1aacb89284c8627c55c186fc50a5fbb2db42577e0c8db86889599332f711f484cbdf3f53c0ecafe4431da35fe51c3a8b7cb831710c19eeb7eab2ad475061684";
+      sha512 = "ad0b071d92c3a882f81b7ac3e295e4234b9912bdca1ab70cae0d79f17b3f5fe04d30c70e91f5639b8c8e0f6759988f0f7bca3a0d4771ba3b60c63b08bbc71c8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/en-ZA/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-ZA/firefox-58.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "f4eb9f4dd20a255bc054089a71d9fdea91c184919b8bbf75ced397bac4d4ee1fb5299d60203f59701ccd1673439653338071fa7c90c32ed0b94ad78cb510f3ff";
+      sha512 = "4434b81ad8cba0b9c380a73feef18eeb1f1c043842b24a13dbe1059285dd0d4c6168f358a38a31a143e2b0f7c2d19bea08734d02a5f7deecd2a185226ae6d694";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/eo/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eo/firefox-58.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "b310c3d01ed998222d922deefb641333239c57da410fff273f238c852e75909eaf1ea851afce1a93257527670b0f0d8861d9b47b68cdc80c5ba4c8bf1afe9775";
+      sha512 = "1f3ab8f6e3969cb9aafb4fc8ec1e8af9d2f883e4013851d822bce47153a1d06fd689e0e2230ebb0fb3eea81f140f4cf984a4b5286325a576bbf5668d5c247346";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-AR/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-AR/firefox-58.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "95ce1ffd9d736b3ee78e22c3c8b6185d55fc3cfa501bef1779f30d345f4af642c92ed5a0248b2acee04136c7ab04bff604f6931d8e19fa86b9a0047c18d41569";
+      sha512 = "b609c22e7cab67feb44be92f8ea3cdc86a512ee96c56c82273013a02c795bcd8da4ef40f586c94133118ef5ccc7968f21a27cbfef499bcd61be069e55c6f9567";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-CL/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-CL/firefox-58.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "2be8b488b2c633513e9b8832a3be8263769fcd28721bf26085ffd62d855aa22eee94bd32bf57d19a8a226d6a5997c4595e4a1d4ff3df71948e66ef9d778975cc";
+      sha512 = "b6bdd2abeff665239e8f246940ee65bfcb54f1831d34aee5264b3e7714ad6819a5dbe9e3107d169cbf8f2532bef1d68bc40d185c281977efd8a3f8d918b06388";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-ES/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-ES/firefox-58.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e5b26bb9cb2a428bee971fb09694a47601304ed5bb49945ce83a84eab90d59e4b60358baea20015a54e4dd8dee1beaa9ce06f80faf9e1d6ef3572087eccee172";
+      sha512 = "672afad688d5a03a1aba52d9ca29073dd2e7636ad049f98552978cc98285b5794b5ab854c78d169a14825455933413e5dea5d4779f5ef24447c1a414361fba37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/es-MX/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-MX/firefox-58.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "2069a6fe973341930bbb482a7983d49576475a6ab858089c64e388812002e698efc7efa328508cb52cb38f013edbe995b5b941779e03f4f44afabe0b013f2209";
+      sha512 = "d10de0d07161e4cca3a7ca42fa7ec3941062db191f2d80325770f55ebc080be2c8ff9b3b8b52c47cd8422f6811696fd6dcad51cf1c2c4fd6c976bd197dd39251";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/et/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/et/firefox-58.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "65c02f08263fb91e5eb5f4edc445f1590e96586890200298339496ec93c9b003eff729f96ce2a954b80bd8161e1ab066bce5df1d1ec501292f4080bd3414a9b1";
+      sha512 = "c3ea53b3422a9cf101eb737d2cb511270fa4b0370453dee86c74f6cf9f36f6d7a2c4f36b85b760ddd089bf655f540f8d12a1d59c259e8beb26b69ab345569785";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/eu/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eu/firefox-58.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b45b71c7ce796bf6a9bdf1e07ed239b33655ef4b79db6d45be4ce5137039b3ee3e10054d90db19b3733b92e9c77e822c5c27b23f1fa5dfc0350129571e56e7c0";
+      sha512 = "1221a19d5fb265cc86fbe3a1f03d99d0d5a5088432d89624ce7c00f26dcaca5571f8b136be8fa65f4c829e6b5a371d22d49dc7bfd0c31f3c168a4abd7d49e8ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fa/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fa/firefox-58.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "e64792f27a99925e49b10db7442963d8ac188f3d2d658fbb6a15e2ca462e2c609abd9f265a6577503b3bf62d9e64879c44917f541d84bd389b6f6ff4150cdf1e";
+      sha512 = "575757d295a420921db0528a8833cc69a7aafb13e4a51c63804b8c76517497f63e84aeb4972bdae0e7139233be50613c26179b6d7cd066beaec2d8ecdf429d95";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ff/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ff/firefox-58.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "ecdf7ffe75352bccc1e5a642f48ed82ed7cef703193ccc97163177fc3c7a77b5bcf4bbef452ea1768ca490037ecad5d742800ec45d984e41dfcc30dcbc70b3a9";
+      sha512 = "a729c190bb3579ef4fca48c837c886f152bfcb550c29fe01a65f6f1186b7e80b71dde3a4f45ab80f282b04868cbc1291e1949a908b7075752fe0af7409c3fdfd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fi/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fi/firefox-58.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "063fbd923090c7452620db1a42358687e1d29975cf19049a5867c18eb0265790f4fca2644010196c09b639e63ada98ffb71bbe17191b31a0cc1b4fd468b4838c";
+      sha512 = "ac7a6844df3a0183d9516e3f526d6e8729b831f241926add256eb790be4d05ab58c62726940eece24b0be6dde8530c62280c744b00117312e937bc024b16d197";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fr/firefox-58.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "889f628248f6c504198988697f18cd2f99be305090350aa5fb8d5afcdac572c14cb780ba07e9c3f98b6155f29e4d32fb5f140886b0dbcc55d9a71cf31d058fc9";
+      sha512 = "f46400d33f72dc888ce686e270c981b0fb11b68207d89297288010df325a71b29f48200c34322a5d9ff493d9540aadcf5f30282fc1da0dff75cc63548534378e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/fy-NL/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fy-NL/firefox-58.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "8749fc2e704a9156bc944f89626e3fdb2ac51d325cc6c3f2c6646c0a60d6029caf5b51ad8cb6a269cbd4b6c0b23b719cfa1f7c4dd1febc3cea2febc6b4964f5d";
+      sha512 = "17e6da89a57a34e4609acbffdda18679fb446c3d931bf5277e10099f3ceaade22bd9db41e9d38da6db09d9150888544c6619a818a50737b429a6f03def94479b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ga-IE/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ga-IE/firefox-58.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "93628f55f76a44041a49ae2c2564814b277095d33b67fbe4d902234554a30461acd5eaaef74780722287874ac4080b8def72a2fece9ed72f5a9e6d2140cebae3";
+      sha512 = "5671564000d63a401e40db275a9ac2f131c9a0811b0165cf1f1d3769324eb481b2de95a29f4b3cb8935ba9808ece9bae4e7760c14764c8521cba1517bfa69626";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gd/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gd/firefox-58.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "af3bdeeb07e2f63628d787f66d0838bc073b927900e6358768a083832a13e0b056ea1821a43623e3c385b6a77d6cef49cdeacf7678be3ba16263ea7c34144d4e";
+      sha512 = "f7c280869b2468c173f0c45a92301c16252365e5cd1fac0b3ec7a3e779325f0cb6a31bb89761e37b697dc5f1a5dcd8160d935769a683dc656f89ffc29995e782";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gl/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gl/firefox-58.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "37082a0429ea2fa9d8009452fc9940b4d507f64a5285d67f3f9d77ae4846aac4d40b58f4ea5c6b6684c5c59057bff330f7ca21a7ce240b78037ca90589231990";
+      sha512 = "75e161834e33a4d9e761f85b2cf1de2da88113503c1235d26a2db0a0ebd815ec12e6d5673aeffb368dc6f75877c52d67e59f27ee44e9eddea8f7efa17b4b040a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gn/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gn/firefox-58.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "b2ec403ccb785f8eda9e1a03d5200c40827f20bf450a334f8ef0ad1a1b4fb38ba63b812405360efe77e0c6705730dc484541065a969e9b51406a47a8a13fa32f";
+      sha512 = "5aeffab6468ba08c15d74cbbda355a8c51132d8f09f5d603e61c6caa04f1c57a3cd659463454d967a8fd68a17bda9185a0d281368381bed772d1b7e8c5722fad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/gu-IN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gu-IN/firefox-58.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "2275c8bf1639108c77b304140ce32a69239fbc96a371c1d88464694f989deb9264ab41053c3a2d3e1afd6443ff3f0fb8e58b61d085dd2f6cde346867aa380c08";
+      sha512 = "89d204f7b931897a9a782eaf99b5cda7a049d35f7e4f3336b3f941d6234ae3984130c59a352052878a72602d6fd21e9725ec51fc2bf990ab395bfccc1ce202cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/he/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/he/firefox-58.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "982b15fc9cef3fb813154f90e1ca6d0768237b04ed496d91c141c59e6b59ce0d02623644d12b885339e6677b01556d1724f3010ed06cce89c1d26a3cbaa9863d";
+      sha512 = "7e3bfa2d8fc1ab1640bd2310c596451afc25ebdbf5b0827e218afcc7144b126220bd4cc94c8c769c20b6f00c6ab338adf4602dc271a3480caa1db69b28e41409";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hi-IN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hi-IN/firefox-58.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "40e6842ab3a8fd79bf9c06cbb2bf1aed9244e87470a7b39957db7c48f8eab2dcbd988c47b81d362bfdf19e7c9891c1ecbf0183cceaae9761c38583aff32e6706";
+      sha512 = "803312f7e912059d05c88a1a6f448fdeede2aee53532fd67d685ad64c4961dd125c81ca9792a2ee781269221da738fdd7c76119a3b9d4ce6b9a5cf579af90388";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hr/firefox-58.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "9c798f2d7483a4b122fa579c0b40232a312a5ac7e19db9a940fd58aa7b54a52494822bf545a79a690c181d47dfbaa7e4e7b9c70d68a981e9bb46f3469b356855";
+      sha512 = "bd4c68ee7fd5d7ae80907111f184825b94b1f12d02019cdf1511ec76ea98098b1935953b5c5759f28538f110a71cc7804b2161d29b8b3835a481f6f025b70448";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hsb/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hsb/firefox-58.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "b00f4b0e377e413c196eadc2eed1c914b496e6b71742c51ef87ec502308fae0fb55c0d69172d47a9ba6271b137b50e1fa365781cef11d0d65ead0089d8c16ef0";
+      sha512 = "6d9d67e98cb39884b54e068b471d5e16e38897105ed890f14d322568a910fa29c5a3a927a31215133a8635e47800f8863afcfb7d88243b8cf9414b450c70f44e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hu/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hu/firefox-58.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "806ec30cfbfc22fa206dda8e3cb5b43aeba99866a19e8fdde212b95c852bd2f313f451b93409d153c0dc07ed5e1ac94a18b75f91a4ba9b4787a89b77491a5293";
+      sha512 = "2f07c74f085e7490ba851448db019d7e0d5deef9a74e53c7e0e3bc13d4be5ba341032b9c63d5f2a7f631883858046d84eae5612166e966c330bd14777015a6ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/hy-AM/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hy-AM/firefox-58.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "9e3a8e46d15d9b71d645d830f10e3ee2089c4dc5083dd2debbd3d9d05ef464b01405f920d9a2787d5155e533ec57c3fe3def34ad88137a4542a2cf5cf8a904fb";
+      sha512 = "91440eb5832be50208473b6474c0f13d794cc24a37b2f9a160b2f173fadba946b934fe0c0867b7e3bab605da6011f32fe834825f2ef229e0a20813f58097ef7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/id/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/id/firefox-58.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "253958e0e6955a8768c5dc7645f6431135bacdfc9c1552305f7409c8044a3bff529a87bcdb2a0676b0eca3ec90de34fdff41a46a9ea63c5ab038b4119e231b4b";
+      sha512 = "b0a2504f562b902bf0ff11363c44bc6fece5c327d0acf9eb8f0b17d5750846df1ad1414c17387a39bae5f1ac33de9198b05c55b0f2a97590a29e6b9c243ff20b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/is/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/is/firefox-58.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "070ba6e602719e79d2a3ecbca1f5c3c412c02cad89c8aba624918179b436606f352c6fc0586597deb2ba7f703623e0484c17a11df78655b4ca0a1a6a826a1b9b";
+      sha512 = "e3518d927758c3e6c0bf73026b3896ec44cd5bb0abc3e0a8e280e458c66b70a32b15d53a27b97671335fa3a00cc7a88032f11458962e48cb1e984aec6c22dea5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/it/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/it/firefox-58.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "9f624b314b29b1ebaa6c92f2b8cf7b4a0b3c38851af4bfb123e140f49435e294a7aa2bf6e449ecb6b315b893d5d55beb487d30814cf6d72c4905eb7df91d0327";
+      sha512 = "617dacd7122d8920c9b51974136b7834c079adf0486e9476f4e203805621864c47138a6bb79f05496f075071d37e45baf6279815e17a3640a805e80b7489b61a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ja/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ja/firefox-58.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "22a95b25a5e66280791fc18bd5050db7726265aa999ad959b07d45c7fa4720f067749a60e33cf8f548b93adbf440e15e47269f98a31d3643d157ed3d3c46b9d1";
+      sha512 = "a0e21fe3a2eb933ebbf379294eebcf3c9f59f5331d4ad7959f5a1241aa4c0a90aa018c901d715274b12b2bde9533571ff164bdf71f081024dc0810e838f73fc0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ka/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ka/firefox-58.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "3cec01bb5d98f192426cb39ccab91d823604b7c722831baefd8f1f6deeebcd5068a9ec8ad52cffeb02842ecccad891534598cb6a898adb40c0fda77a038b94b4";
+      sha512 = "1f33af1629bd806aea449d429d7348362dcce82a5a02ed4930375e9701c700eebfe5773ef492fd303f68d86dd3ce47cd7c3f73e1a5bbf3d82bda1095e696cb55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kab/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kab/firefox-58.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "9f43fea99f324955625889082fc8ca119d0aeef63d226532f87121c6659c0c5a9cb54a07faee30f8b1b10ba58ece7ca1419996269f05c705fa36c364c8fb609b";
+      sha512 = "84f8b464d56f70ece330d6cb5dcc9d7c65b201b4365bc030c02c4b9892ba8641e8686e0f0419da40d620397842c4dcf0de58e9cc6776108e99e9659fe0997a75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kk/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kk/firefox-58.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "c3f10ae05036eff27646d613699c4be408891917fc9d523e202f58815d2ce76a976f3660a507e6f5e4db4dfa7172227c6ab874c8586997d530808ff409ef827a";
+      sha512 = "83774a6b52db454e9a8b18b1ca7199f52ff215e5e35fe7cf0d86de6ae61af3846eb25510fdc7dbe670fc227688ee97b1ac6f25fb6860575431500a0b02eeb4ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/km/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/km/firefox-58.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "d25c83ccbbaec8e599c5ccbd5a21926020392bad5349d65e62a12f9ffcf7fe44bd46fb79974bec12fde2a79e43c6089b9906d5b6926cd17daa30ac3dc6e811ba";
+      sha512 = "6d64e1ad6f6ae88c4d32b6ce96c7f72c03cdb1d13fd25c819e8aabfed07b16bc1ea308f991c8671b6812ae2f91114ca14ef8049bf0a95dfa4b79d11a38bc8afa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/kn/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kn/firefox-58.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "d707cabbe662203520681556c9dce1c7dd0f97e002b795214d17e61f8ef6bcbdd7e16b77f2e5bfd1a0fa80cbba9cff49f4d416f1cffe04138460a49dc7baeded";
+      sha512 = "46bc7f686d971754d1ca3040fafa5573c1b4c6df63d91511beed6848b15717e4820b1a1ef842ef5704dac42e51cd6102102f0566807a2b1ed86f8fc5d8e1cf2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ko/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ko/firefox-58.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c6ad38ff830a6a1af80422af252bcf9dcbdef4151deb59e72de10d048649f8e8ec7ff3013b50ee4e3851afdf609a019bb15e4bb92d93a848b8cd2d57a0bf5a3a";
+      sha512 = "1eecec7d2ba6c2052f26177082384a48505ea2b88fbc5a3880166b11ca061ce77f9e08055776b9904d1d677ce072a87bd9f703dda51667f3fb50b62b42d6bc03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lij/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lij/firefox-58.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "98dea891a50e0176283eb7435aa36e038e2608ed32ac46b587d6212d3484fd42c5f4fa4dae98878fa2b79c69b46f186ce4487234cfe53474db2fce063bbebcc8";
+      sha512 = "20a4f1a52da9e853a40049d7fbed2435ddd48f748a453ae94c9ea14bfae3082aebf032c8f573104eb07317db4ebb970992db667010d0d8e0af6eef995c6481ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lt/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lt/firefox-58.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "5b0ed58b46552c756b47a83b6334c7a47184172db0babfe9b40e3b296088f8814ccd190854cc24c4e79f512f444ba447321848ed34d105c419ec6b1372d746e6";
+      sha512 = "b427ef0a9af8c10b52d4ad55da69d314a55da4de8c68572c57a0983f3e8d566f1604f28c06267736e1d3921cf81912a8829bceddd0cf72b60c08cbb49a190c6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/lv/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lv/firefox-58.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "34a6f8469d4fd7e4fd2c3c8f8f336be95160a076dd7a88b58d345ad540179d241d4a68b46c122380627b2177509ca04a565a53364a9f2190017e75dc0b26bd1f";
+      sha512 = "ff70e130c43b3a5e6b378aa4c048e5b92488a75b8c22a4df4a08ff1a100d63f02dd1bcfa5d4713dec79f65bbac31d3078f786143497c6b0a3d49b545ff43613a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mai/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mai/firefox-58.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "a5bcf34dd945648f6ef88fb96d7b545936aa811f4d1863fb1b381df9e4190e74ee08eb38bab30a46bc5e6449c98a2b3db99d70a62fc46ab85a178bceab7981f0";
+      sha512 = "cfb436e43c1eaa7c5d7b0e4102b79a4e68833591a3c3b09df084533c0ac445bc6ad9a7f4e6f3e3fd0c4ef10c5c177ed7149c992742aa3512c0761a15a64e808c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mk/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mk/firefox-58.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "974c9f4ef377be4b456dfc74d8510074f8bc0bceeaec90670a806fc583795bc06360b4aa21831fa23aff8ebd8d4b8ae6c9f88126a9374b4bc96577b6cd7a5b2e";
+      sha512 = "59c02906c3ae7f810d53b04d8eb1ff6255d62dc3062d5938453a37d50bd35565215e6df9cd13eedd552d9121c415ea94f6a7b507c50b510433c41b6451f1f61d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ml/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ml/firefox-58.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "a2ee22bc5caba643d7694652c2f6288aa6e709ba816023321997e070bfb84a356c6b5d5b92c4a973554aa44862e673690c388d92ac5699e4aec7290d24054565";
+      sha512 = "84c005fa8b3310ee98ec57e882205a465349481bf4cdd3d2daaecc7104ed82882d93df133f6945a2bab2e0b03ef444435438670674d426f7902ef55ead3ad4d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/mr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mr/firefox-58.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "cd828c6366c5450fc3fc5e16268cbccfae4a14bc2cd8041f2965192a9175d642527194564d9891c57bc6f7f8d70ad56338908520ec1c24407f2bfcad1ec1070a";
+      sha512 = "0bd928955589fe29d3801cd4995d9b20c816262549f96e894d06aea026dfcb621aea12abd161af991ee533491408660e38dd8c95af2cb91f24ae1cd6de949c07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ms/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ms/firefox-58.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "21abfe77496cfef3807c962d8f9328511ced673627dd7227c025733d5e229683590b4200e6654f6c20d1ad82657d31ee4dcb64b6d83f797d0c7fa7bc3f5372ce";
+      sha512 = "b9486a558d50b1afd2f7b2dce4a932f233635c2c15c08ca39ca80e83b1319ee1db59aeba679cedee109e4bebe8082017aa7c61ab79bb39238e3c231435a24399";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/my/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/my/firefox-58.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "5d4dec8c8107401ba3e09a1137866b8f690093be14991a0890d941bc4530747d3f64d9cd68bc41dab92b95aa566a30ffbb4156e69f920f0aca7d1560dd9c19c6";
+      sha512 = "d3caac45f5923c01c5c2f7515f2d813351fc8941b8ab11e856b69353f7147bc8c8b06c535642b8c04945c50f923533ac06f87fe3b3a5a818024cd42c08b71a03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nb-NO/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nb-NO/firefox-58.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "10eb68ae015e2a686bea9340f4a26776b388d1a0394ff229a18fc0861a5bea9b3e726f9e3256f99463b2ef56b0035bd17beb8a06b6b3d57b14e22ebd396b135a";
+      sha512 = "56dd91a54b47451bebbd2fdddd5550ee2f8d4339bf46a38d16598e68d54bb853bcc03bd5db946fb800d501c1aa4630f8ed35cd0d8789ce260c78dac0823d7308";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ne-NP/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ne-NP/firefox-58.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "6eccbc0c1cd1307a3f37893b3e0bdc01d9de889fe5a203c034aee4ed7a615d8d049728e7fef4ee87776d9294223839d6cf15565e2a7ced72bda56faab5970a9b";
+      sha512 = "93667ea20de391de78cb8d2a0e06c9015998d00fd4a9fd112912ba93855cae49ce0456fb562bba8b2a32875d4e891ed5e5253517d05ef2b8e6a48bb884f55dc2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nl/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nl/firefox-58.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f1e27b02d460af36dba3fea06c83446a1a12a5994fb3e8ad84dff769fe2307283e7d8eb4dd04211d1bbc12a8b058b4463b012ab01fd8996c12718072ac94311f";
+      sha512 = "9255942bc49f5fd871b4d1c701175a4b74cf555ebba1b89bc8d5d78b9d1db9fc5409c162c2434b78f3094062eb204765a55f235695e6a8c2dfefd70c14cf9fc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/nn-NO/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nn-NO/firefox-58.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "d3c6c97576c393f9a32375ddfe2b6f7055fda84e340af9fa2e4405c0d2e76f309da67a4885ffe58439e7394845c78815bc4ff39367626a3092bf96ae1ccdbb3f";
+      sha512 = "1a72ee04194b5fd4c0799363eb55bba6f993ec51fd920f5a7fe68c06622aa8d92ab7e014275b66fe4406c1f44276d01b34c843c84d16e523632fe2697661a228";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/or/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/or/firefox-58.0b2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "93c8b41c446b15144615ef7c58ac81f0e63dac3747e874e52a6503a953cacb9220274dcc31268440c95dae8b242416dfeef39b392e262bae5b741a323be5fbcb";
+      sha512 = "8b0230279f6d2563e43a0fce11b86c302d852c8acf72a1d27e77d6480d63252518ff5b83ee94b7e5188f687f75bf8929118d01e42e4a7335c0fb5c721bc991af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pa-IN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pa-IN/firefox-58.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "b17ac7bc677fa78f45a2855cc12a35c70701e882a6839764a4d05ee3519f68e1347194895475e916d62d2a679c7bc60588253f6f201b41d82b3a7b85a356a6f7";
+      sha512 = "d7feaf16ea00a77ab91a9b1017f3589e6ddca518cfdf09634fd74142d0a4ce0a87c06ce373a7dd356236aaed6673b3d274bb59fad6113a10cb285abc663ef6a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pl/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pl/firefox-58.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "8b65402216f991dbc780099859821facbee757993d1b57cb9c4cdef792affdc14c01519dfc47731f195796322e5a4d3ee5db319c8d96b2565ee6fd639b42a026";
+      sha512 = "4da447f1beb6eefab3af199090382a1305332802a9e466532a3237271540dc8d1d7b32795196c17a7b41e9884276beef294159db35ca52e3a289e171844838d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pt-BR/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-BR/firefox-58.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "925380239a6575be1e933f645dd26d922ab5368cd10c6822d9b14df8dcb4aed5a59f4c36181d6da79fdd94019800533bff33e6879070815d3ceb089f6ded8249";
+      sha512 = "77bd9d6d893f9c89bbfd6feed241155ce1b6b2d6c3e31985e64fbecac7b254dcae3c4ec7418752d2dc0a9dd820b4358e77011087a61414f320bbf18e93d0ec74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/pt-PT/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-PT/firefox-58.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "d87499d577afcf51f2d7dad05a2307567506612adb87eee14412bd996602c6c8eed554beb1450deaf8224192ee82f8aa6dd51066e7ec1f1cd052f2285402a969";
+      sha512 = "29c6bb56aa2652aec25bc46f46aef5743ea6023106a109e50878528755e31ddcb6e641841729415453161c6c3ffea1a2888fddc046077a76aa723b393ae1c90f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/rm/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/rm/firefox-58.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "a99a69291f670e09abeb7bc336e089da68209fb6b7dcca3391e1716c1a0a2f679c0b2ac902f3ba7239d248159de0128ea5643b01478b66f92d139d2232cbdc10";
+      sha512 = "0d28de9c90068bcf336959588e2f202fedc2e5ff47d08fc15b4baf127ea79162d89080ad933cc7e57c03270a5d86100073a403229ccefe590369df4b085eeda2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ro/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ro/firefox-58.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "13d6d1421ccc54a249b89f172aafc1a4330df11fe68d8c49b74c8da8c4e34d7372be770e19d70f46ac57b6784a57848ecd006a35c93e50b05f89568365bd74c4";
+      sha512 = "a31114b63d5570327302cad0c1e77d7e6ade42a65f53dda70434e3043d1d5188d96791572433d9fb2acbaa1ff5110c9c24cd022c1696867ff6c2999571568076";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ru/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ru/firefox-58.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "2af20c6a0e203fe79c285718bd286a2c8c282e4d1fc669a1586ff3682d704a07e593670c63f94be646e7e3324666ed1de10e445cf05849184ddb295b5bec71b4";
+      sha512 = "ee8aaa73834322c22b239297738eb2ced76a1c2eb7431288ebfcf100966599eacac11ba7e00fa9211fad6c8e624a0f0988552ff1674ac0395ce96c755228cc1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/si/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/si/firefox-58.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "b403cb79bfa008d094262c22071e4499101f15607ae43985bb1a550aac4cfc5fd361742dbaf3a1f655cd74aab41dfdbcfeebdb1606ce9cca77030cb1dcab83aa";
+      sha512 = "22bdfb93f5f153d5ec5556fb8c0e04183c892bffd616eac296d2f2b0bd8ff32bc04bd204e1e62a56a52c1fa00c9d8a309bccbc353179cf3ef1b8d74a4e0c7168";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sk/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sk/firefox-58.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a1a4b65c352ccc73a8d55f38de5aac5288b7f8b406f62d5cc6993f53b0e5a90dd71834a92be5078b0da5a95892070dd1ad51c9458b54f294c791c8307daa1219";
+      sha512 = "3a3cf394d15b11dd95fc0e597fd327d391f06d7a0731b3b57f7a9bea1a05c39b6b65b8a1092f44edd16f08ad2ca8cbd63730650531d1697fdd3fc55a1dcb6c01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sl/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sl/firefox-58.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "8b90668816fb2869f81e4c4ed1611817b63e0072fb58a46409337e4069167722aba206976b9550f72307d8366da5c1379de05cc0102ccfd5b1a01d97b1dfd365";
+      sha512 = "cc27b4356c292b41756eba6debad5b4b18e24435d90c4d2b8afa622328ab96fcc0c854cca03d6ff6fd648d3322bf01a57f9a83fdf5966a7467575dfb1c227db9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/son/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/son/firefox-58.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "3b6792727ccfdae1ac318b93b82997f6aae8754607429c2f15e16c2ed1d8f1d04f6c95bd474abed2604f16969ca580e85945a7d8ced2a694734a236c43c10949";
+      sha512 = "7dd44cfdd59e0e1bb71aa3b2ae8243751bafad89e6639d13d0efe4a3ab99ef34d87ac27f249d768c457e6ddd01d574beaa8ba689a7b85e9c1ce841f2506c55f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sq/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sq/firefox-58.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "554397bd32fbfa5475227cbb5d926c03b5359460c02833b917bd4278ac1917e9fc4da8a75c8cba566a573c26e8f8e0f82f41fef9b57e6584e3da327c6a566b5d";
+      sha512 = "60d7b94a02b6eed876aa7d8cdad849bf384d0f62efaa0590d19907d18d9f42cab2b77b0ac93ba2eaa721d44237e1256fe092429f7c95de4c38c97e8e3d7cd2e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sr/firefox-58.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "8e753463023f2428b15b58fe932ce9a33ff1dab4dcbd4321fb5055eba7768260769b1468d515c76590c61e2248d07fcffe2cc0c0d7035260d6b3694b90ce954e";
+      sha512 = "268fe1e88100cd55fe5ca1b3c2a028e436de0360e0c9e95ae2f77176e67f975f1609e97447eb98eefe82d188a804ffb04c05eae69ef9f6e405296f99794e5f33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/sv-SE/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sv-SE/firefox-58.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "a86ddb45f3900e00906a938d35d5a463f12a7008f0c17c4775ac08216fb4207dc366ce4c23eefaaa7157af8a973cf2bc7a80e166f51c7388dc497ce9455c23fc";
+      sha512 = "39c049e89a7e48f9f1d965d8fe43499856c3cd1ff5d86005d90d486b1cd04adddc5ef5246c71908ea38aae995456aae22124386b5a45d53e86e3e74380193bd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ta/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ta/firefox-58.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "65565bff074e4f5299c6aeafd81f21d8fd265ee060788d0c494371b0c862baa9fabd1a5182d14b49d1f6aa6a9f8c47894163292236421c42fd93b27f0d9da195";
+      sha512 = "bc4fc2ea66fb0701d77ebc31c92d0a72775af52ed8ea7273a470783f972576349db571c861835d78fd201cb28d80fe4ccc5fc566af61502e74cc8e72cc1ac3a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/te/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/te/firefox-58.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "5b4f7656a5ef4dee75c958da7492d7d52e3636f0ee064e1ba93c7ad0360fb0a66825be76a4d26e316f67fb73616d223fc77ba95eaf4283f679c22da1dee79adb";
+      sha512 = "73090fb7df13733d6dee28cb6b9bf40aedf19ffa85149a5d0afb24732b9420f13b8d9860494f83a908c54db9d6e864eb73ca80cac549333f6e3a24b87c8f7337";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/th/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/th/firefox-58.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "cee14df62eb7923ccf2d63953ddc4763ba76443c181cd9e1239db3b489216207b0a367eb9794cf4d52f3b7459df7515348383eb9a035f4252b0310045aa215b6";
+      sha512 = "d6f9e42773736a179ed85ab2767f74270d868adb749286c1221484296f269c5087074e40678bf3abd5b420de3487d934982e53f7d094b98b1faf84ae9b19b7ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/tr/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/tr/firefox-58.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e385eaeb6fc0cd0902c3e48bf99fec484880ca4907c8feeabe2c0747e10fbc3d8198d5aee83bd0b21cff2550d144d20d7a9e9e68ef07169825ef8a512cb0af7c";
+      sha512 = "f9714e0d2340ed9c76a67c733936485810cdf2e3b38c32e1958fabdefcca989102c175c77a34eab30fce1270076a81127ae14b68b8371aa86bc2be2051db4a0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/uk/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uk/firefox-58.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "962aef76a18a25890be145184aabe5149a5469d69ac46c8bafe3ea997613b31c214c96d9ddd565d65173fa639fb5f2cbf5de73b9c9b2aa6394fcbc84233fd38d";
+      sha512 = "784692df6d887e23480cc66730a2e487440d22812398415e412e2d8bdd1f1f9f0235a85be0f1dc55037d3c964996f57a1739f1ae54fc8857d211715a20a40c5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/ur/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ur/firefox-58.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "68de26543d894104bf4349a6e7e13ae58cfafdb35bd14cb97604410b02196d0cdcc40750a04c64be301fbbcdd2c74e624c47cc2363d96d4e293edbfbe0a1f3e5";
+      sha512 = "103d50b878d74827f11c79005f008fb8291cfb8c062e136e2d965bc61200fb6c82998ef3bd9c186a7ce5ae1371e5f21ee6cc6d664fbd60f737b7d05a85abad2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/uz/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uz/firefox-58.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "37afeaeced1488f94212ae76b58465c3ecffc5550db240afc9dee2c5dd1277027402f7264d35707bb132f467305b367d982eaefd83cac72e51601c7d65bef0a7";
+      sha512 = "869230cc3f649a9ab78a2de7dd68cd6c0d416de0f27640c1b2bdd80c88acf71b653bb9ad51a8cc7a8c2be9bcd7cbf5ebe5574577ad00cdec542a85e19902ecfa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/vi/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/vi/firefox-58.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "1d23a043e6f1ba27f13f89a88061b1f4f81c4ba70abcd6c15f563c76ff7b3bb95e66d968ead3df8bca51540b10042a8ed1f1792a42eb7f1e563eed0e92035f0d";
+      sha512 = "f80a57dc3d505701ba4a79819988133a74913918ba96692ed6e6d4479672e28b5c4acb06b978be3e7494ff868737992b8a34223964b737a7346fecf2a93eec5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/xh/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/xh/firefox-58.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "247dc73aeb071d3f430e5f61447287d641d18951bb0c519a95146746906f4a25595f57a781c2f402ec7da2379d0b4fad657b5b097d00f774584f1d746fa783ed";
+      sha512 = "662b14f48738d32b88c14bab1730e73ab208e85317a4abe8215419642299020a491d22299196091b40af41e88fa4fdd6794385152d9eea49f2aa9d6cf800c8bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/zh-CN/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-CN/firefox-58.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "10ad6c7fe8693d502b9d16630962f19f23b0457403430c8d24b34fe32de9b88513f82af3b09dc23bf252c2026efc6f45cad75e7244533aaebd824c7b0ab01926";
+      sha512 = "42562df31b9f69b0370c01f281f289bb7bde34f5c82e43d46cf22084dfd12ecfea7a340116ac16744d5f6af04bbb9eb48d31b610dde34def50860327b9caa9fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b1/linux-i686/zh-TW/firefox-58.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-TW/firefox-58.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "d69059c966b06a9b2c7bc10ce83d0b927f29b85d6aa2a78e62163f8718bde6478f7ee5f8040a70816a29719ae7336cc6d483b4ceefbb2b8153acd5040e0bedcc";
+      sha512 = "71965696cd645d00cc0c2f212e89bc63e023f6c36c3182ed0169839550752559d8c1a04ad47c832e5113c321a54209e00ff598dae7cf5a46edb169176f3cd86d";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index abb7013d106..e6275b2f959 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       featureset might be considered "minimalistic", but not as minimalistic as
       being completely featureless.
     '';
-    homepage = http://sourceforge.net/apps/trac/vimprobable;
+    homepage = https://sourceforge.net/apps/trac/vimprobable;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.aforemny ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 109ab2417af..4bd0f2e73e6 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Graphical wireless scanning for Linux";
-    homepage = http://sourceforge.net/projects/linssid/;
+    homepage = https://sourceforge.net/projects/linssid/;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index c5ef0e8a277..6ce003ff25d 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -37,14 +37,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.17.10-stable";
+  shortVersion = "1.17.11-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "0sc9fsprdpl39q8wqbjp59pnr10c1a8gss60b81h54agjni55yrg"
-    else "02ncfdxcrdwghpch2nlfhc7d0vgjsfqn8sxjkb5yn4bf5wi8z9bq";
+    then "033855ix5qj1gwd3pa6qws5k94hgbp6rvibrrxl3rn5bvhrvvbkq"
+    else "09h6br8qhvphkvzy28y1pnh7dhyigb3w41w3kjwqj6027i46chi7";
 
   deps = [
     qt5.qtbase
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
new file mode 100644
index 00000000000..a73feba97b6
--- /dev/null
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, cmake}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "clingo";
+  version = "5.2.2";
+
+  src = fetchurl {
+    url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz";
+    sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns";
+  };
+
+  buildInputs = [];
+  nativeBuildInputs = [cmake];
+
+  meta = {
+    inherit version;
+    description = "ASP system to ground and solve logic programs";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://potassco.org/";
+    downloadPage = "https://github.com/potassco/clingo/releases/";
+  };
+}
diff --git a/pkgs/applications/science/logic/potassco/clingo.upstream b/pkgs/applications/science/logic/potassco/clingo.upstream
new file mode 100644
index 00000000000..062577d1451
--- /dev/null
+++ b/pkgs/applications/science/logic/potassco/clingo.upstream
@@ -0,0 +1,6 @@
+target clingo.nix
+attribute_name clingo
+url https://github.com/potassco/clingo/releases/
+ensure_choice
+version '.*/v([0-9.]+)[.]tar[.].*' '\1'
+minimize_overwrite
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 58a9e808923..75b53d2cfe0 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -84,6 +84,8 @@ rec {
 
   git-remote-hg = callPackage ./git-remote-hg { };
 
+  git-secret = callPackage ./git-secret { };
+
   git-stree = callPackage ./git-stree { };
 
   git2cl = callPackage ./git2cl { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
new file mode 100644
index 00000000000..3f64d9d86bb
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
+
+let
+  version = "0.2.2";
+  repo = "git-secret";
+
+in stdenv.mkDerivation {
+  name = "${repo}-${version}";
+
+  src = fetchFromGitHub {
+    inherit repo;
+    owner = "sobolevn";
+    rev = "v${version}";
+    sha256 = "0vn9jibp97z7kc828wka1k0d7a9wx4skd6cnqy60kagfc00l0bzh";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -D git-secret $out/bin/git-secret
+
+    wrapProgram $out/bin/git-secret \
+      --prefix PATH : "${lib.makeBinPath [ git gnupg ]}"
+
+    mkdir $out/share
+    cp -r man $out/share
+  '';
+
+  meta = {
+    description = "A bash-tool to store your private data inside a git repository";
+    homepage = http://git-secret.io;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.lo1tuma ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix
index a56eba3bf5a..8287a176ce6 100644
--- a/pkgs/applications/video/lxdvdrip/default.nix
+++ b/pkgs/applications/video/lxdvdrip/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = { 
     description = "Command line tool to make a copy from a video DVD for private use";
-    homepage = http://sourceforge.net/projects/lxdvdrip;
+    homepage = https://sourceforge.net/projects/lxdvdrip;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index 5fd0664d15b..f9d4d4698fa 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/mjpg-streamer/;
+    homepage = https://sourceforge.net/projects/mjpg-streamer/;
     description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 2852eeef2ed..fcf569a762a 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
 
   meta = {
     description = "Sample UEFI firmware for QEMU and KVM";
-    homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
+    homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
     license = stdenv.lib.licenses.bsd2;
     platforms = ["x86_64-linux" "i686-linux"];
   };
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 2a7b4810a24..0d4aa4783c6 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -1,20 +1,25 @@
 { stdenv, fetchFromGitHub, cmake, glibc }:
 
 stdenv.mkDerivation rec {
-  version = "0.13.1";
+  version = "0.16.1";
   name = "tini-${version}";
+
   src = fetchFromGitHub {
     owner = "krallin";
     repo = "tini";
     rev = "v${version}";
-    sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6";
+    sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp";
   };
+
   patchPhase = "sed -i /tini-static/d CMakeLists.txt";
+
   NIX_CFLAGS_COMPILE = [
     "-DPR_SET_CHILD_SUBREAPER=36"
     "-DPR_GET_CHILD_SUBREAPER=37"
   ];
+
   buildInputs = [ cmake glibc glibc.static ];
+
   meta = with stdenv.lib; {
     description = "A tiny but valid init for containers";
     homepage = https://github.com/krallin/tini;
diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix
index dd3a8c1cb41..a1dd9210e73 100644
--- a/pkgs/build-support/fetchgit/private.nix
+++ b/pkgs/build-support/fetchgit/private.nix
@@ -1,19 +1,26 @@
-{ fetchgit, writeScript, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
+{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
   SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success
     then builtins.toString <ssh-auth-sock>
     else null;
-  GIT_SSH = writeScript "fetchgit-ssh" ''
-    #! ${stdenv.shell}
-    exec -a ssh ${openssh}/bin/ssh -F ${let
-      sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
-        then <ssh-config-file>
-        else builtins.trace ''
-          Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
 
-          Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
+  GIT_SSH = let
+    config = ''${let
+        sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
+          then <ssh-config-file>
+          else builtins.trace ''
+            Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
 
-          You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
-        '' "/var/lib/empty/config";
-    in builtins.toString sshConfigFile} "$@"
-  '';
+            Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
+
+            You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
+          '' "/var/lib/empty/config";
+      in builtins.toString sshConfigFile}'';
+
+    ssh-wrapped = runCommand "fetchgit-ssh" {
+      buildInputs = [ makeWrapper ];
+    } ''
+      mkdir -p $out/bin
+      makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@"
+    '';
+  in "${ssh-wrapped}/bin/ssh";
 })
diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix
new file mode 100644
index 00000000000..b4ce653da63
--- /dev/null
+++ b/pkgs/data/fonts/libertinus/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "libertinus-${version}";
+  version = "6.4";
+
+  src = fetchFromGitHub {
+    rev    = "v${version}";
+    owner  = "khaledhosny";
+    repo   = "libertinus";
+    sha256 = "0acnq4vpplp2s7kdnhncz61diji3wmhca04g27yqpk03ahb40x9g";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype/
+    mkdir -p $out/share/doc/${name}/
+    cp *.otf $out/share/fonts/opentype/
+    cp *.txt $out/share/doc/${name}/
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0yn526kwb4xjyf6gvf0wflqi45z5dlzicycz2q003a6if5fgqcz3";
+
+  meta = with stdenv.lib; {
+    description = "A fork of the Linux Libertine and Linux Biolinum fonts";
+    longDescription = ''
+      Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts
+      that started as an OpenType math companion of the Libertine font family,
+      but grown as a full fork to address some of the bugs in the fonts.
+    '';
+    homepage = https://github.com/khaledhosny/libertinus;
+    license = licenses.ofl;
+    maintainers = with maintainers; [ siddharthist ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index 4ae9ceac01d..fccb231f4ca 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -13,7 +13,7 @@ fetchzip {
   sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2";
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/adobe/sourcesans;
+    homepage = https://sourceforge.net/adobe/sourcesans;
     description = "A set of OpenType fonts designed by Adobe for UIs";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
index d627d813daa..d58ccc33813 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/pkgs/data/fonts/source-serif-pro/default.nix
@@ -15,7 +15,7 @@ in fetchzip {
   sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1";
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/adobe/sourceserifpro;
+    homepage = https://sourceforge.net/adobe/sourceserifpro;
     description = "A set of OpenType fonts to complement Source Sans Pro";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
deleted file mode 100644
index 4c5696d4e17..00000000000
--- a/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/vteconv.cc b/src/vteconv.cc
-index b78d3928..5cb63e7e 100644
---- a/src/vteconv.cc
-+++ b/src/vteconv.cc
-@@ -771,7 +771,7 @@ int
- main (int argc,
-       char *argv[])
- {
--        g_test_init (&argc, &argv, NULL);
-+        g_test_init (&argc, &argv, (char *)NULL);
- 
-         g_test_add_func ("/vte/conv/utf8/strlen", test_utf8_strlen);
-         g_test_add_func ("/vte/conv/utf8/validate", test_utf8_validate);
-diff --git a/src/vtetypes.cc b/src/vtetypes.cc
-index 1365a295..8f38c9d9 100644
---- a/src/vtetypes.cc
-+++ b/src/vtetypes.cc
-@@ -407,7 +407,7 @@ test_util_smart_fd(void)
- int
- main(int argc, char *argv[])
- {
--        g_test_init (&argc, &argv, NULL);
-+        g_test_init (&argc, &argv, (char *)NULL);
- 
-         g_test_add_func("/vte/c++/grid/coords", test_grid_coords);
-         g_test_add_func("/vte/c++/grid/span", test_grid_span);
diff --git a/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
deleted file mode 100644
index 70ef7faa782..00000000000
--- a/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/vteseq.cc b/src/vteseq.cc
-index 2330939d..e0ac14eb 100644
---- a/src/vteseq.cc
-+++ b/src/vteseq.cc
-@@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params)
- #define VTE_SEQUENCE_HANDLER(name) name
- 
- static const struct vteseq_n_struct *
--vteseq_n_lookup (register const char *str, register unsigned int len);
-+vteseq_n_lookup (register const char *str, register size_t len);
- #include"vteseq-n.cc"
- 
- #undef VTE_SEQUENCE_HANDLER
diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix
index 69f61eb7697..73bbba3e72b 100644
--- a/pkgs/desktops/gnome-3/core/vte/ng.nix
+++ b/pkgs/desktops/gnome-3/core/vte/ng.nix
@@ -2,22 +2,15 @@
 
 gnome3.vte.overrideAttrs (oldAttrs: rec {
   name = "vte-ng-${version}";
-  version = "0.46.1.a";
+  version = "0.50.2.a";
 
   src = fetchFromGitHub {
     owner = "thestinger";
     repo = "vte-ng";
     rev = version;
-    sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a";
+    sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf";
   };
 
-  # The patches apply the changes from https://github.com/GNOME/vte/pull/7 and
-  # can be removed once the commits are merged into vte-ng.
-  patches = [
-    ./fix_g_test_init_calls.patch
-    ./fix_vteseq_n_lookup_declaration.patch
-  ];
-
   preConfigure = oldAttrs.preConfigure + "; ./autogen.sh";
 
   nativeBuildInputs = oldAttrs.nativeBuildInputs or []
diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix
index 70665919400..88a34bd6fd6 100644
--- a/pkgs/development/compilers/avra/default.nix
+++ b/pkgs/development/compilers/avra/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Assember for the Atmel AVR microcontroller family";
+    description = "Assembler for the Atmel AVR microcontroller family";
     homepage = http://avra.sourceforge.net/;
     license = licenses.gpl2Plus;
     platforms = platforms.all;
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 592eaf38d87..17d91f36875 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , which
 , cmake
 , clang
@@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
     sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw";
   };
 
+  patches = [
+    (fetchpatch {
+      # glibc 2.26
+      url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch;
+      sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq";
+    })
+  ];
+
   buildInputs = [
     which
     cmake
diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix
index 4c4d9f4ff38..3483afc99ef 100644
--- a/pkgs/development/compilers/ghcjs/stage2.nix
+++ b/pkgs/development/compilers/ghcjs/stage2.nix
@@ -133,7 +133,7 @@
           test-framework-hunit test-framework-quickcheck2 text unix
         ];
         jailbreak = true;
-        homepage = http://github.com/tibbe/hashable;
+        homepage = https://github.com/tibbe/hashable;
         description = "A class for types that can be converted to a hash value";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -146,7 +146,7 @@
         doCheck = false;
         libraryHaskellDepends = [ base transformers ];
         jailbreak = true;
-        homepage = http://github.com/ekmett/mtl;
+        homepage = https://github.com/ekmett/mtl;
         description = "Monad classes, using functional dependencies";
         license = stdenv.lib.licenses.bsd3;
       }) {};
@@ -311,7 +311,7 @@
           test-framework-hunit test-framework-quickcheck2 text
         ];
         jailbreak = true;
-        homepage = http://github.com/ghcjs/ghcjs-base;
+        homepage = https://github.com/ghcjs/ghcjs-base;
         description = "Base library for GHCJS";
         license = stdenv.lib.licenses.mit;
       }) {};
diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix
index 7d3b6860c6e..eaf9949b52d 100644
--- a/pkgs/development/compilers/ghdl/default.nix
+++ b/pkgs/development/compilers/ghdl/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://sourceforge.net/p/ghdl-updates/wiki/Home/;
+    homepage = https://sourceforge.net/p/ghdl-updates/wiki/Home/;
     description = "Free VHDL simulator";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ]
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 743f243791b..6e7ef22392b 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetch
+, fetchpatch
 , perl
 , groff
 , cmake
@@ -39,6 +40,22 @@ in stdenv.mkDerivation rec {
     ../fix-llvm-config.patch
   ];
 
+  postPatch = stdenv.lib.optionalString (stdenv ? glibc) ''
+    (
+     cd projects/compiler-rt
+      patch -p1 -F3 < ${
+        fetchpatch {
+          name = "sigaltstack.patch"; # for glibc-2.26
+          url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
+          sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
+        }
+      }
+
+      sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \
+        lib/asan/asan_linux.cc
+    )
+  '';
+
   # hacky fix: created binaries need to be run before installation
   preBuild = ''
     mkdir -p $out/
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 94f39183345..26144e38619 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetch
+, fetchpatch
 , perl
 , groff
 , cmake
@@ -39,6 +40,22 @@ in stdenv.mkDerivation rec {
       --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
   '';
 
+  postPatch = stdenv.lib.optionalString (stdenv ? glibc) ''
+    (
+      cd projects/compiler-rt
+      patch -p1 < ${
+        fetchpatch {
+          name = "sigaltstack.patch"; # for glibc-2.26
+          url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
+          sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
+        }
+      }
+
+      sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \
+        lib/asan/asan_linux.cc
+    )
+  '';
+
   # hacky fix: created binaries need to be run before installation
   preBuild = ''
     mkdir -p $out/
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 3a973fc2644..0d70113727c 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -145,7 +145,7 @@ go.stdenv.mkDerivation (
       if [ -n "$subPackages" ]; then
         echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
       else
-        pushd go/src >/dev/null
+        pushd "$NIX_BUILD_TOP/go/src" >/dev/null
         find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq
         popd >/dev/null
       fi
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b28d5acf978..de8ab8b7181 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -11,6 +11,8 @@ let
 
     let php7 = lib.versionAtLeast version "7.0";
         mysqlHeaders = mysql.lib.dev or mysql;
+        mysqlndSupport = config.php.mysqlnd or false;
+        mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders;
 
     in composableDerivation.composableDerivation {} (fixed: {
 
@@ -112,13 +114,13 @@ let
         };
 
         mysql = {
-          configureFlags = ["--with-mysql"];
-          buildInputs = [ mysqlHeaders ];
+          configureFlags = ["--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"];
+          buildInputs = mysqlBuildInputs;
         };
 
         mysqli = {
-          configureFlags = ["--with-mysqli=${mysqlHeaders}/bin/mysql_config"];
-          buildInputs = [ mysqlHeaders ];
+          configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"];
+          buildInputs = mysqlBuildInputs;
         };
 
         mysqli_embedded = {
@@ -128,8 +130,8 @@ let
         };
 
         pdo_mysql = {
-          configureFlags = ["--with-pdo-mysql=${mysqlHeaders}"];
-          buildInputs = [ mysqlHeaders ];
+          configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"];
+          buildInputs = mysqlBuildInputs;
         };
 
         bcmath = {
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index 1ac023ec534..f3d5fb3e934 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -18,7 +18,7 @@ in rec {
     m2Path = "/com/nequissimus/maven-hello/${version}";
 
     meta = {
-      homepage = http://github.com/NeQuissimus/maven-hello/;
+      homepage = https://github.com/NeQuissimus/maven-hello/;
       description = "Maven Hello World";
       license = stdenv.lib.licenses.unlicense;
       platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix
index e1cfb488be8..9ec9e6284f8 100644
--- a/pkgs/development/libraries/atkmm/default.nix
+++ b/pkgs/development/libraries/atkmm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "C++ wrappers for ATK accessibility toolkit";
     license = stdenv.lib.licenses.lgpl21Plus;
-    homepage = http://gtkmm.org;
+    homepage = https://gtkmm.org;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index 8cae07e2949..8098ac9f3ef 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -18,7 +18,7 @@ rec {
 
     meta = with stdenv.lib; {
       description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
-      homepage = http://sourceforge.net/projects/vamp;
+      homepage = https://sourceforge.net/projects/vamp;
       license = licenses.bsd3;
       maintainers = [ maintainers.goibhniu maintainers.marcweber ];
       platforms = platforms.linux;
diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix
index b64c6c84980..7cb7187a3ce 100644
--- a/pkgs/development/libraries/dirac/default.nix
+++ b/pkgs/development/libraries/dirac/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/dirac;
+    homepage = https://sourceforge.net/projects/dirac;
     description = "A general-purpose video codec based on wavelets";
     platforms = platforms.linux;
     license = with licenses; [ mpl11 gpl2 lgpl21 ];
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 63dd931a139..af543c4e197 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jasper-${version}";
-  version = "2.0.13";
+  version = "2.0.14";
 
   src = fetchFromGitHub {
     repo = "jasper";
     owner = "mdadams";
     rev = "version-${version}";
-    sha256 = "1kd2xiszg9bxfavs3fadi4gi27m876d9zjjy0ns6mmbcjk109c0a";
+    sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f";
   };
 
   # newer reconf to recognize a multiout flag
diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index 7b7e96012ea..9059fe8f845 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = { 
     description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
-    homepage = http://sourceforge.net/projects/liblo;
+    homepage = https://sourceforge.net/projects/liblo;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
index 8bac0f41dde..2a53a1d0e7c 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An abstraction library for audio visualisations";
-    homepage = http://sourceforge.net/projects/libvisual/;
+    homepage = https://sourceforge.net/projects/libvisual/;
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 1fb0605530d..6674f303739 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    homepage = http://sourceforge.net/projects/linuxwacom/;
+    homepage = https://sourceforge.net/projects/linuxwacom/;
     description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
   };
 }
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index 0d711514444..3a3d99b655d 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Extract Cell Data From Excel xls files";
-    homepage = http://sourceforge.net/projects/libxls/;
+    homepage = https://sourceforge.net/projects/libxls/;
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix
index b9ad506e20a..ce0b2506c57 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/pkgs/development/libraries/protobufc/generic.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ protobuf zlib ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/protobuf-c/protobuf-c/;
+    homepage = https://github.com/protobuf-c/protobuf-c/;
     description = "C bindings for Google's Protocol Buffers";
     license = licenses.bsd2;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix
index 111b08b633a..016cc6f0472 100644
--- a/pkgs/development/libraries/sblim-sfcc/default.nix
+++ b/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Small Footprint CIM Client Library";
 
-    homepage = http://sourceforge.net/projects/sblim/;
+    homepage = https://sourceforge.net/projects/sblim/;
 
     maintainers = [ stdenv.lib.maintainers.deepfire ];
 
diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix
index 30f87d36ddf..ff1a7b57f4a 100644
--- a/pkgs/development/libraries/stlport/default.nix
+++ b/pkgs/development/libraries/stlport/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An implementation of the C++ Standard Library";
-    homepage = http://sourceforge.net/projects/stlport/;
+    homepage = https://sourceforge.net/projects/stlport/;
     license = stdenv.lib.licenses.free; # seems BSD-like
     broken = true; # probably glibc-2.20 -related issue
   };
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 0d6674cce81..0156c64306c 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/libtirpc/;
+    homepage = https://sourceforge.net/projects/libtirpc/;
     description = "The transport-independent Sun RPC implementation (TI-RPC)";
     license = licenses.bsd3;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index b274bba9c12..718554b20a4 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++/C library to construct Excel .xls files in code";
-    homepage = http://sourceforge.net/projects/xlslib/;
+    homepage = https://sourceforge.net/projects/xlslib/;
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index 88d24fddf79..eef10f3323f 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -16,7 +16,7 @@ buildRustPackage rec {
   cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk";
 
   meta = {
-    homepage = http://github.com/cgag/loc;
+    homepage = https://github.com/cgag/loc;
     description = "Count lines of code quickly";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 91f6468b465..64131e52c8d 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -5816,7 +5816,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Web Inspector based nodeJS debugger";
-      homepage = http://github.com/node-inspector/node-inspector;
+      homepage = https://github.com/node-inspector/node-inspector;
     };
     production = true;
   };
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 99f2b08897f..e2c6caf78bb 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -29050,7 +29050,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Web Inspector based nodeJS debugger";
-      homepage = http://github.com/node-inspector/node-inspector;
+      homepage = https://github.com/node-inspector/node-inspector;
     };
     production = true;
   };
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index e5a3c282e58..20b63e3a8ee 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   createFindlibDestdir = true;
 
   meta = {
-    homepage = http://sourceforge.net/projects/ocamlfuse;
+    homepage = https://sourceforge.net/projects/ocamlfuse;
     description = "OCaml bindings for FUSE";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix
index d0363abbf2c..6d1654f2b42 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/default.nix
+++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix
@@ -12,7 +12,7 @@ buildOcaml rec {
   propagatedBuildInputs = [ ocaml_batteries csv ocaml_lwt ocaml_sqlite3 estring ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/mfp/ocaml-sqlexpr;
+    homepage = https://github.com/mfp/ocaml-sqlexpr;
     description = "Type-safe, convenient SQLite database access";
     license = licenses.lgpl21;
   };
diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
index 0a5c04ce7aa..ef9c254aba1 100644
--- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/mlin/ocaml-sqlite3EZ;
+    homepage = https://github.com/mlin/ocaml-sqlite3EZ;
     description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
     license = licenses.mit;
     maintainers = [ maintainers.vbgl ];
diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index a9b5faf6006..5acb6cd5785 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A Python library that lets you schedule your Python code to be executed";
-    homepage = http://pypi.python.org/pypi/APScheduler/;
+    homepage = https://pypi.python.org/pypi/APScheduler/;
     license = licenses.mit;
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index becb9ceae72..37d75fd45c0 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/saghul/aiodns;
+    homepage = https://github.com/saghul/aiodns;
     license = licenses.mit;
     description = "Simple DNS resolver for asyncio";
   };
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index e40e3008563..364f4cf9a3a 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil ];
 
   meta = with stdenv.lib; {
-    homepage = http://bitbucket.org/zzzeek/alembic;
+    homepage = https://bitbucket.org/zzzeek/alembic;
     description = "A database migration tool for SQLAlchemy";
     license = licenses.mit;
   };
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index adefb06303c..f2e07eba0c4 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Namespace control and lazy-import mechanism";
-    homepage = http://bitbucket.org/hpk42/apipkg;
+    homepage = https://bitbucket.org/hpk42/apipkg;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix
index 211d51c241d..866c91f7c68 100644
--- a/pkgs/development/python-modules/appdirs/default.nix
+++ b/pkgs/development/python-modules/appdirs/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A python module for determining appropriate platform-specific dirs";
-    homepage = http://github.com/ActiveState/appdirs;
+    homepage = https://github.com/ActiveState/appdirs;
     license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix
index a60109b6e8c..bdb12203de6 100644
--- a/pkgs/development/python-modules/asgi_ipc/default.nix
+++ b/pkgs/development/python-modules/asgi_ipc/default.nix
@@ -16,6 +16,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Posix IPC-backed ASGI channel layer implementation";
     license = licenses.bsd3;
-    homepage = http://github.com/django/asgi_ipc/;
+    homepage = https://github.com/django/asgi_ipc/;
   };
 }
diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
index 77a9af8645e..d4c9388f1a7 100644
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Redis-backed ASGI channel layer implementation";
     license = licenses.bsd3;
-    homepage = http://github.com/django/asgi_redis/;
+    homepage = https://github.com/django/asgi_redis/;
   };
 }
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index fd742031d5a..86a0daa0456 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A abstract syntax tree for Python with inference support";
-    homepage = http://bitbucket.org/logilab/astroid;
+    homepage = https://bitbucket.org/logilab/astroid;
     license = licenses.lgpl2;
     platforms = platforms.all;
     maintainers = with maintainers; [ nand0p ];
diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix
index 9ff3b2adfd9..9226fa1c5bf 100644
--- a/pkgs/development/python-modules/bitcoin-price-api/default.nix
+++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = http://github.com/dursk/bitcoin-price-api;
+    homepage = https://github.com/dursk/bitcoin-price-api;
     description = "Price APIs for bitcoin exchanges";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ bhipple ];
diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix
index dee19b45f44..f09a271faad 100644
--- a/pkgs/development/python-modules/bkcharts/default.nix
+++ b/pkgs/development/python-modules/bkcharts/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "High level chart types built on top of Bokeh";
-    homepage = http://github.com/bokeh/bkcharts;
+    homepage = https://github.com/bokeh/bkcharts;
     license = lib.licenses.bsd3;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
new file mode 100644
index 00000000000..a7fe8620a8a
--- /dev/null
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -0,0 +1,44 @@
+{ buildPythonPackage
+, fetchPypi
+, dateutil
+, jmespath
+, docutils
+, ordereddict
+, simplejson
+, mock
+, nose
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "botocore";
+  version = "1.7.43";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wyyj7sk7dh9v7i1g5jc5maqdadvbs4khi7srz0095cywkjqpysc";
+  };
+
+  propagatedBuildInputs = [
+    dateutil
+    jmespath
+    docutils
+    ordereddict
+    simplejson
+  ];
+
+  checkInputs = [ mock nose ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # Network access
+  doCheck = false;
+
+  meta = {
+    homepage = https://github.com/boto/botocore;
+    license = "bsd";
+    description = "A low-level interface to a growing number of Amazon Web Services";
+  };
+}
diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix
index e182f55cdc0..7326f2cf3b4 100644
--- a/pkgs/development/python-modules/cycler/default.nix
+++ b/pkgs/development/python-modules/cycler/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Composable style cycles";
-    homepage = http://github.com/matplotlib/cycler;
+    homepage = https://github.com/matplotlib/cycler;
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index c319e6535e9..70647b6377f 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Minimal task scheduling abstraction";
-    homepage = http://github.com/ContinuumIO/dask/;
+    homepage = https://github.com/ContinuumIO/dask/;
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
index b980381edbb..32514f86226 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Powerful extensions to the standard datetime module";
-    homepage = http://pypi.python.org/pypi/python-dateutil;
+    homepage = https://pypi.python.org/pypi/python-dateutil;
     license = "BSD-style";
   };
 }
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index 424be07aa61..657a4db4115 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A caching front-end based on the Dogpile lock";
-    homepage = http://bitbucket.org/zzzeek/dogpile.cache;
+    homepage = https://bitbucket.org/zzzeek/dogpile.cache;
     platforms = platforms.unix;
     license = licenses.bsd3;
   };
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index 89b554f3e68..0a006b77793 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Code checking using pep8 and pyflakes";
-    homepage = http://pypi.python.org/pypi/flake8;
+    homepage = https://pypi.python.org/pypi/flake8;
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
   };
diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix
index 960babd84e2..59fb650c883 100644
--- a/pkgs/development/python-modules/guessit/2.0.nix
+++ b/pkgs/development/python-modules/guessit/2.0.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    homepage = http://pypi.python.org/pypi/guessit;
+    homepage = https://pypi.python.org/pypi/guessit;
     license = lib.licenses.lgpl3;
     description = "A library for guessing information from video files";
   };
diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index b0c0bb9496f..77c45d12335 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    homepage = http://pypi.python.org/pypi/guessit;
+    homepage = https://pypi.python.org/pypi/guessit;
     license = lib.licenses.lgpl3;
     description = "A library for guessing information from video files";
   };
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index cc8017f0cd8..89af8596edb 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://pypi.python.org/pypi/gunicorn;
+    homepage = https://pypi.python.org/pypi/gunicorn;
     description = "WSGI HTTP Server for UNIX";
     license = licenses.mit;
   };
diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix
index 0c54c3ab8ae..a5d7b2b711e 100644
--- a/pkgs/development/python-modules/incremental/default.nix
+++ b/pkgs/development/python-modules/incremental/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/twisted/treq;
+    homepage = https://github.com/twisted/treq;
     description = "Incremental is a small library that versions your Python projects";
     license = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index ac26573f4a7..64139f5d905 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -17,6 +17,7 @@
 , prompt_toolkit
 , pexpect
 , appnope
+, typing
 }:
 
 buildPythonPackage rec {
@@ -45,7 +46,8 @@ buildPythonPackage rec {
     traitlets
     prompt_toolkit
     pexpect
-  ] ++ lib.optionals stdenv.isDarwin [appnope];
+  ] ++ lib.optionals stdenv.isDarwin [appnope]
+    ++ lib.optionals (pythonOlder "3.5") [ typing ];
 
   LC_ALL="en_US.UTF-8";
 
diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix
index 29984eed9e9..85a5d1f3622 100644
--- a/pkgs/development/python-modules/mplleaflet/default.nix
+++ b/pkgs/development/python-modules/mplleaflet/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Convert Matplotlib plots into Leaflet web maps";
-    homepage = http://github.com/jwass/mplleaflet;
+    homepage = https://github.com/jwass/mplleaflet;
     license = with lib.licenses; [ bsd3 ];
   };
 }
diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix
index d1c39210607..73d0f5a2dbe 100644
--- a/pkgs/development/python-modules/multipledispatch/default.nix
+++ b/pkgs/development/python-modules/multipledispatch/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = http://github.com/mrocklin/multipledispatch/;
+    homepage = https://github.com/mrocklin/multipledispatch/;
     description = "A relatively sane approach to multiple dispatch in Python";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index d04e5c5eccb..c0b8b90bd08 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   checkPhase = ''
     mkdir tmp
-    LC_ALL=en_US.utf8 HOME=`realpath tmp` py.test -v
+    LC_ALL=en_US.UTF-8 HOME=`realpath tmp` py.test -v
   '';
 
   meta = {
diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
index cf5c5ee06cd..3178b217a00 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A module wrapper for os.path";
-    homepage = http://github.com/jaraco/path.py;
+    homepage = https://github.com/jaraco/path.py;
     license = lib.licenses.mit;
   };
 
diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix
index 57dd687604d..48ea9bd6980 100644
--- a/pkgs/development/python-modules/phpserialize/default.nix
+++ b/pkgs/development/python-modules/phpserialize/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A port of the serialize and unserialize functions of PHP to Python";
-    homepage = http://github.com/mitsuhiko/phpserialize;
+    homepage = https://github.com/mitsuhiko/phpserialize;
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jluttine ];
   };
diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix
index fc8fbcaa8d2..b1ee59a5cd4 100644
--- a/pkgs/development/python-modules/pycassa/default.nix
+++ b/pkgs/development/python-modules/pycassa/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A python client library for Apache Cassandra";
-    homepage = http://github.com/pycassa/pycassa;
+    homepage = https://github.com/pycassa/pycassa;
     license = stdenv.lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index e23cf7794b1..1004d70476c 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
-    homepage = http://github.com/wmayner/pyemd;
+    homepage = https://github.com/wmayner/pyemd;
     license = licenses.mit;
     maintainers = with maintainers; [ rvl ];
   };
diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 8b15c63fb20..30dbbdba5a5 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage (rec {
 
   meta = {
     description = "Python interface to PROJ.4 library";
-    homepage = http://github.com/jswhit/pyproj;
+    homepage = https://github.com/jswhit/pyproj;
     license = with lib.licenses; [ isc ];
   };
 } // (if proj == null then {} else { PROJ_DIR = proj; }))
diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix
index f471c8b8730..ecd46bb1ff5 100644
--- a/pkgs/development/python-modules/pywinrm/default.nix
+++ b/pkgs/development/python-modules/pywinrm/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python library for Windows Remote Management";
-    homepage = http://github.com/diyan/pywinrm/;
+    homepage = https://github.com/diyan/pywinrm/;
     license = licenses.mit;
     maintainers = with maintainers; [ elasticdog ];
     platforms = platforms.all;
diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index d8b380896cc..fa91184f1b7 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "GPGPU algorithms for PyCUDA and PyOpenCL";
-    homepage = http://github.com/fjarri/reikna;
+    homepage = https://github.com/fjarri/reikna;
     license = stdenv.lib.licenses.mit;
     maintainer = stdenv.lib.maintainers.fridh;
 
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
new file mode 100644
index 00000000000..a356db74f07
--- /dev/null
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, freetype
+, pillow
+, pip
+, glibcLocales
+, python
+, isPyPy
+}:
+
+let
+  ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
+in buildPythonPackage rec {
+  pname = "reportlab";
+  version = "3.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5beaf35e59dfd5ebd814fdefd76908292e818c982bd7332b5d347dfd2f01c343";
+  };
+
+  checkInputs = [ glibcLocales ];
+
+  buildInputs = [ ft pillow ];
+
+  postPatch = ''
+    rm tests/test_graphics_barcode.py
+    rm tests/test_graphics_render.py
+  '';
+
+  checkPhase = ''
+    LC_ALL="en_US.UTF-8" ${python.interpreter} tests/runAll.py
+  '';
+
+  # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
+  disabled = isPyPy;
+
+  meta = {
+    description = "An Open Source Python library for generating PDFs and graphics";
+    homepage = http://www.reportlab.com/;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix
index 2dd672c0109..582a4f6138a 100644
--- a/pkgs/development/python-modules/robotsuite/default.nix
+++ b/pkgs/development/python-modules/robotsuite/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python unittest test suite for Robot Framework";
-    homepage = http://github.com/collective/robotsuite/;
+    homepage = https://github.com/collective/robotsuite/;
     license = licenses.gpl3;
   };
 }
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
new file mode 100644
index 00000000000..8e5b30c26b4
--- /dev/null
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -0,0 +1,53 @@
+{ stdenv
+, fetchPypi
+, pythonOlder
+, buildPythonPackage
+, docutils
+, mock
+, nose
+, coverage
+, wheel
+, unittest2
+, botocore
+, futures
+}:
+
+buildPythonPackage rec {
+  pname = "s3transfer";
+  version = "0.1.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0yfrfnf404cxzn3iswibqjxklsl0b1lwgqiml6pwiqj79a7zbwbn";
+  };
+
+  foo = 1;
+
+  propagatedBuildInputs =
+    [ botocore
+    ] ++ stdenv.lib.optional (pythonOlder "3") futures;
+
+  buildInputs = [
+    docutils
+    mock
+    nose
+    coverage
+    wheel
+    unittest2
+  ];
+
+  checkPhase = ''
+    pushd s3transfer/tests
+    nosetests -v unit/ functional/
+    popd
+  '';
+
+  # version on pypi has no tests/ dir
+  doCheck = false;
+
+  meta = {
+    homepage = https://github.com/boto/s3transfer;
+    license = stdenv.lib.licenses.asl20;
+    description = "A library for managing Amazon S3 transfers";
+  };
+}
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 818468d0fca..a65b0206ee5 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Utilities to facilitate the installation of Python packages";
-    homepage = http://pypi.python.org/pypi/setuptools;
+    homepage = https://pypi.python.org/pypi/setuptools;
     license = with licenses; [ psfl zpl20 ];
     platforms = platforms.all;
     priority = 10;
diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix
index 38117337d06..00fbbbc01eb 100644
--- a/pkgs/development/python-modules/six/default.nix
+++ b/pkgs/development/python-modules/six/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A Python 2 and 3 compatibility library";
-    homepage = http://pypi.python.org/pypi/six/;
+    homepage = https://pypi.python.org/pypi/six/;
     license = lib.licenses.mit;
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix
index 7b432154b60..e786cb84329 100644
--- a/pkgs/development/python-modules/testtools/default.nix
+++ b/pkgs/development/python-modules/testtools/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A set of extensions to the Python standard library's unit testing framework";
-    homepage = http://pypi.python.org/pypi/testtools;
+    homepage = https://pypi.python.org/pypi/testtools;
     license = lib.licenses.mit;
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix
index 31f69971e52..34c22132428 100644
--- a/pkgs/development/python-modules/transaction/default.nix
+++ b/pkgs/development/python-modules/transaction/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Transaction management";
-    homepage = http://pypi.python.org/pypi/transaction;
+    homepage = https://pypi.python.org/pypi/transaction;
     license = licenses.zpl20;
   };
 }
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 6bd7355b34d..3144e8e4de9 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/twisted/treq;
+    homepage = https://github.com/twisted/treq;
     description = "A requests-like API built on top of twisted.web's Agent";
     license = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix
index 1a5da395ee3..9b81a28f085 100644
--- a/pkgs/development/python-modules/unidecode/default.nix
+++ b/pkgs/development/python-modules/unidecode/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   buildInputs = [ glibcLocales ];
 
   meta = with stdenv.lib; {
-    homepage = http://pypi.python.org/pypi/Unidecode/;
+    homepage = https://pypi.python.org/pypi/Unidecode/;
     description = "ASCII transliterations of Unicode text";
     license = licenses.gpl2;
     maintainers = with maintainers; [ domenkozar ];
diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index fa6a7a61332..6923f876ff2 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Structured Configuration Library";
-    homepage = http://pypi.python.org/pypi/ZConfig;
+    homepage = https://pypi.python.org/pypi/ZConfig;
     license = licenses.zpl20;
     maintainers = [ maintainers.goibhniu ];
   };
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 232acaec506..f704f305278 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
 
     meta = with stdenv.lib; {
       description = "Zope Object Database: object database and persistence";
-      homepage = http://pypi.python.org/pypi/ZODB;
+      homepage = https://pypi.python.org/pypi/ZODB;
       license = licenses.zpl21;
       maintainers = with maintainers; [ goibhniu ];
     };
diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix
index 9438e8ca54f..53dd8680c31 100644
--- a/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/pkgs/development/python-modules/zodbpickle/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = http://pypi.python.org/pypi/zodbpickle;
+    homepage = https://pypi.python.org/pypi/zodbpickle;
   };
 }
diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index 7f2af64d915..8358c861cba 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A flexible test runner with layer support";
-    homepage = http://pypi.python.org/pypi/zope.testrunner;
+    homepage = https://pypi.python.org/pypi/zope.testrunner;
     license = licenses.zpl20;
     maintainers = [ maintainers.goibhniu ];
   };
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e15b212ebca..a1452d330be 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python }:
+{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python
+# Always assume all markers valid (don't redownload dependencies).
+# Also, don't clean up environment variables.
+, enableNixHacks ? false
+}:
 
 stdenv.mkDerivation rec {
 
@@ -21,6 +25,8 @@ stdenv.mkDerivation rec {
 
   sourceRoot = ".";
 
+  patches = lib.optional enableNixHacks ./nix-hacks.patch;
+
   # Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
 
   customBash = writeScriptBin "bash" ''
@@ -74,7 +80,6 @@ stdenv.mkDerivation rec {
   '';
 
   # Bazel expects gcc and java to be in the path.
-
   installPhase = ''
     mkdir -p $out/bin
     mv output/bazel $out/bin
@@ -84,6 +89,12 @@ stdenv.mkDerivation rec {
     cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
   '';
 
+  # Save paths to hardcoded dependencies so Nix can detect them.
+  postFixup = ''
+    mkdir -p $out/nix-support
+    echo "${customBash} ${coreutils}" > $out/nix-support/depends
+  '';
+
   dontStrip = true;
   dontPatchELF = true;
 }
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index c79f238673e..11caff8ddab 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
-  version = "9.02.02";
+  version = "9.02.03";
 
   src = fetchFromGitHub {
-    sha256 = "0f7w3b8r2h6ckgzc6wbfbw5yyxia0f3j3acmzi1yzylj6ak05mmd";
+    sha256 = "1g3pdcd2i8n29rqwrdg6bd7qnsii55hi0rnma86hy0pm5cshpwi5";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index 636d8ef7b78..f7628cf181c 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
       it is intended as a replacement for the venerable 'isql' program supplied
       by Sybase.
     '';
-    homepage = http://sourceforge.net/projects/sqsh/;
+    homepage = https://sourceforge.net/projects/sqsh/;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 2e17d72ea9e..8ece92b4a3f 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -3558,7 +3558,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Portable Unix shell commands for Node.js";
-      homepage = http://github.com/shelljs/shelljs;
+      homepage = https://github.com/shelljs/shelljs;
       license = "BSD-3-Clause";
     };
     production = true;
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index a6f1c305c4e..a968526e5cd 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -12,7 +12,7 @@ let
   gtkName = if gtkClient then "-gtk" else "";
 
   name = "freeciv";
-  version = "2.5.7";
+  version = "2.5.9";
 in
 stdenv.mkDerivation {
   name = "${name}${sdlName}${gtkName}-${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
-    sha256 = "1lmydnnqraa947l7gdz6xgm0bgks1ywsivp9h4v8jr3avcv6gqzz";
+    sha256 = "0a2rjw6065psh14bkk6ar4i19dcicn9lz63rffr9h278b9c76g5q";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 856e4f6c6c1..d9263d2c2f5 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -32,6 +32,7 @@ let
       xdg_utils
       # Zoneinfo
       etc-zoneinfo
+      iana-etc
     ] ++ lib.optional withJava jdk
       ++ lib.optional withPrimus primus
       ++ extraPkgs pkgs;
diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix
index 735e73d5d49..81300049203 100644
--- a/pkgs/misc/mxt-app/default.nix
+++ b/pkgs/misc/mxt-app/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec{
 
   meta = with stdenv.lib; {
     description = "Command line utility for Atmel maXTouch devices";
-    homepage = http://github.com/atmel-maxtouch/mxt-app;
+    homepage = https://github.com/atmel-maxtouch/mxt-app;
     license = licenses.bsd2;
     maintainers = [ maintainers.colemickens ];
     platforms = platforms.unix;
diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
index 6c8b722fce9..67cb0a4ca6d 100644
--- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix
+++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
     playerctl
   ];
 
-  buildPhases = [ "unpackPhase" "patchPhase" "installPhase" ];
   makeFlags = [
     "PREFIX=$(out)/bin"
   ];
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 5ce78702148..a9468e5356d 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1742,7 +1742,7 @@ rec {
 
     meta = {
       description = "Fastest non utf-8 aware word and C completion engine for Vim";
-      homepage = http://github.com/Valloric/YouCompleteMe;
+      homepage = https://github.com/Valloric/YouCompleteMe;
       license = stdenv.lib.licenses.gpl3;
       maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
       platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix
index 9ad37f3a63d..8f8c58ecc4a 100644
--- a/pkgs/misc/xosd/default.nix
+++ b/pkgs/misc/xosd/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Displays text on your screen";
-    homepage = http://sourceforge.net/projects/libxosd;
+    homepage = https://sourceforge.net/projects/libxosd;
     license = licenses.gpl2;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix
index f8c25339370..603c0f652b0 100644
--- a/pkgs/os-specific/darwin/cf-private/default.nix
+++ b/pkgs/os-specific/darwin/cf-private/default.nix
@@ -7,12 +7,14 @@ stdenv.mkDerivation {
     dest=$out/Library/Frameworks/CoreFoundation.framework/Headers
     mkdir -p $dest
     pushd $dest
-      cp -Lv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest
       for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do
-        ln -sf $file 
+        ln -sf $file
       done
-    popd
 
+      # Copy or overwrite private headers, some of these might already
+      # exist in CF but the private versions have more information.
+      cp -Lfv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest
+    popd
   '';
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index 4b32697c6ae..09a346e4446 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Cross platform port of the macOS CoreFoundation";
-    homepage = http://sourceforge.net/projects/opencflite/;
+    homepage = https://sourceforge.net/projects/opencflite/;
     license = stdenv.lib.licenses.apsl20;
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 2f4689beea4..bbacd615cf2 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,22 +1,47 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchgit, runCommand, git, cacert, gnupg }:
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2017-07-05";
+  version = "2017-10-09-${src.iwlRev}";
 
-  # This repo is built by merging the latest versions of
+  # The src runCommand automates the process of building a merged repository of both
+  #
   # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-  # and
   # http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
-  # for any given date. This gives us up to date iwlwifi firmware as well as
+  #
+  # This gives us up to date iwlwifi firmware as well as
   # the usual set of firmware. firmware/linux-firmware usually lags kernel releases
   # so iwlwifi cards will fail to load on newly released kernels.
-  src = fetchFromGitHub {
-    owner = "fpletz";
-    repo = "linux-firmware";
-    rev = version;
-    sha256 = "0vlk043y7c32g4d9hz93j64x372qqrwsq65mh8s5s5xrvamja2if";
-  };
+  #
+  # To update, go to the above repositories and look for latest tags / commits, then
+  # update version to the more recent commit date
+
+  src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
+    # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
+    baseRev = "bf04291309d3169c0ad3b8db52564235bbd08e30";
+    iwlRev = "iwlwifi-fw-2017-11-03";
+
+    # randomly mutate the hash to break out of fixed hash, when updating
+    outputHash = "11izv1vpq9ixlqdss19lzs5q289d7jxr5kgf6iymk4alxznffd8z";
+
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    buildInputs = [ git gnupg ];
+    NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+  } ''
+    git init src && (
+      cd src
+      git config user.email "build-daemon@nixos.org"
+      git config user.name "Nixos Build Daemon $name"
+      git remote add base git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+      git remote add iwl git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
+      git fetch base $baseRev
+      git checkout -b work FETCH_HEAD
+      git fetch iwl $iwlRev
+      git merge FETCH_HEAD)
+    rm -rf src/.git
+    cp -a src $out
+  '';
 
   preInstall = ''
     mkdir -p $out
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index 9605fb26999..e28a85ab0b2 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip";
-    homepage = http://sourceforge.net/projects/zd1211/;
+    homepage = https://sourceforge.net/projects/zd1211/;
     license = "GPL";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix
index a8348acd5d7..d3654445332 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/pkgs/os-specific/linux/mingetty/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/projects/mingetty;
+    homepage = https://sourceforge.net/projects/mingetty;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix
index 374300db460..ce9136e2ddb 100644
--- a/pkgs/os-specific/linux/mstpd/default.nix
+++ b/pkgs/os-specific/linux/mstpd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Multiple Spanning Tree Protocol daemon";
-    homepage = http://sourceforge.net/projects/mstpd/;
+    homepage = https://sourceforge.net/projects/mstpd/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index c22ffb60df8..e989a7837f9 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   meta = { 
     description = "Ndis driver wrapper for the Linux kernel";
-    homepage = http://sourceforge.net/projects/ndiswrapper;
+    homepage = https://sourceforge.net/projects/ndiswrapper;
     license = "GPL";
     broken = true;
   };
diff --git a/pkgs/os-specific/linux/procps/watch.nix b/pkgs/os-specific/linux/procps/watch.nix
index 5fdd1287a64..4511b9cf843 100644
--- a/pkgs/os-specific/linux/procps/watch.nix
+++ b/pkgs/os-specific/linux/procps/watch.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin";
 
   meta = {
-    homepage = http://sourceforge.net/projects/procps/;
+    homepage = https://sourceforge.net/projects/procps/;
     description = "Utility for watch the output of a given command at intervals";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 06144eedbf4..db23987d4aa 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,7 +1,7 @@
 # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "0.26.0" "0.26.0" "1ywbmay0pwm7rj4y0yqk6a3a62lv32ncshwy5j02rq5b2nf7lbc3")
+  (fetchbower "uchiwa-web" "0.26.3" "0.26.3" "1qc69jk3730skdg2vdqncjwg15vywb1a9f8jqk6kwggmkwdklr0p")
   (fetchbower "angular" "1.6.6" "~1.6.3" "1hc71mpipbdz6ban4zkagdhmn3rw28ksjkr6nwmbzfcpk59gnzkb")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")
   (fetchbower "angular-cookies" "1.6.6" "~1.6.3" "0qfk0az32fmrn71ywjl63k7hgan0f0bb4d7fx7q5ch2kd75rzkfm")
@@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3")
   (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71")
   (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")
-  (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0bpyfbaixz2dhkc19r7zgm61n4rncrvfyvj61c5kn6fmj68fdbz3")
+  (fetchbower "ua-parser-js" "0.7.17" "~0.7.12" "1dx46rm9han9fj409rjxrlnrk9zxmaqbnn62ljnh32ihngd4yxh0")
   (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")
   (fetchbower "jquery" "3.2.1" ">= 1.9.0" "03vn0kq07yxl3i5shc6b0mjck1vdbz1x0jspd3wwb169mvlsxxn3")
 ]; }
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index 4b14eea17ff..924a92a2785 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-  version = "0.26.0-1";
-  sha256  = "10f71wsv43jbbwvw3wicr8r1bml51smfakf4r10mi4zq1l37h77z";
+  version = "0.26.3-1";
+  sha256  = "13gklnrzhcj7s7j1ga5pa7ijwav0w9a96lqh4m7858mmm92v0bsk";
 }
diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh
deleted file mode 100755
index 33e3dacdda5..00000000000
--- a/pkgs/servers/monitoring/uchiwa/update.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl.bin git.out jq.out nodePackages.bower2nix
-
-set -euo pipefail
-IFS=$'\n\t'
-
-# set -x
-
-REPO=sensu/uchiwa
-SHA="1111111111111111111111111111111111111111111111111111"
-
-write_src() {
-  cat <<_EOF > src.nix
-{
-  version = "${VERSION}";
-  sha256  = "${SHA}";
-}
-_EOF
-}
-
-t=$(mktemp -d)
-
-LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
-echo "Latest version: ${LATEST_VERSION}"
-
-VERSION=${1:-${LATEST_VERSION}}
-echo "Updating to: ${VERSION}"
-
-write_src
-
-curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t/bower.json
-bower2nix $t/bower.json $t/bower-packages.nix
-mv $t/bower-packages.nix .
-# sed -i 's@/@-@g' bower-packages.nix
-
-pushd $(git rev-parse --show-toplevel)
-SHA=$(nix-prefetch-url -A uchiwa.src)
-popd
-
-write_src
-
-rm -r $t
diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index 9c8ad94f61c..6752e5b80b7 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 let
-  version = "2.1.6";
-  sha256 = "1x76nvxjhjpagniyh075hqia4sl06972alnhi7628cjrq3pr4v9i";
+  version = "2.1.8";
+  sha256 = "0fnsk61s328dg16iv0chqxayni8ahkbcb84z012w0d9417i806lc";
 in
 
 python3Packages.buildPythonApplication {
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index dd09985a07b..9e211b8df74 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "ONC RPC portmapper";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    homepage = http://sourceforge.net/projects/rpcbind/;
+    homepage = https://sourceforge.net/projects/rpcbind/;
     maintainers = with maintainers; [ abbradar ];
     longDescription = ''
       Universal addresses to RPC program number mapper.
diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index 2cc0cac8a60..8724adfdad6 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
     sha256 = "07ng21n4pva56cxnxkzd6vzs381zn67psqpm51ym5wnl644jqh08";
   };
 
-  buildPhases = ["unpackPhase" "installPhase"];
-
   installPhase = ''
     mkdir $out
     cp -ra * $out/
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 1f8a5649430..71bc0de6d91 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "unifi-controller-${version}";
-  version = "5.6.20";
+  version = "5.6.22";
 
   src = fetchurl {
     url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb";
-    sha256 = "0dqkyg9lpjgj2qwbm8blh7hvlm8656d6gihyxr37dx6ja8qlzcjl";
+    sha256 = "1ffphdi4df3jhlcl68amb90f5pj7cwyrql4qwbswynh9d623880l";
   };
 
   buildInputs = [ dpkg ];
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 1606cc9e76b..14f1dffee64 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "00vrpw7sb95x6lwpaxrlzxyj98k98xblqcrjr236ykv0ha97xv30";
   };
 
-  buildPhases = ["unpackPhase" "installPhase"];
-
   installPhase = ''
     mkdir $out
     cp -ra * $out/
diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix
index bef8915dd64..6dea51a487e 100644
--- a/pkgs/shells/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation {
     rev = "61c373c8aa5556d51522290b82ad44e7166bced1";
   };
 
-  buildPhases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/share/themes
     cp lambda-mod.zsh-theme $out/share/themes
diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix
index af055266293..cd190e8cabe 100644
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ b/pkgs/shells/nix-zsh-completions/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://github.com/spwhitt/nix-zsh-completions;
+    homepage = https://github.com/spwhitt/nix-zsh-completions;
     description = "ZSH completions for Nix, NixOS, and NixOps";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix
index 22ea5414251..4723a6abeb6 100644
--- a/pkgs/shells/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh-autosuggestions/default.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zsh ];
 
-  buildPhases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     install -D zsh-autosuggestions.zsh \
       $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh
diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix
new file mode 100644
index 00000000000..6eee9826948
--- /dev/null
+++ b/pkgs/tools/admin/aws_shell/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, awscli
+, prompt_toolkit
+, boto3
+, configobj
+, pygments
+}:
+
+buildPythonPackage rec {
+  pname = "aws-shell";
+  version = "0.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5";
+  };
+
+  # Why does it propagate packages that are used for testing?
+  propagatedBuildInputs = [
+    awscli
+    prompt_toolkit
+    boto3
+    configobj
+    pygments
+  ];
+
+  #Checks are failing due to missing TTY, which won't exist.
+  doCheck = false;
+  preCheck = ''
+    mkdir -p check-phase
+    export HOME=$(pwd)/check-phase
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/awslabs/aws-shell;
+    description = "An integrated shell for working with the AWS CLI";
+    license = licenses.asl20;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
new file mode 100644
index 00000000000..8061cbfded8
--- /dev/null
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -0,0 +1,68 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, botocore
+, bcdoc
+, s3transfer
+, six
+, colorama
+, docutils
+, rsa
+, pyyaml
+, groff
+, less
+}:
+
+let
+  colorama_3_7 = colorama.overrideAttrs (old: rec {
+    name = "${pname}-${version}";
+    pname = "colorama";
+    version = "0.3.7";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+    };
+  });
+
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "awscli";
+  version = "1.11.185";
+  namePrefix = "";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18rskl6sla456z4hkq2gmmm03fqc4rqw5pfiqdyc7a2v9kljv4ah";
+  };
+
+  # No tests included
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    botocore
+    bcdoc
+    s3transfer
+    six
+    colorama_3_7
+    docutils
+    rsa
+    pyyaml
+    groff
+    less
+  ];
+
+  postInstall = ''
+    mkdir -p $out/etc/bash_completion.d
+    echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
+    mkdir -p $out/share/zsh/site-functions
+    mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
+    rm $out/bin/aws.cmd
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://aws.amazon.com/cli/;
+    description = "Unified tool to manage your AWS services";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with maintainers; [ muflax ];
+  };
+}
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix
index 7cec791ecc5..7d0fc5969bf 100644
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ b/pkgs/tools/cd-dvd/lsdvd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = http://sourceforge.net/projects/lsdvd/;
+    homepage = https://sourceforge.net/projects/lsdvd/;
     shortDescription = "Display information about audio, video, and subtitle tracks on a DVD";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index f20f9aa2bab..f929f354766 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   
   meta = {
     description = "The FAT16/FAT32 non-destructive resizer";
-    homepage = http://sourceforge.net/projects/fatresize;
+    homepage = https://sourceforge.net/projects/fatresize;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
index 3ca46851306..8a417cfe397 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = http://sourceforge.net/projects/fuseiso;
+    homepage = https://sourceforge.net/projects/fuseiso;
     description = "FUSE module to mount ISO filesystem images";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix
index fc504b3208d..7ff42c4d1f9 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs";
     updateWalker = true;
     inherit version;
-    homepage = http://sourceforge.net/projects/smbnetfs/;
+    homepage = https://sourceforge.net/projects/smbnetfs/;
   };
 }
diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix
index e6773e42304..d3a8d19dfe2 100644
--- a/pkgs/tools/graphics/lprof/default.nix
+++ b/pkgs/tools/graphics/lprof/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Little CMS ICC profile construction set";
-    homepage = http://sourceforge.net/projects/lprof;
+    homepage = https://sourceforge.net/projects/lprof;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index 67faf925a27..be1df0510d7 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -26,7 +26,7 @@ buildPythonApplication rec {
   };
 
   meta = {
-    homepage = http://github.com/bepasty/bepasty-server;
+    homepage = https://github.com/bepasty/bepasty-server;
     description = "Binary pastebin server";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.makefu ];
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index 65a5b718e5f..eaa2c6e4942 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Bibliography format interconversion";
     longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters.";
-    homepage = http://sourceforge.net/p/bibutils/home/Bibutils/;
+    homepage = https://sourceforge.net/p/bibutils/home/Bibutils/;
     license = licenses.gpl2;
     maintainers = [ maintainers.garrison ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 2ea29196ed6..3fd5bb7daa6 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -8,12 +8,12 @@
 
 python3Packages.buildPythonApplication rec {
   name = "diffoscope-${version}";
-  version = "86";
+  version = "87";
 
   src = fetchgit {
     url    = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev    = "refs/tags/${version}";
-    sha256 = "0jj3gn7pw7him12bxf0wbs6wkz32ydv909v5gi681p0dyzajd0zr";
+    sha256 = "0j3pljwmggrpaghbamvr24x4cg5yj7hl2ll27405p7970scnpngv";
   };
 
   patches = [
diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix
index 9ba138bf0e9..a13f7160aa6 100644
--- a/pkgs/tools/misc/quota/default.nix
+++ b/pkgs/tools/misc/quota/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tools to manage kernel-level quotas in Linux";
-    homepage = http://sourceforge.net/projects/linuxquota/;
+    homepage = https://sourceforge.net/projects/linuxquota/;
     license = licenses.gpl2; # With some files being BSD as an exception
     platforms = platforms.linux;
     maintainers = [ maintainers.dezgeg ];
diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix
index 5c56f9accfc..ff606c6b72b 100644
--- a/pkgs/tools/misc/rkflashtool/default.nix
+++ b/pkgs/tools/misc/rkflashtool/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/projects/rkflashtool/;
+    homepage = https://sourceforge.net/projects/rkflashtool/;
     description = "Tools for flashing Rockchip devices";
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.viric ];
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index 24a7e8d3f71..f30fdb1f119 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/timidity/;
+    homepage = https://sourceforge.net/projects/timidity/;
     license = licenses.gpl2;
     description = "A software MIDI renderer";
     maintainers = [ maintainers.marcweber ];
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 0e7cd49b543..c1091d47c5a 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -1,17 +1,14 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ stdenv, buildPythonApplication, fetchFromGitHub }:
 
-with pythonPackages;
-
-buildPythonPackage rec {
-  namePrefix = "";
+buildPythonApplication rec {
   name = "wakatime-${version}";
-  version = "7.0.4";
+  version = "10.0.1";
 
   src = fetchFromGitHub {
-    sha256 = "1cddabx9x11d2nxxcqlf4piysjnpfici0n5qy3n9gw81asz1djhf";
-    rev = version;
-    repo = "wakatime";
     owner = "wakatime";
+    repo = "wakatime";
+    rev = version;
+    sha256 = "1bg8fzd3rdc6na0a7z1d55m2gbnfq6d72mf2jlyzc817r6dr4bfx";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix
index f87cecaf4d2..aedb89ce489 100644
--- a/pkgs/tools/networking/sshpass/default.nix
+++ b/pkgs/tools/networking/sshpass/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://sourceforge.net/projects/sshpass/;
+    homepage = https://sourceforge.net/projects/sshpass/;
     description = "Non-interactive ssh password auth";
     maintainers = [ stdenv.lib.maintainers.madjar ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 8161f700ce1..6a322f649ac 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -2,19 +2,21 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urlwatch-${version}";
-  version = "2.5";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner  = "thp";
     repo   = "urlwatch";
     rev    = version;
-    sha256 = "0irz54nvyq3cxa3fvjc5k2836a5nmly4wiiy4s5cwib1rnwg6r94";
+    sha256 = "0fx964z73yv08b1lpymmjsigf6929zx9ax5bp34rcf2c5gk11l5m";
   };
 
   propagatedBuildInputs = with python3Packages; [
+    appdirs
     keyring
     minidb
     pyyaml
+    pycodestyle
     requests
   ];
 
diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix
index 7c72c2cd210..05dcf6dc594 100644
--- a/pkgs/tools/networking/wrk/default.nix
+++ b/pkgs/tools/networking/wrk/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "HTTP benchmarking tool";
-    homepage = http://github.com/wg/wrk;
+    homepage = https://github.com/wg/wrk;
     longDescription = ''
       wrk is a modern HTTP benchmarking tool capable of generating
       significant load when run on a single multi-core CPU. It
diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix
new file mode 100644
index 00000000000..55335927b36
--- /dev/null
+++ b/pkgs/tools/security/doas/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, bison, pam }:
+
+stdenv.mkDerivation rec {
+  name = "doas-${version}";
+
+  version = "6.0";
+
+  src = fetchFromGitHub {
+    owner = "Duncaen";
+    repo = "OpenDoas";
+    rev = "v${version}";
+    sha256 = "1j50l3jvbgvg8vmp1nx6vrjxkbj5bvfh3m01bymzfn25lkwwhz1x";
+  };
+
+  # otherwise confuses ./configure
+  dontDisableStatic = true;
+
+  postPatch = ''
+    sed -i '/\(chown\|chmod\)/d' bsd.prog.mk
+  '';
+
+  buildInputs = [ bison pam ];
+
+  meta = with lib; {
+    description = "Executes the given command as another user";
+    homepage = "https://github.com/Duncaen/OpenDoas";
+    license = licenses.isc;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix
index 4a770f86e5c..3a6c09b9291 100644
--- a/pkgs/tools/security/radamsa/default.nix
+++ b/pkgs/tools/security/radamsa/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A general purpose fuzzer";
     longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs.";
-    homepage = http://github.com/aoh/radamsa;
+    homepage = https://github.com/aoh/radamsa;
     maintainers = [ stdenv.lib.maintainers.markWot ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 75a865917ec..1885940e7f3 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A random number generator daemon";
 
-    homepage = http://sourceforge.net/projects/gkernel;
+    homepage = https://sourceforge.net/projects/gkernel;
 
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 5510ec0e948..d638a1c16b5 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -2,22 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "lr-${version}";
-  version = "0.4";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "lr";
     rev = "v${version}";
-    sha256 = "16qp0791s652yi86x472wwr62w6nhiyb1i662d85y5zyfagdf7dd";
+    sha256 = "171h353238s9wmhirvs2yc1151vds83a71p7wgn96wa3jpl248by";
   };
 
   makeFlags = "PREFIX=$(out)";
 
-  meta = {
-    homepage = http://github.com/chneukirchen/lr;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/chneukirchen/lr;
     description = "List files recursively";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.globin ];
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.globin ];
   };
 }
diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 6ef1f54c23b..5fa55b275fe 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -2,7 +2,7 @@
 , IOKit ? null , ApplicationServices ? null }:
 
 let
-  version = "6.5";
+  version = "6.6";
 
   dbrev = "4548";
   drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49";
+    sha256 = "0m1hllbb78rr6cxkbalmz1gqkl0psgq8rrmv4gwcmz34n07kvx2i";
   };
 
   patches = [ ./smartmontools.patch ];
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix
index 162f7e1a397..3c2b4f5e885 100644
--- a/pkgs/tools/text/xml/jing-trang/default.nix
+++ b/pkgs/tools/text/xml/jing-trang/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jing-trang-${version}";
-  version = "20150603";
+  version = "20151127";
 
   src = fetchFromGitHub {
     owner = "relaxng";
     repo = "jing-trang";
-    rev = "54b9b1f4e67cd79c7987750d8c9dcfc014af98c3"; # needed to compile with jdk8
-    sha256 = "0wa569xjb7ihhcaazz32y2b0dv092lisjz77isz1gfb1wvf53di5";
+    rev = "47a0cbdaec2d48824b78a1c19879ac7875509598"; # needed to compile with jdk8
+    sha256 = "1hhn52z9mv1x9nyvyqnmzg5yrs2lzm9xac7i15izppv02wp32qha";
   };
 
   buildInputs = [ jdk ant saxon ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "A RELAX NG validator in Java";
     # The homepage is www.thaiopensource.com, but it links to googlecode.com
     # for downloads and call it the "project site".
-    homepage = http://www.thaiopensource.com/relaxng/jing.html;
+    homepage = "http://www.thaiopensource.com/relaxng/trang.html";
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 160936af5ae..d1da340a753 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -124,6 +124,8 @@ with pkgs;
 
   dump1090 = callPackage ../applications/misc/dump1090 { };
 
+  ebook2cw = callPackage ../applications/misc/ebook2cw { };
+
   vsenv = callPackage ../build-support/vsenv {
     vs = vs90wrapper;
   };
@@ -511,13 +513,13 @@ with pkgs;
 
   avfs = callPackage ../tools/filesystems/avfs { };
 
-  awscli = pythonPackages.awscli; # Should be moved out of python-packages.nix
+  awscli = pythonPackages.callPackage ../tools/admin/awscli { };
 
   awsebcli = callPackage ../tools/virtualization/awsebcli {};
 
   awslogs = callPackage ../tools/admin/awslogs { };
 
-  aws_shell = python2Packages.aws_shell; # Should be moved out of python-packages.nix
+  aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { };
 
   azure-cli = nodePackages.azure-cli;
 
@@ -885,6 +887,8 @@ with pkgs;
 
   clib = callPackage ../tools/package-management/clib { };
 
+  clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
+
   colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {};
 
   colpack = callPackage ../applications/science/math/colpack { };
@@ -1763,6 +1767,8 @@ with pkgs;
     inherit (perlPackages) PerlMagick;
   };
 
+  doas = callPackage ../tools/security/doas { };
+
   docbook2x = callPackage ../tools/typesetting/docbook2x {
     inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
   };
@@ -4902,7 +4908,7 @@ with pkgs;
 
   vtun = callPackage ../tools/networking/vtun { };
 
-  wakatime = callPackage ../tools/misc/wakatime { };
+  wakatime = pythonPackages.callPackage ../tools/misc/wakatime { };
 
   weather = callPackage ../applications/misc/weather { };
 
@@ -13388,6 +13394,8 @@ with pkgs;
 
   libertine = callPackage ../data/fonts/libertine { };
 
+  libertinus = callPackage ../data/fonts/libertinus { };
+
   libre-baskerville = callPackage ../data/fonts/libre-baskerville { };
 
   libre-bodoni = callPackage ../data/fonts/libre-bodoni { };
@@ -14056,7 +14064,7 @@ with pkgs;
 
   confclerk = callPackage ../applications/misc/confclerk { };
 
-  copyq = callPackage ../applications/misc/copyq { };
+  copyq = libsForQt5.callPackage ../applications/misc/copyq { };
 
   coriander = callPackage ../applications/video/coriander {
     inherit (gnome2) libgnomeui GConf;
@@ -14841,7 +14849,7 @@ with pkgs;
 
   gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});
 
-  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt;
+  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt;
 
   gitMinimal = git.override {
     withManual = false;
@@ -18703,6 +18711,7 @@ with pkgs;
     CoLoR = callPackage ../development/coq-modules/CoLoR {};
     math-classes = callPackage ../development/coq-modules/math-classes { };
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
+    equations = callPackage ../development/coq-modules/equations { };
   };
 
   coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 01d2fc8e046..7cbc36d1cbb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -140,7 +140,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ AnyEvent ];
     doCheck = false; # does an DNS lookup
     meta = {
-      homepage = http://github.com/potyl/perl-AnyEvent-CacheDNS;
+      homepage = https://github.com/potyl/perl-AnyEvent-CacheDNS;
       description = "Simple DNS resolver with caching";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -373,7 +373,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ParamsValidate ];
     doCheck = false;
     meta = {
-      homepage = http://metacpan.org/release/Attribute-Params-Validate;
+      homepage = https://metacpan.org/release/Attribute-Params-Validate;
       description = "Define validation through subroutine attributes";
       license = stdenv.lib.licenses.artistic2;
     };
@@ -694,7 +694,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ ModuleImplementation ModuleRuntime SubExporterProgressive ];
     meta = {
-      homepage = http://metacpan.org/release/B-Hooks-EndOfScope;
+      homepage = https://metacpan.org/release/B-Hooks-EndOfScope;
       description = "Execute code after a scope finished compilation";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -1254,7 +1254,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ];
     meta = {
-      homepage = http://metacpan.org/release/Catalyst-Plugin-AccessLog;
+      homepage = https://metacpan.org/release/Catalyst-Plugin-AccessLog;
       description = "Request logging from within Catalyst";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -2635,7 +2635,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ];
     doCheck = false;
     meta = {
-      homepage = http://github.com/jib/cpanplus-devel;
+      homepage = https://github.com/jib/cpanplus-devel;
       description = "Ameliorated interface to the CPAN";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -3102,7 +3102,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ ParamsUtil SubInstall ];
     meta = {
-      homepage = http://github.com/rjbs/data-optlist;
+      homepage = https://github.com/rjbs/data-optlist;
       description = "Parse and validate simple name/value option pairs";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -3202,7 +3202,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestRequires ];
     propagatedBuildInputs = [ Moose PathClass SubExporter namespaceclean ];
     meta = {
-      homepage = http://metacpan.org/release/Data-Stream-Bulk;
+      homepage = https://metacpan.org/release/Data-Stream-Bulk;
       description = "N at a time iteration API";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -3283,7 +3283,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ Test2Suite ];
     propagatedBuildInputs = [ NetDomainTLD ];
     meta = {
-      homepage = http://metacpan.org/release/Data-Validate-Domain;
+      homepage = https://metacpan.org/release/Data-Validate-Domain;
       description = "Domain and host name validation";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ maintainers.rycee ];
@@ -3299,7 +3299,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestRequires ];
     propagatedBuildInputs = [ NetAddrIP ];
     meta = {
-      homepage = http://metacpan.org/release/Data-Validate-IP;
+      homepage = https://metacpan.org/release/Data-Validate-IP;
       description = "IPv4 and IPv6 validation methods";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ maintainers.rycee ];
@@ -3565,7 +3565,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestFatal TestWarnings ];
     propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone PackageDeprecationManager ParamsValidate TryTiny ];
     meta = {
-      homepage = http://metacpan.org/release/DateTime-Format-Strptime;
+      homepage = https://metacpan.org/release/DateTime-Format-Strptime;
       description = "Parse and format strp and strf time patterns";
       license = stdenv.lib.licenses.artistic2;
     };
@@ -3607,7 +3607,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ DistCheckConflicts TestFatal TestRequires TestWarnings ];
     propagatedBuildInputs = [ DistCheckConflicts ListMoreUtils ParamsValidate ];
     meta = {
-      homepage = http://metacpan.org/release/DateTime-Locale;
+      homepage = https://metacpan.org/release/DateTime-Locale;
       description = "Localization support for DateTime.pm";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -3635,7 +3635,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestFatal TestRequires ];
     propagatedBuildInputs = [ ClassSingleton ListAllUtils ModuleRuntime ParamsValidate TryTiny ];
     meta = {
-      homepage = http://metacpan.org/release/DateTime-TimeZone;
+      homepage = https://metacpan.org/release/DateTime-TimeZone;
       description = "Time zone object base class and factory";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -4082,7 +4082,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "e882ccd7f4cbab0d0cdad53897f3f3bf29bdcf47d2bdfde1ac07f1bc7d7ebd16";
     };
     meta = {
-      homepage = http://metacpan.org/release/Devel-StackTrace;
+      homepage = https://metacpan.org/release/Devel-StackTrace;
       description = "An object representing a stack trace";
       license = stdenv.lib.licenses.artistic2;
     };
@@ -4276,7 +4276,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ CaptureTiny DistZilla MooseAutobox perl ];
     propagatedBuildInputs = [ DistZilla DistZillaPluginMojibakeTests DistZillaPluginNoTabsTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion JSONPP ListMoreUtils Moose PodCoverageTrustPod TestCPANMeta TestPerlCritic TestVersion namespaceautoclean ];
     meta = {
-      homepage = http://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/;
+      homepage = https://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/;
       description = "Test your dist with every testing plugin conceivable";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -4377,7 +4377,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ CPANChanges DistZilla ];
     propagatedBuildInputs = [ CPANChanges DataSection DistZilla Moose ];
     meta = {
-      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/;
+      homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/;
       description = "Release tests for your changelog";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -4422,7 +4422,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ];
     propagatedBuildInputs = [ DistZilla Moose TestDistManifest ];
     meta = {
-      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/;
+      homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/;
       description = "Release tests for the manifest";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -4467,7 +4467,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ DistZilla MooseAutobox TestOutput ];
     propagatedBuildInputs = [ DistZilla Moose TestMinimumVersion ];
     meta = {
-      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/;
+      homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/;
       description = "Release tests for minimum required versions";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -4512,7 +4512,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ];
     propagatedBuildInputs = [ DistZilla Moose TestPortabilityFiles ];
     meta = {
-      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/;
+      homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/;
       description = "Release tests for portability";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -4527,7 +4527,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ];
     propagatedBuildInputs = [ DistZilla Moose TestSynopsis ];
     meta = {
-      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/;
+      homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/;
       description = "Release tests for synopses";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -4542,7 +4542,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ];
     propagatedBuildInputs = [ DistZilla Moose TestVars namespaceautoclean ];
     meta = {
-      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/;
+      homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/;
       description = "Release tests for unused variables";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -5553,7 +5553,7 @@ let self = _self // overrides; _self = with self; {
         --replace "/usr/share/file/magic.mgc" "${pkgs.file}/share/misc/magic.mgc"
     '';
     meta = {
-      homepage = http://metacpan.org/release/File::LibMagic;
+      homepage = https://metacpan.org/release/File::LibMagic;
       description = "Determine MIME types of data or files using libmagic";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ maintainers.rycee ];
@@ -5680,7 +5680,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ FileShareDir ];
     meta = {
-      homepage = http://github.com/ingydotnet/file-share-pm/tree;
+      homepage = https://github.com/ingydotnet/file-share-pm/tree;
       description = "Extend File::ShareDir to Local Libraries";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ];
@@ -6549,7 +6549,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestDeep ];
     propagatedBuildInputs = [ CacheCache CGI ClassContainer ExceptionClass HTMLParser LogAny ParamsValidate ];
     meta = {
-      homepage = http://metacpan.org/release/HTML-Mason;
+      homepage = https://metacpan.org/release/HTML-Mason;
       description = "High-performance, dynamic web site authoring system";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -7735,7 +7735,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestNoWarnings ];
     propagatedBuildInputs = [ LinguaENFindNumber LinguaENInflect LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ];
     meta = {
-      homepage = http://metacpan.org/release/Lingua-EN-Inflect-Phrase;
+      homepage = https://metacpan.org/release/Lingua-EN-Inflect-Phrase;
       description = "Inflect short English Phrases";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -7750,7 +7750,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestFatal TryTiny ];
     propagatedBuildInputs = [ LinguaENFindNumber ];
     meta = {
-      homepage = http://metacpan.org/release/Lingua-EN-Number-IsOrdinal;
+      homepage = https://metacpan.org/release/Lingua-EN-Number-IsOrdinal;
       description = "Detect if English number is ordinal or cardinal";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -7870,7 +7870,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestLeakTrace ];
     propagatedBuildInputs = [ ExporterTiny ModuleImplementation ];
     meta = {
-      homepage = http://metacpan.org/release/List-SomeUtils;
+      homepage = https://metacpan.org/release/List-SomeUtils;
       description = "Provide the stuff missing in List::Util";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -9225,7 +9225,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ Moose ];
     meta = {
-      homepage = http://metacpan.org/release/MooseX-ABC;
+      homepage = https://metacpan.org/release/MooseX-ABC;
       description = "Abstract base classes for Moose";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ];
@@ -9531,7 +9531,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestMoose ];
     propagatedBuildInputs = [ BHooksEndOfScope Moose namespaceautoclean ];
     meta = {
-      homepage = http://metacpan.org/release/MooseX-MarkAsMethods/;
+      homepage = https://metacpan.org/release/MooseX-MarkAsMethods/;
       description = "Mark overload code symbols as methods";
       license = stdenv.lib.licenses.lgpl21;
     };
@@ -9614,7 +9614,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestFatal TestMoose ];
     propagatedBuildInputs = [ Moose ];
     meta = {
-      homepage = http://github.com/sartak/MooseX-Role-Parameterized/tree;
+      homepage = https://github.com/sartak/MooseX-Role-Parameterized/tree;
       description = "Roles with composition parameters";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -9629,7 +9629,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata];
     propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ];
     meta = {
-      homepage = http://metacpan.org/release/MooseX-Role-WithOverloading;
+      homepage = https://metacpan.org/release/MooseX-Role-WithOverloading;
       description = "Roles which support overloading";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -9871,7 +9871,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ DateTime MooseXTypesDateTime TestFatal ];
     propagatedBuildInputs = [ DevelPartialDump Moose MooseXTypes SubExporter ];
     meta = {
-      homepage = http://metacpan.org/release/MooseX-Types-Structured;
+      homepage = https://metacpan.org/release/MooseX-Types-Structured;
       description = "MooseX::Types::Structured - Structured Type Constraints for Moose";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ];
@@ -10454,7 +10454,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CryptSSLeay LWPUserAgent NetOAuth URI ];
     doCheck = false;
     meta = {
-      homepage = http://github.com/semifor/Net-Twitter-Lite;
+      homepage = https://github.com/semifor/Net-Twitter-Lite;
       description = "A perl interface to the Twitter API";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -10633,7 +10633,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestFatal TestWarnings ];
     propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName namespaceautoclean ];
     meta = {
-      homepage = http://metacpan.org/release/Package-DeprecationManager;
+      homepage = https://metacpan.org/release/Package-DeprecationManager;
       description = "Manage deprecation warnings for your distribution";
       license = stdenv.lib.licenses.artistic2;
     };
@@ -10661,7 +10661,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ DistCheckConflicts TestFatal TestRequires ];
     propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ];
     meta = {
-      homepage = http://metacpan.org/release/Package-Stash;
+      homepage = https://metacpan.org/release/Package-Stash;
       description = "Routines for manipulating stashes";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -10675,7 +10675,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ TestRequires TestFatal ];
     meta = {
-      homepage = http://metacpan.org/release/Package-Stash-XS;
+      homepage = https://metacpan.org/release/Package-Stash-XS;
       description = "Faster and more correct implementation of the Package::Stash API";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -10742,7 +10742,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ModuleBuild TestFatal TestRequires ];
     propagatedBuildInputs = [ ModuleImplementation ];
     meta = {
-      homepage = http://metacpan.org/release/Params-Validate;
+      homepage = https://metacpan.org/release/Params-Validate;
       description = "Validate method/function parameters";
       license = stdenv.lib.licenses.artistic2;
     };
@@ -10917,6 +10917,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Perlosnames = buildPerlPackage rec {
+    name = "Perl-osnames-0.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PERLANCAR/${name}.tar.gz";
+      sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b";
+    };
+    meta = {
+      homepage = https://metacpan.org/release/Perl-osnames;
+      description = "List possible $^O ($OSNAME) values, with description";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   PerlCritic = buildPerlModule rec {
     name = "Perl-Critic-1.130";
     src = fetchurl {
@@ -11247,6 +11260,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ProcFind = buildPerlPackage rec {
+    name = "Proc-Find-0.04";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PERLANCAR/${name}.tar.gz";
+      sha256 = "07d715c2b8644dc6d5b5a36ffcd2f02da017bf86a00027387aa47c53e2347a81";
+    };
+    buildInputs = [ Perlosnames ];
+    propagatedBuildInputs = [ ProcProcessTable ];
+    meta = {
+      homepage = https://metacpan.org/release/Proc-Find;
+      description = "Find processes by name, PID, or some other attributes";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ProcSafeExec = buildPerlPackage {
     name = "Proc-SafeExec-1.5";
     src = fetchurl {
@@ -11508,7 +11536,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ModuleBuild ];
     propagatedBuildInputs = [ self."if" ];
     meta = {
-      homepage = http://github.com/timj/perl-Pod-LaTeX/tree/master;
+      homepage = https://github.com/timj/perl-Pod-LaTeX/tree/master;
       description = "Convert Pod data to formatted Latex";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -11853,10 +11881,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   RoleTiny = buildPerlPackage rec {
-    name = "Role-Tiny-2.000005";
+    name = "Role-Tiny-2.000006";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "593a29b621e029bf0218d0154d5dfdf6ec502afc49adeeadae6afd0c70063115";
+      sha256 = "cc73418c904a0286ecd8915eac11f5be2a8d1e17ea9cb54c9116b0340cd3e382";
     };
     meta = {
       description = "Roles. Like a nouvelle cuisine portion size slice of Moose";
@@ -12158,7 +12186,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOstringy OLEStorage_Lite ];
     meta = {
-      homepage = http://github.com/runrig/spreadsheet-parseexcel/;
+      homepage = https://github.com/runrig/spreadsheet-parseexcel/;
       description = "Read information from an Excel file";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -12921,7 +12949,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ModuleBuild perl ];
     propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify Inline InlineC ListMoreUtils Moo MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace YAMLLibYAML ];
     meta = {
-      homepage = http://metacpan.org/release/Task-FreecellSolver-Testing;
+      homepage = https://metacpan.org/release/Task-FreecellSolver-Testing;
       description = "Install the CPAN dependencies of the Freecell Solver test suite";
       license = stdenv.lib.licenses.mit;
     };
@@ -13187,7 +13215,7 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
 
     meta = {
-      homepage = http://sourceforge.net/projects/perl-trg/;
+      homepage = https://sourceforge.net/projects/perl-trg/;
       description = "Perl extension for the GNU Readline/History Library";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -13504,7 +13532,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0qfdn71562xzmgnhmkkdbpp3vj851ldl1zlmxvharxsr16gjh6s3";
     };
     meta = {
-      homepage = http://metacpan.org/release/Test-EOL;
+      homepage = https://metacpan.org/release/Test-EOL;
       description = "Check the correct line endings in your project";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ];
@@ -14237,7 +14265,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "8410438a2acf127bffcf1ab92205b747a615b487e80a48e8c3d0bb9fa0dbb2a8";
     };
     meta = {
-      homepage = http://github.com/audreyt/Test-use-ok/tree;
+      homepage = https://github.com/audreyt/Test-use-ok/tree;
       description = "Alternative to Test::More::use_ok";
       license = "unrestricted";
     };
@@ -15210,7 +15238,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ if_ ];
     meta = {
-      homepage = http://metacpan.org/release/Try-Tiny;
+      homepage = https://metacpan.org/release/Try-Tiny;
       description = "Minimal try/catch with proper preservation of $@";
       license = stdenv.lib.licenses.mit;
     };
@@ -15276,7 +15304,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ ModuleBuild ];
     meta = {
-      homepage = http://metacpan.org/release/Unicode-CaseFold;
+      homepage = https://metacpan.org/release/Unicode-CaseFold;
       description = "Unicode case-folding for case-insensitive lookups";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -15939,7 +15967,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Base class for SAX Drivers and Filters";
-      homepage = http://github.com/grantm/XML-SAX-Base;
+      homepage = https://github.com/grantm/XML-SAX-Base;
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 922b4b738cb..9e2277254b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -421,7 +421,7 @@ in {
     buildInputs = with self; [ self.nose ];
 
     meta = {
-      homepage = http://pypi.python.org/pypi/anyjson/;
+      homepage = https://pypi.python.org/pypi/anyjson/;
       description = "Wrapper that selects the best available JSON implementation";
     };
   };
@@ -439,7 +439,7 @@ in {
     buildInputs = with self; [ mock coverage nose-cover3 unittest2 ];
 
     meta = {
-      homepage = http://github.com/celery/py-amqp;
+      homepage = https://github.com/celery/py-amqp;
       description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";
       license = licenses.lgpl21;
     };
@@ -459,7 +459,7 @@ in {
     propagatedBuildInputs = with self; [ vine ];
 
     meta = {
-      homepage = http://github.com/celery/py-amqp;
+      homepage = https://github.com/celery/py-amqp;
       description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";
       license = licenses.lgpl21;
     };
@@ -735,91 +735,6 @@ in {
     };
   };
 
-  awscli =
-  let
-    colorama_3_7 = self.colorama.overrideAttrs (old: rec {
-      name = "${pname}-${version}";
-      pname = "colorama";
-      version = "0.3.7";
-      src = fetchPypi {
-        inherit pname version;
-        sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
-      };
-    });
-  in buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "awscli";
-    version = "1.11.162";
-    namePrefix = "";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0ff17fdzzncrzl7ps1cyrs0c5f82ncbvflnjz8sd1vkcmn9yij8r";
-    };
-
-    # No tests included
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [
-      botocore
-      bcdoc
-      s3transfer
-      six
-      colorama_3_7
-      docutils
-      rsa
-      pyyaml
-      pkgs.groff
-      pkgs.less
-    ];
-
-    postInstall = ''
-      mkdir -p $out/etc/bash_completion.d
-      echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
-      mkdir -p $out/share/zsh/site-functions
-      mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
-      rm $out/bin/aws.cmd
-    '';
-
-    meta = {
-      homepage = https://aws.amazon.com/cli/;
-      description = "Unified tool to manage your AWS services";
-      license = stdenv.lib.licenses.asl20;
-      maintainers = with maintainers; [ muflax ];
-    };
-  };
-
-  aws_shell = buildPythonPackage rec {
-    name = "aws-shell-${version}";
-    version = "0.1.1";
-    src = pkgs.fetchurl {
-        sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5";
-        url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz";
-      };
-
-    # Why does it propagate packages that are used for testing?
-    propagatedBuildInputs = with self; [
-      awscli prompt_toolkit boto3 configobj pygments
-    ];
-
-    #Checks are failing due to missing TTY, which won't exist.
-    doCheck = false;
-    preCheck = ''
-      mkdir -p check-phase
-      export HOME=$(pwd)/check-phase
-    '';
-
-    disabled = isPy35;
-
-
-    meta = {
-      homepage = https://github.com/awslabs/aws-shell;
-      description = "An integrated shell for working with the AWS CLI";
-      license = licenses.asl20;
-      maintainers = [ ];
-    };
-  };
-
   azure = buildPythonPackage rec {
     version = "0.11.0";
     name = "azure-${version}";
@@ -1114,7 +1029,7 @@ in {
 
     meta = {
       description = "The Secure Sockets layer is only actually *secure*";
-      homepage = http://bitbucket.org/brandon/backports.ssl_match_hostname;
+      homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname;
     };
   };
 
@@ -1129,7 +1044,7 @@ in {
 
     meta = {
       description = "The Secure Sockets layer is only actually *secure*";
-      homepage = http://bitbucket.org/brandon/backports.ssl_match_hostname;
+      homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname;
     };
   };
 
@@ -1165,7 +1080,7 @@ in {
     };
 
     meta = {
-      homepage = http://pypi.python.org/pypi/babelfish;
+      homepage = https://pypi.python.org/pypi/babelfish;
       description = "A module to work with countries and languages";
       license = licenses.bsd3;
     };
@@ -1187,7 +1102,7 @@ in {
 
     meta = {
       description = "Get info about wireless interfaces using libiw";
-      homepage = http://github.com/enkore/basiciw;
+      homepage = https://github.com/enkore/basiciw;
       platforms = platforms.linux;
       license = licenses.gpl2;
     };
@@ -2066,39 +1981,7 @@ in {
     };
   };
 
-  botocore = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "botocore";
-    version = "1.7.20";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "16sy35bp9i2g9785l8jzcd4ddc2nydqs3wnkqwi36xx6l3bdbn13";
-    };
-
-    propagatedBuildInputs = with self; [
-      dateutil
-      jmespath
-      docutils
-      ordereddict
-      simplejson
-    ];
-
-    checkInputs = with self; [ mock nose ];
-
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    # Network access
-    doCheck = false;
-
-    meta = {
-      homepage = https://github.com/boto/botocore;
-      license = "bsd";
-      description = "A low-level interface to a growing number of Amazon Web Services";
-    };
-  };
+  botocore = callPackage ../development/python-modules/botocore { };
 
   bottle = buildPythonPackage rec {
     version = "0.12.11";
@@ -2364,7 +2247,7 @@ in {
     doCheck = false; # depends on the network
 
     meta = {
-      homepage = http://pypi.python.org/pypi/carrot;
+      homepage = https://pypi.python.org/pypi/carrot;
       description = "AMQP Messaging Framework for Python";
     };
   };
@@ -2764,7 +2647,7 @@ in {
     propagatedBuildInputs = with self; [ pyyaml ];
     meta = {
       description = "Utilities for consistent command line tools";
-      homepage = http://github.com/rca/cmdline;
+      homepage = https://github.com/rca/cmdline;
       license = licenses.asl20;
     };
   };
@@ -2940,7 +2823,7 @@ in {
 
     meta = {
       description = "Config file reading, writing and validation";
-      homepage = http://pypi.python.org/pypi/configobj;
+      homepage = https://pypi.python.org/pypi/configobj;
       license = licenses.bsd3;
       maintainers = with maintainers; [ garbas ];
     };
@@ -3523,7 +3406,7 @@ in {
 
     meta = {
       description = "What is detox?";
-      homepage = http://bitbucket.org/hpk42/detox;
+      homepage = https://bitbucket.org/hpk42/detox;
     };
   };
 
@@ -4134,7 +4017,7 @@ in {
     meta = {
       description = "Darcsver, generate a version number from Darcs history";
 
-      homepage = http://pypi.python.org/pypi/darcsver;
+      homepage = https://pypi.python.org/pypi/darcsver;
 
       license = "BSD-style";
     };
@@ -4337,7 +4220,7 @@ in {
 
     meta = {
       description = "Persistent cache for requests library";
-      homepage = http://pypi.python.org/pypi/requests-cache;
+      homepage = https://pypi.python.org/pypi/requests-cache;
       license = licenses.bsd3;
     };
   });
@@ -4355,7 +4238,7 @@ in {
 
     meta = {
       description = "Instant coding answers via the command line";
-      homepage = http://pypi.python.org/pypi/howdoi;
+      homepage = https://pypi.python.org/pypi/howdoi;
       license = licenses.mit;
     };
   });
@@ -4383,7 +4266,7 @@ in {
 
     meta = {
       description = "Parameterized testing with any Python test framework";
-      homepage = http://pypi.python.org/pypi/nose-parameterized;
+      homepage = https://pypi.python.org/pypi/nose-parameterized;
       license = licenses.bsd3;
     };
   });
@@ -4435,7 +4318,7 @@ in {
 
     meta = {
       description = "Jalali datetime binding for python";
-      homepage = http://pypi.python.org/pypi/jdatetime;
+      homepage = https://pypi.python.org/pypi/jdatetime;
       license = licenses.psfl;
     };
   });
@@ -4464,7 +4347,7 @@ in {
 
     meta = {
       description = "Date parsing library designed to parse dates from HTML pages";
-      homepage = http://pypi.python.org/pypi/dateparser;
+      homepage = https://pypi.python.org/pypi/dateparser;
       license = licenses.bsd3;
       broken = true;
     };
@@ -4490,7 +4373,7 @@ in {
 
     meta = {
       description = "Powerful extensions to the standard datetime module";
-      homepage = http://pypi.python.org/pypi/python-dateutil;
+      homepage = https://pypi.python.org/pypi/python-dateutil;
       license = "BSD-style";
     };
   });
@@ -4526,7 +4409,7 @@ in {
     };
 
     meta = {
-      homepage = http://pypi.python.org/pypi/decorator;
+      homepage = https://pypi.python.org/pypi/decorator;
       description = "Better living through Python with decorators";
       license = licenses.mit;
     };
@@ -4742,7 +4625,7 @@ in {
     meta = {
       description = "Add flag to ignore unicode literal prefixes in doctests";
       license = with licenses; [ asl20 ];
-      homepage = http://github.com/gnublade/doctest-ignore-unicode;
+      homepage = https://github.com/gnublade/doctest-ignore-unicode;
     };
   };
 
@@ -4760,7 +4643,7 @@ in {
 
     meta = {
       description = "A 'dogpile' lock, typically used as a component of a larger caching solution";
-      homepage = http://bitbucket.org/zzzeek/dogpile.core;
+      homepage = https://bitbucket.org/zzzeek/dogpile.core;
       license = licenses.bsd3;
     };
   };
@@ -5463,7 +5346,7 @@ in {
 
     meta = {
       description = "An unofficial API for Google Play Music";
-      homepage = http://pypi.python.org/pypi/gmusicapi/;
+      homepage = https://pypi.python.org/pypi/gmusicapi/;
       license = licenses.bsd3;
     };
   };
@@ -6067,7 +5950,7 @@ in {
 
     meta = {
       description = "libthumbor is the python extension to thumbor";
-      homepage = http://github.com/heynemann/libthumbor;
+      homepage = https://github.com/heynemann/libthumbor;
       license = licenses.mit;
     };
   };
@@ -6510,7 +6393,7 @@ in {
 
     meta = {
       description = "Pattern matching and various utilities for file systems paths";
-      homepage = http://github.com/gorakhargosh/pathtools;
+      homepage = https://github.com/gorakhargosh/pathtools;
       license = licenses.mit;
       maintainers = with maintainers; [ goibhniu ];
     };
@@ -6772,7 +6655,7 @@ in {
     doCheck = false;
 
     meta = {
-      homepage = http://github.com/saghul/pycares;
+      homepage = https://github.com/saghul/pycares;
       description = "Interface for c-ares";
       license = licenses.mit;
     };
@@ -7554,7 +7437,7 @@ in {
 
     meta = {
       description = "Python API and shell utilities to monitor file system events";
-      homepage = http://github.com/gorakhargosh/watchdog;
+      homepage = https://github.com/gorakhargosh/watchdog;
       license = licenses.asl20;
       maintainers = with maintainers; [ goibhniu ];
     };
@@ -7606,7 +7489,7 @@ in {
 
     meta = {
       description = "Validate dicts against a schema";
-      homepage = http://github.com/sunlightlabs/validictory;
+      homepage = https://github.com/sunlightlabs/validictory;
       license = licenses.mit;
     };
   };
@@ -7973,7 +7856,7 @@ in {
 
     meta = {
       description = "django-taggit is a reusable Django application for simple tagging";
-      homepage = http://github.com/alex/django-taggit/tree/master/;
+      homepage = https://github.com/alex/django-taggit/tree/master/;
       license = licenses.bsd2;
       maintainers = with maintainers; [ desiderius ];
     };
@@ -8185,7 +8068,7 @@ in {
 
     meta = {
       description = "Add options to doctest examples while they are running";
-      homepage = http://pypi.python.org/pypi/dtopt;
+      homepage = https://pypi.python.org/pypi/dtopt;
     };
     # Test contain Python 2 print
     disabled = isPy3k;
@@ -8248,7 +8131,7 @@ in {
     propagatedBuildInputs = with self; [ ];
 
     meta = {
-      homepage = http://pypi.python.org/pypi/enum/;
+      homepage = https://pypi.python.org/pypi/enum/;
       description = "Robust enumerated type support in Python";
     };
   };
@@ -8362,7 +8245,7 @@ in {
       (with self; [ enum-compat ]) ;
 
     meta = {
-      homepage = http://pypi.python.org/pypi/eventlet/;
+      homepage = https://pypi.python.org/pypi/eventlet/;
       description = "A concurrent networking library for Python";
     };
   };
@@ -8384,7 +8267,7 @@ in {
   };
 
   fastimport = callPackage ../development/python-modules/fastimport { };
- 
+
   feedgen = callPackage ../development/python-modules/feedgen { };
 
   feedgenerator = callPackage ../development/python-modules/feedgenerator {
@@ -8951,7 +8834,7 @@ in {
         Python module that provides a simple interface to FUSE and MacFUSE.
         It's just one file and is implemented using ctypes.
       '';
-      homepage = http://github.com/terencehonles/fusepy;
+      homepage = https://github.com/terencehonles/fusepy;
       license = licenses.isc;
       platforms = platforms.unix;
       maintainers = with maintainers; [ nckx ];
@@ -8962,11 +8845,11 @@ in {
 
   futures = buildPythonPackage rec {
     name = "futures-${version}";
-    version = "3.0.5";
+    version = "3.1.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/f/futures/${name}.tar.gz";
-      sha256 = "1pw1z4329xvlabdpwqa6b7v2fxf7hl64m4cgr22ckbym8m8m4hh5";
+      sha256 = "1z9j05fdj2yszjmz4pmjhl2jdnwhdw80cjwfqq3ci0yx19gv9v2i";
     };
 
     # This module is for backporting functionality to Python 2.x, it's builtin in py3k
@@ -9102,7 +8985,7 @@ in {
     '';
 
     meta = {
-      homepage = http://github.com/gwik/geventhttpclient;
+      homepage = https://github.com/gwik/geventhttpclient;
       description = "HTTP client library for gevent";
       license = licenses.mit;
       maintainers = with maintainers; [ koral ];
@@ -9380,7 +9263,7 @@ in {
     '';
 
     meta = {
-      homepage = http://pypi.python.org/pypi/greenlet;
+      homepage = https://pypi.python.org/pypi/greenlet;
       description = "Module for lightweight in-process concurrent programming";
       license     = licenses.lgpl2;
       platforms   = platforms.all;
@@ -9658,7 +9541,7 @@ in {
     propagatedBuildInputs = with self; [ spark_parser xdis ];
     meta = {
       description = "Python cross-version byte-code deparser";
-      homepage = http://github.com/rocky/python-uncompyle6/;
+      homepage = https://github.com/rocky/python-uncompyle6/;
       license = licenses.mit;
     };
   };
@@ -9897,7 +9780,7 @@ in {
 
     meta = {
       description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting";
-      homepage = http://pypi.python.org/pypi/iptools;
+      homepage = https://pypi.python.org/pypi/iptools;
     };
   };
 
@@ -9916,7 +9799,7 @@ in {
 
     meta = {
       description = "Class and tools for handling of IPv4 and IPv6 addresses and networks";
-      homepage = http://pypi.python.org/pypi/IPy;
+      homepage = https://pypi.python.org/pypi/IPy;
     };
   };
 
@@ -10079,7 +9962,7 @@ in {
     buildInputs = with self; [ pytest unicodecsv ];
 
     meta = {
-      homepage = http://github.com/sunlightlabs/jellyfish;
+      homepage = https://github.com/sunlightlabs/jellyfish;
       description = "Approximate and phonetic matching of strings";
       maintainers = with maintainers; [ koral ];
     };
@@ -10793,7 +10676,7 @@ in {
 
     meta = {
       description = "A documentation builder";
-      homepage = http://pypi.python.org/pypi/manuel;
+      homepage = https://pypi.python.org/pypi/manuel;
       license = licenses.zpl20;
     };
   };
@@ -10981,7 +10864,7 @@ in {
 
     meta = {
       description = "A module for monitoring memory usage of a python program";
-      homepage = http://pypi.python.org/pypi/memory_profiler;
+      homepage = https://pypi.python.org/pypi/memory_profiler;
       license = licenses.bsd3;
     };
   };
@@ -11097,7 +10980,7 @@ in {
     meta = {
       description = "A dot-accessible dictionary (a la JavaScript objects)";
       license = licenses.mit;
-      homepage = http://github.com/Infinidat/munch;
+      homepage = https://github.com/Infinidat/munch;
     };
   };
 
@@ -11889,7 +11772,7 @@ in {
     meta = {
       description = "MySQL database binding for Python";
 
-      homepage = http://sourceforge.net/projects/mysql-python;
+      homepage = https://sourceforge.net/projects/mysql-python;
     };
   };
 
@@ -12315,7 +12198,7 @@ in {
     meta = {
       description = "Extends nose.plugins.cover to add Cobertura-style XML reports";
 
-      homepage = http://github.com/cmheisel/nose-xcover/;
+      homepage = https://github.com/cmheisel/nose-xcover/;
 
       license = licenses.bsd3;
     };
@@ -12699,7 +12582,7 @@ in {
 
     meta = {
       description = "A client library for OAuth 2.0";
-      homepage = http://github.com/google/oauth2client/;
+      homepage = https://github.com/google/oauth2client/;
       license = licenses.bsd2;
     };
   };
@@ -14284,7 +14167,7 @@ in {
     meta = {
       description = "Appendable key-value storage";
       license = with licenses; [ bsd3 ];
-      homepage = http://github.com/dask/partd/;
+      homepage = https://github.com/dask/partd/;
     };
   };
 
@@ -14867,7 +14750,7 @@ in {
 
     meta = {
       description = "Interface Python with pkg-config";
-      homepage = http://github.com/matze/pkgconfig;
+      homepage = https://github.com/matze/pkgconfig;
       license = licenses.mit;
     };
 
@@ -15835,7 +15718,7 @@ in {
 
     meta = {
       description = "Media Meta Data retrieval framework";
-      homepage = http://sourceforge.net/projects/mmpython/;
+      homepage = https://sourceforge.net/projects/mmpython/;
       license = licenses.gpl2;
       maintainers = with maintainers; [ ];
     };
@@ -16245,7 +16128,7 @@ in {
     '';
 
     meta = {
-      homepage = http://github.com/tobgu/pyrsistent/;
+      homepage = https://github.com/tobgu/pyrsistent/;
       description = "Persistent/Functional/Immutable data structures";
       license = licenses.mit;
       maintainers = with maintainers; [ desiderius ];
@@ -16380,7 +16263,7 @@ in {
     '';
 
     meta = {
-      homepage = http://github.com/ericflo/pynzb;
+      homepage = https://github.com/ericflo/pynzb;
       description = "Unified API for parsing NZB files";
       license = licenses.bsd3;
       maintainers = with maintainers; [ domenkozar ];
@@ -16708,7 +16591,7 @@ in {
     doCheck = false;
 
     meta = {
-      homepage = http://pypi.python.org/pypi/pyreport;
+      homepage = https://pypi.python.org/pypi/pyreport;
       license = "BSD";
       description = "Pyreport makes notes out of a python script";
     };
@@ -16942,7 +16825,7 @@ in {
 
     meta = {
       description = "A python client for Etcd";
-      homepage = http://github.com/jplana/python-etcd;
+      homepage = https://github.com/jplana/python-etcd;
       license = licenses.mit;
     };
   };
@@ -17148,37 +17031,7 @@ in {
     };
   };
 
-
-  reportlab =
-   let freetype = overrideDerivation pkgs.freetype (args: { dontDisableStatic = true; });
-   in buildPythonPackage rec {
-    name = "reportlab-3.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/reportlab/${name}.tar.gz";
-      sha256 = "14v212cq2w3p0j5xydfr8rav8c8qas1q845r0xj7fm6q5dk8grkj";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-    buildInputs = with self; [ freetype pillow pip pkgs.glibcLocales ];
-
-    patchPhase = ''
-      rm tests/test_graphics_barcode.py
-      rm tests/test_graphics_render.py
-    '';
-
-    checkPhase = ''
-      ${python.interpreter} tests/runAll.py
-    '';
-
-    # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
-    disabled = isPyPy;
-
-    meta = {
-      description = "An Open Source Python library for generating PDFs and graphics";
-      homepage = http://www.reportlab.com/;
-    };
-  };
+  reportlab = callPackage ../development/python-modules/reportlab { };
 
   requests2 = throw "requests2 has been deprecated. Use requests instead.";
 
@@ -17596,7 +17449,7 @@ in {
 
     meta = {
       description = "Python Tools for Robot Framework and Test Libraries";
-      homepage = http://bitbucket.org/userzimmermann/robotframework-tools;
+      homepage = https://bitbucket.org/userzimmermann/robotframework-tools;
       license = licenses.gpl3;
       platforms = platforms.linux;
     };
@@ -17843,38 +17696,7 @@ in {
     };
   };
 
-  s3transfer = buildPythonPackage rec {
-    version = "0.1.10";
-    name = "s3transfer-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/s3transfer/${name}.tar.gz";
-      sha256 = "1h8g9bknvxflxkpbnxyfxmk8pvgykbbk9ljdvhqh6z4vjc2926ms";
-    };
-
-    foo = 1;
-
-    propagatedBuildInputs =
-      [ self.botocore
-      ] ++ stdenv.lib.optional (pythonOlder "3") self.futures;
-
-    buildInputs = with self; [ docutils mock nose coverage wheel unittest2 ];
-
-    checkPhase = ''
-      pushd s3transfer/tests
-      nosetests -v unit/ functional/
-      popd
-    '';
-
-    # version on pypi has no tests/ dir
-    doCheck = false;
-
-    meta = {
-      homepage = https://github.com/boto/s3transfer;
-      license = stdenv.lib.licenses.asl20;
-      description = "A library for managing Amazon S3 transfers";
-    };
-  };
+  s3transfer = callPackage ../development/python-modules/s3transfer { };
 
   seqdiag = callPackage ../development/python-modules/seqdiag { };
 
@@ -17980,7 +17802,7 @@ in {
 
     meta = {
       description = "A library for testing interactive command-line applications";
-      homepage = http://pypi.python.org/pypi/ScriptTest/;
+      homepage = https://pypi.python.org/pypi/ScriptTest/;
     };
   };
 
@@ -18853,7 +18675,7 @@ in {
 
     meta = {
       description = "Python subprocess interface";
-      homepage = http://pypi.python.org/pypi/sh/;
+      homepage = https://pypi.python.org/pypi/sh/;
     };
   };
 
@@ -19084,7 +18906,7 @@ in {
     meta = {
       description = "Provides a Sphinx domain for describing RESTful HTTP APIs";
 
-      homepage = http://bitbucket.org/birkenfeld/sphinx-contrib;
+      homepage = https://bitbucket.org/birkenfeld/sphinx-contrib;
 
       license = "BSD";
     };
@@ -19102,7 +18924,7 @@ in {
 
     meta = {
       description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website";
-      homepage = http://bitbucket.org/prometheus/sphinxcontrib-newsfeed;
+      homepage = https://bitbucket.org/prometheus/sphinxcontrib-newsfeed;
       license = licenses.bsd2;
     };
   });
@@ -19122,7 +18944,7 @@ in {
 
     meta = {
       description = "Provides a Sphinx domain for embedding UML diagram with PlantUML";
-      homepage = http://bitbucket.org/birkenfeld/sphinx-contrib;
+      homepage = https://bitbucket.org/birkenfeld/sphinx-contrib;
       license = with licenses; [ bsd2 ];
     };
   });
@@ -19178,7 +19000,7 @@ in {
     meta = {
       description = "Setuptools command for uploading Sphinx documentation to PyPI";
 
-      homepage = http://bitbucket.org/jezdez/sphinx-pypi-upload/;
+      homepage = https://bitbucket.org/jezdez/sphinx-pypi-upload/;
 
       license = "BSD";
     };
@@ -19314,7 +19136,7 @@ in {
 
     meta = {
       description = "Lightweight and extensible STOMP messaging client";
-      homepage = http://bitbucket.org/hozn/stompclient;
+      homepage = https://bitbucket.org/hozn/stompclient;
       license = licenses.asl20;
     };
   });
@@ -19455,7 +19277,7 @@ in {
 
     meta = {
       description = "A Python library to create SVG drawings";
-      homepage = http://bitbucket.org/mozman/svgwrite;
+      homepage = https://bitbucket.org/mozman/svgwrite;
       license = licenses.mit;
     };
   };
@@ -19855,7 +19677,7 @@ in {
 
     meta = {
       description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
-      homepage = http://pypi.python.org/pypi/tmdb3;
+      homepage = https://pypi.python.org/pypi/tmdb3;
       license = licenses.bsd3;
     };
   };
@@ -19916,7 +19738,7 @@ in {
 
     meta = {
       description = "Explicitly typed attributes for Python";
-      homepage = http://pypi.python.org/pypi/traits;
+      homepage = https://pypi.python.org/pypi/traits;
       license = "BSD";
     };
   };
@@ -19938,7 +19760,7 @@ in {
 
     meta = {
       description = "Python implementation of the Transmission bittorent client RPC protocol";
-      homepage = http://pypi.python.org/pypi/transmissionrpc/;
+      homepage = https://pypi.python.org/pypi/transmissionrpc/;
       license = licenses.mit;
     };
   };
@@ -20222,7 +20044,7 @@ in {
 
     meta = {
       description = "A backport of the new features added to the unittest testing framework";
-      homepage = http://pypi.python.org/pypi/unittest2;
+      homepage = https://pypi.python.org/pypi/unittest2;
     };
   };
 
@@ -20882,7 +20704,7 @@ EOF
 
     meta = {
       description = "zbase32, a base32 encoder/decoder";
-      homepage = http://pypi.python.org/pypi/zbase32;
+      homepage = https://pypi.python.org/pypi/zbase32;
       license = "BSD";
     };
   });
@@ -20909,7 +20731,7 @@ EOF
 
     meta = {
       description = "A daemon process control library and tools for Unix-based systems";
-      homepage = http://pypi.python.org/pypi/zdaemon;
+      homepage = https://pypi.python.org/pypi/zdaemon;
       license = licenses.zpl20;
       maintainers = with maintainers; [ goibhniu ];
     };
@@ -21095,7 +20917,7 @@ EOF
 
     meta = {
       description = "An event publishing system";
-      homepage = http://pypi.python.org/pypi/zope.event;
+      homepage = https://pypi.python.org/pypi/zope.event;
       license = licenses.zpl20;
       maintainers = with maintainers; [ goibhniu ];
     };
@@ -21118,7 +20940,7 @@ EOF
 
      meta = {
        description = "Exception interfaces and implementations";
-       homepage = http://pypi.python.org/pypi/zope.exceptions;
+       homepage = https://pypi.python.org/pypi/zope.exceptions;
        license = licenses.zpl20;
        maintainers = with maintainers; [ goibhniu ];
      };
@@ -21307,7 +21129,7 @@ EOF
     propagatedBuildInputs = with self; [ hglib ];
 
     meta = {
-      homepage = http://pypi.python.org/pypi/hgsvn;
+      homepage = https://pypi.python.org/pypi/hgsvn;
     };
   };
 
@@ -21796,7 +21618,7 @@ EOF
     };
 
     meta = {
-      homepage = http://pypi.python.org/pypi/ujson;
+      homepage = https://pypi.python.org/pypi/ujson;
       description = "Ultra fast JSON encoder and decoder for Python";
       license = licenses.bsd3;
     };
@@ -21826,7 +21648,7 @@ EOF
 
     meta = {
       description = "Python package to control BlinkStick USB devices";
-      homepage = http://pypi.python.org/pypi/BlinkStick/;
+      homepage = https://pypi.python.org/pypi/BlinkStick/;
       license = licenses.bsd3;
       maintainers = with maintainers; [ np ];
     };
@@ -22797,7 +22619,7 @@ EOF
 
     meta = {
       description = "DataDiff";
-      homepage = http://sourceforge.net/projects/datadiff/;
+      homepage = https://sourceforge.net/projects/datadiff/;
       license = licenses.asl20;
     };
   };
@@ -22812,7 +22634,7 @@ EOF
 
     meta = {
       description = "Termcolor";
-      homepage = http://pypi.python.org/pypi/termcolor;
+      homepage = https://pypi.python.org/pypi/termcolor;
       license = licenses.mit;
     };
   };
@@ -23523,7 +23345,7 @@ EOF
 
     meta = with stdenv.lib; {
       description = "Terminal based YouTube player and downloader";
-      homepage = http://github.com/np1/mps-youtube;
+      homepage = https://github.com/np1/mps-youtube;
       license = licenses.gpl3;
       maintainers = with maintainers; [ odi ];
     };
@@ -23606,7 +23428,7 @@ EOF
 
     meta = {
       description = "Python Import Magic - automagically add, remove and manage imports";
-      homepage = http://github.com/alecthomas/importmagic;
+      homepage = https://github.com/alecthomas/importmagic;
       license = "bsd";
     };
   };
@@ -23663,7 +23485,7 @@ EOF
       sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f";
     };
     meta = {
-      homepage = http://bitbucket.org/thomaswaldmann/xstatic;
+      homepage = https://bitbucket.org/thomaswaldmann/xstatic;
       description = "Base packaged static files for python";
       license = licenses.mit;
       maintainers = [ maintainers.makefu ];