From e57deab6d04dc351f413c42d87bf71a2efe7b967 Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Thu, 1 Jun 2017 13:57:39 -0700
Subject: [PATCH 01/63] gh-ost: init at 1.0.36

---
 pkgs/tools/misc/gh-ost/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/misc/gh-ost/default.nix

diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
new file mode 100644
index 000000000000..24841a2bac79
--- /dev/null
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+let
+  goPackagePath = "github.com/github/gh-ost";
+  version = "1.0.36";
+  sha256 = "0qa7k50bf87bx7sr6iwqri8l49f811gs0bj3ivslxfibcs1z5d4h";
+
+in {
+  gh-ost = buildGoPackage ({
+    name = "gh-ost-${version}";
+    inherit goPackagePath;
+
+    src = fetchFromGitHub {
+      owner = "github";
+      repo  = "gh-ost";
+      rev   = "v${version}";
+      inherit sha256;
+    };
+
+    meta = with stdenv.lib; {
+      description = "Triggerless online schema migration solution for MySQL";
+      homepage = https://github.com/github/gh-ost;
+      license = licenses.mit;
+      platforms = platforms.linux;
+    };
+  });
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a40e8e38d994..5a9d8e0b1b3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -999,6 +999,8 @@ with pkgs;
 
   genromfs = callPackage ../tools/filesystems/genromfs { };
 
+  gh-ost = callPackage ../tools/misc/gh-ost { };
+
   gist = callPackage ../tools/text/gist { };
 
   glide = callPackage ../development/tools/glide { };

From 488db3d392856d841b72986700fc572306972da0 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Mon, 17 Jul 2017 12:32:16 +0900
Subject: [PATCH 02/63] mathematica: fix library paths

---
 pkgs/applications/science/math/mathematica/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 1a9adcd4782f..6191af85bd10 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
     unixODBC
     libxml2
     libuuid
+    zlib
   ] ++ (with xorg; [
     libX11
     libXext
@@ -93,6 +94,12 @@ stdenv.mkDerivation rec {
 
     echo "=== Running MathInstaller ==="
     ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent
+
+    # Fix library paths
+    cd $out/libexec/Mathematica/Executables
+    for path in mathematica MathKernel Mathematica WolframKernel wolfram; do
+      sed -i -e 's/export LD_LIBRARY_PATH/export LD_LIBRARY_PATH=${builtins.replaceStrings ["/"] ["\\/"] "${zlib}/lib"}:\''${LD_LIBRARY_PATH}/' $path
+    done
   '';
 
   preFixup = ''

From 7aaea7297e4a6be6e0e5bd3788df599d0b1cdac8 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Wed, 19 Jul 2017 15:18:44 +0900
Subject: [PATCH 03/63] Simplify the sed script

---
 pkgs/applications/science/math/mathematica/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 6191af85bd10..d2c62cdf21d5 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
     # Fix library paths
     cd $out/libexec/Mathematica/Executables
     for path in mathematica MathKernel Mathematica WolframKernel wolfram; do
-      sed -i -e 's/export LD_LIBRARY_PATH/export LD_LIBRARY_PATH=${builtins.replaceStrings ["/"] ["\\/"] "${zlib}/lib"}:\''${LD_LIBRARY_PATH}/' $path
+      sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path
     done
   '';
 

From fb2302e115b518ccb5349ac3a4827a3cbdb38640 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Wed, 19 Jul 2017 17:39:36 +0900
Subject: [PATCH 04/63] Add missing 'math'

---
 pkgs/applications/science/math/mathematica/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index d2c62cdf21d5..10737a92f8c2 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
 
     # Fix library paths
     cd $out/libexec/Mathematica/Executables
-    for path in mathematica MathKernel Mathematica WolframKernel wolfram; do
+    for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do
       sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path
     done
   '';

From 09e0cc7cc79cd0e028a56907ddcf36f9bdef1540 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Wed, 2 Aug 2017 23:50:51 +0200
Subject: [PATCH 05/63] Update homepage attributes: http -> https Homepage link
 "http://.../" is a permanent redirect to "https://.../" and should be updated
 https://repology.org/repository/nix_stable/problems

---
 pkgs/applications/audio/flac/default.nix             |  2 +-
 pkgs/applications/audio/fldigi/default.nix           |  2 +-
 pkgs/applications/audio/iannix/default.nix           |  2 +-
 pkgs/applications/audio/mp3splt/default.nix          |  2 +-
 pkgs/applications/editors/aseprite/default.nix       |  2 +-
 pkgs/applications/editors/focuswriter/default.nix    |  2 +-
 pkgs/applications/graphics/fontmatrix/default.nix    |  2 +-
 pkgs/applications/graphics/freecad/default.nix       |  2 +-
 pkgs/applications/graphics/gimp/2.8.nix              |  2 +-
 pkgs/applications/misc/cdrtools/default.nix          |  2 +-
 pkgs/applications/misc/dockbarx/default.nix          |  2 +-
 pkgs/applications/misc/far2l/default.nix             |  2 +-
 pkgs/applications/misc/gammu/default.nix             |  2 +-
 pkgs/applications/misc/girara/default.nix            |  2 +-
 pkgs/applications/misc/gmrun/default.nix             |  2 +-
 pkgs/applications/misc/gpsprune/default.nix          |  2 +-
 pkgs/applications/misc/keepassx/2.0.nix              |  2 +-
 pkgs/applications/misc/keepassx/default.nix          |  2 +-
 .../networking/browsers/dillo/default.nix            |  2 +-
 .../networking/browsers/jumanji/default.nix          |  2 +-
 .../networking/feedreaders/canto-curses/default.nix  |  2 +-
 .../networking/feedreaders/canto-daemon/default.nix  |  2 +-
 pkgs/applications/networking/flexget/default.nix     |  2 +-
 .../networking/ftp/filezilla/default.nix             |  2 +-
 pkgs/applications/networking/ids/bro/default.nix     |  2 +-
 .../instant-messengers/bitlbee/default.nix           |  2 +-
 pkgs/applications/networking/irc/hexchat/default.nix |  2 +-
 pkgs/applications/networking/p2p/gnunet/default.nix  |  2 +-
 pkgs/applications/networking/p2p/gnunet/svn.nix      |  2 +-
 pkgs/applications/science/logic/alt-ergo/default.nix |  2 +-
 .../git-and-tools/cgit/default.nix                   |  2 +-
 .../version-management/git-and-tools/git/default.nix |  2 +-
 .../version-management/git-up/default.nix            |  2 +-
 pkgs/applications/video/coriander/default.nix        |  2 +-
 pkgs/applications/video/dvb-apps/default.nix         |  2 +-
 pkgs/applications/video/kodi/default.nix             |  2 +-
 pkgs/applications/video/kodi/plugins.nix             | 12 ++++++------
 pkgs/applications/virtualization/docker/default.nix  |  2 +-
 pkgs/applications/window-managers/bspwm/default.nix  |  2 +-
 pkgs/applications/window-managers/compiz/default.nix |  2 +-
 pkgs/applications/window-managers/i3/lock-color.nix  |  2 +-
 pkgs/applications/window-managers/i3/lock.nix        |  2 +-
 pkgs/build-support/fetchurl/mirrors.nix              |  2 +-
 pkgs/data/documentation/man-pages/default.nix        |  2 +-
 pkgs/data/fonts/anonymous-pro/default.nix            |  2 +-
 pkgs/data/fonts/iosevka/default.nix                  |  2 +-
 pkgs/data/fonts/kawkab-mono/default.nix              |  2 +-
 pkgs/data/fonts/open-dyslexic/default.nix            |  2 +-
 pkgs/data/fonts/opensans-ttf/default.nix             |  2 +-
 pkgs/data/fonts/source-code-pro/default.nix          |  2 +-
 pkgs/data/icons/hicolor-icon-theme/default.nix       |  2 +-
 pkgs/data/misc/cacert/default.nix                    |  2 +-
 pkgs/desktops/gnome-2/desktop/vte/default.nix        |  2 +-
 pkgs/desktops/gnome-2/platform/gtkglext/default.nix  |  2 +-
 pkgs/desktops/gnome-3/3.22/core/evince/default.nix   |  2 +-
 pkgs/desktops/gnome-3/3.22/core/gconf/default.nix    |  2 +-
 .../gnome-3/3.22/core/gnome-disk-utility/default.nix |  2 +-
 .../gnome-3/3.22/core/gnome-screenshot/default.nix   |  2 +-
 pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix         |  2 +-
 pkgs/desktops/gnome-3/3.22/core/vte/default.nix      |  2 +-
 pkgs/development/compilers/ccl/default.nix           |  2 +-
 pkgs/development/compilers/edk2/default.nix          |  2 +-
 .../compilers/elm/packages/elm-package.nix           |  2 +-
 pkgs/development/compilers/gnu-cobol/default.nix     |  2 +-
 pkgs/development/compilers/julia/0.5.nix             |  2 +-
 pkgs/development/compilers/julia/default.nix         |  2 +-
 pkgs/development/compilers/julia/git.nix             |  2 +-
 .../development/haskell-modules/hackage-packages.nix |  6 +++---
 pkgs/development/interpreters/clojure/default.nix    |  2 +-
 .../interpreters/elixir/generic-builder.nix          |  2 +-
 pkgs/development/libraries/blitz/default.nix         |  2 +-
 pkgs/development/libraries/buddy/default.nix         |  2 +-
 pkgs/development/libraries/cfitsio/default.nix       |  2 +-
 pkgs/development/libraries/chromaprint/default.nix   |  2 +-
 pkgs/development/libraries/cppunit/default.nix       |  2 +-
 pkgs/development/libraries/exempi/default.nix        |  2 +-
 pkgs/development/libraries/fdk-aac/default.nix       |  2 +-
 pkgs/development/libraries/ffms/default.nix          |  2 +-
 pkgs/development/libraries/ftgl/2.1.2.nix            |  2 +-
 pkgs/development/libraries/ftgl/default.nix          |  2 +-
 pkgs/development/libraries/git2/default.nix          |  2 +-
 pkgs/development/libraries/glib/default.nix          |  2 +-
 pkgs/development/libraries/glibmm/default.nix        |  2 +-
 pkgs/development/libraries/gmp/4.3.2.nix             |  2 +-
 pkgs/development/libraries/gmp/5.1.x.nix             |  2 +-
 pkgs/development/libraries/gmp/6.x.nix               |  2 +-
 pkgs/development/libraries/gnu-efi/default.nix       |  2 +-
 .../libraries/gstreamer/gstreamermm/default.nix      |  2 +-
 .../libraries/gstreamer/legacy/gnonlin/default.nix   |  2 +-
 .../gstreamer/legacy/gst-ffmpeg/default.nix          |  2 +-
 .../gstreamer/legacy/gstreamermm/default.nix         |  2 +-
 .../libraries/gstreamer/libav/default.nix            |  2 +-
 pkgs/development/libraries/gtk+/2.x.nix              |  2 +-
 pkgs/development/libraries/gtk+/3.x.nix              |  2 +-
 pkgs/development/libraries/gtkmm/2.x.nix             |  2 +-
 pkgs/development/libraries/gtkmm/3.x.nix             |  2 +-
 pkgs/development/libraries/gusb/default.nix          |  2 +-
 pkgs/development/libraries/hunspell/dictionaries.nix |  4 ++--
 pkgs/development/libraries/libao/default.nix         |  2 +-
 pkgs/development/libraries/libav/default.nix         |  2 +-
 pkgs/development/libraries/libavc1394/default.nix    |  2 +-
 pkgs/development/libraries/libbap/default.nix        |  2 +-
 pkgs/development/libraries/libbsd/default.nix        |  2 +-
 pkgs/development/libraries/libcue/default.nix        |  2 +-
 pkgs/development/libraries/libdap/default.nix        |  2 +-
 pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix |  2 +-
 pkgs/development/libraries/libdc1394/default.nix     |  2 +-
 pkgs/development/libraries/libdrm/default.nix        |  2 +-
 pkgs/development/libraries/libdv/default.nix         |  2 +-
 pkgs/development/libraries/libeatmydata/default.nix  |  2 +-
 pkgs/development/libraries/libebml/default.nix       |  2 +-
 pkgs/development/libraries/libewf/default.nix        |  2 +-
 pkgs/development/libraries/libffcall/default.nix     |  2 +-
 pkgs/development/libraries/libftdi/1.x.nix           |  2 +-
 pkgs/development/libraries/libftdi/default.nix       |  2 +-
 pkgs/development/libraries/libgeotiff/default.nix    |  2 +-
 pkgs/development/libraries/libgsf/default.nix        |  2 +-
 pkgs/development/libraries/libibmad/default.nix      |  2 +-
 pkgs/development/libraries/libibumad/default.nix     |  2 +-
 pkgs/development/libraries/liblastfm/default.nix     |  2 +-
 pkgs/development/libraries/libmad/default.nix        |  2 +-
 pkgs/development/libraries/libmatroska/default.nix   |  2 +-
 pkgs/development/libraries/libmesode/default.nix     |  2 +-
 pkgs/development/libraries/libmp3splt/default.nix    |  2 +-
 pkgs/development/libraries/libmspack/default.nix     |  2 +-
 pkgs/development/libraries/libnet/default.nix        |  2 +-
 pkgs/development/libraries/libnice/default.nix       |  2 +-
 pkgs/development/libraries/libogg/default.nix        |  2 +-
 pkgs/development/libraries/liboggz/default.nix       |  2 +-
 .../libraries/libomxil-bellagio/default.nix          |  2 +-
 pkgs/development/libraries/libplist/default.nix      |  2 +-
 pkgs/development/libraries/libqrencode/default.nix   |  2 +-
 pkgs/development/libraries/libraw/default.nix        |  2 +-
 pkgs/development/libraries/librdf/default.nix        |  2 +-
 pkgs/development/libraries/mesa-glu/default.nix      |  2 +-
 .../libraries/science/math/arpack/default.nix        |  2 +-
 pkgs/development/libraries/utf8proc/default.nix      |  2 +-
 .../tools/build-managers/bazel/default.nix           |  2 +-
 .../tools/build-managers/leiningen/default.nix       |  2 +-
 pkgs/development/tools/dcadec/default.nix            |  2 +-
 .../tools/documentation/gtk-doc/default.nix          |  2 +-
 pkgs/development/tools/misc/automoc4/default.nix     |  2 +-
 pkgs/development/tools/misc/avarice/default.nix      |  2 +-
 pkgs/development/tools/misc/cbrowser/default.nix     |  2 +-
 .../development/tools/misc/checkbashisms/default.nix |  2 +-
 pkgs/development/tools/misc/drush/default.nix        |  2 +-
 pkgs/development/tools/misc/eggdbus/default.nix      |  2 +-
 pkgs/development/tools/misc/intltool/default.nix     |  2 +-
 pkgs/development/web/grails/default.nix              |  2 +-
 pkgs/games/0ad/data.nix                              |  2 +-
 pkgs/games/0ad/game.nix                              |  2 +-
 pkgs/games/btanks/default.nix                        |  2 +-
 pkgs/games/extremetuxracer/default.nix               |  2 +-
 pkgs/games/quake3/ioquake/default.nix                |  2 +-
 pkgs/misc/drivers/gutenprint/default.nix             |  2 +-
 pkgs/misc/emulators/higan/default.nix                |  2 +-
 pkgs/misc/emulators/retroarch/cores.nix              |  2 +-
 pkgs/misc/ghostscript/default.nix                    |  2 +-
 pkgs/misc/themes/blackbird/default.nix               |  2 +-
 pkgs/os-specific/linux/acpi/default.nix              |  2 +-
 pkgs/os-specific/linux/batman-adv/alfred.nix         |  2 +-
 pkgs/os-specific/linux/batman-adv/batctl.nix         |  2 +-
 pkgs/os-specific/linux/batman-adv/default.nix        |  2 +-
 pkgs/os-specific/linux/busybox/default.nix           |  2 +-
 pkgs/os-specific/linux/edac-utils/default.nix        |  2 +-
 pkgs/os-specific/linux/eudev/default.nix             |  2 +-
 pkgs/os-specific/linux/firejail/default.nix          |  2 +-
 pkgs/os-specific/linux/hdparm/default.nix            |  2 +-
 pkgs/os-specific/linux/ima-evm-utils/default.nix     |  2 +-
 pkgs/os-specific/linux/jfbview/default.nix           |  2 +-
 pkgs/os-specific/linux/kernel/manual-config.nix      |  2 +-
 pkgs/os-specific/linux/kmod/default.nix              |  2 +-
 pkgs/os-specific/linux/v4l-utils/default.nix         |  2 +-
 pkgs/servers/brickd/default.nix                      |  2 +-
 pkgs/servers/consul/ui.nix                           |  2 +-
 pkgs/servers/emby/default.nix                        |  2 +-
 pkgs/servers/fleet/default.nix                       |  2 +-
 pkgs/servers/mpd/clientlib.nix                       |  2 +-
 pkgs/servers/sip/freeswitch/default.nix              |  2 +-
 pkgs/tools/X11/bumblebee/default.nix                 |  2 +-
 pkgs/tools/X11/hsetroot/default.nix                  |  2 +-
 pkgs/tools/archivers/cabextract/default.nix          |  2 +-
 pkgs/tools/audio/acoustid-fingerprinter/default.nix  |  2 +-
 pkgs/tools/compression/dtrx/default.nix              |  2 +-
 pkgs/tools/filesystems/bcache-tools/default.nix      |  2 +-
 pkgs/tools/filesystems/dosfstools/default.nix        |  2 +-
 pkgs/tools/graphics/briss/default.nix                |  2 +-
 pkgs/tools/graphics/cfdg/default.nix                 |  4 ++--
 pkgs/tools/graphics/cfdg/src-info-for-default.nix    |  2 +-
 pkgs/tools/graphics/editres/default.nix              |  2 +-
 pkgs/tools/graphics/pngtoico/default.nix             |  2 +-
 pkgs/tools/graphics/qrencode/default.nix             |  2 +-
 pkgs/tools/misc/aescrypt/default.nix                 |  2 +-
 pkgs/tools/misc/autorandr/default.nix                |  2 +-
 pkgs/tools/misc/fluentd/default.nix                  |  2 +-
 pkgs/tools/misc/hakuneko/default.nix                 |  2 +-
 pkgs/tools/misc/hdf5/default.nix                     |  2 +-
 pkgs/tools/misc/mstflint/default.nix                 |  2 +-
 pkgs/tools/networking/curl/default.nix               |  4 ++--
 pkgs/tools/networking/dhcpcd/default.nix             |  2 +-
 pkgs/tools/networking/email/default.nix              |  2 +-
 pkgs/tools/networking/httpie/default.nix             |  2 +-
 pkgs/tools/networking/hyenae/default.nix             |  2 +-
 pkgs/tools/networking/iperf/2.nix                    |  2 +-
 pkgs/tools/networking/tftp-hpa/default.nix           |  4 ++--
 pkgs/tools/package-management/dpkg/default.nix       |  2 +-
 pkgs/tools/security/hashcat/default.nix              |  2 +-
 pkgs/tools/security/hashcat/hashcat3/default.nix     |  2 +-
 pkgs/tools/system/at/default.nix                     |  2 +-
 pkgs/tools/system/datefudge/default.nix              |  2 +-
 pkgs/tools/system/dfc/default.nix                    |  2 +-
 pkgs/tools/text/colordiff/default.nix                |  2 +-
 pkgs/tools/typesetting/fop/default.nix               |  2 +-
 pkgs/tools/typesetting/halibut/default.nix           |  4 ++--
 pkgs/top-level/dotnet-packages.nix                   |  2 +-
 pkgs/top-level/python-packages.nix                   |  2 +-
 216 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 52e29e3da4c8..9805232316e6 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" "doc" ];
 
   meta = with stdenv.lib; {
-    homepage = http://xiph.org/flac/;
+    homepage = https://xiph.org/flac/;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
     platforms = platforms.all;
     maintainers = [ maintainers.mornfall ];
diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 2ee03a3f3991..545e7c5047a9 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Digital modem program";
-    homepage = http://sourceforge.net/projects/fldigi/;
+    homepage = https://sourceforge.net/projects/fldigi/;
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index d72a2b13c42d..d56ac7534053 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Graphical open-source sequencer,";
-    homepage = http://www.iannix.org/;
+    homepage = https://www.iannix.org/;
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.nico202 ];
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix
index 0fa9022f67bc..f2922e7eecf9 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/pkgs/applications/audio/mp3splt/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
-    homepage = http://sourceforge.net/projects/mp3splt/;
+    homepage = https://sourceforge.net/projects/mp3splt/;
     license = licenses.gpl2;
     maintainers = [ maintainers.bosu ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 51a2a874f234..9945fd53719b 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Animated sprite editor & pixel art tool";
-    homepage = http://www.aseprite.org/;
+    homepage = https://www.aseprite.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 6ad92b109dd7..28106cf876bd 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.madjar ];
     platforms = stdenv.lib.platforms.all;
-    homepage = http://gottcode.org/focuswriter/;
+    homepage = https://gottcode.org/focuswriter/;
   };
 }
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index ced6a5f7258a..8ca093b90c3e 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
-    homepage = http://github.com/fontmatrix/fontmatrix;
+    homepage = https://github.com/fontmatrix/fontmatrix;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 6b49f975b1b6..80f893e7c3c9 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
-    homepage = http://www.freecadweb.org/;
+    homepage = https://www.freecadweb.org/;
     license = licenses.lgpl2Plus;
     maintainers = [ maintainers.viric ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 47004a025009..ff87b70a0c1e 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "The GNU Image Manipulation Program";
-    homepage = http://www.gimp.org/;
+    homepage = https://www.gimp.org/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index be6989b7e33a..a46565eb76ba 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/cdrtools/;
+    homepage = https://sourceforge.net/projects/cdrtools/;
     description = "Highly portable CD/DVD/BluRay command line recording software";
     license = with licenses; [ gpl2 lgpl2 cddl ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix
index 60bd5134e8ac..cfe76701cebb 100644
--- a/pkgs/applications/misc/dockbarx/default.nix
+++ b/pkgs/applications/misc/dockbarx/default.nix
@@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
     ++ [ keybinder ];
 
   meta = with stdenv.lib; {
-    homepage = http://launchpad.net/dockbar/;
+    homepage = https://launchpad.net/dockbar/;
     description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 87709ec102bf..7f5b7a89358f 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An orthodox file manager";
-    homepage = http://github.com/elfmz/far2l;
+    homepage = https://github.com/elfmz/far2l;
     license = licenses.gpl2;
     maintainers = [ maintainers.volth ];
     platforms = platforms.all;
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 10ce0c177589..939b38ca29f7 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://wammu.eu/gammu/;
+    homepage = https://wammu.eu/gammu/;
     description = "Command line utility and library to control mobile phones";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 7585ef6710a3..cef8640d958f 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://pwmt.org/projects/girara/;
+    homepage = https://pwmt.org/projects/girara/;
     description = "User interface library";
     longDescription = ''
       girara is a library that implements a GTK+ based VIM-like user interface
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 025be1e45641..3be2704896ed 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       Also, supports CTRL-R / CTRL-S / "!" for searching through history.
       Running commands in a terminal with CTRL-Enter. URL handlers.
     '';
-    homepage = http://sourceforge.net/projects/gmrun/;
+    homepage = https://sourceforge.net/projects/gmrun/;
     license = "GPL";
     maintainers = [];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 07fcf31ed263..a51ec8c1b044 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Application for viewing, editing and converting GPS coordinate data";
-    homepage = http://activityworkshop.net/software/gpsprune/;
+    homepage = https://activityworkshop.net/software/gpsprune/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
     platforms = platforms.all;
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 030b1d326e1d..f6814119b5a7 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt password manager compatible with its Win32 and Pocket PC versions";
-    homepage = http://www.keepassx.org/;
+    homepage = https://www.keepassx.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index d0bddbc16102..ed706b138cc5 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt password manager compatible with its Win32 and Pocket PC versions";
-    homepage = http://www.keepassx.org/;
+    homepage = https://www.keepassx.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index a54e5e0c3701..b056bdedb41e 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configureFlags =  "--enable-ssl";
 
   meta = with stdenv.lib; {
-    homepage = http://www.dillo.org/;
+    homepage = https://www.dillo.org/;
     description = "A fast graphical web browser with a small footprint";
     longDescription = ''
       Dillo is a small, fast web browser, tailored for older machines.
diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
index b1d77afa8f1f..7383e0ec0445 100644
--- a/pkgs/applications/networking/browsers/jumanji/default.nix
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Minimal web browser";
-    homepage = http://pwmt.org/projects/jumanji/;
+    homepage = https://pwmt.org/projects/jumanji/;
     platforms = platforms.all;
     maintainers = [ maintainers.koral ];
   };
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 3db20d3de4c1..438efdc813ce 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -24,7 +24,7 @@ python34Packages.buildPythonApplication rec {
       unreadable white text. An interface with almost infinite customization
       and extensibility using the excellent Python programming language.
     '';
-    homepage = http://codezen.org/canto-ng/;
+    homepage = https://codezen.org/canto-ng/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.devhell ];
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index 18837299e93e..c50647ac7b05 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -24,7 +24,7 @@ python34Packages.buildPythonApplication rec {
       unreadable white text. An interface with almost infinite customization
       and extensibility using the excellent Python programming language.
     '';
-    homepage = http://codezen.org/canto-ng/;
+    homepage = https://codezen.org/canto-ng/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.devhell ];
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 6c3731b82a41..814f6bb5548e 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -53,7 +53,7 @@ buildPythonApplication rec {
   ++ lib.optional (transmission != null) transmissionrpc;
 
   meta = {
-    homepage = http://flexget.com/;
+    homepage = https://flexget.com/;
     description = "Multipurpose automation tool for content like torrents";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ domenkozar tari ];
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index dcd143a51560..37dcd00fd02d 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     pugixml libfilezilla nettle ];
 
   meta = with stdenv.lib; {
-    homepage = http://filezilla-project.org/;
+    homepage = https://filezilla-project.org/;
     description = "Graphical FTP, FTPS and SFTP client";
     license = licenses.gpl2;
     longDescription = ''
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 946d0dedba0c..4117d409b935 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Powerful network analysis framework that is much different from the typical IDS you may know";
-    homepage = http://www.bro.org/;
+    homepage = https://www.bro.org/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; linux;
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index abb0a1172973..fa1c64ba0ad7 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       Messenger, AIM and ICQ.
     '';
 
-    homepage = http://www.bitlbee.org/;
+    homepage = https://www.bitlbee.org/;
     license = licenses.gpl2Plus;
 
     maintainers = with maintainers; [ wkennington pSub ];
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index f8acc1807000..baa0b10fd756 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A popular and easy to use graphical IRC (chat) client";
-    homepage = http://hexchat.github.io/;
+    homepage = https://hexchat.github.io/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo jgeerds ];
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 6b91956e5e39..d18342177243 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
       network are rewarded with better service.
     '';
 
-    homepage = http://gnunet.org/;
+    homepage = https://gnunet.org/;
 
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
index be385c5bc8b9..8c8d95169c87 100644
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
       network are rewarded with better service.
     '';
 
-    homepage = http://gnunet.org/;
+    homepage = https://gnunet.org/;
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 7cf0aeb203de..b2495a4a5932 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-performance theorem prover and SMT solver";
-    homepage    = "http://alt-ergo.ocamlpro.com/";
+    homepage    = "https://alt-ergo.ocamlpro.com/";
     license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index e7511e10d40e..518db7708b7f 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://git.zx2c4.com/cgit/about/;
+    homepage = https://git.zx2c4.com/cgit/about/;
     repositories.git = git://git.zx2c4.com/cgit;
     description = "Web frontend for git repositories";
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index aa8ab0084038..7219b4781ae2 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -198,7 +198,7 @@ EOF
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://git-scm.com/;
+    homepage = https://git-scm.com/;
     description = "Distributed version control system";
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index c93ee9244663..4b6ba9398b48 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -26,7 +26,7 @@ python2Packages.buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/msiemens/PyGitUp;
+    homepage = https://github.com/msiemens/PyGitUp;
     description = "A git pull replacement that rebases all local branches when pulling.";
     license = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
index 6eb9e94e9695..60c31cf07f92 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/pkgs/applications/video/coriander/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ];
   
   meta = {
-    homepage = http://damien.douxchamps.net/ieee1394/coriander/;
+    homepage = https://damien.douxchamps.net/ieee1394/coriander/;
     description = "GUI for controlling a Digital Camera through the IEEE1394 bus";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix
index 5e8e63564f4f..8ceb7875be4d 100644
--- a/pkgs/applications/video/dvb-apps/default.nix
+++ b/pkgs/applications/video/dvb-apps/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Linux DVB API applications and utilities";
-    homepage = http://linuxtv.org/;
+    homepage = https://linuxtv.org/;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 33e64c65cf42..09cdf20ace0b 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -138,7 +138,7 @@ in stdenv.mkDerivation rec {
     '';
 
     meta = with stdenv.lib; {
-      homepage = http://kodi.tv/;
+      homepage = https://kodi.tv/;
       description = "Media center";
       license = licenses.gpl2;
       platforms = platforms.linux;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 6897f9df1a1f..0500fc14586c 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -19,7 +19,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=85724;
+      homepage = https://forum.kodi.tv/showthread.php?tid=85724;
       description = "A program launcher for Kodi";
       longDescription = ''
         Advanced Launcher allows you to start any Linux, Windows and
@@ -49,7 +49,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=287826;
+      homepage = https://forum.kodi.tv/showthread.php?tid=287826;
       description = "A program launcher for Kodi";
       longDescription = ''
         Advanced Emulator Launcher is a multi-emulator front-end for Kodi
@@ -129,7 +129,7 @@ rec {
       sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
     };
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=258159;
+      homepage = https://forum.kodi.tv/showthread.php?tid=258159;
       description = "A ROM launcher for Kodi that uses HyperSpin assets.";
       maintainers = with maintainers; [ edwtjo ];
     };
@@ -184,7 +184,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=67110;
+      homepage = https://forum.kodi.tv/showthread.php?tid=67110;
       description = "Watch content from SVT Play";
       longDescription = ''
         With this addon you can stream content from SVT Play
@@ -234,7 +234,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=157499;
+      homepage = https://forum.kodi.tv/showthread.php?tid=157499;
       description = "Launch Steam in Big Picture Mode from Kodi";
       longDescription = ''
         This add-on will close/minimise Kodi, launch Steam in Big
@@ -263,7 +263,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = http://forum.kodi.tv/showthread.php?tid=187421;
+      homepage = https://forum.kodi.tv/showthread.php?tid=187421;
       descritpion = "A comic book reader";
       maintainers = with maintainers; [ edwtjo ];
     };
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c42b2a098f79..719762b9d177 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -161,7 +161,7 @@ rec {
     '';
 
     meta = {
-      homepage = http://www.docker.com/;
+      homepage = https://www.docker.com/;
       description = "An open source project to pack, ship and run any application as a lightweight container";
       license = licenses.asl20;
       maintainers = with maintainers; [ offline tailhook vdemeester ];
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 83e1ea3e88d2..16c624b09ccf 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tiling window manager based on binary space partitioning";
-    homepage = http://github.com/baskerville/bspwm;
+    homepage = https://github.com/baskerville/bspwm;
     maintainers = with maintainers; [ meisternu epitrochoid ];
     license = licenses.bsd2;
     platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index dc6c30d00e47..412cdf91e0bf 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Compoziting window manager";
-    homepage = http://launchpad.net/compiz/;
+    homepage = https://launchpad.net/compiz/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index ade6182ec7b0..fd47a104326e 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "A simple screen locker like slock";
-    homepage = http://i3wm.org/i3lock/;
+    homepage = https://i3wm.org/i3lock/;
     maintainers = with maintainers; [ garbas malyn ];
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 9d7b45025654..a979797d0801 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A simple screen locker like slock";
-    homepage = http://i3wm.org/i3lock/;
+    homepage = https://i3wm.org/i3lock/;
     maintainers = with maintainers; [ garbas malyn domenkozar ];
     license = licenses.bsd3;
     platforms = platforms.all;
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 41bfc84c247b..4861d4b7c353 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -132,7 +132,7 @@ rec {
     http://ftp.riken.jp/net/samba
   ];
 
-  # BitlBee mirrors, see http://www.bitlbee.org/main.php/mirrors.html .
+  # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html .
   bitlbee = [
     http://get.bitlbee.org/
     http://get.bitlbee.be/
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 6ced5785ecfb..79faf7c7baa6 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Linux development manual pages";
-    homepage = http://www.kernel.org/doc/man-pages/;
+    homepage = https://www.kernel.org/doc/man-pages/;
     repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
     maintainers = with maintainers; [ nckx ];
     platforms = with platforms; unix;
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index da34a2f43aa6..024793789835 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.marksimonson.com/fonts/view/anonymous-pro;
+    homepage = https://www.marksimonson.com/fonts/view/anonymous-pro;
     description = "TrueType font set intended for source code";
     longDescription = ''
       Anonymous Pro (2009) is a family of four fixed-width fonts
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 78519ff8c9bc..73f675b61593 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://be5invis.github.io/Iosevka/;
+    homepage = https://be5invis.github.io/Iosevka/;
     downloadPage = "https://github.com/be5invis/Iosevka/releases";
     description = ''
       Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix
index 7b9903272861..bbb1981957b8 100644
--- a/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/pkgs/data/fonts/kawkab-mono/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An arab fixed-width font";
-    homepage = http://makkuk.com/kawkab-mono/;
+    homepage = https://makkuk.com/kawkab-mono/;
     license = stdenv.lib.licenses.ofl;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix
index 5d9bb5843607..9d241654b121 100644
--- a/pkgs/data/fonts/open-dyslexic/default.nix
+++ b/pkgs/data/fonts/open-dyslexic/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://opendyslexic.org/;
     description = "Font created to increase readability for readers with dyslexia";
-    license = "Bitstream Vera License (http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)";
+    license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)";
     platforms = platforms.all;
     maintainers = [maintainers.rycee];
   };
diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix
index dbcf84c9a74b..16e2d54f1300 100644
--- a/pkgs/data/fonts/opensans-ttf/default.nix
+++ b/pkgs/data/fonts/opensans-ttf/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       Open Sans is a humanist sans serif typeface designed by Steve Matteson,
       Type Director of Ascender Corp.
     '';
-    homepage = http://en.wikipedia.org/wiki/Open_Sans;
+    homepage = https://en.wikipedia.org/wiki/Open_Sans;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index 8679a8fd8ce3..5dc522aac2c1 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "A set of monospaced OpenType fonts designed for coding environments";
     maintainers = with stdenv.lib.maintainers; [ relrod ];
     platforms = with stdenv.lib.platforms; all;
-    homepage = http://blog.typekit.com/2012/09/24/source-code-pro/;
+    homepage = https://blog.typekit.com/2012/09/24/source-code-pro/;
     license = stdenv.lib.licenses.ofl;
   };
 }
diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix
index 083ea80a69d6..e5a3faf7742b 100644
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/pkgs/data/icons/hicolor-icon-theme/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Default fallback theme used by implementations of the icon theme specification";
-    homepage = http://icon-theme.freedesktop.org/releases/;
+    homepage = https://icon-theme.freedesktop.org/releases/;
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index fbf9af36f27a..3b34b664d5db 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://curl.haxx.se/docs/caextract.html;
+    homepage = https://curl.haxx.se/docs/caextract.html;
     description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington fpletz ];
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index 7b23d91e5490..dc8181414ce1 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.gnome.org/;
+    homepage = https://www.gnome.org/;
     description = "A library implementing a terminal emulator widget for GTK+";
     longDescription = ''
       VTE is a library (libvte) implementing a terminal emulator widget for
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index de06c671e725..d5be7137c8fa 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   CPPFLAGS = "-UGTK_DISABLE_DEPRECATED";
 
   meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gtkglext/;
+    homepage = https://projects.gnome.org/gtkglext/;
     description = "GtkGLExt, an OpenGL extension to GTK+";
     longDescription =
       '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
index 340825cd6668..559e9b8575a2 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # would need pythonPackages.dogTail, which is missing
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/projects/evince/;
+    homepage = https://www.gnome.org/projects/evince/;
     description = "GNOME's document viewer";
 
     longDescription = ''
diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
index d3b2d814b164..1729ec066233 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gconf/;
+    homepage = https://projects.gnome.org/gconf/;
     description = "A system for storing application preferences";
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
index c329d68674a4..f22f4665c142 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
+    homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
     description = "A udisks graphical front-end";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
index 29ebe8b0ca64..8d3e15d00354 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
+    homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot;
     description = "Utility used in the GNOME desktop environment for taking screenshots";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
index cbb52c9aaa12..4f56439311ec 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
+    homepage = https://www.gnome.org/;
     description = "A library implementing a terminal emulator widget for GTK+";
     longDescription = ''
       VTE is a library (libvte) implementing a terminal emulator widget for
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
index 3181348d843c..09b83e14923f 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
+    homepage = https://www.gnome.org/;
     description = "A library implementing a terminal emulator widget for GTK+";
     longDescription = ''
       VTE is a library (libvte) implementing a terminal emulator widget for
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 76caf12ffd30..7ece0ffda533 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Clozure Common Lisp";
-    homepage    = http://ccl.clozure.com/;
+    homepage    = https://ccl.clozure.com/;
     maintainers = with maintainers; [ raskin muflax tohl ];
     platforms   = attrNames options;
     license     = licenses.lgpl21;
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index f51e3af25ee8..1e6e0e8c1f6b 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -34,7 +34,7 @@ edk2 = stdenv.mkDerivation {
 
   meta = {
     description = "Intel EFI development kit";
-    homepage = http://sourceforge.net/projects/edk2/;
+    homepage = https://sourceforge.net/projects/edk2/;
     license = stdenv.lib.licenses.bsd2;
     platforms = ["x86_64-linux" "i686-linux"];
   };
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
index 4f1f29479312..4a60b3dfb387 100644
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@@ -29,7 +29,7 @@ mkDerivation {
     zip-archive
   ];
   jailbreak = true;
-  homepage = http://github.com/elm-lang/elm-package;
+  homepage = https://github.com/elm-lang/elm-package;
   description = "Package manager for Elm libraries";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix
index e5ec3659f0b5..f82fc17634da 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open-source COBOL compiler";
-    homepage = http://sourceforge.net/projects/open-cobol/;
+    homepage = https://sourceforge.net/projects/open-cobol/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ ericsagnes ];
     platforms = platforms.linux;
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index 2a7bf39c45c6..1ce60d40716d 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = http://julialang.org/;
+    homepage = https://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 0df7da4a43fe..63252084b5de 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = http://julialang.org/;
+    homepage = https://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 4dfe5dc0dc37..cfddb862f59a 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -171,7 +171,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
-    homepage = http://julialang.org/;
+    homepage = https://julialang.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f5b5e42f065a..1b8b00a10ad8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -31267,7 +31267,7 @@ self: {
        executableHaskellDepends = [
          base criterion optparse-applicative silently text turtle
        ];
-       homepage = "http://github.com/Gabriel439/bench";
+       homepage = "https://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31286,7 +31286,7 @@ self: {
        executableHaskellDepends = [
          base criterion optparse-applicative silently text turtle
        ];
-       homepage = "http://github.com/Gabriel439/bench";
+       homepage = "https://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62486,7 +62486,7 @@ self: {
          http-types mtl network optparse-applicative pretty process text
          time unordered-containers vector zip-archive
        ];
-       homepage = "http://github.com/elm-lang/elm-package";
+       homepage = "https://github.com/elm-lang/elm-package";
        description = "Package manager for Elm libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index c088f02ed698..8c724577359b 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A Lisp dialect for the JVM";
-    homepage = http://clojure.org/;
+    homepage = https://clojure.org/;
     license = stdenv.lib.licenses.bsd3;
     longDescription = ''
       Clojure is a dynamic programming language that targets the Java
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 3d779e665cd8..8f83a338484c 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -59,7 +59,7 @@ in
     '';
 
     meta = with stdenv.lib; {
-      homepage = http://elixir-lang.org/;
+      homepage = https://elixir-lang.org/;
       description = "A functional, meta-programming aware language built on top of the Erlang VM";
 
       longDescription = ''
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 96b53e1ad630..4ae47d338a67 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fast multi-dimensional array library for C++";
-    homepage = http://sourceforge.net/projects/blitz/;
+    homepage = https://sourceforge.net/projects/blitz/;
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.aherrmann ];
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index 809d373233d1..313ac086726f 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://sourceforge.net/projects/buddy/;
+    homepage = https://sourceforge.net/projects/buddy/;
     description = "Binary decision diagram package";
     license = "as-is";
 
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index d49bd7eac1bc..93c187ec35ef 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -14,7 +14,7 @@
    '';
 
   meta = with stdenv.lib; {
-    homepage = http://heasarc.gsfc.nasa.gov/fitsio/;
+    homepage = https://heasarc.gsfc.nasa.gov/fitsio/;
     description = "Library for reading and writing FITS data files";
     longDescription =
       '' CFITSIO is a library of C and Fortran subroutines for reading and
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index e1e4604e51f9..41bde5374e8d 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ];
 
   meta = with stdenv.lib; {
-    homepage = http://acoustid.org/chromaprint;
+    homepage = https://acoustid.org/chromaprint;
     description = "AcoustID audio fingerprinting library";
     maintainers = with maintainers; [ ehmry ];
     license = licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index f97dd80d7412..8d2c4bb7dd38 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = http://sourceforge.net/apps/mediawiki/cppunit/;
+    homepage = https://sourceforge.net/apps/mediawiki/cppunit/;
     description = "C++ unit testing framework";
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index ed6728482aa3..b486a327466d 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
 
   meta = with stdenv.lib; {
-    homepage = http://libopenraw.freedesktop.org/wiki/Exempi/;
+    homepage = https://libopenraw.freedesktop.org/wiki/Exempi/;
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd3;
   };
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 43a5eb2103dd..59dc4721812c 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A high-quality implementation of the AAC codec from Android";
-    homepage    = http://sourceforge.net/projects/opencore-amr/;
+    homepage    = https://sourceforge.net/projects/opencore-amr/;
     license     = licenses.asl20;
     maintainers = with maintainers; [ codyopel ];
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 5aa62a638fe8..6b95d0f1692f 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ffmpeg ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/FFMS/ffms2/;
+    homepage = https://github.com/FFMS/ffms2/;
     description = "Libav/ffmpeg based source library for easy frame accurate access";
     license = licenses.mit;
     maintainers = with maintainers; [ fuuzetsu ];
diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix
index f33c889e56cb..d4afc7ad481a 100644
--- a/pkgs/development/libraries/ftgl/2.1.2.nix
+++ b/pkgs/development/libraries/ftgl/2.1.2.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/apps/mediawiki/ftgl/;
+    homepage = https://sourceforge.net/apps/mediawiki/ftgl/;
     description = "Font rendering library for OpenGL applications";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index d303beeb4ea0..5e94618376ba 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [freetype mesa];
 
   meta = {
-    homepage = http://sourceforge.net/apps/mediawiki/ftgl/;
+    homepage = https://sourceforge.net/apps/mediawiki/ftgl/;
     description = "Font rendering library for OpenGL applications";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index cf27249064fc..0d53d00737ba 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "The Git linkable library";
-    homepage = http://libgit2.github.com/;
+    homepage = https://libgit2.github.com/;
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
   };
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 84c044682779..071941d66c32 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C library of programming buildings blocks";
-    homepage    = http://www.gtk.org/;
+    homepage    = https://www.gtk.org/;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 0b966c65f38d..5c318c9b46a2 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "C++ interface to the GLib library";
 
-    homepage = http://gtkmm.org/;
+    homepage = https://gtkmm.org/;
 
     license = licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix
index 1cb7fd42ccec..36067cc0786d 100644
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/pkgs/development/libraries/gmp/4.3.2.nix
@@ -60,7 +60,7 @@ let self = stdenv.mkDerivation rec {
          asymptotically faster algorithms.
       '';
 
-    homepage = http://gmplib.org/;
+    homepage = https://gmplib.org/;
     license = stdenv.lib.licenses.lgpl3Plus;
 
     maintainers = [ ];
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 9a69932d9bd4..b39b56ec116f 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -51,7 +51,7 @@ let self = stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://gmplib.org/;
+    homepage = https://gmplib.org/;
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 34119a3f1530..e3bacc86d58e 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -50,7 +50,7 @@ let self = stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://gmplib.org/;
+    homepage = https://gmplib.org/;
     description = "GNU multiple precision arithmetic library";
     license = licenses.gpl3Plus;
 
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index c6240c40578c..e3b345b31ee9 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GNU EFI development toolchain";
-    homepage = http://sourceforge.net/projects/gnu-efi/;
+    homepage = https://sourceforge.net/projects/gnu-efi/;
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index a1e28efbff46..a41695655114 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++ interface for GStreamer";
-    homepage = http://gstreamer.freedesktop.org/bindings/cplusplus.html;
+    homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ romildo ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
index 9c5de42194e6..16882c8a57d6 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gst-plugins-base gstreamer pkgconfig ];
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org/modules/gnonlin.html;
+    homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html;
     description = "Gstreamer Non-Linear Multimedia Editing Plugins";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
index 3fbaa9ad4e8b..953f8900ade9 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
 
   meta = {
-    homepage = http://gstreamer.freedesktop.org/releases/gst-ffmpeg;
+    homepage = https://gstreamer.freedesktop.org/releases/gst-ffmpeg;
     description = "GStreamer's plug-in using FFmpeg";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index f181aa029bd7..8acaefcedf46 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++ bindings for the GStreamer streaming multimedia library";
-    homepage = http://www.gtkmm.org/;
+    homepage = https://www.gtkmm.org/;
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ plcplc ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 3e94016d057a..f312a14de24f 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -4,7 +4,7 @@
 }:
 
 # Note that since gst-libav-1.6, libav is actually ffmpeg. See
-# http://gstreamer.freedesktop.org/releases/1.6/ for more info.
+# https://gstreamer.freedesktop.org/releases/1.6/ for more info.
 
 assert withSystemLibav -> libav != null;
 
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index f6e718d82e9a..45222b7d7fcc 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A multi-platform toolkit for creating graphical user interfaces";
-    homepage    = http://www.gtk.org/;
+    homepage    = https://www.gtk.org/;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index cf888641b94b..82df6e135d0b 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
       royalties.
     '';
 
-    homepage = http://www.gtk.org/;
+    homepage = https://www.gtk.org/;
 
     license = licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 1ec2a7cd6f0d..469c6adc6f76 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       tutorial.
     '';
 
-    homepage = http://gtkmm.org/;
+    homepage = https://gtkmm.org/;
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 49055f6b4a95..89230fab6581 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       tutorial.
     '';
 
-    homepage = http://gtkmm.org/;
+    homepage = https://gtkmm.org/;
 
     license = licenses.lgpl2Plus;
 
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 5116e39562c8..0157fa1762c7 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GLib libusb wrapper";
-    homepage = http://people.freedesktop.org/~hughsient/releases/;
+    homepage = https://people.freedesktop.org/~hughsient/releases/;
     license = stdenv.lib.licenses.lgpl21;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 497dfe2bb92a..37c00f3e2aa8 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -75,7 +75,7 @@ let
       meta = with stdenv.lib; {
         inherit longDescription;
         description = "Hunspell dictionary for ${shortDescription} from Dicollecte";
-        homepage = http://www.dicollecte.org/home.php?prj=fr;
+        homepage = https://www.dicollecte.org/home.php?prj=fr;
         license = licenses.mpl20;
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
@@ -118,7 +118,7 @@ let
       name = "hunspell-dict-${shortName}-linguistico-${version}";
       readmeFile = dictFileName + "_README.txt";
       meta = with stdenv.lib; {
-        homepage = http://sourceforge.net/projects/linguistico/;
+        homepage = https://sourceforge.net/projects/linguistico/;
         license = licenses.gpl3;
         maintainers = with maintainers; [ renzo ];
         platforms = platforms.all;
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index d3cb1283331b..de4aaf9fdee6 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       programs to output audio using a simple API on a wide variety of
       platforms.
     '';
-    homepage = http://xiph.org/ao/;
+    homepage = https://xiph.org/ao/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 28d435fbb9ca..94ebaed9c2a1 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -118,7 +118,7 @@ let
     passthru = { inherit vdpauSupport; };
 
     meta = with stdenv.lib; {
-      homepage = http://libav.org/;
+      homepage = https://libav.org/;
       description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
       license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
         else if enableGPL then gpl2Plus else lgpl21Plus;
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 51f62b9bd5f4..ab8b507e98b2 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = { 
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
-    homepage = http://sourceforge.net/projects/libavc1394/;
+    homepage = https://sourceforge.net/projects/libavc1394/;
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 83bd81456c07..a427bd99dd58 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://github.com/binaryanalysisplatform/bap-bindings;
+    homepage = https://github.com/binaryanalysisplatform/bap-bindings;
     description = "A C library for interacting with BAP";
     maintainers = [ stdenv.lib.maintainers.maurer ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 792a29eb1fb2..5e906c7ac5de 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";
-    homepage = http://libbsd.freedesktop.org/;
+    homepage = https://libbsd.freedesktop.org/;
     license = licenses.bsd3;
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index 22bda89c6030..e217f5d96db1 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       a file pointer. For handling of the parsed data a convenient API is
       available.
     '';
-    homepage = http://sourceforge.net/projects/libcue/;
+    homepage = https://sourceforge.net/projects/libcue/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index e20b1c95a199..57b56c372339 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A C++ SDK which contains an implementation of DAP";
-    homepage = http://www.opendap.org/download/libdap;
+    homepage = https://www.opendap.org/download/libdap;
     license = licenses.lgpl2;
     maintainers = [ maintainers.bzizou ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 2222825433e4..75cf69035cbe 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   cmakeFlags = "-DWITH_DOC=OFF";
 
   meta = with stdenv.lib; {
-    homepage = http://launchpad.net/libdbusmenu-qt;
+    homepage = https://launchpad.net/libdbusmenu-qt;
     description = "Provides a Qt implementation of the DBusMenu spec";
     maintainers = [ maintainers.ttuegel ];
     inherit (qtbase.meta) platforms;
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index 036adcef74cb..be7852e6cdd2 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch;
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/libdc1394/;
+    homepage = https://sourceforge.net/projects/libdc1394/;
     description = "Capture and control API for IIDC compliant cameras";
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.viric ];
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index a8cf28648079..17d09366a9da 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
 
   meta = {
-    homepage = http://dri.freedesktop.org/libdrm/;
+    homepage = https://dri.freedesktop.org/libdrm/;
     description = "Library for accessing the kernel's Direct Rendering Manager";
     license = "bsd";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index e8c374297d37..a5058de597ef 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
-    homepage = http://sourceforge.net/projects/libdv/;
+    homepage = https://sourceforge.net/projects/libdv/;
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index f40f45d0e41d..5f422f7018b8 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.flamingspork.com/projects/libeatmydata/;
+    homepage = https://www.flamingspork.com/projects/libeatmydata/;
     license = stdenv.lib.licenses.gpl3Plus;
     description = "Small LD_PRELOAD library to disable fsync and friends";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 7b7f880ab9ed..40d80329291a 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Extensible Binary Meta Language library";
     license = licenses.lgpl21;
-    homepage = http://dl.matroska.org/downloads/libebml/;
+    homepage = https://dl.matroska.org/downloads/libebml/;
     maintainers = [ maintainers.spwhitt ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index 06f0bc89c2b3..ec53b50b5af2 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for support of the Expert Witness Compression Format";
-    homepage = http://sourceforge.net/projects/libewf/;
+    homepage = https://sourceforge.net/projects/libewf/;
     license = stdenv.lib.licenses.lgpl3;
     maintainers = [ stdenv.lib.maintainers.raskin ] ;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 47814ef2f253..9639f4008f56 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Foreign function call library";
-    homepage = http://www.haible.de/bruno/packages-ffcall.html;
+    homepage = https://www.haible.de/bruno/packages-ffcall.html;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index 180aab09188e..17cf93473d68 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library to talk to FTDI chips using libusb";
-    homepage = http://www.intra2net.com/en/developer/libftdi/;
+    homepage = https://www.intra2net.com/en/developer/libftdi/;
     license = with licenses; [ lgpl2 gpl2 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index f0d05c0b263f..2f499d3af87f 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A library to talk to FTDI chips using libusb";
-    homepage = http://www.intra2net.com/en/developer/libftdi/;
+    homepage = https://www.intra2net.com/en/developer/libftdi/;
     license = stdenv.lib.licenses.lgpl21;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 389f899e3ef7..3d49fa064509 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
-    homepage = http://www.remotesensing.org/geotiff/geotiff.html;
+    homepage = https://www.remotesensing.org/geotiff/geotiff.html;
     license = stdenv.lib.licenses.mit;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index f2f062785b69..6e036522b1cb 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GNOME's Structured File Library";
-    homepage    = http://www.gnome.org/projects/libgsf;
+    homepage    = https://www.gnome.org/projects/libgsf;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix
index 6a8af9ccac6d..970cb8a530f7 100644
--- a/pkgs/development/libraries/libibmad/default.nix
+++ b/pkgs/development/libraries/libibmad/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libibumad ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.openfabrics.org/;
+    homepage = https://www.openfabrics.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix
index 2f6a574c9899..a7950de3aef0 100644
--- a/pkgs/development/libraries/libibumad/default.nix
+++ b/pkgs/development/libraries/libibumad/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.openfabrics.org/;
+    homepage = https://www.openfabrics.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index aa76505c3a07..331422dd8929 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
 
   meta = {
-    homepage = http://github.com/lastfm/liblastfm;
+    homepage = https://github.com/lastfm/liblastfm;
     repositories.git = git://github.com/lastfm/liblastfm.git;
     description = "Official LastFM library";
     inherit (qt4.meta) platforms;
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 37823af12e9a..f6df090e8b5d 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://sourceforge.net/projects/mad/;
+    homepage    = https://sourceforge.net/projects/mad/;
     description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index 81fa9011e30b..9ad959ae22e0 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library to parse Matroska files";
-    homepage = http://matroska.org/;
+    homepage = https://matroska.org/;
     license = licenses.lgpl21;
     maintainers = [ maintainers.spwhitt ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index 8e684f7af1f2..d36d483b92c7 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       Whilst Profanity will run against libstrophe, libmesode provides extra
       TLS functionality such as manual SSL certificate verification.
     '';
-    homepage = http://github.com/boothj5/libmesode/;
+    homepage = https://github.com/boothj5/libmesode/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.devhell ];
diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix
index 54cef0c4f5c3..7e5ac2a2297c 100644
--- a/pkgs/development/libraries/libmp3splt/default.nix
+++ b/pkgs/development/libraries/libmp3splt/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-pcre";
 
   meta = with stdenv.lib; {
-    homepage    = http://sourceforge.net/projects/mp3splt/;
+    homepage    = https://sourceforge.net/projects/mp3splt/;
     description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
     maintainers = with maintainers; [ bosu ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index 09d41c8bbe94..67aec7fc974e 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A de/compression library for various Microsoft formats";
-    homepage = http://www.cabextract.org.uk/libmspack;
+    homepage = https://www.cabextract.org.uk/libmspack;
     license = stdenv.lib.licenses.lgpl2;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix
index 1e445b20f682..a93c16d784de 100644
--- a/pkgs/development/libraries/libnet/default.nix
+++ b/pkgs/development/libraries/libnet/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/sam-github/libnet;
+    homepage = https://github.com/sam-github/libnet;
     description = "Portable framework for low-level network packet construction";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index 09be1b41353a..7e9ae1608d2b 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ glib gupnp_igd ];
 
   meta = {
-    homepage = http://nice.freedesktop.org/wiki/;
+    homepage = https://nice.freedesktop.org/wiki/;
     description = "The GLib ICE implementation";
     longDescription = ''
       Libnice is an implementation of the IETF's Interactice Connectivity
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 15f58135040d..c5cb85d91ba2 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "doc" ];
 
   meta = with stdenv.lib; {
-    homepage = http://xiph.org/ogg/;
+    homepage = https://xiph.org/ogg/;
     license = licenses.bsd3;
     maintainers = [ maintainers.ehmry ];
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix
index 83bb80cc3203..ed46919f26ce 100644
--- a/pkgs/development/libraries/liboggz/default.nix
+++ b/pkgs/development/libraries/liboggz/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = http://xiph.org/oggz/;
+    homepage = https://xiph.org/oggz/;
     description = "A C library and tools for manipulating with Ogg files and streams";
     longDescription = ''
       Oggz comprises liboggz and the tool oggz, which provides commands to
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index 6328494c17ee..5140402eacb9 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   patches = [ ./fedora-fixes.patch ];
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/omxil/;
+    homepage = https://sourceforge.net/projects/omxil/;
     description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
     license = licenses.lgpl21;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index f1c421b4bf76..98853d08cfe6 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://github.com/JonathanBeck/libplist;
+    homepage = https://github.com/JonathanBeck/libplist;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
   };
diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix
index add0a5bc2bbe..a5e4c4410c09 100644
--- a/pkgs/development/libraries/libqrencode/default.nix
+++ b/pkgs/development/libraries/libqrencode/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://fukuchi.org/works/qrencode/;
+    homepage = https://fukuchi.org/works/qrencode/;
     description = "A C library for encoding data in a QR Code symbol";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 0047f30aad27..63a6b697eb20 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
-    homepage = http://www.libraw.org/;
+    homepage = https://www.libraw.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index 886663101586..945e11d1bcef 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lightweight RDF library with special support for LADSPA plugins";
-    homepage = http://sourceforge.net/projects/lrdf/;
+    homepage = https://sourceforge.net/projects/lrdf/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix
index b6f7411a1c24..06d9994a529d 100644
--- a/pkgs/development/libraries/mesa-glu/default.nix
+++ b/pkgs/development/libraries/mesa-glu/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OpenGL utility library";
-    homepage = http://cgit.freedesktop.org/mesa/glu/;
+    homepage = https://cgit.freedesktop.org/mesa/glu/;
     license = stdenv.lib.licenses.sgi-b-20;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 92fe4b4ab27b..fe90d41ccb29 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://github.com/opencollab/arpack-ng;
+    homepage = https://github.com/opencollab/arpack-ng;
     description = ''
       A collection of Fortran77 subroutines to solve large scale eigenvalue
       problems.
diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 4a40806c4eb1..48c2428bbcdb 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A clean C library for processing UTF-8 Unicode data";
-    homepage = http://julialang.org/utf8proc;
+    homepage = https://julialang.org/utf8proc;
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = [ maintainers.ftrvxmtrx ];
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index dcdc55f0aef3..989d8bc70031 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.4.5";
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/bazelbuild/bazel/;
+    homepage = https://github.com/bazelbuild/bazel/;
     description = "Build tool that builds code quickly and reliably";
     license = licenses.asl20;
     maintainers = [ maintainers.philandstuff ];
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 1e5fb8458e51..05bf8e76db73 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://leiningen.org/;
+    homepage = https://leiningen.org/;
     description = "Project automation for Clojure";
     license = stdenv.lib.licenses.epl10;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index 439e224c4550..95f992e490f4 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "DTS Coherent Acoustics decoder with support for HD extensions";
     maintainers = with maintainers; [ edwtjo ];
-    homepage = http://github.com/foo86/dcadec;
+    homepage = https://github.com/foo86/dcadec;
     license = licenses.lgpl21;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index b46b0be748ad..506684088343 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.gtk.org/gtk-doc;
+    homepage = https://www.gtk.org/gtk-doc;
     description = "Tools to extract documentation embedded in GTK+ and GNOME source code";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix
index e6c7dcbd3624..c2bf7e0a831c 100644
--- a/pkgs/development/tools/misc/automoc4/default.nix
+++ b/pkgs/development/tools/misc/automoc4/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake qt4 ];
   
   meta = with stdenv.lib; {
-    homepage = http://techbase.kde.org/Development/Tools/Automoc4;
+    homepage = https://techbase.kde.org/Development/Tools/Automoc4;
     description = "KDE Meta Object Compiler";
     license = licenses.bsd2;
     maintainers = [ maintainers.sander ];
diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix
index eb81b7136f3d..77cb86766692 100644
--- a/pkgs/development/tools/misc/avarice/default.nix
+++ b/pkgs/development/tools/misc/avarice/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     license = stdenv.lib.licenses.gpl2;
     description = "Translator between GDB's remote debug protocol and the AVR JTAG ICE protocol";
-    homepage = http://sourceforge.net/projects/avarice/files/avarice/;
+    homepage = https://sourceforge.net/projects/avarice/files/avarice/;
     maintainers = [ stdenv.lib.maintainers.smironov ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index 2cc8e640631a..51610349c45e 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    homepage = http://sourceforge.net/projects/cbrowser/;
+    homepage = https://sourceforge.net/projects/cbrowser/;
 
     maintainers = with stdenv.lib.maintainers; [viric];
 
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 563d76930880..2564b42731b3 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/projects/checkbaskisms/;
+    homepage = https://sourceforge.net/projects/checkbaskisms/;
     description = "Check shell scripts for non-portable syntax";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index e7c6b108cdda..f9a640d47038 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Command-line shell and Unix scripting interface for Drupal";
-    homepage    = http://github.com/drush-ops/drush;
+    homepage    = https://github.com/drush-ops/drush;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index 30cbc0daab9a..a6de652f9005 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib dbus dbus_glib ];
 
   meta = {
-    homepage = http://hal.freedesktop.org/releases/;
+    homepage = https://hal.freedesktop.org/releases/;
     description = "D-Bus bindings for GObject";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index 3c5dacb6f65e..3e48192d00e4 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Translation helper tool";
-    homepage = http://launchpad.net/intltool/;
+    homepage = https://launchpad.net/intltool/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index ef8ac133b2c3..f3f137da757f 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       over configuration to provide a productive and stream-lined development
       experience.
     '';
-    homepage = http://grails.org/;
+    homepage = https://grails.org/;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 2c54d9ef8288..f61b8bc1dcf6 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare -- data files";
-    homepage = http://wildfiregames.com/0ad/;
+    homepage = https://wildfiregames.com/0ad/;
     license = licenses.cc-by-sa-30;
     platforms = platforms.linux;
     hydraPlatforms = [];
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 35d6487f21e1..c1b69eb3120b 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare";
-    homepage = http://wildfiregames.com/0ad/;
+    homepage = https://wildfiregames.com/0ad/;
     license = with licenses; [
       gpl2 lgpl21 mit cc-by-sa-30
       licenses.zlib # otherwise masked by pkgs.zlib
diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix
index 93f341298a83..3f490b2976c1 100644
--- a/pkgs/games/btanks/default.nix
+++ b/pkgs/games/btanks/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/projects/btanks/;
+    homepage = https://sourceforge.net/projects/btanks/;
     description = "Fast 2d tank arcade game";
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index 0a94a1c433da..411101955093 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes.
     '';
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://sourceforge.net/projects/extremetuxracer/;
+    homepage = https://sourceforge.net/projects/extremetuxracer/;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 3be2d9757c02..d94a1f9a8d4d 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://ioquake3.org/;
+    homepage = https://ioquake3.org/;
     description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 430a5348398b..0bd40721c4ed 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Ghostscript and cups printer drivers";
-    homepage = http://sourceforge.net/projects/gimp-print/;
+    homepage = https://sourceforge.net/projects/gimp-print/;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index b1495987e613..ea794c3f06b5 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
         - NEC's PC Engine, SuperGrafx;
         - Bandai' WonderSwan, WonderSwan Color.
     '';
-    homepage = http://byuu.org/higan/;
+    homepage = https://byuu.org/higan/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = with platforms; unix;
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 319003400d06..c2ec16081e86 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -33,7 +33,7 @@ let
 
     meta = with stdenv.lib; {
       inherit description;
-      homepage = http://www.libretro.com/;
+      homepage = https://www.libretro.com/;
       license = licenses.gpl3Plus;
       maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
       platforms = platforms.linux;
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index c8edeaf93a13..57c87b577317 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
   passthru = { inherit version; };
 
   meta = {
-    homepage = http://www.ghostscript.com/;
+    homepage = https://www.ghostscript.com/;
     description = "PostScript interpreter (mainline version)";
 
     longDescription = ''
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index 17aa60162ad6..dbc0beb1872b 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Dark Desktop Suite for Gtk, Xfce and Metacity";
-    homepage = http://github.com/shimmerproject/Blackbird;
+    homepage = https://github.com/shimmerproject/Blackbird;
     license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index b815cd778fa4..6dae0f6bb38b 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       the "old" `apm' command on ACPI systems.  It includes
       battery and thermal information.
     '';
-    homepage = http://sourceforge.net/projects/acpiclient/;
+    homepage = https://sourceforge.net/projects/acpiclient/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.mornfall ];
diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 3a1407aae1ff..9105f635ae93 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
+    homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
     description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ fpletz ];
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 5f659eb9884c..7ea8cf6d1bf6 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
+    homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
     description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 4270f37594e3..4514e18f44f5 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
+    homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
     description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 2548e33bf4cf..bab8c5502de1 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tiny versions of common UNIX utilities in a single small executable";
-    homepage = http://busybox.net/;
+    homepage = https://busybox.net/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix
index b24099f95991..7532f8bfc27e 100644
--- a/pkgs/os-specific/linux/edac-utils/default.nix
+++ b/pkgs/os-specific/linux/edac-utils/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/grondo/edac-utils;
+    homepage = https://github.com/grondo/edac-utils;
     description = "Handles the reporting of hardware-related memory errors";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 54ca7d9e324f..9e61c377ecf9 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = ''http://www.gentoo.org/proj/en/eudev/'';
+    homepage = ''https://www.gentoo.org/proj/en/eudev/'';
     downloadPage = ''http://dev.gentoo.org/~blueness/eudev/'';
     updateWalker = true;
   };
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index e9af25809edd..9230e6920f96 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = http://l3net.wordpress.com/projects/firejail/;
+    homepage = https://l3net.wordpress.com/projects/firejail/;
     downloadPage = "http://sourceforge.net/projects/firejail/files/firejail/";
   };
 }
diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index fa63cddfcdb9..0f0eab1fa202 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tool to get/set ATA/SATA drive parameters under Linux";
-    homepage = http://sourceforge.net/projects/hdparm/;
+    homepage = https://sourceforge.net/projects/hdparm/;
     platforms = platforms.linux;
     license = licenses.bsd2;
     maintainers = [ maintainers.fuuzetsu ];
diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix
index 014fe41afc8e..c3730dd8de50 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/default.nix
+++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)";
-    homepage = http://sourceforge.net/projects/linux-ima/;
+    homepage = https://sourceforge.net/projects/linux-ima/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 0700191e7a89..6a0706106625 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       - Asynchronous background rendering of the next page
       - Customizable multi-threaded caching
     '';
-    homepage = http://seasonofcode.com/pages/jfbview.html;
+    homepage = https://seasonofcode.com/pages/jfbview.html;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index c295293fa2cc..70544ff92943 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -207,7 +207,7 @@ let
             + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches))
             + ")");
         license = stdenv.lib.licenses.gpl2;
-        homepage = http://www.kernel.org/;
+        homepage = https://www.kernel.org/;
         repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
         maintainers = [
           maintainers.thoughtpolice
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 5d0dca7b6bec..c55ebffa8293 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
+    homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/;
     description = "Tools for loading and managing Linux kernel modules";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 622bf4fbd5cc..3adedf8c1dd1 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "V4L utils and libv4l, provide common image formats regardless of the v4l device";
-    homepage = http://linuxtv.org/projects.php;
+    homepage = https://linuxtv.org/projects.php;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ codyopel viric ];
     platforms = platforms.linux;
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index 8478804a7b03..d83e32bcb392 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://www.tinkerforge.com/;
+    homepage = https://www.tinkerforge.com/;
     description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages";
     maintainers = [ stdenv.lib.maintainers.qknight ];
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
index caf3792e9831..b4cbca22c30a 100644
--- a/pkgs/servers/consul/ui.nix
+++ b/pkgs/servers/consul/ui.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://www.consul.io/;
+    homepage    = https://www.consul.io/;
     description = "A tool for service discovery, monitoring and configuration";
     maintainers = with maintainers; [ cstrahan wkennington ];
     license     = licenses.mpl20 ;
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 7e4c69e3862d..f88b7e74ffd1 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "MediaBrowser - Bring together your videos, music, photos, and live television";
-    homepage = http://emby.media/;
+    homepage = https://emby.media/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.fadenb ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix
index 3e097c0ebd47..3f600b5a1221 100644
--- a/pkgs/servers/fleet/default.nix
+++ b/pkgs/servers/fleet/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A distributed init system";
-    homepage = http://coreos.com/using-coreos/clustering/;
+    homepage = https://coreos.com/using-coreos/clustering/;
     license = licenses.asl20;
     maintainers = with maintainers; [
       cstrahan
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index 5c72ac97bc0d..a48ee83755b5 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Client library for MPD (music player daemon)";
-    homepage = http://www.musicpd.org/libs/libmpdclient/;
+    homepage = https://www.musicpd.org/libs/libmpdclient/;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ mornfall ehmry ];
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 5c9737660c42..97e7a9daf658 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
-    homepage = http://freeswitch.org/;
+    homepage = https://freeswitch.org/;
     license = stdenv.lib.licenses.mpl11;
     maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 7b725bfeb57c..7868c2726ece 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/Bumblebee-Project/Bumblebee;
+    homepage = https://github.com/Bumblebee-Project/Bumblebee;
     description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)";
     platforms = platforms.linux;
     license = licenses.gpl3;
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
index eeaf5dac7c6a..9de29da9b44a 100644
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Allows you to compose wallpapers ('root pixmaps') for X";
-    homepage = http://thegraveyard.org/hsetroot.html;
+    homepage = https://thegraveyard.org/hsetroot.html;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.henrytill ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix
index 7a1eec92bbeb..2e9d8cafdc07 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/pkgs/tools/archivers/cabextract/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.cabextract.org.uk/;
+    homepage = https://www.cabextract.org.uk/;
     description = "Free Software for extracting Microsoft cabinet files";
     platforms = platforms.all;
     license = licenses.gpl3;
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index b8341204e92e..b14364c2b79e 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   }) ];
 
   meta = with stdenv.lib; {
-    homepage = http://acoustid.org/fingerprinter;
+    homepage = https://acoustid.org/fingerprinter;
     description = "Audio fingerprinting tool using chromaprint";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with maintainers; [ ehmry ];
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index f7382997f16b..91f7637e1bcb 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
-    homepage = http://brettcsmith.org/2007/dtrx/;
+    homepage = https://brettcsmith.org/2007/dtrx/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.spwhitt ];
     platforms = platforms.all;
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index 1eedff5c011e..61c7f26db1e1 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       User documentation is in Documentation/bcache.txt in the Linux kernel
       tree.
     '';
-    homepage = http://bcache.evilpiepirate.org/;
+    homepage = https://bcache.evilpiepirate.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 2eeb2003a194..dc6bcca597bd 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Utilities for creating and checking FAT and VFAT file systems";
     repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;
-    homepage = http://www.daniel-baumann.ch/software/dosfstools/;
+    homepage = https://www.daniel-baumann.ch/software/dosfstools/;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix
index ba28b67d75b0..a5045f97b45d 100644
--- a/pkgs/tools/graphics/briss/default.nix
+++ b/pkgs/tools/graphics/briss/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://sourceforge.net/projects/briss/;
+    homepage = https://sourceforge.net/projects/briss/;
     description = "Java application for cropping PDF files";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index 2b88ada21aa7..8c53882ff1b2 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Context-free design grammar - a tool for graphics generation";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
-    homepage = http://contextfreeart.org/;
-    downloadPage = "http://contextfreeart.org/mediawiki/index.php/Download_page";
+    homepage = https://contextfreeart.org/;
+    downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page";
   };
 }
diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/tools/graphics/cfdg/src-info-for-default.nix
index 42295c82216e..0e2018b6bfdd 100644
--- a/pkgs/tools/graphics/cfdg/src-info-for-default.nix
+++ b/pkgs/tools/graphics/cfdg/src-info-for-default.nix
@@ -1,5 +1,5 @@
 {
-  downloadPage = "http://contextfreeart.org/mediawiki/index.php/Download_page";
+  downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page";
   baseName = "cfdg";
   sourceRegexp = ''.*[.]tgz'';
   versionExtractorSedScript = ''s/[^0-9]*([0-9.]*)[.]tgz/\1/'';
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index 95acb08fbf09..86848f958838 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = http://cgit.freedesktop.org/xorg/app/editres/;
+    homepage = https://cgit.freedesktop.org/xorg/app/editres/;
     description = "A dynamic resource editor for X Toolkit applications";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix
index fe01a9459ecb..e4163cd93a87 100644
--- a/pkgs/tools/graphics/pngtoico/default.nix
+++ b/pkgs/tools/graphics/pngtoico/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpng ];
 
   meta = {
-    homepage = http://www.kernel.org/pub/software/graphics/pngtoico/;
+    homepage = https://www.kernel.org/pub/software/graphics/pngtoico/;
     description = "Small utility to convert a set of PNG images to Microsoft ICO format";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 40f612533068..104e423bd721 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = http://fukuchi.org/works/qrencode/;
+    homepage = https://fukuchi.org/works/qrencode/;
     description = "QR code encoder";
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 53aec187bb76..a18fabcb4e5f 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Encrypt files with Advanced Encryption Standard (AES)";
-    homepage    = http://www.aescrypt.com/;
+    homepage    = https://www.aescrypt.com/;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 qknight ];
     platforms   = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 43f69a82e7f5..dc67c96ca1a2 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -44,7 +44,7 @@ in
     };
 
     meta = {
-      homepage = http://github.com/phillipberndt/autorandr/;
+      homepage = https://github.com/phillipberndt/autorandr/;
       description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr";
       license = stdenv.lib.licenses.gpl3Plus;
       maintainers = [ stdenv.lib.maintainers.coroa ];
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index 25e083b6bf57..8219d110f2ef 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -8,7 +8,7 @@ bundlerEnv {
 
   meta = with lib; {
     description = "A data collector";
-    homepage    = http://www.fluentd.org/;
+    homepage    = https://www.fluentd.org/;
     license     = licenses.asl20;
     maintainers = with maintainers; [ offline ];
     platforms   = platforms.unix;
diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index 2a4de41332eb..e50df02a1189 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Manga downloader";
-    homepage = http://sourceforge.net/projects/hakuneko/;
+    homepage = https://sourceforge.net/projects/hakuneko/;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 192da26b452e..ea71def36195 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
       applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and 
       applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
     '';
-    homepage = http://www.hdfgroup.org/HDF5/;
+    homepage = https://www.hdfgroup.org/HDF5/;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix
index 1d1ff991f3b8..9706e3f02882 100644
--- a/pkgs/tools/misc/mstflint/default.nix
+++ b/pkgs/tools/misc/mstflint/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib libibmad ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.openfabrics.org/;
+    homepage = https://www.openfabrics.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index daf5a19b01c2..b2f64aca2d39 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     optional gnutlsSupport gnutls ++
     optional scpSupport libssh2;
 
-  # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
+  # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html
   preConfigure = ''
     sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
     rm src/tool_hugehelp.c
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A command line tool for transferring files with URL syntax";
-    homepage    = http://curl.haxx.se/;
+    homepage    = https://curl.haxx.se/;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index beffb0c05e82..7204ddd5e06f 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
-    homepage = http://roy.marples.name/projects/dhcpcd;
+    homepage = https://roy.marples.name/projects/dhcpcd;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ eelco fpletz ];
   };
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix
index c7a6fbcfd7c7..d8c60882cd4a 100644
--- a/pkgs/tools/networking/email/default.nix
+++ b/pkgs/tools/networking/email/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Command line SMTP client";
     license = with lib.licenses; [ gpl2 ];
-    homepage = http://deanproxy.com/code;
+    homepage = https://deanproxy.com/code;
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index 84420aa3efb0..b445dd93c4c0 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "A command line HTTP client whose goal is to make CLI human-friendly";
-    homepage = http://httpie.org/;
+    homepage = https://httpie.org/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ];
   };
diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix
index 557fce6d94b3..a7d42b773172 100644
--- a/pkgs/tools/networking/hyenae/default.nix
+++ b/pkgs/tools/networking/hyenae/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "";
-    homepage = http://sourceforge.net/projects/hyenae/;
+    homepage = https://sourceforge.net/projects/hyenae/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix
index fba6ae92b034..6f2ca96d120f 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/tools/networking/iperf/2.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
-    homepage = http://sourceforge.net/projects/iperf/;
+    homepage = https://sourceforge.net/projects/iperf/;
     description = "Tool to measure IP bandwidth using UDP or TCP";
     platforms = platforms.unix;
     license = licenses.mit;
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index e95cba18e109..b9abba2cd0da 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.bsd3;
-    homepage = http://www.kernel.org/pub/software/network/tftp/;
+    homepage = https://www.kernel.org/pub/software/network/tftp/;
   };
 
   passthru = {
     updateInfo = {
-      downloadPage = "http://www.kernel.org/pub/software/network/tftp/";
+      downloadPage = "https://www.kernel.org/pub/software/network/tftp/";
     };
   };
 }
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 0d7a5449d6e3..d262253a51ff 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The Debian package manager";
-    homepage = http://wiki.debian.org/Teams/Dpkg;
+    homepage = https://wiki.debian.org/Teams/Dpkg;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ mornfall nckx ];
diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix
index fdd49cc3c271..298dd336be1f 100644
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/pkgs/tools/security/hashcat/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fast password cracker";
-    homepage    = "http://hashcat.net/hashcat/";
+    homepage    = "https://hashcat.net/hashcat/";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix
index 1cb028a1a333..7a0d7241bbf9 100644
--- a/pkgs/tools/security/hashcat/hashcat3/default.nix
+++ b/pkgs/tools/security/hashcat/hashcat3/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fast password cracker";
-    homepage    = http://hashcat.net/hashcat/;
+    homepage    = https://hashcat.net/hashcat/;
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.kierdavis ];
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 185645763fd2..4c1a5431f3eb 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   meta = {
     description = ''The classical Unix `at' job scheduling command'';
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://packages.qa.debian.org/at;
+    homepage = https://packages.qa.debian.org/at;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index d2d14ddd110b..13c2938f63bc 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       different by pre-loading a small library which modifies the time,
       gettimeofday and clock_gettime system calls.
     '';
-    homepage = http://packages.qa.debian.org/d/datefudge.html;
+    homepage = https://packages.qa.debian.org/d/datefudge.html;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ leenaars ];
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 7b2ca93cc0d4..80d6f6a42f81 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake gettext ];
 
   meta = {
-    homepage = http://projects.gw-computing.net/projects/dfc;
+    homepage = https://projects.gw-computing.net/projects/dfc;
     description = "Displays file system space usage using graphs and colors";
     license="free";
     maintainers = with stdenv.lib.maintainers; [qknight];
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index 7661db22cc18..381dc8dd4577 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting";
-    homepage = http://www.colordiff.org/;
+    homepage = https://www.colordiff.org/;
     license = licenses.gpl3;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index aff11fd61279..5f926f771c5f 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
       This package contains the fop command line tool.
     '';
-    homepage = http://xmlgraphics.apache.org/fop/;
+    homepage = https://xmlgraphics.apache.org/fop/;
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor ndowens ];
diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix
index 84cd2cf921a1..f0ed44351a20 100644
--- a/pkgs/tools/typesetting/halibut/default.nix
+++ b/pkgs/tools/typesetting/halibut/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "halibut-1.2";
 
   src = fetchurl {
-    url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz";
+    url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz";
     sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s";
   };
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Documentation production system for software manuals";
-    homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/;
+    homepage = https://www.chiark.greenend.org.uk/~sgtatham/halibut/;
     license = licenses.mit;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; unix;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index ac4c5eaac64c..fe3f89ef804e 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -443,7 +443,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
     meta = {
       description = "Excel-DNA is an independent project to integrate .NET into Excel";
-      homepage = "http://excel-dna.net/";
+      homepage = "https://excel-dna.net/";
       license = stdenv.lib.licenses.mit;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0fd99d17743..aa3723dcb406 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3376,7 +3376,7 @@ in {
     doCheck = false;
 
     meta = {
-      description = "Python client for Consul (http://www.consul.io/)";
+      description = "Python client for Consul (https://www.consul.io/)";
       homepage = https://github.com/cablehead/python-consul;
       license = licenses.mit;
       maintainers = with maintainers; [ desiderius ];

From 0b21848e772d82f822a2050205ce00475517be25 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 5 Aug 2017 07:39:48 -0700
Subject: [PATCH 06/63] zsnes: remove $STRIP from compiler options

In ab70693 @viric says zsnes works better without stripping. But the
build expression kept the $STRIP in the compiler options, so if it is
set to something it will show up in there. For example:

g++  -pipe -I. -I/usr/local/include -I/usr/include -D__UNIXSDL__ -I/nix/store/04qgmdpmalgsy92zgs2z896jx073hcn2-SDL-1.2.15-dev/include/SDL -I/nix/store/04qgmdpmalgsy92zgs2z896jx073hcn2-SDL-1.2.15-dev/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  -DNCURSES -D__OPENGL__ -march=native -O3 -fomit-frame-pointer -fprefetch-loop-arrays -fforce-addr strip -D__RELEASE__ -fno-rtti -o tools/fileutil.o -c tools/fileutil.cpp

g++: error: strip: No such file or directory

This commit removes that reference to $STRIP too.
---
 pkgs/misc/emulators/zsnes/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index ae94c3de41b2..6f3957379e53 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -34,6 +34,7 @@ in stdenv.mkDerivation {
   preConfigure = ''
     cd src
     sed -i "/^STRIP/d" configure
+    sed -i "/\$STRIP/d" configure
   '';
 
   configureFlags = [ "--enable-release" ];

From ca64eaadf87d19c444e619b006c8436e9521dcf6 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 31 Jul 2017 12:40:41 +0200
Subject: [PATCH 07/63] postage: init at 3.2.17 & add NixOS module

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/databases/postage.nix | 205 +++++++++++++++++++
 pkgs/applications/misc/postage/default.nix   |  27 +++
 pkgs/top-level/all-packages.nix              |   2 +
 4 files changed, 235 insertions(+)
 create mode 100644 nixos/modules/services/databases/postage.nix
 create mode 100644 pkgs/applications/misc/postage/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7dea5cb9dad..a1dce1e8b44e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -186,6 +186,7 @@
   ./services/databases/neo4j.nix
   ./services/databases/openldap.nix
   ./services/databases/opentsdb.nix
+  ./services/databases/postage.nix
   ./services/databases/postgresql.nix
   ./services/databases/redis.nix
   ./services/databases/riak.nix
diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/postage.nix
new file mode 100644
index 000000000000..d49c9a83a46f
--- /dev/null
+++ b/nixos/modules/services/databases/postage.nix
@@ -0,0 +1,205 @@
+{ lib, pkgs, config, ... } :
+
+with lib;
+
+let
+  cfg = config.services.postage;
+
+  confFile = pkgs.writeTextFile {
+    name = "postage.conf";
+    text =  ''
+      connection_file = ${postageConnectionsFile}
+
+      allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}
+
+      postage_port = ${toString cfg.port}
+
+      super_only = ${builtins.toJSON cfg.superOnly}
+
+      ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"}
+
+      login_timeout = ${toString cfg.loginTimeout}
+
+      web_root = ${cfg.package}/etc/postage/web_root
+
+      data_root = ${cfg.dataRoot}
+
+      ${optionalString (!isNull cfg.tls) ''
+      tls_cert = ${cfg.tls.cert}
+      tls_key = ${cfg.tls.key}
+      ''}
+
+      log_level = ${cfg.logLevel}
+    '';
+  };
+
+  postageConnectionsFile = pkgs.writeTextFile {
+    name = "postage-connections.conf";
+    text = concatStringsSep "\n"
+      (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);
+  };
+
+  postage = "postage";
+in {
+
+  options.services.postage = {
+    enable = mkEnableOption "PostgreSQL Administration for the web";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.postage;
+      defaultText = "pkgs.postage";
+      description = ''
+        The postage package to use.
+      '';
+    };
+
+    connections = mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      example = {
+        "nuc-server"  = "hostaddr=192.168.0.100 port=5432 dbname=postgres";
+        "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
+      };
+      description = ''
+        Postage requires at least one PostgreSQL server be defined.
+        </para><para>
+        Detailed information about PostgreSQL connection strings is available at:
+        <link xlink:href="http://www.postgresql.org/docs/current/static/libpq-connect.html"/>
+        </para><para>
+        Note that you should not specify your user name or password. That
+        information will be entered on the login screen. If you specify a
+        username or password, it will be removed by Postage before attempting to
+        connect to a database.
+      '';
+    };
+
+    allowCustomConnections = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        This tells Postage whether or not to allow anyone to use a custom
+        connection from the login screen.
+      '';
+    };
+
+    port = mkOption {
+      type = types.int;
+      default = 8080;
+      description = ''
+        This tells Postage what port to listen on for browser requests.
+      '';
+    };
+
+    localOnly = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        This tells Postage whether or not to set the listening socket to local
+        addresses only.
+      '';
+    };
+
+    superOnly = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        This tells Postage whether or not to only allow super users to
+        login. The recommended value is true and will restrict users who are not
+        super users from logging in to any PostgreSQL instance through
+        Postage. Note that a connection will be made to PostgreSQL in order to
+        test if the user is a superuser.
+      '';
+    };
+
+    loginGroup = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        This tells Postage to only allow users in a certain PostgreSQL group to
+        login to Postage. Note that a connection will be made to PostgreSQL in
+        order to test if the user is a member of the login group.
+      '';
+    };
+
+    loginTimeout = mkOption {
+      type = types.int;
+      default = 3600;
+      description = ''
+        Number of seconds of inactivity before user is automatically logged
+        out.
+      '';
+    };
+
+    dataRoot = mkOption {
+      type = types.str;
+      default = "/var/lib/postage";
+      description = ''
+        This tells Postage where to put the SQL file history. All tabs are saved
+        to this location so that if you get disconnected from Postage you
+        don't lose your work.
+      '';
+    };
+
+    tls = mkOption {
+      type = types.nullOr (types.submodule {
+        options = {
+          cert = mkOption {
+            type = types.str;
+            description = "TLS certificate";
+          };
+          key = mkOption {
+            type = types.str;
+            description = "TLS key";
+          };
+        };
+      });
+      default = null;
+      description = ''
+        These options tell Postage where the TLS Certificate and Key files
+        reside. If you use these options then you'll only be able to access
+        Postage through a secure TLS connection. These options are only
+        necessary if you wish to connect directly to Postage using a secure TLS
+        connection. As an alternative, you can set up Postage in a reverse proxy
+        configuration. This allows your web server to terminate the secure
+        connection and pass on the request to Postage. You can find help to set
+        up this configuration in:
+        <link xlink:href="https://github.com/workflowproducts/postage/blob/master/INSTALL_NGINX.md"/>
+      '';
+    };
+
+    logLevel = mkOption {
+      type = types.enum ["error" "warn" "notice" "info"];
+      default = "error";
+      description = ''
+        Verbosity of logs
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.postage = {
+      description = "postage - PostgreSQL Administration for the web";
+      wants    = [ "postgresql.service" ];
+      after    = [ "postgresql.service" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User         = postage;
+        Group        = postage;
+        ExecStart    = "${pkgs.postage}/sbin/postage -c ${confFile}" +
+                       optionalString cfg.localOnly " --local-only=true";
+      };
+    };
+    users = {
+      users."${postage}" = {
+        name  = postage;
+        group = postage;
+        home  = cfg.dataRoot;
+        createHome = true;
+      };
+      groups."${postage}" = {
+        name = postage;
+      };
+    };
+  };
+}
diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/postage/default.nix
new file mode 100644
index 000000000000..17f718182e2e
--- /dev/null
+++ b/pkgs/applications/misc/postage/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
+
+stdenv.mkDerivation rec {
+  name = "postage-${version}";
+  version = "3.2.17";
+
+  src = fetchFromGitHub {
+    owner  = "workflowproducts";
+    repo   = "postage";
+    rev    = "eV${version}";
+    sha256 = "1c9ss5vx8s05cgw68z7y224qq8z8kz8rxfgcayd2ny200kqyn5bl";
+  };
+
+  buildInputs = [ postgresql openssl ];
+
+  meta = with stdenv.lib; {
+    description = "A fast replacement for PGAdmin";
+    longDescription = ''
+      At the heart of Postage is a modern, fast, event-based C-binary, built in
+      the style of NGINX and Node.js. This heart makes Postage as fast as any
+      PostgreSQL interface can hope to be.
+    '';
+    homepage = http://www.workflowproducts.com/postage.html;
+    license = licenses.asl20;
+    maintainers = [ maintainers.basvandijk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ed1a6715e9..46cf5eb2c1bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18769,6 +18769,8 @@ with pkgs;
 
   opkg-utils = callPackage ../tools/package-management/opkg-utils { };
 
+  postage = callPackage ../applications/misc/postage { };
+
   pgadmin = callPackage ../applications/misc/pgadmin { };
 
   pgf = pgf2;

From 38f3153caa17c6f3d0445e5e55696cc041e60e9a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 9 Aug 2017 10:08:14 +0200
Subject: [PATCH 08/63] motu-client: 1.0.8 -> 1.4.0

---
 pkgs/applications/science/misc/motu-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix
index b5e9fa6a51ee..0d5c79fde900 100644
--- a/pkgs/applications/science/misc/motu-client/default.nix
+++ b/pkgs/applications/science/misc/motu-client/default.nix
@@ -1,11 +1,11 @@
 { python27Packages, fetchurl, lib } :
 python27Packages.buildPythonApplication rec {
   name = "motu-client-${version}";
-  version = "1.0.8";
+  version = "1.4.00";
 
   src = fetchurl {
-    url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz";
-    sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2";
+    url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz";
+    sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb";
   };
 
   meta = with lib; {

From a77c7e95fbb56af347cc6d731f8a9c343cdcf1a9 Mon Sep 17 00:00:00 2001
From: Grant Wu <grantwwu@gmail.com>
Date: Wed, 9 Aug 2017 22:40:44 -0400
Subject: [PATCH 09/63] libtorrentRasterbar_1_0 1.0.10 -> 1.0.11

---
 pkgs/development/libraries/libtorrent-rasterbar/1.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix
index 97aa0145956c..877d8ed434c6 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.0.10";
-  sha256 = "1x5gvajplmwx869avlpx8p3c12pzi6wkgqaxmj5049nvw57l00kl";
+  version = "1.0.11";
+  sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i";
 })

From 35a268795c5ce93c05ecbdb155f7bb88f4210e59 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 12 Aug 2017 10:28:09 +0200
Subject: [PATCH 10/63] emby: 3.2.22.0 -> 3.2.26.0

---
 pkgs/servers/emby/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 7e4c69e3862d..4480d9507663 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.22.0";
+  version = "3.2.26.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0vc9391q1mi16k05yl5lqs2cmsgcid339pbqm9fyqzm33fk7d73r";
+    sha256 = "04d06640g56f894ypxyp7q5ikbp29nw19w6z136b5kdjy97b6idr";
   };
 
   buildInputs = with pkgs; [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "MediaBrowser - Bring together your videos, music, photos, and live television";
-    homepage = http://emby.media/;
+    homepage = https://emby.media/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.fadenb ];
     platforms = stdenv.lib.platforms.all;

From 8e178502e5d6c611e0e4f7fdad5ddd6a00c95106 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 12 Aug 2017 20:39:32 +0200
Subject: [PATCH 11/63] clib: 1.7.0 -> 1.8.0

---
 pkgs/tools/package-management/clib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index cd9499d9146d..795a605b3b63 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, curl  }:
 
 stdenv.mkDerivation rec {
-  version = "1.7.0";
+  version = "1.8.0";
   name = "clib-${version}";
 
   src = fetchFromGitHub {
     rev    = version;
     owner  = "clibs";
     repo   = "clib";
-    sha256 = "08n2i3dyh5vnrb74a6wlqqn67c9nwkq0v0v651zzha495mqbciq7";
+    sha256 = "0w1qiwq0jjrk8p848bmwxq4wvzhbd2zghq3qm8ylaj3z0xdw7ppk";
   };
 
   hardeningDisable = [ "fortify" ];

From 463f53906abe58f532edd3811e98ac3ceb85fb85 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 12 Aug 2017 23:56:21 +0200
Subject: [PATCH 12/63] mixxx: fix build

---
 pkgs/applications/audio/mixxx/default.nix  |  2 ++
 pkgs/applications/audio/mixxx/sqlite.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/audio/mixxx/sqlite.patch

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 33265e1b3e8f..0bf7472ea115 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
   };
 
+  patches = [ ./sqlite.patch ]; # from: https://bugs.gentoo.org/show_bug.cgi?id=622776
+
   buildInputs = [
     chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
     libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
diff --git a/pkgs/applications/audio/mixxx/sqlite.patch b/pkgs/applications/audio/mixxx/sqlite.patch
new file mode 100644
index 000000000000..ed9f4ee51437
--- /dev/null
+++ b/pkgs/applications/audio/mixxx/sqlite.patch
@@ -0,0 +1,13 @@
+diff -urN old/src/library/trackcollection.h mixxx-2.0.0/src/library/trackcollection.h
+--- old/src/library/trackcollection.h	2017-07-30 00:04:48.511029517 -0400
++++ mixxx-2.0.0/src/library/trackcollection.h	2017-07-30 00:05:03.378699826 -0400
+@@ -34,8 +34,7 @@
+ #include "library/dao/libraryhashdao.h"
+
+ #ifdef __SQLITE3__
+-typedef struct sqlite3_context sqlite3_context;
+-typedef struct Mem sqlite3_value;
++#include <sqlite3.h>
+ #endif
+
+ class TrackInfoObject;

From 302e7825fad0788849ad76d35dc04fb78a0e66ed Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 00:16:42 +0200
Subject: [PATCH 13/63] htslib: 1.4.0 -> 1.5.0

---
 pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index a74905b5ba1d..5a08e32e7e98 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   version = "${major}.0";
   pname = "htslib";
-  major = "1.4";
+  major = "1.5";
 
   src = fetchurl {
     url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2";
-    sha256 = "0l1ki3sqfhawfn7fx9v7i2pm725jki4c5zij9j96xka5zwc8iz2w";
+    sha256 = "0bcjmnbwp2bib1z1bkrp95w9v2syzdwdfqww10mkb1hxlmg52ax0";
   };
 
   buildInputs = [ zlib bzip2 lzma curl ];

From ca45a26ec36d8fe52ca4821668400a71b42bc626 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 00:17:25 +0200
Subject: [PATCH 14/63] samtools: 1.4.0 -> 1.5.0

---
 pkgs/applications/science/biology/samtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index 827c1448693a..f8391a2d6b3c 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "samtools";
-  major = "1.4";
+  major = "1.5";
   version = "${major}.0";
 
   src = fetchurl {
     url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2";
-    sha256 = "1x73c0lxvd58ghrmaqqyp56z7bkmp28a71fk4ap82j976pw5pbls";
+    sha256 = "1xidmv0jmfy7l0kb32hdnlshcxgzi1hmygvig0cqrq1fhckdlhl5";
   };
 
   buildInputs = [ zlib ncurses ];

From 15a99ae367ee899d9a3c095dd3b2c8e05f4da3b5 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 00:17:48 +0200
Subject: [PATCH 15/63] bcftools: 1.4.0 -> 1.5.0

---
 pkgs/applications/science/biology/bcftools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index 97e081f908ef..cfd72601d1eb 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bcftools";
-  major = "1.4";
+  major = "1.5";
   version = "${major}.0";
 
   src = fetchurl {
     url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2";
-    sha256 = "0k93mq3lf73dch81p4zxi0bdll567acxfa81qzbzkqflgsjb1ccg";
+    sha256 = "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz";
   };
 
   buildInputs = [ zlib bzip2 lzma perl ];

From 8933aca97827a1efd8628d2f11e85f1aa9617508 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 00:50:34 +0200
Subject: [PATCH 16/63] byobu: 5.112 -> 5.121

---
 pkgs/tools/misc/byobu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index d00e1abc7a5d..82ae4d40f2db 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
-  version = "5.112";
+  version = "5.121";
   name = "byobu-" + version;
 
   src = fetchurl {
     url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
-    sha256 = "0avv1s8dh3z6rzkf1mn1375v3im1qc9c63w09yvwxdlcq5xznrsd";
+    sha256 = "0rbwb7kh0f458ad51grrhz56889g6xj1c29c838pi37cjdgl3wjx";
   };
 
   doCheck = true;

From 32e329b1c73e59429496b7ee2ad1024af33ad669 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 13 Aug 2017 01:01:07 +0200
Subject: [PATCH 17/63] dateutils: 0.4.1 -> 0.4.2

---
 pkgs/tools/misc/dateutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 396d26a6cd14..86a8d3f234b3 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.1";
+  version = "0.4.2";
   name = "dateutils-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
-    sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c";
+    sha256 = "0sxl5rz9rw02dfn5mdww378hjgnnbxavs52viyfyx620b29finpc";
   };
 
   meta = with stdenv.lib; {

From 877d331765393420ed2855715d1f445b8de25cd9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 12 Aug 2017 19:44:56 -0400
Subject: [PATCH 18/63] vscode: 1.14.2 -> 1.15.0

---
 pkgs/applications/editors/vscode/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 18eb1803fd62..dee8dc6b5107 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.14.2";
+  version = "1.15.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0ladqwgy37imq957mmbdfslaxcnx8gcl9nb1q5p8r91vldvf31zd";
-    "x86_64-linux" = "1nb9n6511v2p1nwcwh6kbpxgydfs66yn7q2nf1rmh42ha5yzqkja";
-    "x86_64-darwin" = "0yk2yd8rzhmsh276xfgywp1gjjkvxypgnjhs8jaxvrgsj7aw1s39";
+    "i686-linux" = "1ny4n6xbwvw88fy6k59dd2g4h8z9a9r7m6fbpgs6lwv0a6cill01";
+    "x86_64-linux" = "16mm9yks271p81nsp6yhfgdy5b1w7cs12cwn2z919kj0i4i09fk1";
+    "x86_64-darwin" = "1dwpnllff72yd8a6gc9xv4j7fxwsjgwjvdss0ld4m6kx17zm43qm";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 8da8a162bbc8858632eb5da3c1682e3c75393034 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 13 Aug 2017 03:57:50 +0200
Subject: [PATCH 19/63] notmuch: 0.24.2 -> 0.25

---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 606e5593593f..d9af01bdad41 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -10,7 +10,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.24.2";
+  version = "0.25";
   name = "notmuch-${version}";
 
   passthru = {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "0lfchvapk11qazdgsxj42igp9mpp83zbd0h1jj6r3ifmhikajxma";
+    sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5";
   };
 
   buildInputs = [

From 184d2e79778a4e5ff6bf09037d0df9f4574c11b9 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 13 Aug 2017 13:26:30 +0200
Subject: [PATCH 20/63] alt-ergo: use https instead of http to fetch archive

---
 pkgs/applications/science/logic/alt-ergo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 7cf0aeb203de..8cf4bb9b6d25 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.30";
 
   src = fetchurl {
-    url    = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
+    url    = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
     name   = "${name}.tar.gz";
     sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g";
   };
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-performance theorem prover and SMT solver";
-    homepage    = "http://alt-ergo.ocamlpro.com/";
+    homepage    = "https://alt-ergo.ocamlpro.com/";
     license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];

From b9b00495d53ad85f04279865c95d09e2a57bb94a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 13 Aug 2017 19:31:23 +0800
Subject: [PATCH 21/63] tboot: 1.8.2 -> 1.9.6

---
 pkgs/tools/security/tboot/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix
index 506b1d398d54..8530aab4e706 100644
--- a/pkgs/tools/security/tboot/default.nix
+++ b/pkgs/tools/security/tboot/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchurl, trousers, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tboot-1.8.2";
+  name = "tboot-${version}";
+  version = "1.9.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/tboot/${name}.tar.gz";
-    sha256 = "1l9ccm7ik9fs7kzg1bjc5cjh0pcf4v0k1c84dmyr51r084i7p31m";
+    sha256 = "0f9afz260xhycpd0x5zz6jn8ha14i8j98rck0fhb55l1rbbfwm8v";
   };
 
+  patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ];
+
   buildInputs = [ trousers openssl zlib ];
 
-  patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ];
+  enableParallelBuilding = true;
 
   hardeningDisable = [ "pic" "stackprotector" ];
 
@@ -27,8 +30,7 @@ stdenv.mkDerivation rec {
     description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM";
     homepage    = http://sourceforge.net/projects/tboot/;
     license     = licenses.bsd3;
-    maintainers = [ maintainers.ak ];
+    maintainers = with maintainers; [ ak ];
     platforms   = platforms.linux;
   };
 }
-

From fd6db4f9136bff6d4926f2a77b07f85328aa3723 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 13 Aug 2017 14:18:49 +0200
Subject: [PATCH 22/63] aescrypt: use https to fetch archive

---
 pkgs/tools/misc/aescrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 53aec187bb76..d11392599220 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "aescrypt-${version}";
 
   src = fetchurl {
-    url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz";
+    url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz";
     sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Encrypt files with Advanced Encryption Standard (AES)";
-    homepage    = http://www.aescrypt.com/;
+    homepage    = https://www.aescrypt.com/;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 qknight ];
     platforms   = stdenv.lib.platforms.all;

From beec141d84cc9cdc960c960fbf3dde145c2d3e33 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 13 Aug 2017 21:17:53 +0800
Subject: [PATCH 23/63] ddclient: assign group for ddclient

---
 nixos/modules/misc/ids.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6ec3c1a112dd..859838182ed4 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -335,7 +335,7 @@
       dialout = 27;
       #polkituser = 28; # currently unused, polkitd doesn't need a group
       utmp = 29;
-      #ddclient = 30; # unused
+      ddclient = 30;
       davfs2 = 31;
       disnix = 33;
       osgi = 34;

From d4f4f418b31f0a70dce50f54ce4280fef76cba08 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 13 Aug 2017 21:45:25 +0800
Subject: [PATCH 24/63] ddclient: minor packaging cleanups

---
 pkgs/tools/networking/ddclient/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index 333292d9fab8..6d3ca27df1d6 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -11,31 +11,31 @@ buildPerlPackage rec {
 
   outputs = [ "out" ];
 
-  buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ];
+  buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ];
 
   patches = [ ./ddclient-line-buffer-stdout.patch ];
 
   # Use iproute2 instead of ifconfig
   preConfigure = ''
     touch Makefile.PL
-    substituteInPlace ddclient --replace 'in the output of ifconfig' 'in the output of ip addr show'
-    substituteInPlace ddclient --replace 'ifconfig -a' '${iproute}/sbin/ip addr show'
-    substituteInPlace ddclient --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg'
+    substituteInPlace ddclient \
+      --replace 'in the output of ifconfig' 'in the output of ip addr show' \
+      --replace 'ifconfig -a'               '${iproute}/sbin/ip addr show' \
+      --replace 'ifconfig $arg'             '${iproute}/sbin/ip addr show $arg'
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp ddclient $out/bin
+    install -Dm755 ddclient $out/bin/ddclient
   '';
 
+  # there are no tests distributed with ddclient
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = https://sourceforge.net/p/ddclient/wiki/Home/;
     description = "Client for updating dynamic DNS service entries";
-    license = licenses.gpl2Plus;
-
+    homepage    = https://sourceforge.net/p/ddclient/wiki/Home/;
+    license     = licenses.gpl2Plus;
     # Mostly since `iproute` is Linux only.
-    platforms = platforms.linux;
+    platforms   = platforms.linux;
   };
 }

From 4ce76d9e1a4abb5ef0461ea8ac19095868fa5f66 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 13 Aug 2017 21:46:13 +0800
Subject: [PATCH 25/63] ddclient nixos module: follow best practice for running
 daemons

Couple of changes:

 - move home to /var/lib/ddclient so we can enable ProtectSystem=full
 - do not stick binary into systemPackages as it will only run as a daemon
 - run as dedicated user/group
 - document why we cannot run as type=forking (output is swallowed)
 - secure things by running with ProtectSystem and PrivateTmp
 - .pid file goes into /run/ddclient
 - let nix create the home directory instead of handling it manually
 - make the interval configurable
---
 .../modules/services/networking/ddclient.nix  | 98 +++++++++++--------
 1 file changed, 55 insertions(+), 43 deletions(-)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 28c96a9baefc..9e56545f746c 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -1,17 +1,33 @@
 { config, pkgs, lib, ... }:
 
 let
+  cfg = config.services.ddclient;
+  boolToStr = bool: if bool then "yes" else "no";
 
-  inherit (lib) mkOption mkIf singleton;
-  inherit (pkgs) ddclient;
-
-  stateDir = "/var/spool/ddclient";
-  ddclientUser = "ddclient";
-  ddclientFlags = "-foreground -file ${config.services.ddclient.configFile}";
-  ddclientPIDFile = "${stateDir}/ddclient.pid";
+  configText = ''
+    # This file can be used as a template for configFile or is automatically generated by Nix options.
+    daemon=${toString cfg.interval}
+    cache=${cfg.homeDir}/ddclient.cache
+    pid=/run/ddclient/ddclient.pid
+    foreground=NO
+    use=${cfg.use}
+    login=${cfg.username}
+    password=${cfg.password}
+    protocol=${cfg.protocol}
+    ${let server = cfg.server; in
+      lib.optionalString (server != "") "server=${server}"}
+    ssl=${boolToStr cfg.ssl}
+    wildcard=YES
+    quiet=${boolToStr cfg.quiet}
+    verbose=${boolToStr cfg.verbose}
+    ${cfg.domain}
+    ${cfg.extraConfig}
+  '';
 
 in
 
+with lib;
+
 {
 
   ###### interface
@@ -28,6 +44,12 @@ in
         '';
       };
 
+      homeDir = mkOption {
+        default = "/var/lib/ddclient";
+        type = str;
+        description = "Home directory for the daemon user.";
+      };
+
       domain = mkOption {
         default = "";
         type = str;
@@ -52,6 +74,12 @@ in
         '';
       };
 
+      interval = mkOption {
+        default = 600;
+        type = int;
+        description = "The interval at which to run the check and update.";
+      };
+
       configFile = mkOption {
         default = "/etc/ddclient.conf";
         type = path;
@@ -126,37 +154,24 @@ in
 
   config = mkIf config.services.ddclient.enable {
 
-    environment.systemPackages = [ ddclient ];
+    users = {
+      extraGroups.ddclient.gid = config.ids.gids.ddclient;
 
-    users.extraUsers = singleton {
-      name = ddclientUser;
-      uid = config.ids.uids.ddclient;
-      description = "ddclient daemon user";
-      home = stateDir;
+      extraUsers.ddclient = {
+        uid = config.ids.uids.ddclient;
+        description = "ddclient daemon user";
+        group = "ddclient";
+        home = cfg.homeDir;
+        createHome = true;
+      };
     };
 
     environment.etc."ddclient.conf" = {
-      enable = config.services.ddclient.configFile == "/etc/ddclient.conf";
+      enable = cfg.configFile == "/etc/ddclient.conf";
       uid = config.ids.uids.ddclient;
+      gid = config.ids.gids.ddclient;
       mode = "0600";
-      text = ''
-        # This file can be used as a template for configFile or is automatically generated by Nix options.
-        daemon=600
-        cache=${stateDir}/ddclient.cache
-        pid=${ddclientPIDFile}
-        use=${config.services.ddclient.use}
-        login=${config.services.ddclient.username}
-        password=${config.services.ddclient.password}
-        protocol=${config.services.ddclient.protocol}
-        ${let server = config.services.ddclient.server; in
-          lib.optionalString (server != "") "server=${server}"}
-        ssl=${if config.services.ddclient.ssl then "yes" else "no"}
-        wildcard=YES
-        quiet=${if config.services.ddclient.quiet then "yes" else "no"}
-        verbose=${if config.services.ddclient.verbose then "yes" else "no"}
-        ${config.services.ddclient.domain}
-        ${config.services.ddclient.extraConfig}
-      '';
+      text = configText;
     };
 
     systemd.services.ddclient = {
@@ -166,17 +181,14 @@ in
       restartTriggers = [ config.environment.etc."ddclient.conf".source ];
 
       serviceConfig = {
-        # Uncomment this if too many problems occur:
-        # Type = "forking";
-        User = ddclientUser;
-        Group = "nogroup"; #TODO get this to work
-        PermissionsStartOnly = "true";
-        PIDFile = ddclientPIDFile;
-        ExecStartPre = ''
-          ${pkgs.stdenv.shell} -c "${pkgs.coreutils}/bin/mkdir -m 0755 -p ${stateDir} && ${pkgs.coreutils}/bin/chown ${ddclientUser} ${stateDir}"
-        '';
-        ExecStart = "${ddclient}/bin/ddclient ${ddclientFlags}";
-        #ExecStartPost = "${pkgs.coreutils}/bin/rm -r ${stateDir}"; # Should we have this?
+        RuntimeDirectory = "ddclient";
+        # we cannot run in forking mode as it swallows all the program output
+        Type = "simple";
+        User = "ddclient";
+        Group = "ddclient";
+        ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}";
+        ProtectSystem = "full";
+        PrivateTmp = true;
       };
     };
   };

From 3fde7111461715457464decd19404e4c82a6d2ef Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 13 Aug 2017 13:43:16 +0200
Subject: [PATCH 26/63] acoustid-fingerprinter: use https to fetch package

---
 pkgs/tools/audio/acoustid-fingerprinter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index b8341204e92e..ba029814f392 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.6";
 
   src = fetchurl {
-    url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
+    url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
         + "${name}.tar.gz";
     sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0";
   };
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   }) ];
 
   meta = with stdenv.lib; {
-    homepage = http://acoustid.org/fingerprinter;
+    homepage = https://acoustid.org/fingerprinter;
     description = "Audio fingerprinting tool using chromaprint";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with maintainers; [ ehmry ];

From d60b288663718cbde7a0f5ec936b55e70c14a3d2 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Wed, 9 Aug 2017 19:00:30 +0100
Subject: [PATCH 27/63] Nixpkgs manual: expand documentation for overlays

---
 doc/overlays.xml | 67 +++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index f8f554bb5569..6d631071c345 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -8,59 +8,62 @@
 overlays. Overlays are used to add layers in the fix-point used by Nixpkgs
 to compose the set of all packages.</para>
 
+<para>Nixpkgs can be configured with a list of overlays, which are
+applied in order. This means that the order of the overlays can be significant
+if multiple layers override the same package.</para>
+
 <!--============================================================-->
 
 <section xml:id="sec-overlays-install">
-<title>Installing Overlays</title>
+<title>Installing overlays</title>
 
-<para>The set of overlays is looked for in the following places. The
-first one present is considered, and all the rest are ignored:
+<para>The list of overlays is determined as follows:
 
 <orderedlist>
 
   <listitem>
+    <para>First, if an <varname>overlays</varname> argument to the nixpkgs function itself is given,
+    then that is used. This can be passed explicitly when importing nipxkgs, for example 
+    <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ] }</literal>.</para>
 
-    <para>As an argument of the imported attribute set. When importing Nixpkgs,
-    the <varname>overlays</varname> attribute argument can be set to a list of
-    functions, which is described in <xref linkend="sec-overlays-layout"/>.</para>
-
+    <para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present, 
+    is passed to the system Nixpkgs in this way. Note that this does not affect the overlays for
+    non-NixOS operations (e.g. <literal>nix-env</literal>), which are looked up independently.</para>
   </listitem>
 
   <listitem>
+    <para>Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists and is a 
+    directory, then the result is the set of overlays found in that directory, ordered lexicographically.</para> 
 
-    <para>In the directory pointed to by the Nix search path entry
-    <literal>&lt;nixpkgs-overlays></literal>.</para>
+    <para>See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to 
+    set a value for <literal>&lt;nixpkgs-overlays>.</literal></para>
   </listitem>
 
   <listitem>
-
-    <para>In the directory <filename>~/.config/nixpkgs/overlays/</filename>.</para>
+    <para>Otherwise, if <filename>~/.config/nixpkgs/overlays/</filename> exists and is a directory, then
+    the result is the set of overlays found in that directory, ordered lexicographically.</para>
   </listitem>
 
 </orderedlist>
 </para>
 
-<para>For the second and third options, the directory should contain Nix expressions defining the
-overlays. Each overlay can be a file, a directory containing a
-<filename>default.nix</filename>, or a symlink to one of those. The expressions should follow
-the syntax described in <xref linkend="sec-overlays-layout"/>.</para>
+<para>For the second and third options overlays can be provided as files, 
+directories containing a <filename>default.nix</filename>, or symlinks to one of those.</para>
 
-<para>The order of the overlay layers can influence the recipe of packages if multiple layers override
-the same recipe. In the case where overlays are loaded from a directory, they are loaded in
-alphabetical order.</para>
-
-<para>To install an overlay using the last option, you can clone the overlay's repository and add
-a symbolic link to it in <filename>~/.config/nixpkgs/overlays/</filename> directory.</para>
+<para>The last option provides a convenient way to install an overlay from a repository, 
+by cloning the overlay's repository and adding a symbolic link to it in 
+<filename>~/.config/nixpkgs/overlays/</filename>.</para>
 
 </section>
 
 <!--============================================================-->
 
-<section xml:id="sec-overlays-layout">
-<title>Overlays Layout</title>
+<section xml:id="sec-overlays-definition">
+<title>Defining overlays</title>
 
-<para>Overlays are expressed as Nix functions which accept 2 arguments and return a set of
-packages.</para>
+<para>Overlays are Nix functions which accept two arguments, 
+conventionally called <varname>self</varname> and <varname>super</varname>, 
+and return a set of packages. For example, the following is a valid overlay.</para>
 
 <programlisting>
 self: super:
@@ -75,25 +78,31 @@ self: super:
 }
 </programlisting>
 
-<para>The first argument, usually named <varname>self</varname>, corresponds to the final package
+<para>The first argument (<varname>self</varname>) corresponds to the final package
 set. You should use this set for the dependencies of all packages specified in your
 overlay. For example, all the dependencies of <varname>rr</varname> in the example above come
 from <varname>self</varname>, as well as the overridden dependencies used in the
 <varname>boost</varname> override.</para>
 
-<para>The second argument, usually named <varname>super</varname>,
+<para>The second argument (<varname>super</varname>)
 corresponds to the result of the evaluation of the previous stages of
 Nixpkgs. It does not contain any of the packages added by the current
-overlay nor any of the following overlays. This set should be used either
+overlay, nor any of the following overlays. This set should be used either
 to refer to packages you wish to override, or to access functions defined
 in Nixpkgs. For example, the original recipe of <varname>boost</varname>
 in the above example, comes from <varname>super</varname>, as well as the
 <varname>callPackage</varname> function.</para>
 
 <para>The value returned by this function should be a set similar to
-<filename>pkgs/top-level/all-packages.nix</filename>, which contains
+<filename>pkgs/top-level/all-packages.nix</filename>, containing
 overridden and/or new packages.</para>
 
+<para>Overlays are similar to other methods for customizing Nixpkgs, in particular
+the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>.
+Indeed, <literal>packageOverrides</literal> acts as an overlay with only the 
+<varname>super</varname> argument. It is therefore appropriate for basic use, 
+but overlays are more powerful and easier to distribute.</para>
+
 </section>
 
 </chapter>

From 5bc183ebf868b32b599692a3b651a39d8a97dee3 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Sun, 13 Aug 2017 14:42:33 +0100
Subject: [PATCH 28/63] Overlays: fix some documentation nits

---
 doc/overlays.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index 6d631071c345..ad31b90299e7 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -47,7 +47,7 @@ if multiple layers override the same package.</para>
 </orderedlist>
 </para>
 
-<para>For the second and third options overlays can be provided as files, 
+<para>For the second and third options, overlays are extracted from the given directory as files, 
 directories containing a <filename>default.nix</filename>, or symlinks to one of those.</para>
 
 <para>The last option provides a convenient way to install an overlay from a repository, 

From 7d50d5e304caa148f1bcde7ee9ae42aac30f8111 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 13 Aug 2017 15:09:16 +0000
Subject: [PATCH 29/63] far2l: 2017-05-09 -> 2017-07-13

---
 pkgs/applications/misc/far2l/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 87709ec102bf..658fe3477b31 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -2,15 +2,15 @@
   xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
 
 stdenv.mkDerivation rec {
-  rev = "ab240373f69824c56e9255d452b689cff3b1ecfb";
-  build = "2017-05-09-${builtins.substring 0 10 rev}";
+  rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed";
+  build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}";
   name = "far2l-2.1.${build}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
     rev = rev;
-    sha256 = "1b6w6xhja3xkfzhrdy8a8qpbhxws75khm1zhwz8sc8la9ykd541q";
+    sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8";
   };
 
   nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];

From d9854884fa52f0207faa1f5d431d2a48f3d57eb4 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 13 Aug 2017 15:09:37 +0000
Subject: [PATCH 30/63] far2l: add nix syntax highlighting

---
 .../far2l/add-nix-syntax-highlighting.patch   | 157 ++++++++++++++++++
 pkgs/applications/misc/far2l/default.nix      |   2 +
 2 files changed, 159 insertions(+)
 create mode 100644 pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch

diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
new file mode 100644
index 000000000000..68a16b196fa3
--- /dev/null
+++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
@@ -0,0 +1,157 @@
+diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc
+new file mode 100644
+index 0000000..1bd9bb5
+--- /dev/null
++++ b/colorer/configs/base/hrc/nix.hrc
+@@ -0,0 +1,132 @@
++<?xml version="1.0" encoding="windows-1251"?>
++<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
++  "http://colorer.sf.net/2003/hrc.dtd">
++<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
++     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++     xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">
++
++  <type name="nix">
++
++    <annotation><documentation>
++        Nix
++    </documentation></annotation>
++
++    <import type="def"/>
++
++    <region name="Code" parent="def:Text"/>
++    <region name="StringEscape" parent="def:StringContent"/>
++    <region name='Import' parent='def:Directive'/>
++    <region name='ImportOutline' parent='def:Outlined'/>
++    <region name="Path"     parent="def:Path"/>
++    <region name="URL"      parent="def:String"/>
++    <region name="LiteralKeyword" parent="def:Keyword"/>
++    <region name='Interpolation' parent='def:StringEdge'/>
++    <region name="Ident" parent="def:Identifier"/> <!-- Label  -->
++
++    <scheme name="TabsAsErrors" if="tabs-as-errors">
++      <regexp match="/\t+/" region='def:Error'/>
++    </scheme>
++
++    <scheme name="SpacesAsErrors" if="spaces-as-errors">
++      <regexp match="/\x20+$/" region='def:Error'/>
++    </scheme>
++
++    <scheme name="NotNestedComment">
++      <inherit scheme="TabsAsErrors"/>
++      <inherit scheme="SpacesAsErrors"/>
++      <inherit scheme="Comment"/>
++    </scheme>
++
++    <scheme name="String">
++      <inherit scheme="TabsAsErrors"/>
++      <inherit scheme="SpacesAsErrors"/>
++<!--  <regexp match="/\\[xX]0*[\da-fA-F]{1,2}/"                   region0="StringEscape"/> -->
++      <regexp match="/\\./"                                       region0="StringEscape"/>
++      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
++    </scheme>
++
++    <scheme name="BlockString">
++      <inherit scheme="TabsAsErrors"/>
++      <inherit scheme="SpacesAsErrors"/>
++
++      <regexp match="/&apos;&apos;\$/"                                          region0="StringEscape"/>
++      <regexp match="/&apos;&apos;&apos;/"                                      region0="StringEscape"/>
++      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
++    </scheme>
++
++    <scheme name="NixIdent">
++      <regexp match="/\w[\w\d-]*'*/"           region0="Ident"/>
++    </scheme>
++
++    <scheme name="NixExpression">
++      <inherit scheme="TabsAsErrors"/>
++      <inherit scheme="SpacesAsErrors"/>
++
++      <inherit scheme="def:unixCommentDirective"/>
++      <block start="/#/"    end="/\s*$/"            scheme="Comment"          region="LineComment" region10="def:Error"/>
++      <block start="/\/\*/" end="/\*\//"            scheme="NotNestedComment" region="Comment"     region00="PairStart" region10="PairEnd"/>
++
++      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
++      <block start="/(\{)/"   end="/(\})/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
++      <block start="/(\()/"   end="/(\))/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
++      <block start="/(\[)/"   end="/(\])/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
++
++      <regexp match="/(\.\.|\.|\~|)\/[\w\d.+=?-]+(\/[\w\d.+=?-]+)*/"            region0="Path"/>
++      <regexp match="/&lt;[\w\d\/.-]+&gt;/"                                     region0="Path"/>
++      <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/"    region0="URL"/>
++      <block start="/(&quot;)/"       end="/(&quot;)/"       scheme="String"      region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
++      <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
++
++      <keywords region="Keyword">
++        <word name="assert"/>
++        <word name="else"/>
++        <word name="if"/>
++        <word name="in"/>
++        <word name="inherit"/>
++        <word name="import"/>
++        <word name="let"/>
++        <word name="rec"/>
++        <word name="then"/>
++        <word name="throw"/>
++        <word name="with"/>
++      </keywords>
++      <keywords region="LiteralKeyword">
++        <word name="true"/>
++        <word name="false"/>
++        <word name="null"/>
++      </keywords>
++      <keywords region="Symbol">
++        <symb name="."/>
++        <symb name=":"/>
++        <symb name=","/>
++        <symb name=";"/>
++
++        <symb name="*"/>
++        <symb name="/"/>
++        <symb name="%"/>
++        <symb name="+"/>
++        <symb name="-"/>
++        <symb name="!"/>
++        <symb name="?"/>
++        <symb name="@"/>
++        <symb name="&lt;"/>
++        <symb name="&gt;"/>
++        <symb name="&amp;"/>
++        <symb name="|"/>
++        <symb name="="/>
++        <symb name="..."/>
++      </keywords>
++
++      <inherit scheme="def:Number"/>
++      <inherit scheme="NixIdent"/>
++
++      <regexp match="/[^\)\}\]\s]/" region='def:Error'/>
++
++    </scheme>
++
++    <scheme name="nix">
++      <inherit scheme="NixExpression"/>
++    </scheme>
++
++  </type>
++</hrc>
+diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc
+index 11e493b..2a67263 100644
+--- a/colorer/configs/base/hrc/proto.hrc
++++ b/colorer/configs/base/hrc/proto.hrc
+@@ -156,6 +156,14 @@
+     <location link="jar:common.jar!base/lua.hrc"/>
+     <filename>/\.(w?lua)$/i</filename>
+   </prototype>
++  <prototype name="nix" group="main" description="Nix">
++    <location link="nix.hrc"/>
++    <filename>/\.(nix)$/i</filename>
++    <parameters>
++      <param name="tabs-as-errors" value="true" description="Shows tabulation symbol as error"/>
++      <param name="spaces-as-errors" value="true" description="Shows trailing spaces as error"/>
++    </parameters>
++  </prototype>
+   <prototype name="ruby" group="main" description="Ruby">
+     <location link="jar:common.jar!base/ruby.hrc"/>
+     <filename>/\.(rb|rbw|ruby|rake)$/i</filename>
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 658fe3477b31..926b1a41ede7 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ wxGTK30 glib pcre ];
 
+  patches = [ ./add-nix-syntax-highlighting.patch ];
+
   postPatch = ''
     echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
 

From 206faacbcb8c9a4655c6c8cf2cf5eec688d59719 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 13 Aug 2017 17:58:18 +0200
Subject: [PATCH 31/63] gcc: fix clang build

Fixes #27889

This works properly now that LD_DYLD_PATH is fixed
---
 pkgs/development/compilers/gcc/5/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e95ef92c3f65..c9780077835e 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -325,7 +325,13 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+  preConfigure =
+    # Not sure why this is causing problems, now that the stdenv
+    # exports CPP=cpp the build fails with strange errors on darwin.
+    # https://github.com/NixOS/nixpkgs/issues/27889
+    stdenv.lib.optionalString stdenv.cc.isClang ''
+    unset CPP
+  '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

From cb3575bda7ab110e4e6fce9f29d8ac5edb142294 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 13 Aug 2017 12:27:30 -0400
Subject: [PATCH 32/63] kubernetes-helm: 2.5.0 -> 2.5.1

---
 pkgs/applications/networking/cluster/helm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index dc7d2b8b2eab..0ac872c35c90 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,10 +4,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd"
-             else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj";
+             then "1hkr5s1c72sqf156lk6gsnbfs75jnpqs42f64a7mz046c06kv98f"
+             else "00xw0c66x58g915989fc72mwliysxi5glrkdafi3gcfmlhrnc68i";
   pname = "helm";
-  version = "2.5.0";
+  version = "2.5.1";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";

From 92d4efee8e895d4cc3fb10841004ba6d389e3d19 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 13 Aug 2017 18:54:43 +0200
Subject: [PATCH 33/63] clipster: 1.0.1 -> 1.2.5

---
 pkgs/tools/misc/clipster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index e34f4bc8f2f2..a70cba3f3d0d 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation  rec {
   name = "clipster-${version}";
-  version = "1.0.1";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
     rev = "${version}";
-    sha256 = "0y0igi5r5x2gxglm0aarn2mhdfn6whakm6359i3h0wkn6qw1p1l2";
+    sha256 = "0yjljpqpcbi84ibbrxbm5cbgs16ada4cmvir744hygrdl948zzk3";
   };
 
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);

From 2d5a04e5bdb3e5817352d6c31eb56f0653cbe50c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 13 Aug 2017 19:07:38 +0200
Subject: [PATCH 34/63] nixos/agetty: override upstream default

Also see c2cf696430055498467dd9deec59939e8d52a43e.
---
 nixos/modules/services/ttys/agetty.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index f8dd75ea2c46..3429397d2cc2 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -85,12 +85,18 @@ in
       };
 
     systemd.services."container-getty@" =
-      { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = [
+          "" # override upstream default with an empty ExecStart
+          (gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM")
+        ];
         restartIfChanged = false;
       };
 
     systemd.services."console-getty" =
-      { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = [
+          "" # override upstream default with an empty ExecStart
+          (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM")
+        ];
         serviceConfig.Restart = "always";
         restartIfChanged = false;
         enable = mkDefault config.boot.isContainer;

From a0aae85012ec4807d46495f44246ea092db2570e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 21:30:42 +0200
Subject: [PATCH 35/63] Python: move some attributes together with the rest of
 the Python-related attributes.

---
 pkgs/top-level/all-packages.nix | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6ae62db18db..d50e812eaf00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6336,6 +6336,7 @@ with pkgs;
   python = python2;
   python2 = python27;
   python3 = python36;
+  pypy = pypy27;
 
   # Python interpreter that is build with all modules, including tkinter.
   # These are for compatibility and should not be used inside Nixpkgs.
@@ -6369,17 +6370,22 @@ with pkgs;
     self = python36;
   };
 
-  # Should eventually be moved inside Python interpreters.
-  python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { };
-
-  pypy = pypy27;
-
   pypy27 = callPackage ../development/interpreters/python/pypy/2.7 {
     self = pypy27;
     python = python27.override{x11Support=true;};
     db = db.override { dbmSupport = true; };
   };
 
+  # Python package sets.
+  python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
+  python34Packages = python34.pkgs;
+  python35Packages = python35.pkgs;
+  python36Packages = recurseIntoAttrs python36.pkgs;
+  pypyPackages = pypy.pkgs;
+
+  # Should eventually be moved inside Python interpreters.
+  python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { };
+
   python2nix = callPackage ../tools/package-management/python2nix { };
 
   pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
@@ -10914,20 +10920,6 @@ with pkgs;
     sqitchModule = perlPackages.AppSqitch;
   };
 
-  ### DEVELOPMENT / PYTHON MODULES
-
-  # Python package sets.
-
-  python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
-
-  python34Packages = python34.pkgs;
-
-  python35Packages = python35.pkgs;
-
-  python36Packages = recurseIntoAttrs python36.pkgs;
-
-  pypyPackages = pypy.pkgs;
-
   ### DEVELOPMENT / R MODULES
 
   R = callPackage ../applications/science/math/R {

From 9c3702ad35b796a8799ffd6424ede60947ef8e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Aug 2017 21:38:39 +0200
Subject: [PATCH 36/63] busybox: downgrade 1.27.1 -> 1.26.2

... to fix our bootstrap tools until we find what exactly is wrong.
This effectively reverts 06a513ee05 and 50831d543d.
Discussion thread: #27746.
---
 pkgs/os-specific/linux/busybox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 2548e33bf4cf..815e2e0f6ef6 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -27,11 +27,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.27.1";
+  name = "busybox-1.26.2";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468";
+    sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From 59e34685da9450bfac43815b175a345656c0a10c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 13 Aug 2017 15:38:42 -0400
Subject: [PATCH 37/63] linux: 4.12.6 -> 4.12.7

---
 pkgs/os-specific/linux/kernel/linux-4.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index 1cbba85b7bad..a7b6442cb6e9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.6";
+  version = "4.12.7";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ywkzqjl9rq672nwn74cw2d871hpzxkrlyx40lkkp4z1y440ijh1";
+    sha256 = "14xyh5wyvp4pmvw4mz9lccw1ijshm7500ijmxzhc9ipjnmp5rhky";
   };
 
   kernelPatches = args.kernelPatches;

From 5c29873e99cd5276175c9b16151eaf675204a6e2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 13 Aug 2017 15:41:45 -0400
Subject: [PATCH 38/63] linux: 4.9.42 -> 4.9.43

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 597d87c63fbd..40c99cbfd88e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.42";
+  version = "4.9.43";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ivq75vksd8rca881zyfimb6n43clr93gbgkd9w8p4qcj797f18a";
+    sha256 = "1h0fv24pmrwmnpa6zzknqk7swq15z7dhkvy1hvzkjz4bfqgb28mx";
   };
 
   kernelPatches = args.kernelPatches;

From c0769dc6effc042209ede41330946bbe34b9ec90 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 13 Aug 2017 00:17:43 +0200
Subject: [PATCH 39/63] nixos/hardened profile: increase ASLR entropy

---
 nixos/modules/profiles/hardened.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 0a0838431da7..0ab210cc4c39 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -59,4 +59,10 @@ with lib;
   # the feature at runtime.  Attempting to create a user namespace
   # with unshare will then fail with "no space left on device".
   boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0;
+
+  # Raise ASLR entropy for 64bit & 32bit, respectively.
+  #
+  # Note: mmap_rnd_compat_bits may not exist on 64bit.
+  boot.kernel.sysctl."vm.mmap_rnd_bits" = mkDefault 32;
+  boot.kernel.sysctl."vm.mmap_rnd_compat_bits" = mkDefault 16;
 }

From f91355443282244ce78292b77d88a09e4ff7bb5d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 21:42:30 +0200
Subject: [PATCH 40/63] python.pkgs.gst-python: fix Python 3 build

---
 .../libraries/gstreamer/python/default.nix     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 4c3cdd901276..9a4a19d59611 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -1,12 +1,11 @@
-{ fetchurl, stdenv, pkgconfig, pythonPackages
-, gst-plugins-base
-, ncurses
+{ fetchurl, stdenv, pkgconfig, python, pygobject3
+, gst-plugins-base, ncurses
 }:
 
-let
-  inherit (pythonPackages) python pygobject3;
-in stdenv.mkDerivation rec {
-  name = "gst-python-1.10.4";
+stdenv.mkDerivation rec {
+  pname = "gst-python";
+  version = "1.10.4";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     urls = [
@@ -26,11 +25,14 @@ in stdenv.mkDerivation rec {
   buildInputs = [ ncurses ];
 
   preConfigure = ''
-    export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides"
+    export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.sitePackages}/gi/overrides"
   '';
 
   propagatedBuildInputs = [ gst-plugins-base pygobject3 ];
 
+  # Needed for python.buildEnv
+  passthru.pythonPath = [];
+
   meta = {
     homepage = http://gstreamer.freedesktop.org;
 

From d0d87242619e5649078739e34afcdf05f3a52cac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Aug 2017 21:46:01 +0200
Subject: [PATCH 41/63] python.pkgs.gst-python: move expression

---
 .../gstreamer/python => python-modules/gst-python}/default.nix  | 0
 .../gst-python}/different-path-with-pygobject.patch             | 0
 pkgs/top-level/python-packages.nix                              | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/{libraries/gstreamer/python => python-modules/gst-python}/default.nix (100%)
 rename pkgs/development/{libraries/gstreamer/python => python-modules/gst-python}/different-path-with-pygobject.patch (100%)

diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
similarity index 100%
rename from pkgs/development/libraries/gstreamer/python/default.nix
rename to pkgs/development/python-modules/gst-python/default.nix
diff --git a/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch b/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch
similarity index 100%
rename from pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch
rename to pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd3d0c1cccf2..146b7e5ec579 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6391,7 +6391,7 @@ in {
     };
   };
 
-  gst-python = callPackage ../development/libraries/gstreamer/python {
+  gst-python = callPackage ../development/python-modules/gst-python {
     gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;
   };
 

From 6883119ab0bb4c9db7b99e4269ab5091ad95191c Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 13 Aug 2017 13:31:56 -0700
Subject: [PATCH 42/63] add some overrides for ghc 7.10.3 to build ghcjs

---
 .../haskell-modules/configuration-ghc-7.10.x.nix            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index ffa7030d98b2..74e1c21c581f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -164,6 +164,12 @@ self: super: {
   vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms)
     [ self.mtl self.mwc-random ];
 
+  # vector with ghc < 8.0 needs semigroups
+  vector = addBuildDepend super.vector self.semigroups;
+
+  # too strict dependency on directory
+  tasty-ant-xml = doJailbreak super.tasty-ant-xml;
+
   # https://github.com/thoughtpolice/hs-ed25519/issues/13
   ed25519 = dontCheck super.ed25519;
 

From b7bd842fd646bf802623b9da22b873b3c9c40d99 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 12 Aug 2017 18:18:14 +0200
Subject: [PATCH 43/63] zexy: fix build

---
 pkgs/applications/audio/pd-plugins/zexy/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix
index 7cd244c9ea4f..8b7c2121bd79 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoconf automake puredata ];
 
-  patchPhase = ''
+  preBuild = ''
+    export LD=$CXX
     cd src/
     for i in ${puredata}/include/pd/*; do
       ln -s $i .

From 207ed51615dd7e2aae32f400182f0f45b6064241 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 13 Aug 2017 22:35:25 +0200
Subject: [PATCH 44/63] gkrellm: fix installation

Fixes #28239.
---
 pkgs/applications/misc/gkrellm/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index 8654e7f3a261..77ce0327a927 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE
+{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which
 , IOKit ? null }:
 
 with stdenv.lib;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig which ];
   buildInputs = [gettext glib gtk2 libX11 libSM libICE]
     ++ optionals stdenv.isDarwin [ IOKit ];
 
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
        sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
      done '';
 
-   installPhase = ''
-     make DESTDIR=$out install
-     '';
+  makeFlags = [ "STRIP=-s" ];
+  installFlags = [ "DESTDIR=$(out)" ];
 
    meta = {
     description = "Themeable process stack of system monitors";

From 247974025bf909ef6305fd7e878790e2a94f9889 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 13 Aug 2017 22:37:05 +0200
Subject: [PATCH 45/63] gkrellm: minor formatting fix

---
 pkgs/applications/misc/gkrellm/default.nix | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index 77ce0327a927..b9cbf8064a07 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -20,22 +20,23 @@ stdenv.mkDerivation rec {
   # Makefiles are patched to fix references to `/usr/X11R6' and to add
   # `-lX11' to make sure libX11's store path is in the RPATH.
   patchPhase = ''
-     echo "patching makefiles..."
-     for i in Makefile src/Makefile server/Makefile
-     do
-       sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
-     done '';
+    echo "patching makefiles..."
+    for i in Makefile src/Makefile server/Makefile
+    do
+      sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
+    done
+  '';
 
   makeFlags = [ "STRIP=-s" ];
   installFlags = [ "DESTDIR=$(out)" ];
 
-   meta = {
+  meta = {
     description = "Themeable process stack of system monitors";
-    longDescription =
-      '' GKrellM is a single process stack of system monitors which supports
-         applying themes to match its appearance to your window manager, Gtk,
-         or any other theme.
-      '';
+    longDescription = ''
+      GKrellM is a single process stack of system monitors which
+      supports applying themes to match its appearance to your window
+      manager, Gtk, or any other theme.
+    '';
 
     homepage = http://gkrellm.srcbox.net;
     license = licenses.gpl3Plus;

From f66b765f769b5eae58bc7786d5439682b1d9e8a6 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 21:52:41 +0000
Subject: [PATCH 46/63] lib/maintainers.nix: added sdll

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0f4e6fe22619..5efd472d5f87 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -521,6 +521,7 @@
   schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
   scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
+  sdll = "Sasha Illarionov <sasha.delly@gmail.com>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
   shanemikel = "Shane Pearlman <shanemikel1@gmail.com>";

From 58b28484edd8a355403fc31dcf71a6fb0e0fa805 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 22:25:14 +0000
Subject: [PATCH 47/63] cymem: init at 1.31.2

---
 .../python-modules/cymem/default.nix          | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/cymem/default.nix

diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
new file mode 100644
index 000000000000..f2c6c649a837
--- /dev/null
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, python
+}:
+buildPythonPackage rec {
+  name = "cymem-${version}";
+  version = "1.31.2";
+
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = "cymem";
+    rev = "1.31.2";
+    sha256 = "0miznr4kbdzw8yik3m96jmrlmln4qv7z3i3qdp7wjqr51zpqfm1k";
+  };
+
+  propagatedBuildInputs = [
+   cython   
+  ];
+    
+  checkPhase = ''
+    cd cymem/tests
+    ${python.interpreter} -m unittest discover -p "*test*"
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Cython memory pool for RAII-style memory management";
+    homepage = https://github.com/explosion/cymem;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74be1ab3a768..0f23d36333fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28715,6 +28715,8 @@ EOF
 
   gensim = callPackage  ../development/python-modules/gensim { };
 
+  cymem = callPackage ../development/python-modules/cymem { };
+
 });
 
 in fix' (extends overrides packages)

From fe17ed640a9cf9673b1d3e59affa4903b2992982 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 22:26:02 +0000
Subject: [PATCH 48/63] ftfy: init at 4.4.3

---
 .../python-modules/ftfy/default.nix           | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/ftfy/default.nix

diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
new file mode 100644
index 000000000000..c0aea9877812
--- /dev/null
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, html5lib
+, wcwidth
+, nose
+, python
+}:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "ftfy";
+  version = "4.4.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";        
+  };
+
+  propagatedBuildInputs = [ html5lib wcwidth];
+
+  buildInputs = [
+    nose
+  ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Given Unicode text, make its representation consistent and possibly less broken.";
+    homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];    
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f23d36333fe..07d20c7f4836 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28717,6 +28717,8 @@ EOF
 
   cymem = callPackage ../development/python-modules/cymem { };
 
+  ftfy = callPackage ../development/python-modules/ftfy { };    
+
 });
 
 in fix' (extends overrides packages)

From b5b2890278331ceaa21b237f6aa29fa2a946a5e7 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 22:26:25 +0000
Subject: [PATCH 49/63] murmurhash: init at 0.26.4

---
 .../python-modules/murmurhash/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/murmurhash/default.nix

diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
new file mode 100644
index 000000000000..aa5e3358866d
--- /dev/null
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, python
+}:
+
+buildPythonPackage rec {
+  name = "murmurhash-${version}";
+  version = "0.26.4";
+  
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = "murmurhash";
+    rev = "0.26.4";
+    sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv";    
+  };
+
+  buildInputs = [
+   cython
+  ];
+  
+  checkPhase = ''
+    cd murmurhash/tests
+    ${python.interpreter} -m unittest discover -p "*test*"
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Cython bindings for MurmurHash2";
+    homepage = https://github.com/explosion/murmurhash;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07d20c7f4836..77e33e63a3e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28719,6 +28719,8 @@ EOF
 
   ftfy = callPackage ../development/python-modules/ftfy { };    
 
+  murmurhash = callPackage ../development/python-modules/murmurhash { };      
+
 });
 
 in fix' (extends overrides packages)

From 3fe916dd4af296657a193c1dfef5d31deccca364 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Sun, 14 May 2017 22:27:01 +0000
Subject: [PATCH 50/63] plac: init at 0.9.6

---
 .../python-modules/plac/default.nix           | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/plac/default.nix

diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
new file mode 100644
index 000000000000..4ca6d0e08d10
--- /dev/null
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+}:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "plac";
+  version = "0.9.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16zqpalx4i1n1hrcvaj8sdixapy2g76fc13bbahz0xc106d72gxs";
+  };
+
+  checkPhase = ''
+      cd doc
+      ${python.interpreter} -m unittest discover -p "*test_plac*"
+    '';
+  
+  meta = with stdenv.lib; {
+    description = "Parsing the Command Line the Easy Way";
+    homepage = https://github.com/micheles/plac;
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 77e33e63a3e9..3f944c7077f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28721,6 +28721,8 @@ EOF
 
   murmurhash = callPackage ../development/python-modules/murmurhash { };      
 
+  plac = callPackage ../development/python-modules/plac { };        
+
 });
 
 in fix' (extends overrides packages)

From f1ce370b8e91dbc0e255456610a9f1b292114b40 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Mon, 15 May 2017 10:06:47 +0000
Subject: [PATCH 51/63] preshed: init at 1.0.0

---
 .../python-modules/preshed/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/preshed/default.nix

diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix
new file mode 100644
index 000000000000..d82408e620ea
--- /dev/null
+++ b/pkgs/development/python-modules/preshed/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, cython
+, cymem
+, python
+}:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "preshed";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1pdl4p2d32ficfh18xdkgsj6ajzdxc6mxhhf84z0wq1l8viskcx6";
+  };
+
+  propagatedBuildInputs = [
+   cython
+   cymem
+  ];
+  buildInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} setup.py test
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Cython hash tables that assume keys are pre-hashed";
+    homepage = https://github.com/explosion/preshed;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f944c7077f7..9a394641373e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28721,8 +28721,12 @@ EOF
 
   murmurhash = callPackage ../development/python-modules/murmurhash { };      
 
+
   plac = callPackage ../development/python-modules/plac { };        
 
+
+  preshed = callPackage ../development/python-modules/preshed { };
+
 });
 
 in fix' (extends overrides packages)

From ea418720d79fc2115e7c95474e77182b6f4e6924 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Mon, 15 May 2017 10:08:30 +0000
Subject: [PATCH 52/63] thinc: init at 1.0.1

---
 .../python-modules/thinc/default.nix          | 84 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +-
 2 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/thinc/default.nix

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
new file mode 100644
index 000000000000..817ea6388f95
--- /dev/null
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -0,0 +1,84 @@
+{ stdenv
+, pkgs
+, buildPythonPackage
+, fetchPypi
+, fetchFromGitHub
+, pytest
+, cython
+, cymem
+, preshed
+, numpy
+, python
+, murmurhash
+, hypothesis
+, tqdm
+, cytoolz
+, plac
+, six
+, mock
+, termcolor
+, wrapt
+, dill
+}:
+
+let
+  enableDebugging = true;
+
+  pathlibLocked = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "pathlib";
+    version = "1.0.1";
+
+    src = fetchPypi {
+      inherit pname version;      
+      sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39";
+    };
+
+    doCheck = false; # fails to import support from test
+  };
+in buildPythonPackage rec {
+  name = "thinc-${version}";
+  version = "6.5.1";
+
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = "thinc";
+    rev = "v${version}";
+    sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws";    
+  };
+
+  propagatedBuildInputs = [
+   cython
+   cymem
+   preshed
+   numpy
+   murmurhash
+   pytest
+   hypothesis
+   tqdm
+   cytoolz
+   plac
+   six
+   mock
+   termcolor
+   wrapt
+   dill
+   pathlibLocked
+  ];
+
+  doCheck = false;
+  
+  # fails to import some modules
+  # checkPhase = ''
+  #   ${python.interpreter} -m pytest thinc/tests
+  #   # cd thinc/tests
+  #   # ${python.interpreter} -m unittest discover -p "*test*"
+  # '';
+  
+  meta = with stdenv.lib; {
+    description = "Practical Machine Learning for NLP in Python";
+    homepage = https://github.com/explosion/thinc;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a394641373e..7572a28ac84f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28721,12 +28721,12 @@ EOF
 
   murmurhash = callPackage ../development/python-modules/murmurhash { };      
 
-
   plac = callPackage ../development/python-modules/plac { };        
-
-
+  
   preshed = callPackage ../development/python-modules/preshed { };
 
+  thinc = callPackage ../development/python-modules/thinc { };  
+
 });
 
 in fix' (extends overrides packages)

From 96dc15f2c9790029cfd7d4b19c35d43a0e9e4583 Mon Sep 17 00:00:00 2001
From: Sasha Delly <shura.sdll@gmail.com>
Date: Mon, 15 May 2017 10:09:39 +0000
Subject: [PATCH 53/63] spacy: init at 1.8.2

---
 .../python-modules/spacy/default.nix          | 76 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/python-modules/spacy/default.nix

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
new file mode 100644
index 000000000000..452f3f1d9234
--- /dev/null
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -0,0 +1,76 @@
+{ stdenv
+, pkgs
+, buildPythonPackage
+, python
+, fetchPypi
+, fetchFromGitHub
+, pytest 
+, cython
+, cymem
+, preshed
+, pathlib2
+, numpy
+, murmurhash
+, plac
+, six
+, ujson
+, dill
+, requests
+, ftfy
+, thinc
+, pip
+}:
+let
+  enableDebugging = true;
+  regexLocked = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "regex";
+    version = "2017.04.05";
+
+    src = fetchPypi {
+      inherit pname version;      
+      sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq";
+    };
+  };
+in buildPythonPackage rec {
+  name = "spacy-${version}";
+  version = "1.8.2";
+
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = "spaCy";
+    rev = "v${version}";
+    sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648";    
+  };  
+
+  propagatedBuildInputs = [
+   cython
+   cymem
+   pathlib2
+   preshed
+   numpy
+   murmurhash
+   plac
+   six
+   ujson
+   dill
+   requests
+   regexLocked
+   ftfy
+   thinc
+   pytest
+   pip
+  ];
+
+  doCheck = false;
+  # checkPhase = ''
+  #   ${python.interpreter} -m pytest spacy/tests --vectors --models --slow
+  # '';  
+  
+  meta = with stdenv.lib; {
+    description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython";
+    homepage = https://github.com/explosion/spaCy;
+    license = licenses.mit;
+    maintainers = with maintainers; [ sdll ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7572a28ac84f..9fe6d253b016 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28727,6 +28727,7 @@ EOF
 
   thinc = callPackage ../development/python-modules/thinc { };  
 
+  spacy = callPackage ../development/python-modules/spacy { };  
 });
 
 in fix' (extends overrides packages)

From 5dc63e69dbc4acacdbf08fee71be994b15829f50 Mon Sep 17 00:00:00 2001
From: Wisut Hantanong <wizzup@users.noreply.github.com>
Date: Mon, 14 Aug 2017 03:58:35 +0700
Subject: [PATCH 54/63] pythonPackages.django_extensions : init at 1.8.1
 (#27378)

* add django-extensions 1.8.1

* enable testing

* use propagatedBuildInputs
---
 .../django-extensions/default.nix             | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-extensions/default.nix

diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
new file mode 100644
index 000000000000..13f35d110c7a
--- /dev/null
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, vobject, mock, tox, pytestcov, pytest-django, pytest, shortuuid
+, django, six
+}:
+
+buildPythonPackage rec {
+  pname = "django-extensions";
+  version = "1.8.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "${pname}";
+    repo = "${pname}";
+    rev = "${version}";
+    sha256 = "08rd9zswvjb9dixzyd3p3l3hw3wwhqkgyjvid65niybzjl1xdb5h";
+  };
+
+  buildInputs = [ vobject mock tox pytestcov pytest-django pytest shortuuid ];
+
+  propagatedBuildInputs = [ django six ];
+
+  meta = with stdenv.lib; {
+    description = "A collection of custom extensions for the Django Framework";
+    homepage = https://github.com/django-extensions/django-extensions;
+    licenses = [ licenses.mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9fe6d253b016..c053ca7450c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8968,6 +8968,8 @@ in {
     };
   };
 
+  django_extensions = callPackage ../development/python-modules/django-extensions { };
+
   django_guardian = callPackage ../development/python-modules/django_guardian.nix { };
 
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };

From 6c41803f02b387db31cd8982ec866d5f1799ded1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 13 Aug 2017 22:43:41 +0200
Subject: [PATCH 55/63] ldns: get rid of reference to openssl.dev

Reduces size from ~100MB to ~40M.
---
 pkgs/development/libraries/ldns/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 88586cdabba3..f465cf1cc441 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
     make
     make install
     popd
+
+    sed -i "$out/lib/libldns.la" -e "s,-L${openssl.dev},-L${openssl.out},g"
   '';
 
   meta = with stdenv.lib; {

From 1995dbf7722d8dcb71c2e7585a249ea49d628876 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 13 Aug 2017 14:47:31 -0700
Subject: [PATCH 56/63] obs-studio: 20.0.0 -> 20.0.1

---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index b0214f4faa34..3707f32c9d3c 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -26,13 +26,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "20.0.0";
+  version = "20.0.1";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "07xjrr86722b05f88z77hzcrkkdlcz3pndaw600ip5xqhsyjy330";
+    sha256 = "1f701rh4w88ba48b50y16fvmzzsyv4y5nv30mrx3pb2ni7wyanld";
   };
 
   patches = [ ./find-xcb.patch ];

From ed0af35697f1846e2ea2c03cb721618b6cd2eb96 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sun, 13 Aug 2017 17:07:27 +0300
Subject: [PATCH 57/63] wineUnstable: 2.13 -> 2.14

Staging updated as well
---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index ac27f0f15054..479726e13042 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.13";
+    version = "2.14";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "1y3yb01lg90pi8a9qjmymg7kikwkmvpkjxi6bbk1q1lvs7fs7g3g";
+    sha256 = "1ilmhwm7vlp4fbl5a5m3rwwfw8g821gkjkd01ih2ixw1a7ck9y83";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1ivjx5pf0xqqmdc1k5skg9saxgqzh3x01vjgypls7czmnpp3aylb";
+    sha256 = "0mbklg0q3k5iavmwfbrwq4p8589ayikwq5q9wk87885xv32g176g";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 276d7477f8930053d898818c2c5f10c04c5bc765 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 13 Aug 2017 23:43:58 +0200
Subject: [PATCH 58/63] josm: 12450 -> 12545

---
 pkgs/applications/misc/josm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 2431e7b7cbbe..e03abb8bf95a 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "12450";
+  version = "12545";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1l817mclbzyin9yh16q9jcqi31cz0qy6yi31hc8jp5ablknk979j";
+    sha256 = "0817mjc4118b5hhfvx67bib1lhcg8mdkzibrpa2mb7hrv38q56y4";
   };
 
   phases = [ "installPhase" ];

From fbfe53b12ff42f376514fce2bc588d3ffd6a3aea Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 13 Aug 2017 23:52:34 +0200
Subject: [PATCH 59/63] eclipse-plugin-autodetect-encoding: 1.8.3 -> 1.8.4

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 44c1ebcecfde..a3b4193edc6f 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -129,16 +129,16 @@ rec {
 
   autodetect-encoding = buildEclipsePlugin rec {
     name = "autodetect-encoding-${version}";
-    version = "1.8.3.201610171338";
+    version = "1.8.4.201708052053";
 
     srcFeature = fetchurl {
       url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar";
-      sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f";
+      sha256 = "1gbvib5dd75pp5mr17ckj2y66gnxjvpc067im5nsl9fyljdw867c";
     };
 
     srcPlugin = fetchurl {
       url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar";
-      sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y";
+      sha256 = "0728zsbfs1mc4qvx2p92hkxpnknckqk0xvqlmzivsnr62b5qd5im";
     };
 
     meta = with stdenv.lib; {

From 059d722e5ce492917d6c48e9137f8df208231503 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 13 Aug 2017 22:29:00 +0200
Subject: [PATCH 60/63] sshfs-fuse: 2.9 -> 2.10

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index dd49b19358ce..c1502a3227d2 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "2.9";
+  version = "2.10"; # Temporary (need to add libfuse 3.x first)
   name = "sshfs-fuse-${version}";
   
   src = fetchFromGitHub {
-    repo = "sshfs";
     owner = "libfuse";
+    repo = "sshfs";
     rev = "sshfs-${version}";
-    sha256 = "1n0cq72ps4dzsh72fgfprqn8vcfr7ilrkvhzpy5500wjg88diapv";
+    sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1";
   };
   
   buildInputs = [ pkgconfig glib fuse autoreconfHook ];
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/libfuse/sshfs;
+    inherit (src.meta) homepage;
     description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ primeos ];
   };
 }

From e6157451c18f884b37c14a69f585900c0107dccf Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 12 Aug 2017 22:04:00 +0200
Subject: [PATCH 61/63] nixos/munin: scripts need to be executable in order to
 build a wrapper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"Builder called die: Cannot wrap
/nix/store/XXX-munin-available-plugins/plugin.sh because it is not an
executable file"

[Bjørn: Keep DRY, quote "$file".]
---
 nixos/modules/services/monitoring/munin.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index b26bcba64059..723b04dc0fe9 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -26,7 +26,9 @@ let
 
       for file in $out/*; do
         case "$file" in
-            plugin.sh) continue;;
+            */plugin.sh|*/plugins.history)
+              chmod +x "$file"
+              continue;;
         esac
 
         # read magic makers from the file

From 3317c71c5c629939e434288390c1d26506160d13 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 12 Aug 2017 00:54:28 +0200
Subject: [PATCH 62/63] grub2: 2.x-2015-11-16 -> 2.02

Fixes #24451.
---
 pkgs/tools/misc/grub/2.0x.nix | 38 +++++++++--------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 634022e88e02..5b9130bbe0e8 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake
-, gettext, ncurses, libusb, freetype, qemu, devicemapper
+, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont
 , zfs ? null
 , efiSupport ? false
 , zfsSupport ? true
@@ -30,18 +30,7 @@ let
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.x-2015-11-16";
-
-  unifont_bdf = fetchurl {
-    url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
-    sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
-  };
-
-  po_src = fetchurl {
-    name = "grub-2.02-beta2.tar.gz";
-    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
-    sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";
-  };
+  version = "2.02";
 
 in (
 
@@ -52,13 +41,12 @@ assert !(efiSupport && xenSupport);
 stdenv.mkDerivation rec {
   name = "grub-${version}";
 
-  src = fetchFromSavannah {
-    repo = "grub";
-    rev = "50d6f38febe80d4d3088dae1ee639b341787ab71";
-    sha256 = "1pyn2qa8hwiabhgnzj86y4b69y4a37dh5n0j4csmm7xmgc13vvww";
+  src = fetchurl {
+    url = "mirror://gnu/grub/${name}.tar.xz";
+    sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1";
   };
 
-  nativeBuildInputs = [ autogen flex bison python autoconf automake ];
+  nativeBuildInputs = [ bison flex python ];
   buildInputs = [ ncurses libusb freetype gettext devicemapper ]
     ++ optional doCheck qemu
     ++ optional zfsSupport zfs;
@@ -68,6 +56,10 @@ stdenv.mkDerivation rec {
   # Work around a bug in the generated flex lexer (upstream flex bug?)
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
+  postPatch = ''
+    substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
+  '';
+
   preConfigure =
     '' for i in "tests/util/"*.in
        do
@@ -89,16 +81,6 @@ stdenv.mkDerivation rec {
       unset CPP # setting CPP intereferes with dependency calculation
     '';
 
-  prePatch =
-    '' tar zxf ${po_src} grub-2.02~beta2/po
-       rm -rf po
-       mv grub-2.02~beta2/po po
-       sh autogen.sh
-       gunzip < "${unifont_bdf}" > "unifont.bdf"
-       sed -i "configure" \
-           -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
-    '';
-
   patches = [ ./fix-bash-completion.patch ];
 
   configureFlags = optional zfsSupport "--enable-libzfs"

From eb9f427d4e23af7f7da051e640024bf99a72f343 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 14 Aug 2017 07:55:31 +0200
Subject: [PATCH 63/63] zfs: use multiple outputs

Some dev headers are especially large.
---
 pkgs/os-specific/linux/zfs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 6d3ad657140a..48389a758b71 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -107,6 +107,8 @@ in stdenv.mkDerivation rec {
     rm -rf $out/share/zfs/zfs-tests
   '';
 
+  outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ];
+
   meta = {
     description = "ZFS Filesystem Linux Kernel module";
     longDescription = ''