Merge remote-tracking branch 'upstream/master' into hardened-stdenv

author: Robin Gloster <mail@glob.in> 2016-08-12 09:46:53 +0000
committer: Robin Gloster <mail@glob.in> 2016-08-12 09:46:53 +0000
commit: b7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch)
tree: c4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs
parent: bc025e83bd6c44df38851ef23da53359a0e62841 (diff)
parent: 532b2222965377e77ed884c463ee2751fb51dba3 (diff)
download: nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar
nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz
nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2
nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz
nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz
nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst
nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.zip
326 files changed, 6166 insertions, 3455 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index f7097442744..af796f7490a 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
 
   buildInputs = [
-    qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib
+    qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
     taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
     libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
     lz4 lzo snappy libaio pcre
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
 
+  enableParallelBuilding = true;
+
   propagatedUserEnvPkgs = [ qtscriptgenerator ];
 
   meta = {
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index db17ca8553c..9df6abf1697 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -11,10 +11,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "fmit-${version}";
-  version = "1.0.15";
+  version = "1.1.8";
 
   src = fetchFromGitHub {
-    sha256 = "0bakqwgl7xx6khs8993w10a8kvlbr7sbqdaljbsmy8y8mjd6inqb";
+    sha256 = "14vx4p1h3c6frvv8dam4ymz588zpycmg17pxfkmx4m7pszhlin6b";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 97e8f5f1429..e3ebc5fde08 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/OSSIA/i-score.git";
     rev = "ede2453b139346ae46702b5e2643c5488f8c89fb";
-    sha256 = "0mk0zsqhx9z7ry1amjki89h6yp5ysi1qgy2j3kzhrm5sfazvf0x3";
+    sha256 = "0cl9vdmxkshdacgpp7s2rg40b7xbsjrzw916jds9i3rpq1pcy5pj";
     leaveDotGit = true;
     deepClone = true;
   };
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index b89278a7fd9..c719080c742 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchzip {
     url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
-    sha256 = "12a83v4i830gj76z5744034y1vvwzgy27mjbjp508yh9bd328yqw";
+    sha256 = "067f4li48qfhz2barj70zpf2d2mlii12npx07jx9xjkkgz84z4c9";
   };
 
   hardeningDisable = [ "relro" "bindnow" ];
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index a11f37a6d52..e4d9541673a 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchFromGitHub , liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx
-  ,libsamplerate, rubberband, pkgconfig, autoconf, automake, libtool, gettext, ncurses, which
+{ stdenv, fetchFromGitHub, liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx
+, libsamplerate, rubberband, pkgconfig, libtool, gettext, ncurses, which
+, autoreconfHook
 }:
 
 stdenv.mkDerivation rec {
   name = "sooperlooper-git-${version}";
-  version = "19-07-2016";
+  version = "2016-07-19";
 
   src = fetchFromGitHub {
     owner = "essej";
@@ -13,9 +14,16 @@ stdenv.mkDerivation rec {
     sha256 = "0qz25h4idv79m97ici2kzx72fwzks3lysyksk3p3rx72lsijhf3g";
   };
 
+  autoreconfPhase = ''
+    patchShebangs ./autogen.sh
+    ./autogen.sh
+  '';
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ];
+
   buildInputs = [
     liblo libxml2 libjack2 libsndfile wxGTK libsigcxx
-    libsamplerate rubberband pkgconfig autoconf automake libtool gettext ncurses which
+    libsamplerate rubberband gettext ncurses
   ];
 
   meta = {
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index e9c1d7d8119..0cd5c199751 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,7 +5,7 @@
 assert stdenv.system == "x86_64-linux";
 
 let
-  version = "1.0.32.96.g3c8a06e6-37";
+  version = "1.0.36.120.g536a862f-20";
 
   deps = [
     alsaLib
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "0nk5sf3x9vf5ivm035h7rnjx0wvqlvii1i2mwvv50h86wmc25iih";
+      sha256 = "03r4hz4x4f3zmp6dsv1n72y5q01d7mfqvaaxqvd587a5561gahf0";
     };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -104,6 +104,6 @@ stdenv.mkDerivation {
     homepage = https://www.spotify.com/;
     description = "Play music from the Spotify music service";
     license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu ];
+    maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu mudri ];
   };
 }
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
new file mode 100644
index 00000000000..eea686d691d
--- /dev/null
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -0,0 +1,82 @@
+{ bash
+, buildFHSUserEnv
+, coreutils
+, fetchurl
+, findutils
+, git
+, gnugrep
+, gnutar
+, gzip
+, jdk
+, libXrandr
+, makeWrapper
+, pkgsi686Linux
+, stdenv
+, unzip
+, which
+, writeTextFile
+, zlib
+}:
+
+let
+
+  version = "2.1.2.0";
+  build = "143.2915827";
+
+  androidStudio = stdenv.mkDerivation {
+    name = "android-studio";
+    buildInputs = [
+      makeWrapper
+      unzip
+    ];
+    installPhase = ''
+      cp -r . $out
+      wrapProgram $out/bin/studio.sh --set PATH "${stdenv.lib.makeBinPath [
+
+        # Checked in studio.sh
+        coreutils
+        findutils
+        gnugrep
+        jdk
+        which
+
+        # Used during setup wizard
+        gnutar
+        gzip
+
+        # Runtime stuff
+        git
+
+      ]}" --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [
+        # Gradle wants libstdc++.so.6
+        stdenv.cc.cc.lib
+        # mksdcard wants 32 bit libstdc++.so.6
+        pkgsi686Linux.stdenv.cc.cc.lib
+        # aapt wants libz.so.1
+        zlib
+        # Support multiple monitors
+        libXrandr
+      ]}"
+    '';
+    src = fetchurl {
+      url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
+      sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams";
+    };
+  };
+
+  # Android Studio downloads prebuilt binaries as part of the SDK. These tools
+  # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS
+  # environment is used as a work around for that.
+  fhsEnv = buildFHSUserEnv {
+    name = "android-studio-fhs-env";
+  };
+
+in writeTextFile {
+  name = "android-studio-${version}";
+  destination = "/bin/android-studio";
+  executable = true;
+  text = ''
+    #!${bash}/bin/bash
+    ${fhsEnv}/bin/android-studio-fhs-env ${androidStudio}/bin/studio.sh
+  '';
+}
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 13816f8bfdc..cfcb822ade0 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.9.0";
+  version = "1.9.6";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0hhv1yfs2h5x86pjbkbdg1mn15afdd3baddwpf3p0fl8x2gv9z7m";
+    sha256 = "1hw3s4zc0rs138gg429w98kkgmkm19wgq7r790hic5naci7d7f4i";
     name = "${name}.deb";
   };
 
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index afb3eab625d..95be75dbe51 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -311,6 +311,36 @@ rec {
     };
   };
   eclipse_sdk_451 = eclipse-sdk-451; # backward compatibility, added 2016-01-30
+  
+  eclipse-sdk-452 = buildEclipse {
+    name = "eclipse-sdk-4.5.2";
+    description = "Eclipse Mars Classic";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz;
+          sha256 = "87f82b0c13c245ee20928557dbc4435657d1e029f72d9135683c8d585c69ba8d";
+        };
+      "i686-linux" = fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk.tar.gz;
+          sha256 = "78f7e537b34333401fc782fbd1260087c586ff93b17b88da5b177642f3aa5a02";
+        };
+    };
+  };
+  
+  eclipse-sdk-46 = buildEclipse {
+    name = "eclipse-sdk-4.6";
+    description = "Eclipse Neon Classic";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz;
+          sha256 = "4d7a39ce4e04ba1f5179f6a72926eb86ed506d97842a3bf4247814491c508e0a";
+        };
+      "i686-linux" = fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk.tar.gz;
+          sha256 = "d9e1d390cac504a17a65d4a22ebb8da6a592bcc54491912cbc29577990d77014";
+        };
+    };
+  };
 
   eclipse-platform = eclipse-platform-46;
 
diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix
index 073bdf55c63..56100ae6e63 100644
--- a/pkgs/applications/editors/emacs-25/default.nix
+++ b/pkgs/applications/editors/emacs-25/default.nix
@@ -82,9 +82,6 @@ stdenv.mkDerivation rec {
     mv nextstep/Emacs.app $out/Applications
   '';
 
-  # https://github.com/NixOS/nixpkgs/issues/13573
-  doCheck = false;
-
   meta = with stdenv.lib; {
     description = "GNU Emacs 25 (pre), the extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 187480217eb..c113b63390f 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -10,32 +10,6 @@ let
   bnumber = with stdenv.lib; build: last (splitString "-" build);
   mkIdeaProduct = callPackage ./common.nix { };
 
-  buildAndroidStudio = { name, version, build, src, license, description, wmClass }:
-    let drv = (mkIdeaProduct rec {
-      inherit name version build src wmClass jdk;
-      product = "Studio";
-      meta = with stdenv.lib; {
-        homepage = https://developer.android.com/sdk/installing/studio.html;
-        inherit description license;
-        longDescription = ''
-          Android development environment based on IntelliJ
-          IDEA providing new features and improvements over
-          Eclipse ADT and will be the official Android IDE
-          once it's ready.
-        '';
-        platforms = platforms.linux;
-        maintainers = with maintainers; [ edwtjo ];
-      };
-    });
-    in stdenv.lib.overrideDerivation drv (x : {
-      buildInputs = x.buildInputs ++ [ makeWrapper ];
-      installPhase = x.installPhase +  ''
-        wrapProgram "$out/bin/android-studio" \
-          --set ANDROID_HOME "${androidsdk}/libexec/" \
-          --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" # Gradle installs libnative-platform.so in ~/.gradle, that requires libstdc++.so.6
-      '';
-    });
-
   buildClion = { name, version, build, src, license, description, wmClass }:
     (mkIdeaProduct rec {
       inherit name version build src wmClass jdk;
@@ -147,20 +121,6 @@ in
 
 {
 
-  android-studio = let buildNumber = "143.2915827"; in buildAndroidStudio rec {
-    name = "android-studio-${version}";
-    version = "2.1.2.0";
-    build = "AI-${buildNumber}";
-    description = "Android development environment based on IntelliJ IDEA";
-    license = stdenv.lib.licenses.asl20;
-    src = fetchurl {
-      url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
-            "/android-studio-ide-${buildNumber}-linux.zip";
-      sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams";
-    };
-    wmClass = "jetbrains-studio";
-  };
-
   clion = buildClion rec {
     name = "clion-${version}";
     version = "1.2.5";
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index e59214395e4..d933a207cd4 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, xlibsWrapper, motif, libXpm }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "nedit-5.6a";
   
@@ -14,7 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ xlibsWrapper motif libXpm ];
 
-  buildFlags = if stdenv.isLinux then "linux" else "";
+  buildFlags = if stdenv.isLinux then "linux" else
+               # the linux config works fine on darwin too!
+               if stdenv.isDarwin then "linux" else "";
 
   NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib";
 
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
     cp -p source/nedit source/nc $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.nedit.org;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 31f1559b4ee..c13ad738ffe 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey
+{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
 , libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig
 , unibilium, makeWrapper, vimUtils, xsel
 
@@ -72,7 +72,6 @@ let
     enableParallelBuilding = true;
 
     buildInputs = [
-      glib
       libtermkey
       libuv
       libmsgpack
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 949be3875d8..778c1cc6445 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -3,7 +3,7 @@
 }:
 
 let # not very usable ATM
-  version = "0pre-2015-10-18";
+  version = "0.2.1";
 in
 stdenv.mkDerivation {
   name = "neovim-qt-${version}";
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     repo = "neovim-qt";
     owner = "equalsraf";
-    rev = "03236e2";
-    sha256 = "0hhwpnj7yfqdk7yiwrq0x6n4xx30brj9clxmxx796421rlcrxypq";
+    rev = "v${version}";
+    sha256 = "0mqs2f7l05q2ayj77czr5fnpr7fa00qrmjdjxglbwxdxswcsz88n";
   };
 
   # It tries to download libmsgpack; let's use ours.
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
     # Similar enough to FindMsgpack
     set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE)
-    set(MSGPACK_LIBRARIES msgpack PARENT_SCOPE)
+    set(MSGPACK_LIBRARIES msgpackc PARENT_SCOPE)
   '';
     in "echo '${use-msgpack}' > third-party/CMakeLists.txt";
 
@@ -34,9 +34,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  installPhase = ''
-    mkdir -p "$out/bin"
-    mv ./bin/nvim-qt "$out/bin/"
+  postInstall = ''
     wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin"
   '';
 
diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix
index f90eb609d44..eb0be39e7c1 100644
--- a/pkgs/applications/editors/tweak/default.nix
+++ b/pkgs/applications/editors/tweak/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     description = "An efficient hex editor";
     homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak";
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index c373f8b9e27..5773718b0a4 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
-  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.lib blas ]
+  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
     ++ (with pythonPackages; [ python dateutil wxPython30 numpy sqlite3 ]);
 
   configureFlags = [
@@ -22,7 +22,8 @@ stdenv.mkDerivation {
     "--with-netcdf"
     "--with-geos"
     "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/"
-    "--with-mysql" "--with-mysql-includes=${mysql.lib}/include/mysql"
+    # it complains about missing libmysqld but doesn't really seem to need it
+    "--with-mysql" "--with-mysql-includes=${stdenv.lib.getDev mysql.client}/include/mysql"
     "--with-blas"
   ];
 
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 609d88cea3a..2a4d52088e8 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.0.4";
+  version = "2.0.5";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "0qhyjsjjcd8yirqdnzbbzsldwd6y4wf1bxjbsshvqq7h5xi4ir40";
+    sha256 = "00hap68yvfdif6a4lpbhn4jx1n68mpd2kj473kml1xby9swp32w9";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 6508b16d15a..04119f3f1c6 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "geeqie-${version}";
-  version = "1.2.3";
+  version = "1.3";
 
   src = fetchurl {
     url = "http://geeqie.org/${name}.tar.xz";
-    sha256 = "2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248";
+    sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb";
   };
 
   preConfigure = "./autogen.sh";
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index c53d755da07..1f3a9967b02 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://xaos.sourceforge.net/;
     description = "Fractal viewer";
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix
index 8221e4ba8d3..319764ae81a 100644
--- a/pkgs/applications/misc/acbuild/default.nix
+++ b/pkgs/applications/misc/acbuild/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "acbuild-${version}";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "appc";
     repo = "acbuild";
     rev = "v${version}";
-    sha256 = "19f2fybz4m7d5sp1v8zkl26ig4dacr27qan9h5lxyn2v7a5z34rc";
+    sha256 = "0s81xlaw75d05b4cidxml978hnxak8parwpnk9clanwqjbj66c7x";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 871d153e961..966df509c92 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
 , makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp
-, xdg_utils
+, xdg_utils, makeDesktopItem
 }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "calibre-${version}";
 
   src = fetchurl {
-    url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
+    url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
     sha256 = "0npqvfjqj1vwa7nmnsyd4d30z40brydw275ldf1jankrp6dr9dyd";
   };
 
@@ -67,11 +67,88 @@ stdenv.mkDerivation rec {
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
                      --prefix PATH : ${poppler_utils.out}/bin
     done
+
+    # Replace @out@ by the output path.
+    mkdir -p $out/share/applications/
+    cp {$calibreDesktopItem,$ebookEditDesktopItem,$ebookViewerDesktopItem}/share/applications/* $out/share/applications/
+    for entry in $out/share/applications/*.desktop; do
+      substituteAllInPlace $entry
+    done
   '';
 
+  calibreDesktopItem = makeDesktopItem {
+    name = "calibre";
+    desktopName = "calibre";
+    exec = "@out@/bin/calibre --detach %F";
+    genericName = "E-book library management";
+    icon = "@out@/share/calibre/images/library.png";
+    comment = "Manage, convert, edit, and read e-books";
+    mimeType = stdenv.lib.concatStringsSep ";" [
+      "application/x-mobipocket-subscription"
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+      "text/html"
+      "application/x-cbc"
+      "application/ereader"
+      "application/oebps-package+xml"
+      "image/vnd.djvu"
+      "application/x-sony-bbeb"
+      "application/vnd.ms-word.document.macroenabled.12"
+      "text/rtf"
+      "text/x-markdown"
+      "application/pdf"
+      "application/x-cbz"
+      "application/x-mobipocket-ebook"
+      "application/x-cbr"
+      "application/x-mobi8-ebook"
+      "text/fb2+xml"
+      "application/vnd.oasis.opendocument.text"
+      "application/epub+zip"
+      "text/plain"
+      "application/xhtml+xml"
+    ];
+    categories = "Office";
+    extraEntries = ''
+      Actions=ebook-edit ebook-viewer
+
+      [Desktop Action ebook-edit]
+      Name=Edit E-book
+      Icon=@out@/share/calibre/images/tweak.png
+      Exec=@out@/bin/ebook-edit --detach %F
+
+      [Desktop Action ebook-viewer]
+      Name=E-book Viewer
+      Icon=@out@/share/calibre/images/viewer.png
+      Exec=@out@/bin/ebook-viewer --detach %F
+    '';
+  };
+
+  ebookEditDesktopItem = makeDesktopItem {
+    name = "calibre-edit-ebook";
+    desktopName = "Edit E-book";
+    genericName = "E-book Editor";
+    comment = "Edit e-books";
+    icon = "@out@/share/calibre/images/tweak.png";
+    exec = "@out@/bin/ebook-edit --detach %F";
+    categories = "Office;Publishing";
+    mimeType = "application/epub+zip";
+    extraEntries = "NoDisplay=true";
+  };
+
+  ebookViewerDesktopItem = makeDesktopItem {
+    name = "calibre-ebook-viewer";
+    desktopName = "E-book Viewer";
+    genericName = "E-book Viewer";
+    comment = "Read e-books in all the major formats";
+    icon = "@out@/share/calibre/images/viewer.png";
+    exec = "@out@/bin/ebook-viewer --detach %F";
+    categories = "Office;Viewer";
+    mimeType = "application/epub+zip";
+    extraEntries = "NoDisplay=true";
+  };
+
   meta = with stdenv.lib; {
     description = "Comprehensive e-book software";
-    homepage = http://calibre-ebook.com;
+    homepage = https://calibre-ebook.com;
     license = with licenses; if unrarSupport then unfreeRedistributable else gpl3;
     maintainers = with maintainers; [ viric domenkozar pSub AndersonTorres ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix
index 8df06980b47..75f5ab406fe 100644
--- a/pkgs/applications/misc/catclock/default.nix
+++ b/pkgs/applications/misc/catclock/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = http://codefromabove.com/2014/05/catclock/;
     license = with licenses; mit;
     maintainers = with maintainers; [ ramkromberg ];
-    platforms = with platforms; linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix
new file mode 100644
index 00000000000..35b66299c06
--- /dev/null
+++ b/pkgs/applications/misc/fehlstart/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, pkgconfig, gtk2, keybinder, fetchFromGitLab }:
+
+stdenv.mkDerivation {
+  name = "fehlstart-9f4342d7";
+
+  src = fetchFromGitLab {
+    owner = "fehlstart";
+    repo = "fehlstart";
+    rev = "9f4342d75ec5e2a46c13c99c34894bc275798441";
+    sha256 = "1rfzh7w6n2s9waprv7m1bhvqrk36a77ada7w655pqiwkhdj5q95i";
+  };
+
+  patches = [ ./use-nix-profiles.patch ];
+  buildInputs = [ pkgconfig gtk2 keybinder ];
+
+  preConfigure = ''
+    export PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Small desktop application launcher with reasonable memory footprint";
+    homepage = https://gitlab.com/fehlstart/fehlstart;
+    licence = licenses.gpl3;
+    maintainers = [ maintainers.mounium ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/misc/fehlstart/use-nix-profiles.patch b/pkgs/applications/misc/fehlstart/use-nix-profiles.patch
new file mode 100644
index 00000000000..0c06e53f981
--- /dev/null
+++ b/pkgs/applications/misc/fehlstart/use-nix-profiles.patch
@@ -0,0 +1,21 @@
+--- fehlstart-9f4342d75ec5e2a46c13c99c34894bc275798441-src/fehlstart.c	1970-01-01 01:00:01.000000000 +0100
++++ fehlstart.c	2016-08-10 12:21:11.231638418 +0200
+@@ -779,8 +779,15 @@
+     read_settings(setting_file, &settings);
+     update_commands();
+     g_hash_table_foreach(action_map, update_launcher, NULL);
+-    add_launchers(STR_S(APPLICATIONS_DIR_0));
+-    add_launchers(STR_S(APPLICATIONS_DIR_1));
+-    add_launchers(STR_S(USER_APPLICATIONS_DIR));
++    const char* nixprofiles = getenv("NIX_PROFILES");
++    if(nixprofiles != NULL) {
++      const char* pch = strtok(nixprofiles, " ");
++      while (pch != NULL)
++      {
++          String nix_dir = str_concat((String) { pch, strlen(pch), false },STR_S("/share/applications"));
++          add_launchers(nix_dir);
++          pch = strtok(NULL, " ");
++      }
++    }
+     return NULL;
+ }
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
index 975bc3b358d..9115fe026da 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     '';
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.romildo ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index bf63df4d154..8a31c591b29 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
   };
 
-  doCheck = false;
+  doCheck = true;
 
   meta = {
     description = "A program that produces a familiar, friendly greeting";
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index fb475f047b4..1724b0d612f 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -3,17 +3,26 @@
 , libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }:
 
 stdenv.mkDerivation rec {
-  version = "1.9";
+  version = "1.9a";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
-    sha256 = "15p2k1n3afc7bnqrc0zfqz31fjfq3rrrrj4fwwy5az26d11ynxhp";
+    sha256 = "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0";
   };
 
+  patches = [
+    # http://www.openwall.com/lists/oss-security/2016/08/03/2
+    (fetchpatch {
+      name = "mupdf-fix-CVE-2016-6525.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958";
+      sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7";
+    })
+  ];
+
   NIX_CFLAGS_COMPILE= [ "-fPIC" ];
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ zlib freetype libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama];
+  buildInputs = [ zlib freetype libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama ];
 
   installPhase = ''
     make install prefix=$out
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 4bf6e36f1d2..4050f8bf589 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -24,7 +24,7 @@
 assert stdenv.isLinux;
 
 let
-  version = "4.2.9";
+  version = "4.2.10";
 
   binpath = stdenv.lib.makeBinPath
     [ cabextract
@@ -57,7 +57,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
-    sha256 = "89bb0fd7cce8cf598ebf38cad716b8587eaca5b916d54386fb24b3ff66b48624";
+    sha256 = "0ws94hgxajaww450q8ivrp28ypv39mashs29ak41faxf29cr097m";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index 5864a07fde7..e67c141f358 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share}
-    cp -rv doc/man $out/share/
+    mkdir -p $out/{bin,share/man/man1}
+    cp -rv doc/man/*.1 $out/share/man/man1
     cp src/timew $out/bin/
   '';
 
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 163c4a60eba..40810adbbdc 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,27 +1,27 @@
-{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, pango, cairo, glib
-, pcre , imlib2, libXinerama , libXrender, libXcomposite, libXdamage, libX11
-, libXrandr, gtk, libpthreadstubs , libXdmcp, librsvg
-, libstartup_notification, hicolor_icon_theme, wrapGAppsHook
+{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre
+, glib , imlib2, gtk, libXinerama , libXrender, libXcomposite, libXdamage
+, libX11 , libXrandr, librsvg, libpthreadstubs , libXdmcp
+, libstartup_notification , hicolor_icon_theme, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.12.11";
+  version = "0.12.12";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "0gfxbxslc8h95q7cq84a69yd7qdhyks978l3rmk48jhwwixdp0hr";
+    sha256 = "0zgcdancsna95sjxslack9lh8f6qnj8d5wm02891mshn2jhgins3";
   };
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ];
 
-  buildInputs = [ pango cairo glib pcre imlib2 libXinerama libXrender
-    libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs libXdmcp
-    librsvg libstartup_notification hicolor_icon_theme ];
+  buildInputs = [ cairo pango pcre glib imlib2 gtk libXinerama libXrender
+    libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs
+    libXdmcp libstartup_notification hicolor_icon_theme ];
 
   preConfigure = ''
     substituteInPlace CMakeLists.txt --replace /etc $out/etc
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index 54e56785071..2b11ccf5837 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -9,6 +9,16 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "1yxgafk1sczg1xi2p6nhrvr3hchp7ydw98n48lp3qzwnryn1kxv8";
   };
 
+  patches = [
+    # This is necessary to build without a config file.
+    # It can be safely removed after updating to wikicurses to 1.4
+    # or when commit 4b944ac339312b642c6dc5d6b5a2f7be7503218f is included
+    (fetchurl {
+      url = "https://github.com/ids1024/wikicurses/commit/4b944ac339312b642c6dc5d6b5a2f7be7503218f.patch";
+      sha256 = "0ii4b0c4hb1zdhcpp4ij908mfy5b8khpm1l7xr7lp314lfhsg9as";
+    })
+  ];
+
   propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ];
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index fe21642373e..9eb25c316f9 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -7,13 +7,19 @@ mkChromiumDerivation (base: rec {
   packageName = "chromium";
   buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
 
+  outputs = ["out" "sandbox"];
+
+  sandboxExecutableName = "__chromium-suid-sandbox";
+
   installPhase = ''
     mkdir -p "$libExecPath"
     cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
     cp -v "$buildPath/icudtl.dat" "$libExecPath/"
     cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
     cp -v "$buildPath/chrome" "$libExecPath/$packageName"
-    cp -v "$buildPath/chrome_sandbox" "$libExecPath/chrome-sandbox"
+
+    mkdir -p "$sandbox/bin"
+    cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}"
 
     mkdir -vp "$out/share/man/man1"
     cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1"
@@ -29,6 +35,8 @@ mkChromiumDerivation (base: rec {
     done
   '';
 
+  passthru = { inherit sandboxExecutableName; };
+
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 997551f3fae..2c70978a496 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -134,6 +134,12 @@ let
     ];
 
     postPatch = ''
+      # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
+      substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
+        --replace \
+          'return sandbox_binary;' \
+          'return base::FilePath(GetDevelSandboxPath());'
+
       sed -i -r \
         -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
         -e 's|/bin/echo|echo|' \
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 51493fb4655..f2c37d9e973 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, makeWrapper, makeDesktopItem
+{ newScope, stdenv, makeWrapper, makeDesktopItem, writeScript
 
 # package customization
 , channel ? "stable"
@@ -61,21 +61,46 @@ let
 
   suffix = if channel != "stable" then "-" + channel else "";
 
+  sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
+
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${chromium.browser.version}";
 
   buildInputs = [ makeWrapper ];
 
+  outputs = ["out" "sandbox"];
+
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
     getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
+    launchScript = writeScript "chromium" ''
+      #! ${stdenv.shell}
+
+      if [ -x "/var/setuid-wrappers/${sandboxExecutableName}" ]
+      then
+        export CHROME_DEVEL_SANDBOX="/var/setuid-wrappers/${sandboxExecutableName}"
+      else
+        export CHROME_DEVEL_SANDBOX="@sandbox@/bin/${sandboxExecutableName}"
+      fi
+
+      # libredirect causes chromium to deadlock on startup
+      export LD_PRELOAD="$(echo -n "$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\.so$ | tr '\n' ':')"
+
+      exec @out@/bin/.chromium-wrapped "''${extraFlagsArray[@]}" "$@"
+    '';
   in with stdenv.lib; ''
     mkdir -p "$out/bin" "$out/share/applications"
 
     ln -s "${chromium.browser}/share" "$out/share"
-    eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
+    eval makeWrapper "${browserBinary}" "$out/bin/.chromium-wrapped" \
       ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
+    cp -v "${launchScript}" "$out/bin/chromium"
+    substituteInPlace $out/bin/chromium --subst-var out --subst-var sandbox
+    chmod 755 "$out/bin/chromium"
+
+    ln -sv "${chromium.browser.sandbox}" "$sandbox"
+
     ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
     ln -s "${chromium.browser}/share/icons" "$out/share/icons"
     cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
@@ -84,7 +109,8 @@ in stdenv.mkDerivation {
   inherit (chromium.browser) meta packageName;
 
   passthru = {
-    inherit (chromium) upstream-info;
+    inherit (chromium) upstream-info browser;
     mkDerivation = chromium.mkChromiumDerivation;
+    inherit sandboxExecutableName;
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 55cc35c2592..d7b9c74130b 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "00dll63b3z1ijj60m0h8y2ydmkf91hyr6h98rqp21w11c2xbwzis";
-    sha256bin64 = "1cdfvi5af18mlhn2ax3shsdm4p4jkhs29v3d2gmkyldfvvixh3zc";
-    version = "52.0.2743.41";
+    sha256 = "0brpkjg1rcq8c0h5hnzqg3bg4jj805dph67zzramlcvbr44a06r6";
+    sha256bin64 = "0zqa40xz0v715ggb1g2hc2085k65m24mf8xl1n2fzj7k21hf7bkc";
+    version = "53.0.2785.34";
   };
   dev = {
-    sha256 = "1pzcabdk7d9p4sc8wdpwvji9xvblsihpimnjh6n2jz5al9sm1q8j";
-    sha256bin64 = "0k84hy4sj03h5bjciigagr83qf7yss22vj21fivgkvgasdmd12m8";
-    version = "53.0.2767.4";
+    sha256 = "1c73jfy11l4qiy553a3lvmd8kb29i25az6i5a4azmfc1abriwhjn";
+    sha256bin64 = "06r53fnwp8v5drh3ilplqbwcak954gcgclc8mqq3mlx5530fp6fv";
+    version = "54.0.2816.0";
   };
   stable = {
-    sha256 = "0aypf5lhi2l7cn41xhq2ck6bjblapwv26nygvg2883hhqinmnwvn";
-    sha256bin64 = "1c1796sd82l480xjdw7w46867w2phw3ng2dvdb6njsvpg299chi8";
-    version = "51.0.2704.103";
+    sha256 = "00d16yr8d9280b2rcjmjxkqvdzgy6a7l7fmnsjrj8404vcgax551";
+    sha256bin64 = "0knlxgcv3wfvpgysaxb83agmp88n4ljmyx40j4r8wb5cisnl6cs8";
+    version = "52.0.2743.116";
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 6748b0a9517..ce49d92e335 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -4,189 +4,189 @@
 # ruby generate_sources.rb 46.0.1 > sources.nix
 
 {
-  version = "48.0b9";
+  version = "49.0b1";
   sources = [
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ach/firefox-48.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "0738019c7078daa1beb31445d12718dce195719279cf430c13526907aaa04328efd043b77eaf641674ed4eff8033e8ac47139858a9c9e194bf6ccaaf8cd54d8a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ach/firefox-48.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "9700cfff54bdd3404b75d7690863ace89aacc49db3339b2ee11807b1ea88f3744d610800d6e5d5144cf7ff8f292374e297779581d629700c9570eab116b5b449"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/af/firefox-48.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8700996788a438bb6cf7a5bc0aae166e621a2b32cbe06dd91589bf0abecf123ba34ef9fe7800395d5a8fb148f50a68e35bfc97ddb4b51f2318e87dfb92023798"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/af/firefox-48.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "b6ff01541e51fd287783750011ec5d5ea1a731c28d4c807d75fedcb6780afbda76b19a4bcb7bbec305cbcbaaa84dd3f57a0b41c404f374022b4ea1e850b9c6d5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/an/firefox-48.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "11710dcf2c470bac75eaa9a3fca7aa3508d4e9c9b59d2a39f03d166d25c05ba8bcfeda4c4a95134dce8d7c4d261dceb980e1a53a9a11869b7d8b226983f6cadd"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/an/firefox-48.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "7723e02a752d30c597ef7b295b2c1644de4e2a6d02b364853f9a9c419a2d172bb5338792a5a9403851bb3952e93dc092e12056782df1017bfb3c39a2550ccd70"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ar/firefox-48.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "90bb7327e77e048784efaed6afda9c35eabe4c238194acbb14543f7841c052153fb5f0f7ef202564f2f749aaddf7e870b9b850022b0570cc96d34f730bd1ff52"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ar/firefox-48.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "410b9d0db9038b597129ea423752300e1831d69c6768bfb09eed3c20a26b1bcf2d67ace6f8befa8a47ab2441ebe69d34361571609709586c3a1086259d9864f5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/as/firefox-48.0b9.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "b50989125c6982cf8d9c97af09e9734046d2d3eb8e0e220b139a8835e76cd39195ab2fe2fbded7461acf6d153a8b5376b4991f0c72322f8a22e9961d17589072"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/as/firefox-48.0b9.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "873830760fcf310d26dd40f7147a8c7ad252828ede05a03b82e6d7ccb021435af1d5f7fc61bea6a968ea0f24e54cf108e5f6fd4b3e0558163bcda00cb3fe9aa5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ast/firefox-48.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "ab6f0c4efc8ab7c6db6a4b31d6dfc93aeff8d65e1fce60d8bc9ce6f86e391f0cd5f6be1a3e4f8784c73d5f982a66e33a69b40614ff4eed04416bfcdab5362e86"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ast/firefox-48.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "f66b0c006d530dbfd4df30400dd6b15728a7fbd023e88d745d0b8ae05bb63d0d33e344ae70d3105815aa9a23ea5419b80b853d68ef05b7ca2c24d31c670e23a4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/az/firefox-48.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "cd96e076df13db6cf82d8a6d13653bc928ebde446f4a283e949dd66229297c5a284392b118539c7628593c696eacf2de9b4b8ad623750ed909c08349b3263093"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/az/firefox-48.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "0c5311168bd7e73e7d81175aca2a46e10122b29b2c54a8b92bbd74ca7092dfb9c43709cd30c50a02c030382c021b1192fccd8e8694fe3c8c8d0cce6370d3bd93"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/be/firefox-48.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "07c7fac9790d83a06940efa3445212e592764bf794c0b3fb924a695129d0efb649e5cf68656d2160cdbcb188290fdebac971947d891d3eb31cc99e25126c3a55"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/be/firefox-48.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "789d5ff8f0ae19758b379508d72f7d8315026fdea898218d03108ed3e9d42b85f4fd58649af5783a484a4f5dedc282dacfa68cfcfc9be5154ae9d5a73ae3cde1"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bg/firefox-48.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "9d8b4837ba7d03e2b5482333e945ac56ea0c715cd7db2a8126d1ad589df2cdabe9eb9ea6b4ac302b02976fcc319752f544090aff6f7569c5610977e6c24b350d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bg/firefox-48.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "244ba31c371c649e2f448a3593cb267e19837f011215283d73d1e672acf4c32df1b5c11aaec722170c26b2eef7b7bafea49ffebedfd52ef1a6ebc9fba5650210"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bn-BD/firefox-48.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "eb50c9a1f867a1e89424511f1b6152a3633f77271997e33d819a194bc3b85024d76aacdc1d877d6ba72299678a7b5dabb7a3c3f3c37cd309bc73b6514374e683"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bn-BD/firefox-48.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "780c482fa5b809b7220fd672c7c24c1e2d764ffb8b13b431663385cb6651da17f26c32fcc60e978ecd971b45076a3fbf8675243c26d5e178b326b84d3b9a0b32"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bn-IN/firefox-48.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "5d4936b8beb2db435aa89308492a3ffdcddf4ac60bf32a100bc0943f648a4ca624709d4b171f802df4780ef74bf9d2ba3029fe3aa9e5a6d498fd44642db36f9c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bn-IN/firefox-48.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "d9c4089a87289815b4af7e3ad91fdeea76359d941c5a14a9c9e3289c47127b3a3f5a72d522679ae1fadc547cf65d448c604ae3687e11fcfdd73c5c48a104dfda"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/br/firefox-48.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "134890cbf087ad9b97d532fa10b5b6b0738236d6d1b27b402b1b1832d0982fd9e53f398f28fbf285cc432c5cfc6f83caf9f42c39e351ec188d77c43fbd3fdeab"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/br/firefox-48.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "d19af5f724f6ce509c05f9005b1e3576061244e6653d8069da9aa6ef8fae3dded66e8138dd806babf9bf7a3e8c7c14de999a28368f26190e747c67af5f29e81d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bs/firefox-48.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "f0d29df4df68482cc74da7b2b7c6a2658b3ecaee51d259a1aacc1dd1b30aec7fee7a54696ba2f859608bacb23ff4e0cbba81353387e12b3567067034bef3905c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bs/firefox-48.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "bd98070a500f5c6621b4bb18910a1728d23aa193aaa0faa6cc68f35932b436d64441d1f95065f543263e6e6b0484d6c42b7fcc4462a63e594b56297df7713a1b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ca/firefox-48.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e7ea69142daf2981432237db537ad85760eb9ce1407e66a206cef39f99c6aa5cd067feca3626ccecfa2d1c67d3425b13bb88c6eb4cdb903cdb12de04b3904bf8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ca/firefox-48.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "7f30559ad0e456bdf6492561f1283f85fba3c715f43549d2da46d006a59146002b4fe2f06b50a5b34e94633cfde9aded6514a61b451257c19baff3ecff770299"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cak/firefox-48.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "289bc8d19ab40a435740e27e44eb637511f0458e8dc14d87851ceef7e2594b52ef621107efcd090e2a31d97be5c04dc5d185f9c10173c38a1974ad28def18f5a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cak/firefox-48.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "f1f7b43df14d70fd543402b62edf47e0e347b630282e0976f6bcd64e14fcbbf60f5526824a1355c7c493fba539eb42dc7dda760f3896b5893e72e84fabb39dca"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cs/firefox-48.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "04c42f09f55ca4ba3a9f4618cf4d860927ca9c01b152ea4d9452c218e02c960fae75311f707091ab0633989c918feac0a50fd27310c09c0d3608b95e0bcd132b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cs/firefox-48.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "f4dbf9158adc508d494d03232a24a880ff6eee5b4d6a0aa74c1f3e9a52b7a4a573f579e870d0c57e3b9d17875a2cbe2848c2d7acb7b225ba1b2a860cfaf5dc85"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cy/firefox-48.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "7fc634a345f2cb8c1876eac09a40f71592531bcda3058f2d3f6d10f8544be2d6f88cc541960329aef91bdfda21140e181d095c2e656882250ae23f7713b8aa29"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cy/firefox-48.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "fc4f316b01ec48fec0a5726742521a735977705a7ae5c36e47f13c1b375663e3a2187fc3fb08400c6f89901315edf81cac79a0b90bbf42421f9305ea79509d95"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/da/firefox-48.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "00fda3e6357e98eece16090d6e6452d70d5bb3e4d253604f19c635d880f8a4967f5c6ddfa64db1e64e85ffd1c2b64473255ded8b6d547d277c2a37283e18b5ac"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/da/firefox-48.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "5971f31c81346a18ee5cf5a8dbff79c9348254a6f882a73f27a391a1136e2df7019744df76e8044c299b548163f2f75ba51bd67d0d3f77cf1dba38b449656c45"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/de/firefox-48.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "1e02384a438f23571c23b471e75bd89717163014b326ee3568dec6e2c458c601e9f96b1ded21fb2b4f5611530a7c145c4bd2d124a7fb375768da4c0936989d19"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/de/firefox-48.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "f9b35ff0b69c3e48e3c77a0e79d332f7aa6d336e3840ecf377d614a16b7debb1cb288145671a0aeb03c04058aef4b5933e332b9b48cc0d82b3c12c4c2c00fb9e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/dsb/firefox-48.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "bf24a7a33bd83618953c42f79a2a9261d68048f52ab62e6cd030ddf1283802d7cb5df0fb26e9eb05bcd0e81dc61814ddfb0383a2172c741da9615a4a208cfa07"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/dsb/firefox-48.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "b6f8413df7ccf5a7a3a7cdaafacbddbd996a8496471f51b5bef62eeda9057e93ce1f7fa941f2a6670609ae0c711187530e95516ef0644253335080e25a66c0fc"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/el/firefox-48.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f066a0d534e39581dddfefa8808850b1fc427c84f25c8582610d7db47c0c5a792c8cb516321fb3d91134dc0f3e76bbb26075b1d8030bd07eb14a77024c8afaec"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/el/firefox-48.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "2a0125284f2dc4b402ce02344fc3f367834438ea37ee84b866fb0f6b69e8cb9afc0bd586ec43efe6c45c3a5bcb0c99d9a0ad273faea464048bdb5ed56f2b8577"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-GB/firefox-48.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "49be18428af54affc03efc0bb4aef87bf361224fddc735830a71a2f71dfd527af9f7593d90eec930e5edc3e7949172347e63ae78d75dd9916c97ca1ce3e3f92f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-GB/firefox-48.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "b1220f9977187408e1756fb27e26ab763ecb5edf6d497321ea4ba5fc2b32ec5c2caf3b2cb54fb3e506ad3b1a76c8b05c5b986fa6ca25e4ff335a083ba96802b3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-US/firefox-48.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "a91f9d2e04ebcd209bdf4db3638f0ca05287ff52023f6bc993a165d14bcf3264199bcd3559cfe1314e1e886094251c0bf86f274cf410bc456241c5d96fcfa255"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-US/firefox-48.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "e75c437b0cce3e06f9f91fd53cefbd4489d6d31ce93fd642b20e547e03f5a1f417d06ca4566453d1c5b7fad4dd1fac61bf58a414b982c3ae843891a8efef40e5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-ZA/firefox-48.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "6a1d643add5c1b63633a02fdee766de6a73174c169a832b7f400e320ee7eb39cf74d652389b36957df200942877ba03dad714d2686d7dd7bad4a3993698e8630"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-ZA/firefox-48.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "877c2d4562fbda98c62902536f07e5ab474a78ab2c5a077bee440cb48525a6eb529e5042533061524cf6fa85b9f6b70fa91e6f2bfa718ca49fb4adc70ea92514"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/eo/firefox-48.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "d91d25252de09a1c8f52066a3d4bd9f8a6f479c9cfb52bdb7f3939d32162805a26c02b4e3a13e9463b318c2da47d83b77b23fd4bcad58657e8eac8f6f6a769a4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/eo/firefox-48.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1a697f4a9c98e956d78f41a22c4c0996542ed67d89b8cde095b330fb366c0ddcaa1403c016f2f2d11dae18564ca50a6f953fdeefe66ce8cd95c8d3ce99212555"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-AR/firefox-48.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "59067e78b573ceae232f11f5b507fafd5f0cb75ce19f9dbc05a30990247321a239157881202b7ae3676c4a6991473741f7bb4e3ccb799bb138f46a3497d1f38d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-AR/firefox-48.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "377410f25dd32fe268a07783bff69f4412a3418d9c9e852e6bd577914727c7e65642781e86a2bbde4085bc175a1ee034fd960d9bbba72463f0361d17bbd7ebee"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-CL/firefox-48.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "5ae95c0e81ef1c23956b5324dab0690c237cc9e7f8b56a51870f668ef7091d8962a0633691909672b63e53bc436ca0c46705cdd393c07aa6f7023d2fb5600ff0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-CL/firefox-48.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "36ff8818adf938144923df82a7fdf9bea26d43225c0853c84a541233cccc370879e8fcca3750f162f880a879c0b41789f692cb08fabc9073d11e2e865d357ee7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-ES/firefox-48.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "0af5cceb948a6cb1be21f98a53e8733113c27339c50e5bb3ca21bb2a82d28821f7f92fcf71f31db156def398e8ce5bc7875d2cab2f231a3702b0c0e30990748e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-ES/firefox-48.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "1c0b8d5e458314f1895bd41d73886962813f9ce1ce099a7438202faf0e4e82a3fb9b701e0950cd5b668a1c0e5a051939868b774956f607c30de974eb7a06a710"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-MX/firefox-48.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "7ad31cf9470e416c6a8cd9a7c14aaeaa6998d9b20ab67387fa32e28490b3dee96ceeb6fbc20258e01d2264e2a96f7607a7a69d960c09a189b62bf638d211306c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-MX/firefox-48.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "8f757afbc6869351b561fae7b9773a8fe7009b3869ffa5e1776ce1b28c1786d6558f0e2bf8487e8a028e3377de39c461309aeb9565e3b03ed1ac6ec8934ce59b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/et/firefox-48.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "97acd2242d10184243a7d1390bc58326351d48877fbb70b16945278049f597e627cec7b55deb35337392787e29e46b1004d7e332e730ba020b17615ad2f9fd5e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/et/firefox-48.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "665878727ddbdc85b4d6757a566ebcc4ba9ae098312ea4aa8c63eb52642460365bd4c29dfff42f63561d9b2806d9d9dc26a32422caff56795af93ee78a838bd2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/eu/firefox-48.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "a6c7af099860209cdc98dd8929392cb71f8607723da9f53f99d9074948b6ec571998db536421d7a79e2e623484be00971380d866ef0962626ebdc45f5f3d535d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/eu/firefox-48.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "9ea439a7607e5ce736e9f5b22b507473dac5c6e710904b3d273ab2873f9254fc5999d570cd2bfbe2316bead8d1cf8bb6e7db021efc876c266741e7f1aa7f2443"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fa/firefox-48.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "7735a5436d28f6ea02d1083a4f97665b86d8795456002076513b236e336092cdba4cd1ca9505178bec87b8ceaadf78e236bb7185a49e662dc13f394f4e63afbe"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fa/firefox-48.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "a335270482f4fa3a1ba27a865721047112edb960e433cfc315e5ba07dc3ff0e465f21b86ae15ceabefb7d92ff249e950a36e786b1312d84bee9c133213ee4a31"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ff/firefox-48.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "a6c3d4c2e493a7e48fb6ef6cddeccc359aa0d8b615beff078c7065df47c5215bf1c964aa885bec5867a1220bf5406c2b481c46ddfb7e01f121e4913af086deda"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ff/firefox-48.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "7f387391a8105972ca877818766048f2f0c100a1cbda0a2bde976c65cea63ee957100920d43a1b6cab4e7c103e5b4c048cd1293410cd32c7e47475aa7aae81ad"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fi/firefox-48.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "6ed696d1d4d7e04204ea943b15069de3ef19e8e57ea4f697c728aafb4f892f80d4b448137ffd4f7591f8342edbb6a1ad719bf7ca9d05960d72b22bf172ff7a6b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fi/firefox-48.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "92f16501746fc84132b7e5efa29efad4dea56c1596d1b589799b2f4a59321e344ef252e346be40fde915372b50f9106ca580bbcb16c19ff88c97079ab8954e07"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fr/firefox-48.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "3657fbdbb3543897047a119dfb218b5717be7d6ddcb31ea976761211e3186a8ef847f326d5a46bee376f326972f4b4cd213b877909ea5c97d05e1a81cd61fcf3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fr/firefox-48.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "afbad7884f15b0d9e3e61681bd62449b55a8b161c0ba5bd74beb50993d47068941535b49837509b9a645061b44aa17566e806b16b64a7a19bb5a4be327fe3600"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fy-NL/firefox-48.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "d78aca665ec2f7fcbf4380555df36bc0d4add5920ff4a3f4a1471776fe970d8d7b80b681c32859ac57a04c8f90732d240cb82d2d3dbaebfda62325bc65bafea8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fy-NL/firefox-48.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "86c3b0df4feab0e6acfc51e6c0b0d159d22e0ba285ae4d0f517c6fa6b36f3d14a73334ec0767dadc5c21afffb616ac055a72bd15c8972ae6a718f3a88b4a4b3a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ga-IE/firefox-48.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "368f2fff3afa7cde9f3bca2f3fa281dfd020919093204e6e4ae5d1a0b6af17e748ded0aed83d2646961b0140e21e97a978c24539a6a7e984f607bf330f77d1f0"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ga-IE/firefox-48.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "7053373d6b96eb2dfb95cec2583a5b0b25f9b3076d03d85cd9e550d02f473f4b4ff3bd7196bca5ab69cf383fa92ee4be8fbe4fc47628b55938552c6d4762858c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gd/firefox-48.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "02a82abd833755a06afc0b245ee2ce503ec45133f929282225df84e3f9eb76dcec40351431ed099a601c63d12f36502471e27f58c8855c618598f7befc647d1c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gd/firefox-48.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "dfdb2a4d0627f782c6054c4cbc529711e42b107b8fab4550c51443ab39b6f0496b206d238c14e292bcc9e5959480931bbea2647afe5b029e2a4bd255fe621a7a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gl/firefox-48.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "2a2c4d5f9df457560bd4084ec0641d4fb17f66e1e41ba73b12a2a467942b5a010fcc3895be12b187b2b1abaf912288efbb123b6aa914a0c2668f9d8e4160ebc7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gl/firefox-48.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "2dd595709f6a8715eb72d920e4f3a216bb3e7c64470c5e86883726e65918c42eeab75688b7ce8540c055f0151174ea117d345fdc28ac979f3bd49e94cb3bf88d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gn/firefox-48.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "fd9117544cb86ffba9661113e5f8e2eb12c782decffd8e66a7dfaa84da256bba5294e2dc9121985237a5c26abdd2f3005b5fdbc997161f3d0d8933c3133878d8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gn/firefox-48.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "29fa2f47048a14260482ee98ac4083f94b86d669df4bc6fcea3614648c70274f4352f80d92421ccb22c34b00a40d05a6e8a39dff74bff1963803893555c44c54"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gu-IN/firefox-48.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "810626ef20f6bb6840fdab2c5bb943c210445396747cdc08cd7eba2d06dec43b9f8156d586e751d226569b51eca6f939f9a921b760887ea9a3e33ab6c9bf7dc4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gu-IN/firefox-48.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "ba0be48fc7f37260d28c9aba7058d5b846f2c4333fa738c6fca93c70c580fbd1e6659800bc2236e12f03b91f0eb83d061aa97332c5553e64cf36559dbed68428"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/he/firefox-48.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "9babddd78b2f479d965b3afd35f4f862ac1aa9508a40eead15bb2d8851773fc331a1f19a79abb032cb943d4cf396e09e43d1d19ada0cc99c7496ec95732d0998"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/he/firefox-48.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "27329d2fa27443d000bb09978e0938b4d3fa01113ecfaae31ef4fd07d15f4973edd025dfd5c9872689a5682f59195fcc93491275e604893902ef96ec04657784"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hi-IN/firefox-48.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "91f1482f99dcb8107e3332becf616004a157a3d2a0127682994c01590dfdca85c273e86a459ed68f09ea5688ead17c0f771850adb8d885dad7a8a303b63dad21"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hi-IN/firefox-48.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2c16c240315d20bf0a9f2d9231d1c7a72380ff1c66b7004d9dac6d84b8eaf665421e1a69e9d738bababefa1b7013ace385bbaec79dcf6c7f9bcb20a5484b8b3f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hr/firefox-48.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "fac7b7782a77874cdfaa33d5312ff4cbf768716b6ed17dc762568f1fbc69a9e4eae328b83bcae951b61f3513347a45dd922daf2679420a04385ef1f5260655e7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hr/firefox-48.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "edd07b7766d98933d9e4338336fcfc44ba1aeeeba867e1e8943dc30d2696c93c337287f45cc3cecc13e2920c6d4b31198393573600d828623b4b96973eac356b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hsb/firefox-48.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "67ff1af81011477dda69baacca4c48e0534e17804cd147bbae57e7e2427f32764bbad1eda06687602b39f3e14de3b455dd526de42bf21b9913c97876ca03e168"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hsb/firefox-48.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "676f7e8c0377ec0e4f6614395608d1f8e4458445820fe7ff60ebd191aa640020ab6c94284ac9260581ad32c3e733c6a407c7b92588ed90f7f9b687289a29f984"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hu/firefox-48.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "afe8bbbfb44bfdaf85f3700d2410d03e488a05727bbe81858317e3a6851d54e97d223ca76a3e10c374a0f7ebef93113cbf61b4fb208ddbfb438ca86fd6b26f6d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hu/firefox-48.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "efb13d909e84435d152886e6d6059a48fa64f9422e35429105c40605985de8769544c1005df2396d66c7336d8d04a7195dd95c3c29a74674c8c171040b66d19c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hy-AM/firefox-48.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "3e57e60bc13cc90768495d2edd1afc82526eed21045d22251f43d8c4e3688f5985de31d60e9da3222a34d1c0126e9a722311686011a70ecdb719a4b294e9e9fa"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hy-AM/firefox-48.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "f9cf84a91d1b624163b5384051ca626800c51f486b2f1deb213cf7c62c7010e9b5b27c75420794c3d930ab126ce1c699851a279ee1f2f51d7ac939c57b0f0a31"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/id/firefox-48.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "047eb087640ab3bb89c3870cd8fdc50f33d393abeeec16e038c627f74743f61b9a14091aba858006e283b1d21cd51436267259185ea259657958395db99e71d8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/id/firefox-48.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "1c8ec433c5b1fa936b299dcb53414e98e4a4d745151c2ea995c44d589e54fb159db2ddfdc380b317c343ede35ba88223c941db4e563a96a4a93878aef0ec7ba2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/is/firefox-48.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "2242c0e23d7ee69f5dc52203c6326caa194a3aa04a27701340334f5a9adb287ced4a5e8d42248cb43512ee3e2e4e94764b738af72b3c2fa45e20519ebff47225"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/is/firefox-48.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "ced9018f2409ff544f1f86cbdbaa516aa03bdebb9a2c96c8c6df3503e7be1677321c52710837309434548d4cbf6a6a23c5a79157462483537fba6d0aff1f3717"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/it/firefox-48.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "1fa74d050366c3175ded35f3879d14eadd81670d9abc28f4493171ab13fa87cf19667c2f40581b5029ac7391d2e21226d355d7c6d78c6f0d821867f86a67334c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/it/firefox-48.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "cc63233e9d9eeac428e999c509a7a9cb3d83a3d2b7b9ddfd8bff8841daf1e594a714f5540911616615babbc21f734295de8a5ac7f0a53dd4f62dbfab657e0133"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ja/firefox-48.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "4fef54eeabea6033078bd94d385a1fc96cd38d49eebccf2820710c5d516641e045be9a65f1ab0eab3eaf7f727adbfa98795671864b78288c04155d4516e064e3"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ja/firefox-48.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "0c25eb277891702d418c62de31f6a0d7706ac783fc527070e6051456927154ad23d0bb3a085127426ba4d54017ce2a713ad95e47066fc2da0831a0a9f0ca29a9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/kk/firefox-48.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b42f1a2115efc622c1efbe62de3b275ce01ec43f3ebe68f6cb591b12af4232a0c5262cee6ea61648f9fec2da8702b5f24f6df187afce020f333c519d32da18af"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/kk/firefox-48.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "2bba17f65a5b7d412c1e357886bce2fb4e017a5694f69930a7835429825dba86659e1caa31ab0ade9ae34dab0a507102d485c5fa44d9fd156d4ce4e3d4453976"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/km/firefox-48.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "36cdc77425f5b9d0546ccbe24027676fbb98616b226ecde4e610d9958a11c4645fd2741213820bf145bf258a0f32f65c81bf6ba365484949da673ca3a79a1b5e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/km/firefox-48.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "0ed475a08d580bb864fb1d8ba74e6ce2925591c008b479016faa048a642d2246830ef1a102381e553e5309c1b3d5885ef409befde2c1ef950c2483bde3de1ee9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/kn/firefox-48.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "4961da8a5f554895a642ea22bdeb640c289385a632a6de2b02154cdd10de8f7eaa9f3979f16bc026701f1986e1fcdfe2b67c0580eb30ef4e7c32a5c7b0a89744"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/kn/firefox-48.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "63d674029a8f43e21fc4eea4278e0944141d6b0425fc92855e84fb4859085ea15ddb7e06c229e4ea6262d42a91e8f2216de45d185e9507034f636b95d116c3dd"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ko/firefox-48.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "217af13c53e8e9edb43a7817a901bc51c5b013e9fd27f3aa3ec8ee46a820f23fdc558e73e5ca1e40829d0269a07f32d704f1a607d8cb36878338b8084d8463bc"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ko/firefox-48.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "14c8c220ce753be62628f9a0ccc726bb2c04aa9fe8af72e412853445dd3a4e4e328ae5b641142c181df0949212805a20c381b4716b5d4ee97633707bf70baa95"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lij/firefox-48.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "e162cf0bc0545be09b6f7c8dc237c1f757d18fc2e81640b12ebf8e8bd396f9f58f5bdba875e5472d03f7596da9a0a9670f35a570241cbcbbe8ff8071861c6fce"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lij/firefox-48.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "c041bc122decc4ab427457a4c0e2807694d7cc9e44c4414e75f9b3cb09068167de0a98b1a1a876e4a36a1edc5a1efb9fc416b2676ecd25a80c0361833dcfdce2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lt/firefox-48.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "7d69e16806b8fc2eed1e9ef9e270693f4ca9beeced5f20e825ae6b65eecbee7538b9f7d29217a7c35043d221d0a4ecea3c6e0ae985431dc00c88133e7118ae83"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lt/firefox-48.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "6e2db9841264bcdf55f6f170935c3235178d4bf287399af80c953922bce1424b6260eeee57d2a80c5d090da14ea7d9ddbf36d96e27704a57c9064119d324378f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lv/firefox-48.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "0a56414f8c375a201ba730ec132546bf9db558b0491fa9201c977bcf8fe24d958d3f39bd845cde3d5cbe3427a8e4503663d1f63a8b49eb814757cd7b4160f5e5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lv/firefox-48.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "adf934ca0002427735e77ec583882f81a8e7a905fb20c81eb30d25e4681a5e77738d361105906a7e538f61b967ddc4e44e61627bb1670cf7ffa92a0a25b170de"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mai/firefox-48.0b9.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "598c052561b618ee8ee16ca3d3db49e6102cfa998fef2e201d80980a2a24683347d1b335bab6f4914d262530e1d3aa0a31d06994b211a3d1fc92cda9b38485b5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mai/firefox-48.0b9.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "9aeb08929ec09da09d375c4fbe757d1e7d7fade2b9307fb27c880d8a3dfe1e73346a2128904ce5ec2824bb57c3bc9c533fcb445bbc4b0d5f7aec7f5bdd8beeb9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mk/firefox-48.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "75d8b7534adddcdb3354a36848023c2015ff9701c8a4abecea5d8699c77464d27e4a5411b38fcfc1590443d991044637f9c37c38d9745756e18e93e3a9df9630"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mk/firefox-48.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "10a82086b5e54b70d1110dba1be3dc98ec64ee4fd32ff9c73abf743ccabce37d586f63b46fbcf11913126f62be3c4caff6593ea276665632ada512e9119bae8e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ml/firefox-48.0b9.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f32e2a3e4c2c233840f6235c71fe70fad5afd0455cf3729cef3888fe3bc54a6d73d5fe32fb0363b693a39ba414be02d5107f62920f147712e36f48a6a339a96c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ml/firefox-48.0b9.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "c21851d483a9dff5ca1a5831c3438a9d6e25828e6bb6af415dc9943d665f0752536672a9bdf6d5a0d8bc9ece1193279aec2401d5fa982210aadc5cd4891a1093"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mr/firefox-48.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "42158c09eb37ec16ea1aadfe06c44a62eaa7be1bbaee5e7b13ff72aaf60e674a4b27d03054c6a7748b06cf02522fe54eef92e6ea016ca59ac0c6caba33ab7c99"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mr/firefox-48.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "00a6455c238f72f5112c8e2570e53c54c6b20c1dd12fef9613b700fe6ea9e0017ef97f88f028509575960ab28e485c2ea79cd06ebf03a7d262709892e1b0ee9b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ms/firefox-48.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "6a7c0e93a11417413099b557057ffcb495b8dd97aad0c0d95320c59508258721676230f0e10114aa59084c3e26eb48470931d0ce31c7697c17f3eab5480b6f93"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ms/firefox-48.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "6428319d01d1b31b84f6ecfb8ab3ade9f2ef5ce56fdcb4da1a6adfa89422c9c83099aab95b4884d1c336a88f429e05586f590e83da9d1bb07b5c7d1e4e81d4f5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nb-NO/firefox-48.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "b1edfc9d90f018b87e5d3ad6daae2d5aec0276f086020c7dbf199cfa120c1f6216627ca72c98a307d98fe82a0e4b57a703b0cdf7473604b09918b4dd3548a795"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nb-NO/firefox-48.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "8d17660df93e03c056cb96aec3a64528b3613c7173fb19957916d1f4271cb13defa59f4771fe0547ad72a5fbca5bcfa68855fb220e5f560ce6d185ff074156d8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nl/firefox-48.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "2d881068bf9e8eace11e3d57c41ba99fc81f797e13a2ec05cca6acf884369a4bfd140027de2f7c79c6b7245e133c5261bb8e11f522debbd946154d0414b3226b"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nl/firefox-48.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "1ee190a679c5575ccfc6d5decbe5bf2da55769c766d70400f79d94d4423dc594830f08b456a8a398e3e7a1cdd507dcc224c1b255fab56b4b4889c0f283bf0ff5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nn-NO/firefox-48.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "094533a700c763afc66cf417b0b09f8c2666143592afd0fabb138c03e95c94da4746b03c80d1b473fca94f24f57105239399a994cde961ded535cc5787bdc7d7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nn-NO/firefox-48.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "98ab06a9210bfe63c0a7e90310286afcb24ce46b8096966a2adff608e214b95563421372a383814163dadaa4c9fe318a1c9f2f18537dcc37b1fc1eded227df6d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/or/firefox-48.0b9.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "6139c760019bd9932a5baebf599090540e4ccaf0e18b3faaec8eec27f8f5b6a2199c4a554c0d6d5c92ddba4c9fe24addba47becf69b296cce186be3c2ba3a5c5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/or/firefox-48.0b9.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "503da59dbc9c7cbf5fb85198ea2cebe3a9d3ed5b6d0edeb2bc0e0a4705397816840f40d235ac63bc95e34c5aad7daf66ce31a3f6b43a8cee9720245269520bfa"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pa-IN/firefox-48.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "af70115ad3fc5798f7add37bf342a291cf263afbedd1b57aaa68dddcd1d707953dde2e10c71b38f46c942e629e3edf8a2e55f502d1d98bb92a693cbc85e3ba73"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pa-IN/firefox-48.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "2f11b9bb6315843815beace2de30f5d054575806e98021144f3a622362fb484a0078cc279e1fd13a1b2b6fe9070c878eb718680a95ff9e4e5a5bac3ad31fc949"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pl/firefox-48.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "7fc676238c0a484e71fe165921bb2edff5f5f98d87a3a02111e4c9f4c103ea8b0c4454fc39d2be381410beec7e6bfbcf02eecad8555f61d424187dbb7e8117f2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pl/firefox-48.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "cd27e4c532324f35756c3274ecfdbc47d42ff7a456e81363df4a96ee4067dcb0ef6dc321a884f9a19e0b0f25101e2e1caeeb62280ad1305c0eed1f8308997bba"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pt-BR/firefox-48.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "70123bf8edd0ec031eac0f150bd8d7c12e52d5255841c074c8ace5d0062fe1e1beb336e27815b3321a93f2be2c7eb8c5b95b653781922562b625d37921f986df"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pt-BR/firefox-48.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "28c864f45774f4e56558e691220a03cbdbae07ad6c4cb12df51938a0e394b0aca91d64ea1d3b5efdf361c54510e4a14033c3c9b72f94315307b606516a9da5f5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pt-PT/firefox-48.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "b56bcf6c74c3d629c89bcd138e948fc768bccd8844f664100156399ed89c2715e75edfda1427f9205ba44bf7ae12d46308f6bd9bdd661aa27a2791a50860afc4"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pt-PT/firefox-48.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "c71179e281f660787df540c9a894591ac22303a7cf600c649e96d8748753f1c8caf7a016c91a822b867ed5ff7467aa182583fd45d0e6445dd07eab58fa0799d7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/rm/firefox-48.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "51693c87e2961b69db233d543c08b6c3fb02c04e7cfe70ecdc6e060fd1a32625e197db2042b0b063b0f5eb465191f87a41b5602424c44ef4dcd3131423ee3152"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/rm/firefox-48.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "48241427ee3d820da6a42b33660184f56ae1b9bce2d70515b26c8310503563c7a6fc7de3a15be3a366bfe697696ba9dfb19e08fdd31bfbda50abc42c248e1a70"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ro/firefox-48.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "f458cda0c659c8ce5af848e7a64942d89b9d844b5d8ad0d79d44decc0a537bd8893055bf9868e3c65e4b53ca4f01c0a90ed449f19726a9e1314cf4726f9a1bf9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ro/firefox-48.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "91656c40f1aeaaa1fd93abda711c4ef748a3bb7a357f7a4f469bcc3bd8e2a1ba52546beb51d894e0c167f168fb70d1b5dc382773c73c094221e3042bc9857bfa"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ru/firefox-48.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "f384eadacf3cce571e594a02fa7af39f64889f5b8d02846162c6d359052ee0f9071e6df600800a5fd3f3fbed622fd34358dbbbc7e05357ecc12369bedfe8196a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ru/firefox-48.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "de52b810d65d048065a83ea430d93d75c4e21667d197aeadae9e036f75d16c9a25af5c4b2c2fd9bc9b3a7968355e9f6640e19996f6d3fc42aa2e1bc4ebb53afd"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/si/firefox-48.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "a14807d1077ba5ee3ee258220768094f49002bf624e235e66943f2b7bd1f0eb61f84e3f540d0403276d664f0aadfb75d1cb433a1b364139c46cb48d6cfff75a2"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/si/firefox-48.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "0d6161efd6fdf1837892b71ebe639d13751ebd880b06211a40076e98e9256f30099b9071611c25aed2c36fa255af7756e39a90d60103e22c3e2572dc3bd870a7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sk/firefox-48.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "d5f7b76b75afedd12cf1bcd52df49418f17e518dbde52c0b822f8e7e7aca55838f85b924433b8083876588209eb1ae8d148585d60408eb8ac06b3be38ea4faa7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sk/firefox-48.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "123bd1962ad26df9c72075ee360d715c5ba87bbf715f0f35841d2466e14a93fede982a33bf43c6593f5356fe2de1d11ae4ffb0d05d4506856bb9e3933cb33a9d"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sl/firefox-48.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "343ebcc6207e8cf4b8e46df9371f9ba6b91f6d79a5fae675cefa5a80fca3d62e06557db6d0126aa68479450365dc1084327947fc061efc41b504d329a6d7ee78"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sl/firefox-48.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "3eb40d1c17d96bfb24d02dce3195107abd37673675bc04eeae71d7e8efb4e3ab70ba5ad466e890bd82d55e45cb34edb407e03676d03dd27f29c219666e6307ea"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/son/firefox-48.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "926bff8d0899b2720677c072bb24c7622eed59d548084f2863b844afd8244cf83753268f712aa2fb6cff360448e9ce4da4974f7f38417fd48ff0d3e48629db08"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/son/firefox-48.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "0fbe6e0edf8bbf3039b0ea472b25471f41446cc0c65b1455470d8afbc2c005f3113a82a82782a013f6c6dab2888c0be260ba52a516bfc2045ce4e7307faa16dd"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sq/firefox-48.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "7886982f83d57172c9c982f4dd74ba925a04d9506ad0690dadcd8932fceccaab44d20fdbcb571164108281099be051becfdbfbf76f1e52798af7a0fb51c54578"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sq/firefox-48.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "a59386e187da12e21ab1b378b59429e6504ea1c7047d60bcf9fce7ef3de578c92fc8cc791f67c9b6e4577dfa0547da93344899f5ed9c88049437604abd7c70d8"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sr/firefox-48.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "1e0d31851ddb5fc67aca4aeb30b368e5e1f7818d265f279b033f8fc0fc891d0caee1badaceb3bcc868cfc58ece068efba92c751b3a94d3968f84cf060ea18b4a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sr/firefox-48.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "ffa9176877aea7fe0672a8a5b2fc8f182206cd80d40521057502d981f80c8e2a77fa9dab595a3594774b9e6cd08fb2bb66e8416c17ee59669d0e4d8b6f73e67c"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sv-SE/firefox-48.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "15ae7f700d02a1608097b2b1d14f3e560155fb16a43eed962fb359e92525637dd2bd6992f4616640420d3db489b7fdb5e771085f6b502f8ecee55377fcd03be6"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sv-SE/firefox-48.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "b8d8f12b9b63e034197344e52145dbba0e3e9a5dc2bf53b3efa8824e3f730ebcaa2a8302c6abfad67c0fb3fa5fd1e76d93bd5be5ac2707b93ed8421fc8e45256"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ta/firefox-48.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "34c6e9235b8c5be2e221f4a3a1e319f201df2247bc54d0e07094190d4b80ad064ccd9b426420ee5b5014ac1fd6d7a5180d39c331bd5d561de942cd00536a57de"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ta/firefox-48.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "2f41636896e79b9d4ec9d772f27f817b7fac7c291335ed1338d6520378be7553698225692883c186f63faf471a94dc9fee4c07a93284dc2df5dbc26655679f73"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/te/firefox-48.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "4ee88c91de2438ea362ae50afe1d8f290bb5cea2103af31d51441385c4c2c78e6ed2ae444b121038c7146eca7efb0acdbb8181f099f9638a25bb91f39b20ca3a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/te/firefox-48.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "c34b58adf0d89093782fc5e9272c298fee026e0f5efd172766f47105ed19617e483cbc9af63d73dc2edeb0025c95db0a5dfb5f31343717b73a431d0bd5a5a20a"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/th/firefox-48.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "887d830f0afe21759212a8d112d2b4da48613488c3e69dec1d526eacc067a23ce0d58245151b89176c2a1d869550cc5e5e6598f3270e43ca4030d8caed583e14"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/th/firefox-48.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "a4113c7f87e6e7f0491d12b7cf65d402c75a5b4dfe9bdedbc69a60f4456f825b60e4170ed49110a42720a57814375c33a14845a653d9f71f51cf417334c2233e"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/tr/firefox-48.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "33620a2a49f9cdc39f591c3aa75ad5688437938b1fa31084d74d2ccbfd2cd502e788ca3bd8d863e666b3028c44b1742ef9621c40051cda361b389080f3e54eb9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/tr/firefox-48.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "29b1065949adec1cd057ce242294176d23fd71249d7f727d41dfa81224d744fe0d8f1d19a60b5d8aed680f9e9b2ee2f10d2da9fb5c627aef6e00627b56b0f979"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/uk/firefox-48.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "49140602407a30ffce9d7084bf9b85f1f1c6f9e2464ff61c8ef3c7d7ee8cf23eae9492613718d78d16f56cf0f7473ddd8171526cc64ba599d1770205dacafd10"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/uk/firefox-48.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "200101a9c88cb71474ced39007050cae429f0ddc973a58ffd11b816e749ce3f5dca2f4db50d3b80068a0bd048d383c2847f7a283785d52c5df938d9e20fd76a9"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/uz/firefox-48.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "37f5469824bd70cc04c7d64f48d29aead9cf4839f795df61f02f109955d299655a730064fd52a98170925ee746ffef1802bc492d474779963bc12851efb8109f"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/uz/firefox-48.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "9eeacfc5b02758e79d4b47ca80357c6d8029f64e0fa117f6a73c3f1039190c3edc36ffe24b7231dbb28e5242cee419ee48ae4cd7614d6f7209473502ad4f1a79"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/vi/firefox-48.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "4b6b9f4e95caf2bf331cf2fa910ccd8ea89c4bb34afdbc9eb2d972f1efb7a7929adb6701356a70d1567fe71dd857c9b1b8076aaeea916b8a4fd025675305b8e7"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/vi/firefox-48.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "635a750087f5eb9d80dd4a9410e1ae3d43deb7ec6c88b2991c74387ae0d6db568cb33db975fbb29586489b09f470b280bf4d5e921aa06a5a881aa8fab02122e5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/xh/firefox-48.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "fe3e1e006c71015853e0ed9ee595d1a91be62124f7966e3202cf0bcb10942501c0428f216068d372191268b2757ef55005924d64529337f6bf64c695c2cb8ab5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/xh/firefox-48.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "e6f2276f5a41cab83352c8180aad14ac3328db21dde432e1d5ed7d18d0f98c4ddd7f733fc645d690d0c328382c64d5ee76fee17dd6e6bbbda43a717a22014303"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/zh-CN/firefox-48.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "188d418f0debdda2479b0ff2a355ec0014b04ec8695eb6e2675bc71d8c925eef6e2044024601e1de583d6512a977d5c923963a9be60290bc9928821180b371f5"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/zh-CN/firefox-48.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "fc7d5d18c568417d650ab282d0f09ee77a5e49cf9d6c20134a38b8388ed908e00e224be99fb757d7d885bc27ec5f01c6f4555cd5853f837d361e2501db65d723"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/zh-TW/firefox-48.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1a968c979273b21e76625988dc21b8037c405c912730fd2ebba515a13dbc1f6d3807873fbef821f5126af773b91d10b3be444739eff287dda642448e692715af"; }
-    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/zh-TW/firefox-48.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "1b79bf4dbe43574342f8093c036ae29b2f2f4d88e1201e9fda0e190ab00e5319ae5fe830745c0b01d66deed73f04be7313ac4e3b3438afa22c75f03cde8d0fa2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "98736e1a7503e6550491147b418815abc1cc59e58172ca45933f24f8a3df1d2e2d614d059d1159fefd727e771489c488a369e0b1f9bb7a25c8eb75cfb4c3e2b0"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "e8186d58d6c3847b475ac3c55f97476f393bb2ef210a4b7ec95d174d160011e0b4d0798de8bd33ebd30c342506f713a71509eba06fab03dc6b0fee7524f19dcc"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "0732de2c643ec1ac17bfb3b7629207cfde48f4a135b7dafd6a5efbac3231382fdc5f19048cb76f3da3bca255bf9816956e301e26cf28390ea9cccada67d920cc"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "ea5c72eb31b41714d57385040cd2d80f273b4177a576685ee752b2e92f90f8d9b5439e1f52dfc9941143bf91248be72aa670d134ba523cca856d175960bb3f40"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "36e3b5c374522efe6dfbb3b072ed2a75b3bcda8934c4763468643999fd14bcf043a2e4a0a5c62ada2f2d903a1f593e06976354a620733523ff806f6b8fecf1ce"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "398134c3133b75f027743ded416f3063d74ef777cc854992cd39aabb6397b00fff8dcf5116dabdfccee6ab1335bc296ccd991b3a4d72707735880d94b8f81af7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "395b9abf6a6f01f448d7671908c2d7903604592490109793f3e36ba83375685aa43007bec07d3f28997416d8aa02df2597ce3392b7c1e83e1af4911203e2baaf"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "731d61dbc03548c77aade87c413f91d727cc8a87e15c202b73dece2a17c2bab887eb3912077aea670d9a928e930c4550ef2150442be8894e59b082c6f3d4b479"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "7f2d08dbeae79e7f903ed182c9eeb436f227ed9ff9db17d93f2c34efc3353788a0b499e23f2fb3eb892c9ee1592493cd8f960a6092f83b19de9419c7bd4ec3e1"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "311e413592438b610b8402eb00ed19b87caaa02522e8c40fff454d6d3fd8e0b7d5cf9223a6fc52d7c5f0be23baebb87639c2c64630e5a1a966d341b679bc1d03"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "a782df4a337fe18a7bb85c2a252444154100a597253d98d25c268c69a430045e4722a888f3d5fa51926de3571dd1941c117cd34537ff866c5d34279f3861e0e5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "87a7759ecd002f994ebf7334b9c8c4c042ed6b84bc33485c791c5ba49bb7477ec801531a0723820aa181770c3d404eb7a0f7fb91818c38044ca9e3a130962899"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "d3822be0aebbbaf200e243c3e0ed0564cf6b5a9f14825f477767f98b796afedde9c6018f3b34c0263553fe190516ff0020e591ddc8ed688cab9454b7760cf131"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "2a70bffe3da3d3a9a61e649badc3a64f3110950cfc0b3cbb42c6f799465d928ec12c9efd1e7ee6ea978c865e2d3fe05d732a870654bf629f083f15357b360ccd"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "edc39ed32b7d990074ae3a5099cc4a0caf23190364eb87d1218a61a25b66777fa02b5df6f20c96c5ea67798a999f0cba6873d5d23b583bcd3d6ee90a7c978847"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "d0558a2e751d561e2f316a7bd57c3a8d92e8d5cb56e5eb28d44b5d40303550afef2bb9b69dfb0b80d1ef706a33717017eb077d3b2bca9277294cc76656a6131b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3524f48e8fb8b0c98c8df55d3e2934240eb414160d0e17d6f9beccb6b0540b9c9b554757e99dc99b16e685779c5d3395ff9bdb5c3a6c9faa2e88e099986aa4df"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "f44089b4c10a0791d98e75580c1316f400c7fadd48050d9f3a352064005b3b4205db7ef54bb1ab7bf6518f7bdb3be5f853f490cc0247f3f7a4ee7d6c50cbd20b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "39b42d189a8ba7508e98045e1d94a1c79f8544cf4b2e2cc5187356d7f9ab6deef012c6e5d2220b2ce2b5a58f565289c5aeaee6ddcf0ab7b0cfcf18a902b95715"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "210c40e18347440077ddd0ffd25426fe583547a2a9bfbecf3e8ba3d0159d7f7317c06f893731512cc0666af488f32ed5808c8e2aabc921367f538695ba49fde9"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "dadbab0c70f22ec20a253d73081d3ccecbe148c6b0e854b85e7c079f4979f746c79fd5febd916c167cedd78ef04f5e0b2d2c925999424bb77118d251287311a6"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "8a2b9fe150579e487063f68373157ba087c571f53a98dbc9251deee92ebc58d587e38be2bc0412ed02cd8ccd485d91bc2fe5d70c223e7fe6edd996d9bfb89bfe"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "7a3a3c5015f407a1b7ecbf35763ea091cdcd3652c7916fe81d39336521fd6ab908a549bec8d39e089d0161fb6b37894b893058b523f78bb76e75dff21852fd13"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "9a7b5efd1f8d35f8cacaeefcb446028745bd999765fb04e60403b710cc9e5be14d172b6f0c2b08f1093083b6c4d94f22117f2b717473f5cd2bdc43ecaaec50a4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "4671c1ed650df67ecdf152ae1503979f52b001660e167ea4ca1c47e1152e1450e2a5eac306b302c55b28e686c8535f6d612faa4c53b81cc5297e765c1bdd0afc"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a2e4417c3987c8ab15ef8afd4fa130f6c45550c57a4605ffa301dc7d4ff49620c768d83e9de00f509dbb0cfd94530f4cb102cdb1f2a01eba091982fbfcd82d36"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "076f1deebdec83f76b44c41820253a7659b6702a1b1ef7139419a50411f2f752e764f96f84be24d84be388a3a3083656f967ee53ae1c640651dcac46b6dcd089"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "6a34ba7edb264cf974fa23650c73bcdca3e9344dfa82f3adf56c04a73439af5a093789e38406e2ec94c97635883eda2a232fe33a1746d08ff148022a1bb61fd1"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "0657e07ceb245e435dcb3c2e36e71054bf369c088e42ad0b7448c05c5d6a666ba5505da01d2e232388794ce5ae3be8dd1ce30ab0926dc9948d2a1291948f9b5f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "4e95bff1e40614451baad90fb3ef76e27f2ee5d1d2ede400c091f46421b6b17a0c91bad04a45208219ef7513046749b9a42a147cdf7ba52a88dd515f5dc27cec"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "73264dd3b43e4ea4028bf622a2062797e4a28118ba597df19affa7fe38e630aac4a960fde8eb6be4a1e64d91b3b01e986d93684819c54e66c506153b19a06550"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "a94a811ede59154c98e87c47bedf4a5faae44cbf2c87bd7346476c92977abcdb96b79cfe379a04a459daa576170849a5c2c779a14948e51e046fc6fcf0ba4571"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "cc45c49758e3542ce704f941fda143ec531c9c0b9b0b28eade737e792afe7bad0db708a61510fadcede7af64622b7a97cb1f2c8eae7385ab447dc4a4198c07d4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "07999f0049f305e75ec3fd1102673576e685e42b894db7ac8eef4d4dd1b4d2599a47b8f1ac034c728a5f3bb433ed96550907dd2f9e63a3fbd0aa43b65f2ca744"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "115840053470a057de9afeecc8a74113ff97c06293ce52995ef2bb473217d7b057329a4bb239bd21799d894e6a11081e7afe5191cc1ffb8887481fd08911f333"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "358f79e56cab4260557fdd999a70d025c6b2f8e7ea01a5767500e4b1906a57994592c633b7e10b9aa54a7a2dfd98f86bb3a8f8b09c364d8675bad5d74cedfd2c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5f80f4e32a71560188a21bb6b457b66a692f5eb32c5b45e04c40770b83689ead6bc07ec4a110f3855f5fe0e034f7b64ef8b5fe80526c708077664b179def71f6"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "01c71572560665dafa87ae8b327ee356b18b5ef08df093792c07b3858c42f2f9f3a89a2752fee35503785cf10130ca22fb21db83ce48fb902876eb9780b959cf"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "11385bdd26fd0eb9eb505141af2033a9e3b85f0d748959938eb51b9d7bb9e4c801ecf19e351957b9f8549d487086968b1f86e19534b09997b04642ced3f708d5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "4daa34474c395c52c42c12f03125db8266e83ac1d8e5b098f0371cab7445b767abfb965668eafff466857ac99b6f4c00f4238d00b2f3915f228a25277b54fc2d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f77b62b8acabbd5afca19572be983c2f81200ff2bccabfe45b6c3d41c32de90cb4fac56db7be01fcf6a8dd69a72056e903f62d2af08b7ef0a06d18588c685b8e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "9a3852f3dec48d5c40c09d6c961f87fb34f7fd6423ac86c4f4fe293560769c1e5a40f0d3e307fe65cdf614fe6b7fa7b1279c59b8a514e83e121b58ca90b46d31"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "3197dddc1f6aa65cc7bef6217175d308c29f1bc87014e651af76b490601cc202e9609d2728ba2c05203cfb93735094dc7efc2ee9f02b8544776ead8e788ac7b2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "c1dcd26ed3b07c555793304c15644033105a72390c1307921fb215a06ddde547a34e1d027966e524878adf26a8fd3323d3d59c2914bfd20b6e7b7b4e59f54eb3"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "27d8f7ca57bd1fad729e73c0fce7f33da77249f1668c4d2b546db8b0edbddff4795537250c190d59cebd83dd91a06baad9b791c7c7ffec2f4d82cfdf15bb58f8"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "1e267127d21a6f7c64acd7e1a991a70b51742bdc2ae83f669a25203f710483a35b3bc7a9f226ad2efed77ef88161d345d312efba32e9b38d60d2144a1ff1810d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "37fc1a82999c427496fb50ab6ce47d719add8f2e00d47269d266418dc1c1cb4191675a0cef398098fa17e9ec510a40250628eb5290b270c502316b3694361f6c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "5ce15a1e1d9a5d3c26a2e1b2705c11fcd42acbd296231f2d25d7b130185b09ab25d0332c199d0f8e4994b30c97ea8d80e1f1ceaab8c8d8ffeaa2a2da91b32875"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "bb5e5f0b07054f2cfaa047e8df129c0fede79f6e5d736014cea52bc59b8b4c5276bf3c4217b818adf2ddf11c054c8a5ddc782a9c0b529b7164bd6f1e7edb6ca4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "01d363154887ebf4c008646c4d749c89f8d748d9b0f76e19de37dc097517aa67485830679406b57348a670568f9406fe14fd22e01410f3a00e102b5436779193"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "8fa22a6ac6e2f9553bfc6fd7b0326ce327e4352b83e45d89ea0f79267073e03bba7dd1f2c2c2de40e3533cb0af97673aaa758eb0914c090078306f4b2902e361"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "da2b44fc3bd5c7536744b1355ee9640b2d430c32c3127ce1f8eea09cf88016c0e2bd9768925abf19b49ba62c55d90c029465b03c307fbc361ad95f4c28acb419"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "2cbc20485b5faf26a7f8978b63b8c135582569bc5d68c96b2dcd3d66864b2158479b7c5db0521ccb9c2de4eda6b4ffdea04ea480ac9b3e4609fade7f17806a6f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "ea8bfed6bb886d23f8755b8187495ead5aa955c9fa45db1249a2f23477bf01dae4959cd4eeacffb6c3a6402d47da458c9d9fdb43243d64e19e3d66e3e1b85114"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "ffb37896e2f7de03c26b6e182416c399b9776bb14828fd54ebb34406f25ef77bc9eb975a13b7c9c9b02bf78b496928abc059283322fb1422d63d506f40b533a5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "635e7f1e0fe96d6e074bb1f2a4e92d98e0fb4049f7bf34f5e5547fadd00691e27efbd5acf6b79ea9e3bbb8d7b72a50f7beb64bbabfc55601645292a83384a2a2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "f67781fcf3ff9e4dfc1ed042bbc6c8aede1a06a6f9b4f9f4c969a9df769114febcdb4bae191ccc9ac10cebe727f495307e497af721c326ad7d2bb6894fd93944"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "42236f745af27e5ffbd1370b9d5136793d1c0ffcd1a1f8299f3a3d439e2671175524416bba6e1ecd162d9f986f89da0d3d1ffc760f2d48c5d28a99d74c467bbb"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "d2823810c39808332c46cc39d50c552efb61d74dbc7fb59dfd5b76d1efae544b52de89cac42be4944d831691971d4d8c880ed1cffd9448b05872acf7da39b698"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "61fb55d812c8b487ddad136f9c908396aa02e3ec4eee3f2f3fefd883c5aaf24a0c138366326bfbebe59b7065cc6f8f99550823e46bad876db8d930251f6a4492"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "5086ad7828197b129d8cd25fbbe7bf0e152b3476ea886ed8cc02290d4ab4912cd02ccdee0c02f08c73dffe6a0b34c11dceeba73cd948c03b26fea8c3bb2a84bc"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "b701decbbb6374ebb39522b068a36fb7c3bedff9f2b76cb655cd56addd592bf7d118c828283f52686545a6d9f603b674d8d80b35db217b5637fe2b29864e35b1"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "e14d7a15eb97c7b35bcdca156a86514ad8ca91d9af8978d9e9c1afeef6e71fd3f990daabd65efe424c6275944ea1922c3a313d562e710ee747b4e63d950c6578"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "4a0cd3b22daae4cba54473e4b144062e93dcc995a00e4f94fb66349e52274a5504b8e91e681305999fbd0acc3691fb011cc4db5485d59a9de79f542c3fd4dc64"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "d199ced706d4dd7f1b21999c335c500cacb8c1e4ece153f2f169711b4b381c316d5c2654608bb6f9a035f8c318c6ec96afe217ee6480451002e8f3269b4f0a82"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "58bb1595a4eb0dc651ad4778674103b42621375f8f7d138ac658915a974be52c35fd3944c099ee7ff791d7441cd818b09cddfb2a1498274aaecbaba8cbbd8ba7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4796471c2c42d9f5f278615b4a29edd80df8c113f42929a97c211bd63fe905bb7861a4c42474c6f19847308c2444e5549b7844824d99e6f236bcd0e2ab44e906"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "5d61a0ce98ffb8b9b3a8942b756ecaccaed33fe02513607aacf5338141beefcdcc547815d0f522da57ea1ba81dfcfb0c0e3ca6a0df237ce12501c41a157cfb51"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "6d69faed2f0c72d47311b2a756cd08c1f0b3c142129fd062bce661ec90a888e1ab246a04fd10dc2ba987ee2602f43b794a1507a7f23a5c65e909c0378e2bdea6"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "c92b0a2d591037bfda7831767d3c3f3d324190cfb26100bfb26cb12d9281a1b3a487141e4db5112cf122cb4e236ffded74d751aef2590fe703201128a1c453ff"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "25cddb8ea11d5422f966c1467d225743aa5807df9131563ed272953b4fa5004c331de87629e2eb6ba1903ad9abf8f0745be966f2e29c82fa74f620f08473f638"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6ea3b911dcbf66fa365b2ce6a6722ce3e412e61e9779d647fdc42d6e9571d60b3908af034658cfa42bc22432ab0a360f9eca676ef3f22b36f05008a33760b1db"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "7d594f87fc45fd1ef00f2d62dc1c0a382eabd02745cee1901d133f853cc937a4c8915615c189ee6c5378d161fc75230a1c250c789a8c734aca7eb23bb44d45cd"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "af5a12a3cf90eeaea1f028d4c9a6985d9d8c994947b7976b1a3e8e0ec1af18bab4f8d7b5b86105eb119b1928c23abb4cb7fde737662eb06e0b8394b19573daef"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "8f0e9fa58b929fe1d5640a373ec0b9a93eac336989b1cf10e1577ef8b3b57786f51a40fb0b6a2401faf192e54f7793f04ac3ebccef5dec56a48ded34cbd5cbb7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "8719d4655bf8ac157a6d144ff9acbcdcc138094a3d589a4078d9786acd036adfae6216846681a8feb33f9e020129acff3756074bfe18289cca126f140c4be1a5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e198a3becf663600184ee46f5d7043d5349abf10e2e951abfef7782449c142755fa0a37defaadecd674fb92589c24c3d49b45fadcd75ccfb81dea5ddd42b766e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "e37ed350a7cdd5801631ddc934874016b38e4596b1d397d28a9735a977ceee80a70f0b382c186a88bef39c3c747f9825805a2c8143e0fb7b7be574c07301b77d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "24b41e132f5aac62884d6b5703a8c3be679d6f8201a3abd3ed966cfe349055102bf099cec81f01cd86b40499c597adfbcbae2ca17bc6767c18aa9c0f1c317fb5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "27c62ad953946a1c40b7b7393cc249a9fc2047c6a251c4d27c5a1a9ae8e8361a14c3fa934f6669f0e7a99b27573fac6c5e151ae9c590bb58327ab503f4482ba5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "aea376e23c7522fdd3c0c82f39455b8bbe67ce7008e1e1d9de575f98776fdf3bfa06bab3ba0da81862c0a7242ab9cd2ab1f873a34df084a88ec82ec45c088611"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "4dbb401a0f92e02ee8822379a6313a9e7822d1155d064199272dd2be921d9dc7849439b04be3f25043fe37f43a3dee3e7b21831eabd1c555d5292694975987ae"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "97888c66cec9bfd111e76fc22440dda604c643396679abad421223b10688763a5d0e64fec46dd94084f30d819a5a12df4fd78434c4b03290fa745b60281b39eb"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "d46a2aec65b32e9b92a11230465ee6e2f83cef5a5b95057710f0ebdb3581810a1cbff09563f9ad3503a2c7217947369fdd80e0217318a40feed7bfd01fdbbcff"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "48c3142a39ed9d9173d1c25337d65367f1430804b13d0c9595ac2546c7c22a177a4d528f37d773ddff3379bc7bdba5e69002f2a37c837aa95a29d4e52774e65b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "cc3c1520f6ec453bd7e347791f8ab3da06a3aeaccb44cfe5491a4fcfdf69ed7baef66c2d31a9ebad9d2538b6ff8f1dd27b20a8f42665a1c6ee57c5f60094ef71"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "86dce4d32a3f01493ce83379cb20bb2e267dbeb770b9631914d3b9e722cdb9ae5a0a974b323ee2ed17fb97bd232baaaea1e53ea6f29b11253046656f98219cde"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "446c11ab6645e17465e24fe1d4dbf27175b27e4808bc66084bcf8a1760883f6a36a5992be18ab26115f75bf0dce780c42fcabb1af3d2009f4ff7015bbe0612fd"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "8eae4fae6e4a7d5acb9ad2b83c4f7b4d2c7edd75a4d320b6665d803d44fc448214ac71b2c86c9b16e6450f7b5238db8633a917f201b5d45f2cc03a31df2ac9d7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "c937552d45b948fde0854ab6ec27f77aebf7fa13eb6ff5fbcc74e86309581fe6ec799580fca7e131c940d218d09f70e4e49dc5348ec99e4d5ae6a0c63c9a6f06"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "4c38f40861411365e4a67bef548252328024438fc3a39260708a505a625ae9fc2912bd537a83bbe4125a027b50916daceae369a68d0ea7ba309b8595f8864fd8"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "fa298f7b4cd8fa50767f8b9a2bea0bd10e898a9e3042a0e09785ac74559b05877dbbc663ddb185146062fb1b3018a06f7e948fc33711726e43d5f33df1b3aef4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "9e2838645094c6f8703857b674916517a47328aedead3e10dd3801abfe94971a648d792cbc1abfcfc7e39629aa7936d74cb711b53daf9f7198594e7b82c063ec"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "a84c9f9f20e19d3820b632f3ba4c9c479066459d293a57b5ff8fd4dae1d1451f812b0a6a71e72559d3ae0596a4ccb5fd09c0056a2726ac3a0c1cf083595adceb"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc84f03e90ca309805c85f45f8e3a54c92e80237980b488abcac0eee1083237a51f30847b84adc3b6051b6d9c9075799c295996d5a912b7ebfb290911006b8c7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e3d9e20347ffdce67d5bf5c720c93330b6a19e9733eab79f07820b50cc4ccd39a7f0736b0355f15e5bd59a8de24a0e9105bedb9d8da1cef125ea88cd1e6865c0"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "5b4966046dae0bb27a9fde5850fe291820b19c5e41fef4f010faa4d2d040ffcccb487d7f7647d0286e8e4e7fd27b50a12047d6fc95dc70dc34e7e1da4bce6b37"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "7b30d841c840af2c9b55173ac31ce5880a8b01daefd7871a4519107d276660af072c097479ae92b5b83379cd36a7c68ecf2d781d16b75d5eb38648aef6d89288"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "920e34f7db5452fad20303296b49f7d3dc7bc780735ef881c4c2cb42f2393d3be319adacbda74cfa965283681a01260dbe2298244fba5e541b807f7faffdf285"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "3af89ab3f92d771fa82c58fc5ebdaa9ad11d7f89b57357e98ecadcd57bcadfe66101d09b187daec1c64dff808172eac5a608239be6c991e2a725ea9421e4b8e5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "e0239291135a98bce718d86831a0aaf3486c0e1ff54c98e65e970d1824786624e76ae73572b85f009b413bbe8c61aff41972629819812eb36918d4f2e864a274"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "998635a41eb45b8329f70837d0096cc69c6c7983ec48a208185fb0f3ee56c607c68178ac6f8c02de34c62e5c7ab38c1829b445dfed80f7794b7ef4fcd9ddc4aa"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "aee3c991acefbf1e257882bbd34eaee45415eecfb3fee2fa47a1d70cc5b6780b0894165a4c25609d595e4759d56ff0767b42f5b1d9174b4c1daa3e967871b66d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "e2170378be3b442bd97066d740d458e82d282cbcdcac555d425d16082ca22c766832a8602071135cf9802eb97b0c6f7f414fe076ddb976d84a4ddb1f1ea23bcc"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "71e8ebcec8758c4fcd6056530b26c2fed1512f36746d431660eb603838c22e7c9c86a560ba36bd18e3df783531e608c67daceb50ea1758671c489ce91e214690"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ed54aa4da9b6b2692c7d275d11ea53a85bd4ad131ecd644ec37acd3efbd51a25358c6b5720227e5cffb291d018c0890d46d09b61d3782e8000012893da10d144"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "678f4cfff160cfc6fd4f8e478f64ace3658c84672153c501f817a1456d7f7721d891d0186dfffa32e12bbbb46421e08e46753dc01021d3361b2e863176b32288"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "ec945284725364eff8e57d2f2e8bee7d35d8c217423b21d97328c8c5c2d43575c2af30fc93c8e128131c72ca7b2ea7420b88b21ded184a6b5e242fc76731e25a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "07839edad66284da56ec54366fef1ef0d1a55b6e7f7d215d9f52827e080d070c07be4948df13d3b082bb5962e00d503b4916937bcf5045d9e3f9896e7c8698d1"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "6183cd77dfef7ed41e2049f3b423942eedcc2d5a49f820226c1fa366cbb75f63954b26c7797da42a11ec63f19bfc5bf19ebe605ac0d501391f64f5f168e157a5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "3e78f5ada0a37d181e4a7b5ef90ad39fcc0216783e6ef26de826c642f1aaea59cb968636b0249af9ff92b0ef32fdde051c2d6a71d4aa2e6ac35aecc062f8e222"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "b8e8f635e927beaa0a12e92e025deaa2e98cf2d19dacca5ae91c21fe6c41177c8670b46b1a896f1b8b80fc60d806f1642bf787c44058077c4225a6de8902e664"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "e71759b4088ab845c193271e0c48c319401362c8d2f0def8342807a972f70db6963ea405c93fb8832cae1f930503a3a54458de230d17d53cc376946782cb6e3f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "616a104d2ef421c162e6688d4128995faddac35f95327fccb313e20e56c410558f39869041900ac246d2cdbf510552bdc8a006623d8c6bbbf5350b6d7bd94899"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "2c413f2194c147fa4c3e21a9bdf67157fa7ea51dc7129dd8cb34e3b645600561ad9e9ebf3608cd75fc17e7d7b95cec49bb746d48c0b55fb4ea7b9ba7a359cfee"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "2743486ad0860c500a6a9146a49ec6190867706a74350310ed2987b71c5503886ba2931ba066f373fd05342198f6e8bf2a491cbb4a85c0763f1a68c1a124f796"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "7e5bbede973200faf58753d0de6041298f8d31937e19b9353bb83043229c8634cafc2e79129e9a8b34d1b4be451b6d3ad77e3ceb21ce8bf1a35f386ecdd64d09"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "8e51758b070bbde4d7bb4cd8aee148c1e8fef2d5bf236a4801b58e8acdfa567b6df5d32c3d46ddf965a599ba79c95b0884210bc3166fb8e9408e5255fcfaf5c7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "3d945094b78f360045cfe6e1ffd53ac15a070b61adafec3063a88dd7f6ad4972fa5d4cc0398aa9bf30494be4326b63c8d8340ebd25d15c231c39d9a8b9c18da4"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "d2e8537a64747c06b2fe05b080c0eb0af82e1f4427a396c90006d012b663c1d34273307af4995b6ff8e75de4e3727cc3f736c7a9a78e0042f2f8d018ce525582"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "561b7a1d3f308552ba8b2084c86d6318b901fe8a7fff3254b65b790e4909dffb355eaaa898ee352310b8633fc695c6d7feb1d13ab60bf491a0668dbb05297b7a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "6970448bfda2c54605d052570fa3ac81cfd554611c994125247ff4927807938a80fa65405ddc14a295a38bae9a1d9fcf460b32e5ba0cdff5cc690b57cb4a8d87"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "43b9022cd14ca829cc1f8546a9e13767e6f32daa3b008b6864a8cae3a8e6f99e70df0a05fdaa724e92fad38aabc5ffdbc9685795a0cbf1c914fbe3b515e80c99"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "16e029ba38ba9a88d57a72d7bb3ac843916f2e15b4a288815f59109cad9bb1c70beb0716360df4977231fe91f18ba3490168a857ce94c04d85a1aa5927372571"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "f418c661961f6c2e6fae0a1cd5329c35b331fa64bf9aa6d186f59d7b778d5b3fd7d6d548f69ba86f5b031bade68ec118aecc4aefc9a90ebc219945ce907f31be"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "05630d2f74ea7f70e9dd97284b41c4d4da2d325884696f58b1f88b3e29c4d5bcfa1ba7cc5f3aa412c852ac61f406fec29e0d3fea7820759d87f022811e6c5b0f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "81127ce66c7f7da82e6059abaf002b79225bea3e69558636d5aaccba0c9df97adcc8c041b9239ec8763e28040807151b2ea01c795f4df088b896b774ea2e6162"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "e6c13dcdef6935921f74beaad25ceb8394a1256bc3ac6a1d76f3957f067d0bf1572d1a7b8ea2da6ffeb0eff8a4b2a1d80215f5169dce3c701fcc40dece34bd3e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "b97db2d48eb98be9228358a0a068ea93d21ce4a5f6d138d079461c0a7f93d3a726d141adb43f41a56e658f629366eebb7ed4a0a1594a9d265ef121faabb14d52"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "acd10d50291fd833a574d049d99a567383dbb4483ecc45583dd977c3c67fabb9d450c802b8e2eb3d4eabc719f68f0db4e2a102bd716a4bf50aa02724da382f58"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "a07fb8c7ee065b0b7a4a3fa33e8dad026b65e42920398e6fdbf186985e46c6c55b72ecff087aace1559df286b7832a6de8215b713274234242531d7807d90180"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "37d17e905e92aa51d82f13e33415738cf8a5952617bec6a6e095147efca81b7196f997b47167abdd7a8d041c3308307c587a29ca3ec9f2e65e71d15b68b8bbda"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "85ec647821f82cc3ad99142e8e4425a00b6e0b273f137cdbff10c4e91afbdf4eb9feb7d4a2c9f80191cec918180aab0a84f96b7de1efda1fe0cdf9e1c44446eb"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "8819b00e2fdc06fb17873c769f7c8461fa131bcb12f0fd191a08a3a6526571fe40caa7cd8f7ef8e0d8722bae84699a479105cf518897c76aee674ea8a2dddc2f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "70f7cdc912a6d1c5360b58ce522386ed9562aee8dffbf4a1f653871114359880df3f98629a2d4fe5556a1ba89fc5ec90a2c3da2d56ccf419f3956dfad157a3f9"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "9b60f41e9fd92c1d22dbfa1d287081d9514e081940dd9cbe1c9b4467926d83cec9ff43caf854710ec59d805293a83ea5defab887be5a93c8eedfa959b74ba783"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "80372feb8348b48627a93c5f2a5486933fe731a3fdfa2da6d71a7c75b35f585cd5b2cfa0760bb17de8fb98be1ef3dd90339a635ce25749bd27d147b316847084"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "445b104cd539f088a5cecbad4a1a861096542d1a4f2c95696ec51d43d08f10fc71513cceb5a68fa179fd988abaedb20829742f108f529face6e8e442576abb54"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "0788d7f599c3f46dfe485ed1ded013a7d87db6aec63193887f5e6b8c3636e0b117f4b854c5b0f60ee8b9683e6d46390f365a19e499fabc2a78ac29380dd26b35"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ced012e0d447aae654edde3b26422f895440d8aa0822f3a14450142f6d97c20e74d1ec068bf2cde4a81270a77ef01a23646532e55ada6dc41603b013945986cf"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "d27ad4e240ee032cf16ecdc5588d3bdfcc81d338ef357c96194bc33d5d0d571c3826d298215b9cf058dec1cdb86d2bb41d5739ee4f49292bcc290ea4d50d2ca7"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "e80d1df4ea210d5a3731803026c3fca5143ade3e7f994a7a7bd673a6ba8b7df8eff9784e9bfe6d3360caf5c50609835ffaab631ecb5aafe71dde8adafa91db04"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "75f10944c6ab83ca1ca49d2bc05e8923830b1fa236620ceba9cbe2f874713cd49a6f0ea4968ce3ad08a5196746dbe3c48a3b51eb0f6d8d310715c6636d17d1f1"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "35df8ad315c60342119605cbad7fc1614002750ba6745d35d25653eaad6eedd7b039271b2900f712ec5a1c03425a902f5009e76b8c42bb074d5f64d6f6ea7477"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8c31aa2df6cf1e1006691152e74aaf4b580a3b15d141444eab1cd4f3adc1066e7ac9c8196c8cd87902d590cf605bdf449d71fcb34b132a9221b101e0c16efe8d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "ff6d5a5bc127841a1e92eb6bc22d157a57d7f48e4bc95b68907fee50683b20a0dcfd9e5a567f013a6c72311b9441231e986c7659fa60b894ea34d265786a857e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8e7a794a3dde3b9fbe82c367d44134979cc45ad115fbc82bc8b9c8c438a857abe2e4962f50fa69ac7c22772ba3eb21c464bb800bef9eee9f2b33636f43261d2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "c653182b26d643d32e0983cf546fe8f0e5a96b7f174c52e8a9025fc56f17ce6ae12b1362abe9b408cb9970b15fcacad1747b41be86bd2475a3e3c45665f88355"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "4e4ab25fc8048b4bd9129a554b465ced3ff773d9a7eed9715c71ab92852573712c58667971a1dec556917603c493872577b003168821350ceaa3dc3dd9e2211c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "a8a9dad2f7563b686012a002b8fedac3b0a68f73986db717b901e832c57d1e4b2304b47aabcc17f5e453de3467caf8aabf9635e6db7772ef340fa38fed29eb0d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "2e2f936448e58f8b3b46119e06b2ab5f1c181536939127de0a76931ac992f28ea307227d5c61aa8b440907aefaeb95cdf81f9d0184c78234f82f6d965c045c98"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "14d5960a06fb7135bbe78ea7123a7c151c4494898ad6ea1a5386f0532f0a5ec35ef58e3fcb82381afdf47ca1c0e6954d0903232d1ee06d9c2a606e706d22e82e"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "04f2f408835a9bdddd4a4c256d9a0040171760f5bce1b7d5e9c3a4ce2c74682c4016ee93f8da193280c7fd3d47ef839d67e0c480d5abd8c2235e61b9c039453d"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "631c9305f259aab364c71550ad14a0cfc6edc24a43eac08345e4331cfd4192faf710f077f5b2a5fad169b15098725c996587b96261dc18b96bc18f2a63c62e34"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "b8605cc6851440a615cb8a29d6baadb90fc783270253c25992299b1ced630094c891d41a49a9802e47aa2f9e1656875825dabb31450d7765658e5fd4f3815b10"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "c17946e4d664eefbeed3a3e3430b4c5b9ffcb69628344568b354092fb72142e7da107b1a88d1af89caa7ae63a0cb76814662fdffc9e179213df4e10a3290596b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ecab80a09b8c2eb75f38c14c169ee88f78266973d21da9295d5cdbeb329a43e3978feca7bada4ee049b24cb914dcd2a4ebaa95f42ed6966cf614c55a229862a2"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5931bc9ddb86a39fd0edda4cbedfa6838549201efb882eb9a3c25ea88031fe4aed971ef327d6c356c99a0610a19e99a6ec49e755888b00882c6039f2c0e4cfc5"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "57895b4d8a0319d25288661b145d0aa59afbbd36edd8fbdf777d95f48fffa53d3dea546f465ce2070b801bcf751b03182711e5f74ca01f72258427fd37b2f038"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "67d96d069f43312a4c5870c2a9715e9aa5e7592b12302a773c8d6fd9f9979e63a5053d54f326d66374f216d1e69203fafef436be6b015269513f8f4a289aa796"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "f7b1ddace365492563a3eb985067e0c19270725a8db571b626000593b7e89130345b61199d50d41daadd499ecc6858fcb46115dac455cc62ed21460b916eaf41"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "7ac9fbd7b3175d82e73fe176481c3611eaf313fd006cf1191b79860f215af8847af88299fcf673d9e9a52db4a68a4ea4e95b632729c7b221f38e35926d60bc93"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "05a83591aaf1d5fc15b9a0445e2d5a20798329b3842992ccd82d22e4c788bbd34cdb46b09b48cf044369742f2b6244857e7d00b68160d094fe01465b746e0493"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "ec3cc0ae6d3765e9942436fadcb6208672a745df670a9e5881d243812b86023e8181f5b1b6d3ad3a2dbf8b93e80e3c8b2eee4622b511566b3ca7902b454d698c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ab9a5d17a70bd8685370898ad86ca867bb9a919169ef4c8ee6dae07836f4dfa58d3dead4565462b6f12d3c39c16b50ef99919f850928de0527c55563edac66ed"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "e3d216ee3ab627f7f86ef192f63a63f1e20bbc22df4947f53e3d9f8902e3871b7fb797eb409f0cf966be4da5b1ae05461c0b0dab7788a6c87069f940e1cc5498"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "4df9b93ba7bb70fa0c7c3c4e9a88cbfd8197c6bf628d2107a2a57105307a50cb08d8fc114e456b125164668c6f48aef1f0e4b71b52eb045e6b8be792e8b8e38b"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "51ed80166e1224db790dbdffc60d0eda618eaf67f473fb60ff0bb6a6f15d45fa8d44a31c6d4bc747752dac8fc3075371b4798040afaa594b713c331a91633724"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "7db1ec390a2d4f120eff21fbaee7700d106c4fd5c1ee1216bba0c7f896e6708bbc1da4c0f1f3ef1dd6f830ed58256fce36616950df9eae3307d2bffba6c3147f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "7f1295dbb8c66e22dd818e9fcc910957328dee42ffed8ad3f987b1959bf6f1c01f8f94657dcf0c2593ff747308c6fccf14fa3716fb4b189fb03b77332300823a"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "81b1d6cd6e5666307ea592992084f7289a5eed5a732070fd65532722f6a345cb78de868e15f3e74dc15d97cfb57f346b7e36559c5f40769391f6616c897b218c"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "752a9aaafe23559f2cb15e6652012803eeca5e3b584dd5515fc496d62671090272b7154f1e5f701a2cc6f848b5d2a1050966c1b9cccfab7cd16fe88d66a101c9"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "44b6ea23bd56ad74892f00f1abd3aaf1d0e8d748814b509f791dc0ac4d303c61cb3f5d9988c07028e9dfe88ef8130fb300c131b96fa1f1b5fb4693c8a2dc0c4f"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "94a7da589c758fc5766ade665f15af4704aae4e0729fe0a92235804c42a280bdedc3b0d2d23f153243765fb803d05023c1f4900367fcbf1b60ec5a9449f99226"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "e1674665330ce86c9ce6379e81f71ce7e1dd58f1dcf7ce4141a681e1135262565021c0885e884065b5f3637884ef25f7611c7ababa614e0f3e561051925fb168"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "74da3a781ceb5937e42f3aa8b6f2aa3481d439e67ab16e1745a9248efe96129c6962583276e06e417b7930ac65d4681f6362eef4cb916a5943f50b7ef98aa4a3"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "052c729f9a90bb02e60dc5d0639fb9639669aba511fbfb5cb727500892e58519f3b6231144741a163622a5bcbe855d38b530780350c5caf33d43d297769b0aa0"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b0c436603ed7ab7004e84f2e0654f04c5e5f3fb7866faa7548e675e8246adb2a60528d476292be99206a3e1b6342ced48d80031c8caba11f01a1534ae17901fa"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "c591789133b5c73026d1f5131581f91c21d8c6ea402dfcfb80ff1dd5e07f7985274ef8682fc7a576421b05721df9533a14bb34ba95193178e62b6e195fae0ae6"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "762eec0143e00d41d909f865dfef006a460a5b046b75f1132b63d76dff6380d40284a04b07415785f0bbadc457cf66f3aed1bf47e34cf5d5909fb6f8fddf58ec"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "b7eacd7854170626e9135d2bd5360b9d2073afc64ecc9f963de8b03ea550a0f6d2c4bae48268d2f9d0c09e7747dcbf8d06eaff4951cbf5953c237a8461b163df"; }
+    { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "78968866d80798b3360d3860db039b4f5ab4d62618be681188799efa675ed83b84b4b266dee84ff26d27afdbb8a08f3a3bf73f3bc85289473e7e7836e4a92cab"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 865af0a5abf..e1e603b28fd 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation {
       nss
       pango
       libheimdal
+      libpulseaudio
       libpulseaudio.dev
       systemd
     ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index eaa60084b6d..bc170cfdafd 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -47,7 +47,6 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--enable-application=browser"
-      "--disable-javaxpcom"
       "--with-system-jpeg"
       "--with-system-zlib"
       "--with-system-bz2"
@@ -64,11 +63,9 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
       #"--enable-system-cairo"
       "--enable-startup-notification"
       "--enable-content-sandbox"            # available since 26.0, but not much info available
-      "--disable-content-sandbox-reporter"  # keeping disabled for now
       "--disable-crashreporter"
       "--disable-tests"
       "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer"
       "--disable-updater"
       "--enable-jemalloc"
       "--disable-gconf"
@@ -135,8 +132,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "47.0.1";
-    sha512 = "f79c53b9acf0d96917aa11e57092a4e540ce694471123ef8e616e15864195fab7b37235ebd37367e4d0cc8e594a881a30c973075cc97346ef6f88d92944c0312";
+    version = "48.0";
+    sha512 = "51bbb1954920b4d0e49e2834939748e596ed27c09a45adeea2be2cfbd32898dae41f13db17318e9699fa96c41fb50fba9966df1f88deeadc0ae3bdd679bd79c5";
   };
 
   firefox-esr-unwrapped = common {
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 78edcff30cc..2bc1a643db7 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -15,10 +15,10 @@ buildGoPackage rec {
   };
 
   postInstall = ''
-    # prefix all the plugins with "terraform-"
+    # remove all plugins, they are part of the main binary now
     for i in $bin/bin/*; do
       if [[ $(basename $i) != terraform ]]; then
-        mv -v $i $bin/bin/terraform-$(basename $i);
+        rm "$i"
       fi
     done
   '';
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 10243e5f1d8..10cf9874ff1 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -3,22 +3,21 @@
 
 stdenv.mkDerivation rec {
   name = "bro-2.4.1";
-  
+
   src = fetchurl {
     url = "http://www.bro.org/downloads/release/${name}.tar.gz";
     sha256 = "1xn8qwgnxihlr4lmg7kz2vqjk46aqgwc8878pbv30ih2lmrrdffq";
   };
-  
-  buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip
-   gperftools ];
+
+  buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ];
 
   enableParallelBuilding = true;
-  
+
   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/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ pSub ];
-    platforms = with platforms; unix;
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index acc0ddd43d3..e4a732ba66d 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.19";
+  version = "0.4.20";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "1ldh3sc4n19vsjfc1f3kbrin7djb1z6y1rkisc5f6zjx4bd6535v";
+    sha256 = "0m8afbfdc9a57cy94ny7g6jv2ndfmrvkx0lgk64i8w870958gkwb";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index 1c717eb97fb..533c0ba48ba 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -1,20 +1,17 @@
 { stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }:
 
-let
-  rev = "b92a05c67e";
-  date = "2015-10-02";
-in
 stdenv.mkDerivation rec {
-  name = "pidgin-skypeweb-${date}-${rev}";
+  name = "pidgin-skypeweb-${version}";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "EionRobb";
     repo = "skype4pidgin";
-    rev = "${rev}";
-    sha256 = "00r57w9iwx2yp68ld6f3zkhf53vsk679b42w3xxla6bqblpcxzxl";
+    rev = "${version}";
+    sha256 = "0qmqf1r9kc7r6rgzz0byyq7yf5spsl2iima0cvxafs43gn4hnc2z";
   };
 
-  sourceRoot = "skype4pidgin-${rev}-src/skypeweb";
+  sourceRoot = "skype4pidgin-${version}-src/skypeweb";
 
   buildInputs = [ pkgconfig pidgin json_glib ];
 
@@ -28,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/EionRobb/skype4pidgin;
-    description = "SkypeWeb Plugin for Pidgin";
+    description = "SkypeWeb plugin for Pidgin";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jgeerds ];
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
new file mode 100644
index 00000000000..2bf67f44c94
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, pkgconfig, pidgin, json_glib, glib, http-parser } :
+
+let
+  version = "2016-07-11";
+in
+stdenv.mkDerivation rec {
+  name = "purple-matrix-unstable-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/matrix-org/purple-matrix";
+    rev = "f9d36198a57de1cd1740a3ae11c2ad59b03b724a";
+    sha256 = "1mmyvc70gslniphmcpk8sfl6ylik6dnprqghx4n47gsj1sb1cy00";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pidgin json_glib glib http-parser ];
+
+  installPhase = ''
+    install -Dm755 -t $out/lib/pidgin/ libmatrix.so
+    for size in 16 22 48; do
+      install -TDm644 matrix-"$size"px.png $out/pixmaps/pidgin/protocols/$size/matrix.png
+    done
+  '';
+
+  meta = {
+    homepage = https://github.com/matrix-org/purple-matrix;
+    description = "Matrix support for Pidgin / libpurple";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 24edbc85643..36a91716f5e 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -31,7 +31,7 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.0.19.3";
+  version = "3.0.19.4";
 
   src = fetchurl {
     urls = [
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit
-                then "05620qqi8plxsrzj92g306a0l8wg1pd2l66vpmj71vs0f5lms6p4"
-                else "07b2120pa8nyvnvh48vp5vqq7xlxg6vrrx67azz9kfcdzbbarcv9";
+                then "f74617d2a2f5cb78e0ead345e6ee66c93e4a251355779018fd060828e212294a"
+                else "e11467dc1732ddc21ec0d86c2853c322af7a6b8307e3e8dfebc6b4b4d7404841";
   };
 
   # grab the plugin sdk for the desktop icon
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index af2166aafe2..e8c1f50164d 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib
   ];
 
+  # hack: needed to fix build issues in
+  # http://hydra.nixos.org/build/38322959/nixlog/1
+  # should be an upstream issue but it's easy to fix
+  NIX_LDFLAGS = "-lz";
+
   nativeBuildInputs = [ qmake4Hook ];
 
   preConfigure = ''
diff --git a/pkgs/applications/networking/irc/wraith/configure.patch b/pkgs/applications/networking/irc/wraith/configure.patch
new file mode 100644
index 00000000000..e5fa2feb201
--- /dev/null
+++ b/pkgs/applications/networking/irc/wraith/configure.patch
@@ -0,0 +1,58 @@
+--- a/configure
++++ b/configure
+@@ -6029,53 +6029,8 @@
+ #AC_CHECK_HEADERS(zlib.h)
+ #EGG_CHECK_ZLIB
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5
+-$as_echo_n "checking for path to OpenSSL... " >&6; }
+-
+-
+-# Check whether --with-openssl was given.
+-if test "${with_openssl+set}" = set; then :
+-  withval=$with_openssl; with_openssl_path=$withval
+-else
+-  with_openssl_path=auto
+-fi
+-
+-
+-
+-cf_openssl_basedir=""
+-if test "$with_openssl_path" != "auto"; then
+-    cf_openssl_basedir="`echo ${with_openssl_path} | sed 's/\/$//'`"
+-else
+-    for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/local/openssl; do
+-    if test -f "${dirs}/include/openssl/opensslv.h" && test -f "${dirs}/lib/libssl.so"; then
+-      cf_openssl_basedir="${dirs}"
+-      break
+-    fi
+-  done
+-  unset dirs
+-fi
+-if test ! -z "$cf_openssl_basedir"; then
+-  if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" && test -f "${cf_openssl_basedir}/lib/libssl.so"; then
+-    SSL_INCLUDES="-I${cf_openssl_basedir}/include"
+-    SSL_LIBS="-L${cf_openssl_basedir}/lib"
+-  else
+-        cf_openssl_basedir=""
+-  fi
+-else
+-    if test -f "/usr/include/openssl/opensslv.h" ; then
+-    cf_openssl_basedir="/usr"
+-  fi
+-fi
+-
+-if test ! -z "$cf_openssl_basedir"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5
+-$as_echo "$cf_openssl_basedir" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+-$as_echo "not found" >&6; }
+-  as_fn_error 1 "OpenSSL is required." "$LINENO" 5
+-fi
+-unset cf_openssl_basedir
++SSL_INCLUDES="-I@openssl.dev@/include"
++SSL_LIBS="-L@openssl.out@/lib"
+ 
+ save_CXX="$CXX"
+ CXX="$CXX $SSL_INCLUDES"
diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix
index 4484178a6d5..16346bcf720 100644
--- a/pkgs/applications/networking/irc/wraith/default.nix
+++ b/pkgs/applications/networking/irc/wraith/default.nix
@@ -5,18 +5,19 @@ with stdenv.lib;
 
 mkDerivation rec {
   name = "wraith-${version}";
-  version = "1.4.6";
+  version = "1.4.7";
   src = fetchurl {
     url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz";
-    sha256 = "0vb2hbjmwh040f5yhxvwcfxvgxa0q9zdy9vvddydn8zn782d7wl8";
+    sha256 = "0h6liac5y7im0jfm2sj18mibvib7d1l727fjs82irsjj1v9kif3j";
   };
   buildInputs = [ openssl ];
-  patches = [ ./dlopen.patch ];
+  patches = [ ./configure.patch ./dlopen.patch ];
   postPatch = ''
-    substituteInPlace src/libssl.cc    --subst-var-by openssl ${openssl}
-    substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl}
+    substituteInPlace configure        --subst-var-by openssl.dev ${openssl.dev} \
+                                       --subst-var-by openssl.out ${openssl.out}
+    substituteInPlace src/libssl.cc    --subst-var-by openssl ${openssl.out}
+    substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl.out}
   '';
-  configureFlags = "--with-openssl=${openssl.dev}";
   installPhase = ''
     mkdir -p $out/bin
     cp -a wraith $out/bin/wraith
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 6b206bb13d9..9eaaf903585 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -22,9 +22,9 @@ let
   lib = stdenv.lib;
   langsSpaces = lib.concatStringsSep " " langs;
   major = "5";
-  minor = "1";
-  patch = "3";
-  tweak = "2";
+  minor = "2";
+  patch = "0";
+  tweak = "4";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -50,14 +50,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "039gjg4295x9f3hj0bh32csp63gbfns1sj7wk5mv51szdz50a8zi";
+      sha256 = "0a3dnqm9k1skp7jvg354fdn84y0ylvnjzpd4v2r2mbz8vc4p3ld5";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0fq9wqzvbs6x003ljvhwbnq7vglzcq3yylndv0kp1mj00dkyz3gm";
+      sha256 = "1gyakwbbsd3aykf0gsanyg6p4g4qixj1rh6qxspln70afl3kxm90";
     };
 
   };
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1i077hz24kz1wmnvw9xicmm1mrr9msdxq4lg3y0hy47ar6kiqnnd";
+    sha256 = "1v3bbk2afq61gs3l4qvc1r6y0ylr21jzbm3wcnyq9c3bbyw43pj7";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
@@ -128,6 +128,13 @@ in stdenv.mkDerivation rec {
     sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
     # rendering-dependent test
     sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
+    # tilde expansion in path processing checks the existence of $HOME
+    sed -e 's@rtl::OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
+    # rendering-dependent: on my computer the test table actually doesn't fit…
+    # interesting fact: test disabled on macOS by upstream
+    sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
+    # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
+    sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -215,7 +222,6 @@ in stdenv.mkDerivation rec {
     "--without-system-hsqldb"
     "--without-system-altlinuxhyph"
     "--without-system-lpsolve"
-    "--without-system-npapi-headers"
     "--without-system-libetonyek"
     "--without-system-libfreehand"
     "--without-system-liblangtag"
@@ -249,6 +255,10 @@ in stdenv.mkDerivation rec {
     ]
     ++ lib.optional kdeIntegration kde4.kdelibs;
 
+  passthru = {
+    inherit srcs;
+  };
+
   meta = with lib; {
     description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
     homepage = http://libreoffice.org/;
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
index bba1ad9c213..0c92a1c5553 100755
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
@@ -33,15 +33,18 @@ while read line; do
     *_MD5SUM\ :=*)
       read tbline;
       line=${line##* };
+      line=${line##*:=};
       if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then
          verline=${tbline##* };
          read tbline;
          tbline=${tbline##* };
+         tbline=${tbline##*:=};
          md5=$line
          name=$tbline;
          name="${name/\$([A-Z]*_VERSION_MICRO)/$verline}"
       else
          tbline=${tbline##* };
+         tbline=${tbline##*:=};
          md5=$line
          name=$tbline;
       fi
@@ -50,6 +53,7 @@ while read line; do
       ;;
     *_TARBALL\ :=*)
       line=${line##* };
+      line=${line##*:=};
       line="${line#,}"
       md5=${line:0:32};
       name=${line:33};
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index a70d5a7c77c..0d626728c9a 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -5,21 +5,6 @@
   brief = true;
 }
 {
-  name = "commons-codec-1.6-src.tar.gz";
-  md5 = "2e482c7567908d334785ce7d69ddfff7";
-  brief = false;
-}
-{
-  name = "commons-httpclient-3.1-src.tar.gz";
-  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
-  brief = false;
-}
-{
-  name = "commons-lang-2.4-src.tar.gz";
-  md5 = "625ff5f2f968dd908bca43c9469d6e6b";
-  brief = false;
-}
-{
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
   brief = true;
@@ -35,9 +20,9 @@
   brief = true;
 }
 {
-  name = "boost_1_55_0.tar.bz2";
-  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
-  brief = false;
+  name = "boost_1_59_0.tar.bz2";
+  md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87";
+  brief = true;
 }
 {
   name = "bsh-2.0b5-src.zip";
@@ -45,13 +30,18 @@
   brief = false;
 }
 {
+  name = "bzip2-1.0.6.tar.gz";
+  md5 = "00b516f4704d4a7cb50a1d97e6e8e15b";
+  brief = false;
+}
+{
   name = "cairo-1.10.2.tar.gz";
   md5 = "f101a9e88b783337b20b2e26dfd26d5f";
   brief = false;
 }
 {
-  name = "libcdr-0.1.1.tar.bz2";
-  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
+  name = "libcdr-0.1.2.tar.bz2";
+  md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2";
   brief = true;
 }
 {
@@ -100,18 +90,18 @@
   brief = false;
 }
 {
-  name = "libetonyek-0.1.3.tar.bz2";
-  md5 = "e5947373dd7834f27e93f1636faa419f";
+  name = "libetonyek-0.1.6.tar.bz2";
+  md5 = "77ff46936dcc83670557274e7dd2aa33";
   brief = true;
 }
 {
-  name = "expat-2.1.0.tar.gz";
-  md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
-  brief = false;
+  name = "expat-2.1.1.tar.bz2";
+  md5 = "7380a64a8e3a9d66a9887b01d0d7ea81";
+  brief = true;
 }
 {
-  name = "Firebird-2.5.2.26540-0.tar.bz2";
-  md5 = "21154d2004e025c8a3666625b0357bb5";
+  name = "Firebird-2.5.4.26856-0.tar.bz2";
+  md5 = "7a17ec9889424b98baa29e001a054434";
   brief = true;
 }
 {
@@ -130,8 +120,8 @@
   brief = false;
 }
 {
-  name = "dejavu-fonts-ttf-2.34.zip";
-  md5 = "a4e565e220b5de082c23995e256e3c12";
+  name = "dejavu-fonts-ttf-2.35.zip";
+  md5 = "d8b5214d35bcd2bfcb2cffa7795b351d";
   brief = false;
 }
 {
@@ -185,8 +175,8 @@
   brief = false;
 }
 {
-  name = "glew-1.10.0.zip";
-  md5 = "594eb47b4b1210e25438d51825404d5a";
+  name = "glew-1.12.0.zip";
+  md5 = "3941e9cab2f4f9d8faee3e8d57ae7664";
   brief = false;
 }
 {
@@ -195,9 +185,14 @@
   brief = false;
 }
 {
-  name = "graphite2-1.2.4.tgz";
-  md5 = "2ef839348fe28e3b923bf8cced440227";
-  brief = true;
+  name = "glyphy-0.2.0.tar.bz2";
+  md5 = "5d303fb955beb9bf112267316ca9d021";
+  brief = false;
+}
+{
+  name = "graphite-minimal-1.3.6.tgz";
+  md5 = "17df8301bcc459e83f8a8f3aca6183b2";
+  brief = false;
 }
 {
   name = "harfbuzz-0.9.40.tar.bz2";
@@ -220,8 +215,8 @@
   brief = false;
 }
 {
-  name = "icu4c-54_1-src.tgz";
-  md5 = "e844caed8f2ca24c088505b0d6271bc0";
+  name = "icu4c-56_1-src.tgz";
+  md5 = "c4a2d71ff56aec5ebfab2a3f059be99d";
   brief = false;
 }
 {
@@ -285,13 +280,13 @@
   brief = true;
 }
 {
-  name = "libjpeg-turbo-1.3.1.tar.gz";
-  md5 = "2c3a68129dac443a72815ff5bb374b05";
+  name = "libjpeg-turbo-1.4.2.tar.gz";
+  md5 = "86b0d5f7507c2e6c21c00219162c3c44";
   brief = true;
 }
 {
-  name = "language-subtag-registry-2015-08-04.tar.bz2";
-  md5 = "bf5986dbfa1c9a0f26cf1b00ed369484";
+  name = "language-subtag-registry-2016-02-10.tar.bz2";
+  md5 = "d1e7c55a0383f7d720d3ead0b6117284";
   brief = true;
 }
 {
@@ -326,8 +321,8 @@
   subDir = "libgltf/";
 }
 {
-  name = "liblangtag-0.5.1.tar.bz2";
-  md5 = "36271d3fa0d9dec1632029b6d7aac925";
+  name = "liblangtag-0.5.8.tar.bz2";
+  md5 = "aa899eff126216dafe721149fbdb511b";
   brief = false;
 }
 {
@@ -336,8 +331,8 @@
   brief = false;
 }
 {
-  name = "libxml2-2.9.3.tar.gz";
-  md5 = "daece17e045f1c107610e137ab50c179";
+  name = "libxml2-2.9.4.tar.gz";
+  md5 = "ae249165c173b1ff386ee8ad676815f5";
   brief = false;
 }
 {
@@ -366,8 +361,8 @@
   brief = true;
 }
 {
-  name = "libmwaw-0.3.5.tar.bz2";
-  md5 = "bdc58bbf89aaaf6d29b3516d96830a06";
+  name = "libmwaw-0.3.7.tar.bz2";
+  md5 = "4a8a53a9d997cf0e2bd208178797dbfb";
   brief = true;
 }
 {
@@ -381,18 +376,18 @@
   brief = false;
 }
 {
-  name = "neon-0.29.5.tar.gz";
-  md5 = "ff369e69ef0f0143beb5626164e87ae2";
+  name = "neon-0.30.1.tar.gz";
+  md5 = "231adebe5c2f78fded3e3df6e958878e";
   brief = false;
 }
 {
-  name = "nss-3.19.4-with-nspr-4.10.10.tar.gz";
-  md5 = "478e0e90ebc4a90159549e77021021fd";
+  name = "nss-3.22.2-with-nspr-4.12.tar.gz";
+  md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7";
   brief = false;
 }
 {
-  name = "libodfgen-0.1.4.tar.bz2";
-  md5 = "8716be5c22ae8353f9aaa380d74840dc";
+  name = "libodfgen-0.1.6.tar.bz2";
+  md5 = "32572ea48d9021bbd6fa317ddb697abc";
   brief = true;
 }
 {
@@ -406,14 +401,19 @@
   brief = false;
 }
 {
-  name = "openssl-1.0.2a.tar.gz";
-  md5 = "a06c547dac9044161a477211049f60ef";
+  name = "openssl-1.0.2h.tar.gz";
+  md5 = "9392e65072ce4b614c1392eefc1f23d0";
   brief = true;
 }
 {
-  name = "liborcus-0.7.0.tar.bz2";
-  md5 = "7681383be6ce489d84c1c74f4e7f9643";
-  brief = false;
+  name = "liborcus-0.9.2.tar.gz";
+  md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0";
+  brief = true;
+}
+{
+  name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
+  md5 = "593f0aa47bf2efc0efda2d28fae063b2";
+  brief = true;
 }
 {
   name = "libpagemaker-0.0.2.tar.bz2";
@@ -426,8 +426,8 @@
   brief = false;
 }
 {
-  name = "libpng-1.5.24.tar.gz";
-  md5 = "6652e428d1d3fc3c6cb1362159b1cf3b";
+  name = "libpng-1.6.19.tar.gz";
+  md5 = "3121bdc77c365a87e054b9f859f421fe";
   brief = true;
 }
 {
@@ -446,6 +446,11 @@
   brief = true;
 }
 {
+  name = "Python-3.5.0.tgz";
+  md5 = "a56c0c0b45d75a0ec9c6dee933c41c36";
+  brief = true;
+}
+{
   name = "raptor2-2.0.9.tar.gz";
   md5 = "4ceb9316488b0ea01acf011023cf7fff";
   brief = false;
@@ -461,8 +466,8 @@
   brief = false;
 }
 {
-  name = "librevenge-0.0.2.tar.bz2";
-  md5 = "2d4183bf17aea1a71842468a71a68c47";
+  name = "librevenge-0.0.4.tar.bz2";
+  md5 = "5b9ac52ec77d4d19157cf5962ebc0aea";
   brief = true;
 }
 {
@@ -491,23 +496,23 @@
   brief = false;
 }
 {
-  name = "libvisio-0.1.1.tar.bz2";
-  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
+  name = "libvisio-0.1.5.tar.bz2";
+  md5 = "cbee198a78b842b2087f32d33c522818";
   brief = true;
 }
 {
-  name = "libwpd-0.10.0.tar.bz2";
-  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
+  name = "libwpd-0.10.1.tar.bz2";
+  md5 = "79b56bcc349264d686a67994506ad199";
   brief = true;
 }
 {
-  name = "libwpg-0.3.0.tar.bz2";
-  md5 = "17da9770cb8b317b7633f9807b32b71a";
+  name = "libwpg-0.3.1.tar.bz2";
+  md5 = "dfd066658ec9d2fb2262417039a8a1c3";
   brief = true;
 }
 {
-  name = "libwps-0.4.0.tar.bz2";
-  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
+  name = "libwps-0.4.2.tar.bz2";
+  md5 = "8a6c55542ce80203dd6d3b1cba99d4e5";
   brief = true;
 }
 {
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 7af49d51a85..219b7e20632 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -20,13 +20,18 @@
   brief = true;
 }
 {
-  name = "boost_1_59_0.tar.bz2";
-  md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87";
+  name = "boost_1_60_0.tar.bz2";
+  md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe";
   brief = true;
 }
 {
-  name = "bsh-2.0b5-src.zip";
-  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
+  name = "breakpad.zip";
+  md5 = "415ce291aa6f2ee1d5db7b62bf62ade8";
+  brief = true;
+}
+{
+  name = "bsh-2.0b6-src.zip";
+  md5 = "beeca87be45ec87d241ddd0e1bad80c1";
   brief = false;
 }
 {
@@ -50,9 +55,9 @@
   brief = false;
 }
 {
-  name = "libcmis-0.5.0.tar.gz";
-  md5 = "5821b806a98e6c38370970e682ce76e8";
-  brief = false;
+  name = "libcmis-0.5.1.tar.gz";
+  md5 = "3270154f0f40d86fce849b161f914101";
+  brief = true;
 }
 {
   name = "CoinMP-1.7.6.tgz";
@@ -95,13 +100,13 @@
   brief = true;
 }
 {
-  name = "expat-2.1.0.tar.gz";
-  md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
-  brief = false;
+  name = "expat-2.2.0.tar.bz2";
+  md5 = "2f47841c829facb346eb6e3fab5212e2";
+  brief = true;
 }
 {
-  name = "Firebird-2.5.4.26856-0.tar.bz2";
-  md5 = "7a17ec9889424b98baa29e001a054434";
+  name = "Firebird-2.5.5.26952-0.tar.bz2";
+  md5 = "b0b5293991fcf07347b38431c80be1d4";
   brief = true;
 }
 {
@@ -190,13 +195,13 @@
   brief = false;
 }
 {
-  name = "graphite-minimal-1.3.6.tgz";
-  md5 = "17df8301bcc459e83f8a8f3aca6183b2";
+  name = "graphite2-minimal-1.3.8.tgz";
+  md5 = "4311dd9ace498b57c85f611e0670df64";
   brief = false;
 }
 {
-  name = "harfbuzz-0.9.40.tar.bz2";
-  md5 = "0e27e531f4c4acff601ebff0957755c2";
+  name = "harfbuzz-1.2.6.tar.bz2";
+  md5 = "9f4b6831c86135faef011e991f59f77f";
   brief = true;
 }
 {
@@ -205,8 +210,8 @@
   brief = false;
 }
 {
-  name = "hunspell-1.3.3.tar.gz";
-  md5 = "4967da60b23413604c9e563beacc63b4";
+  name = "hunspell-1.4.1.tar.gz";
+  md5 = "33d370f7fe5a030985e445a5672b2067";
   brief = false;
 }
 {
@@ -215,8 +220,8 @@
   brief = false;
 }
 {
-  name = "icu4c-56_1-src.tgz";
-  md5 = "c4a2d71ff56aec5ebfab2a3f059be99d";
+  name = "icu4c-57_1-src.tgz";
+  md5 = "976734806026a4ef8bdd17937c8898b9";
   brief = false;
 }
 {
@@ -326,18 +331,18 @@
   brief = false;
 }
 {
-  name = "xmlsec1-1.2.14.tar.gz";
-  md5 = "1f24ab1d39f4a51faf22244c94a6203f";
+  name = "xmlsec1-1.2.20.tar.gz";
+  md5 = "ce12af00283eb90d9281956524250d6e";
   brief = false;
 }
 {
-  name = "libxml2-2.9.3.tar.gz";
-  md5 = "daece17e045f1c107610e137ab50c179";
+  name = "libxml2-2.9.4.tar.gz";
+  md5 = "ae249165c173b1ff386ee8ad676815f5";
   brief = false;
 }
 {
-  name = "libxslt-1.1.28.tar.gz";
-  md5 = "9667bf6f9310b957254fdcf6596600b7";
+  name = "libxslt-1.1.29.tar.gz";
+  md5 = "a129d3c44c022de3b9dcf6d6f288d72e";
   brief = false;
 }
 {
@@ -351,8 +356,13 @@
   brief = false;
 }
 {
-  name = "mdds_0.12.1.tar.bz2";
-  md5 = "ef2560ed5416652a7fe195305b14cebe";
+  name = "mdds-1.2.0.tar.bz2";
+  md5 = "9f3383fb7bae825eab69f3a6ec1d74b2";
+  brief = true;
+}
+{
+  name = "mDNSResponder-576.30.4.tar.gz";
+  md5 = "940057ac8b513b00e8e9ca12ef796762";
   brief = true;
 }
 {
@@ -401,13 +411,13 @@
   brief = false;
 }
 {
-  name = "openssl-1.0.2g.tar.gz";
-  md5 = "f3c710c045cdee5fd114feb69feba7aa";
+  name = "openssl-1.0.2h.tar.gz";
+  md5 = "9392e65072ce4b614c1392eefc1f23d0";
   brief = true;
 }
 {
-  name = "liborcus-0.9.2.tar.gz";
-  md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0";
+  name = "liborcus-0.11.2.tar.gz";
+  md5 = "205badaee72adf99422add8c4c49d669";
   brief = true;
 }
 {
@@ -416,8 +426,8 @@
   brief = true;
 }
 {
-  name = "libpagemaker-0.0.2.tar.bz2";
-  md5 = "795cc7a59ace4db2b12586971d668671";
+  name = "libpagemaker-0.0.3.tar.bz2";
+  md5 = "5c4985a68be0b79d3f809da5e12b143c";
   brief = true;
 }
 {
@@ -491,11 +501,6 @@
   brief = false;
 }
 {
-  name = "vigra1.6.0.tar.gz";
-  md5 = "d62650a6f908e85643e557a236ea989c";
-  brief = false;
-}
-{
   name = "libvisio-0.1.5.tar.bz2";
   md5 = "cbee198a78b842b2087f32d33c522818";
   brief = true;
@@ -511,8 +516,8 @@
   brief = true;
 }
 {
-  name = "libwps-0.4.2.tar.bz2";
-  md5 = "8a6c55542ce80203dd6d3b1cba99d4e5";
+  name = "libwps-0.4.3.tar.bz2";
+  md5 = "027fb17fb9e43553aa6624dc18f830ac";
   brief = true;
 }
 {
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 248772b759f..8c69d610a9a 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -22,9 +22,9 @@ let
   lib = stdenv.lib;
   langsSpaces = lib.concatStringsSep " " langs;
   major = "5";
-  minor = "0";
-  patch = "6";
-  tweak = "3";
+  minor = "1";
+  patch = "5";
+  tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -50,14 +50,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0ir97k91p3dxxs85ld1vyxcx7s63w678h9njbmw4y3mpp9f28y8c";
+      sha256 = "1mzsz9pd2k1lpvwf7r5q90qmdp57160362cmlxaj6bxz52gr9f2i";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "06qwdmdb086852qs6fzb3mm1wixkkkkg39njpvqsrfbdrr2amdjc";
+      sha256 = "1qqpggcanchz0qqasc5xvginrpa5rx7ahj3dw2vk7n34xaarnni6";
     };
 
   };
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1izc1ynfzg36jyi1ms5lmz9rl5lhlxa8qfa4bg7j2qlf65wdf0a6";
+    sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
@@ -249,6 +249,10 @@ in stdenv.mkDerivation rec {
     ]
     ++ lib.optional kdeIntegration kde4.kdelibs;
 
+  passthru = {
+    inherit srcs;
+  };
+
   meta = with lib; {
     description = "Comprehensive, professional-quality productivity suite (Still/stable release)";
     homepage = http://libreoffice.org/;
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index d4e4ed5b954..71ceca12224 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  preBuild = ''
-    makeFlagsArray=("HSTDIR=${htslib}" "prefix=$out")
-  '';
+  makeFlags = [
+    "HSTDIR=${htslib}"
+    "prefix=$out"
+    "CC=cc"
+  ];
 
   meta = with stdenv.lib; {
     description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants";
diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix
index 4e163a5b3f8..1ed1eda229c 100644
--- a/pkgs/applications/science/biology/bwa/default.nix
+++ b/pkgs/applications/science/biology/bwa/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     license     = licenses.gpl3;
     homepage    = http://bio-bwa.sourceforge.net/;
     maintainers = with maintainers; [ luispedro ];
-    platforms = with platforms; linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index 5207245b0ba..ee9e580a7b8 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib boost ];
 
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace "GCC = g++" "GCC = c++"
+  '';
+
   preBuild = ''
     cp ${glucose.src} patches/glucose-syrup.tgz
     ./bootstrap.sh
diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix
index b448b511421..515b7e27289 100644
--- a/pkgs/applications/science/math/LiE/default.nix
+++ b/pkgs/applications/science/math/LiE/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.2";
      # The current version of LiE is 2.2.2, which is more or less unchanged
      # since about the year 2000. Minor bugfixes do get applied now and then.
-  name = "LiE-${version}";
+  name = "lie-${version}";
 
   meta = {
     description = "A Computer algebra package for Lie group computations";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       characteristics, we refer to the following sources of information.
     ''; # take from the website
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ ]; # this package is probably not going to change anyway
   };
 
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
new file mode 100644
index 00000000000..fcbd1356665
--- /dev/null
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "geogebra-${version}";
+  version = "5.0.265.0";
+
+  preferLocalBuild = true;
+
+  src = fetchurl {
+    url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
+    sha256 = "74e5abfa098ee0fc464cd391cd3ef6db474ff25e8ea4fbcd82c4b4b5d3d5c459";
+  };
+
+  srcIcon = fetchurl {
+    url = "http://static.geogebra.org/images/geogebra-logo.svg";
+    sha256 = "55ded6b5ec9ad382494f858d8ab5def0ed6c7d529481cd212863b2edde3b5e07";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "geogebra";
+    exec = "geogebra";
+    icon = "geogebra";
+    desktopName = "Geogebra";
+    genericName = "Geogebra";
+    comment = meta.description;
+    categories = "Education;Science;Math;";
+    mimeType = "application/vnd.geogebra.file;application/vnd.geogebra.tool;";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -D geogebra/* -t "$out/libexec/geogebra/"
+
+    makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \
+      --set JAVACMD "${jre}/bin/java" \
+      --set GG_PATH "$out/libexec/geogebra"
+
+    install -Dm644 "${desktopItem}/share/applications/"* \
+      -t $out/share/applications/
+
+    install -Dm644 "${srcIcon}" \
+      "$out/share/icons/hicolor/scalable/apps/geogebra.svg"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Dynamic mathematics software with graphics, algebra and spreadsheets";
+    longDescription = ''
+      Dynamic mathematics software for all levels of education that brings
+      together geometry, algebra, spreadsheets, graphing, statistics and
+      calculus in one easy-to-use package.
+    '';
+    homepage = https://www.geogebra.org/;
+    license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ];
+    platforms = platforms.all;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix
index e01b9654711..4c99b5081cc 100644
--- a/pkgs/applications/science/math/msieve/default.nix
+++ b/pkgs/applications/science/math/msieve/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.publicDomain;
     homepage = http://msieve.sourceforge.net/;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index da10e89855a..0cda65b32c3 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  version = "2.7.5";
+  version = "2.7.6";
   name = "pari-${version}";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11";
+    sha256 = "04dqi697czd8mmw8aiwzrkgbvkjassqagg6lfy3lkf1k5qi9g9rr";
   };
 
   buildInputs = [gmp readline];
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
new file mode 100644
index 00000000000..7f94b7408a1
--- /dev/null
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl, fetchFromGitHub
+, assembleReductionMatrix ? false
+, useCoefficients ? false
+, indicateProgress ? false
+, useGoogleHashmap ? false, sparsehash ? null
+, fileFormat ? "lowerTriangularCsv"
+}:
+
+with stdenv.lib;
+
+assert elem fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"];
+assert useGoogleHashmap -> sparsehash != null;
+
+let
+  inherit (stdenv.lib) optional;
+in
+stdenv.mkDerivation {
+  name = "ripser";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "Ripser";
+    repo = "ripser";
+    rev = "f69c6af6ca6883dd518c48faf41cf8901c379598";
+    sha256 = "1mw2898s7l29hgajsaf75bs9bjn2sn4g2mvmh41a602jpwp9r0rz";
+  };
+
+  #Patch from dev branch to make compilation work.
+  #Will be removed when it gets merged into master.
+  patches = [(fetchurl {
+    url = https://github.com/Ripser/ripser/commit/dc78d8ce73ee35f3828f0aad67a4e53620277ebf.patch;
+    sha256 = "1y93aqpqz8fm1cxxrf90dhh67im3ndkr8dnxgbw5y96296n4r924";
+  })];
+
+  buildInputs = optional useGoogleHashmap sparsehash;
+
+  buildFlags = [
+    "-std=c++11"
+    "-Ofast"
+    "-D NDEBUG"
+  ]
+  ++ optional assembleReductionMatrix "-D ASSEMBLE_REDUCTION_MATRIX"
+  ++ optional useCoefficients "-D USE_COEFFICIENTS"
+  ++ optional indicateProgress "-D INDICATE_PROGRESS"
+  ++ optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP"
+  ++ optional (fileFormat == "lowerTriangularCsv") "-D FILE_FORMAT_LOWER_TRIANGULAR_CSV"
+  ++ optional (fileFormat == "upperTriangularCsv") "-D FILE_FORMAT_UPPER_TRIANGULAR_CSV"
+  ++ optional (fileFormat == "dipha") "-D FILE_FORMAT_DIPHA"
+  ;
+
+  buildPhase = "c++ ripser.cpp -o ripser $buildFlags";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ripser $out/bin
+  '';
+
+  meta = {
+    description = "A lean C++ code for the computation of Vietoris–Rips persistence barcodes";
+    homepage = "https://github.com/Ripser/ripser";
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = with stdenv.lib.maintainers; [erikryb];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index bf6eabef909..40d23cc7e8a 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, wxGTK, perl, python, zlib}:
+{stdenv, fetchurl, wxGTK, perl, python, zlib, mesa, libX11}:
 let
   s = # Generated upstream information
   rec {
     baseName="golly";
-    version="2.7";
+    version="2.8";
     name="${baseName}-${version}";
-    hash="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f";
-    url="mirror://sourceforge/project/golly/golly/golly-2.7/golly-2.7-src.tar.gz";
-    sha256="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f";
+    hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
+    url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz";
+    sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
   };
   buildInputs = [
-    wxGTK perl python zlib
+    wxGTK perl python zlib mesa libX11
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream
index 57881e5de35..24032de5668 100644
--- a/pkgs/applications/science/misc/golly/default.upstream
+++ b/pkgs/applications/science/misc/golly/default.upstream
@@ -1,4 +1,4 @@
 url http://sourceforge.net/projects/golly/files/golly/
 version_link '[-][0-9.]+/$'
-SF_version_tarball
+SF_version_tarball 'src'
 SF_redirect
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 52075be8484..c33ffb5cefb 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -3,8 +3,8 @@
 buildGoPackage rec {
   name = "git-lfs-${version}";
   # NOTE: use versions after 1.2.1
-  version = "2016-06-07";
-  rev = "12fe249f2eebb56608a825fdb4a68c00f090bc91";
+  version = "1.3.1";
+  rev = "9c9dffb1b5baddfa06f280ef1b5fbf68ecbc90b1";
   
   goPackagePath = "github.com/github/git-lfs";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "github";
     repo = "git-lfs";
-    sha256 = "0cj7xbgvj706r1cyxqlcwfvy5zg2d19al04d441sxa6spr6xa4v6";
+    sha256 = "0fg48jxh0gmd0w5yy3avascaasxk85019qayaikzfkym8bdqplb2";
   };
 
   # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 0b0f59b0077..ea04fa33a73 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
 { stdenv, ruby, bundler, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
-  version = "2.6.10";
+  version = "3.2.1";
   name = "gitlab-shell-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1f1ma49xpkan2iksnw9amzjdw6i0bxnzdbsk0329m7if4987vcqd";
+    sha256 = "099w4s606k2mk9xc42jwqym1ycr20824w6nkf3zpiv17slwakw90";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index e24ff31708e..df0125a6de8 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.4";
+  version = "0.7.8";
   name = "gitlab-workhorse-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
-    rev = version;
-    sha256 = "09bs3kdmqi6avdak2nqma141y4fhfv050zwqqx7qh9a9hgkgwjxw";
+    rev = "v${version}";
+    sha256 = "03lhgmd8w2ainvgf2q3pgafz2jl5g4x32qyybyijlyxfl07vkg4g";
   };
 
   buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 99b8a4e28df..f97c99183f2 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -1,67 +1,71 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'rails', '4.2.5.2'
+gem 'rails', '4.2.7'
 gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 
 # Responders respond_to and respond_with
 gem 'responders', '~> 2.0'
 
-# Specify a sprockets version due to security issue
-# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
-gem 'sprockets', '~> 2.12.3'
+# Specify a sprockets version due to increased performance
+# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
+gem 'sprockets', '~> 3.6.0'
 
 # Default values for AR models
-gem "default_value_for", "~> 3.0.0"
+gem 'default_value_for', '~> 3.0.0'
 
 # Supported DBs
-gem "mysql2", '~> 0.3.16', group: :mysql
-gem "pg", '~> 0.18.2', group: :postgres
+gem 'mysql2', '~> 0.3.16', group: :mysql
+gem 'pg', '~> 0.18.2', group: :postgres
 
 # Authentication libraries
-gem 'devise',                 '~> 3.5.4'
-gem 'devise-async',           '~> 0.9.0'
-gem 'doorkeeper',             '~> 2.2.0'
+gem 'devise',                 '~> 4.0'
+gem 'doorkeeper',             '~> 4.0'
 gem 'omniauth',               '~> 1.3.1'
+gem 'omniauth-auth0',         '~> 1.4.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
 gem 'omniauth-bitbucket',     '~> 0.0.2'
 gem 'omniauth-cas3',          '~> 1.1.2'
 gem 'omniauth-facebook',      '~> 3.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
-gem 'omniauth-google-oauth2', '~> 0.2.0'
+gem 'omniauth-google-oauth2', '~> 0.4.1'
 gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
-gem 'omniauth-saml',          '~> 1.4.2'
+gem 'omniauth-saml',          '~> 1.6.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
 gem 'rack-oauth2',            '~> 1.2.1'
+gem 'jwt'
 
 # Spam and anti-bot protection
-gem 'recaptcha', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
 
 # Two-factor authentication
-gem 'devise-two-factor', '~> 2.0.0'
+gem 'devise-two-factor', '~> 3.0.0'
 gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 1.3.4'
+gem 'attr_encrypted', '~> 3.0.0'
+gem 'u2f', '~> 0.2.1'
 
 # Browser detection
-gem "browser", '~> 1.0.0'
+gem 'browser', '~> 2.2'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 8.2'
+gem 'gitlab_git', '~> 10.3.2'
 
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
 # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
+gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap'
 
 # Git Wiki
-gem 'gollum-lib', '~> 4.1.0'
+# Required manually in config/initializers/gollum.rb to control load order
+gem 'gollum-lib', '~> 4.2', require: false
+gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
 
 # Language detection
-gem "github-linguist", "~> 4.7.0", require: "linguist"
+gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 
 # API
 gem 'grape',        '~> 0.13.0'
@@ -69,72 +73,80 @@ gem 'grape-entity', '~> 0.4.2'
 gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
 
 # Pagination
-gem "kaminari", "~> 0.16.3"
+gem 'kaminari', '~> 0.17.0'
 
 # HAML
-gem "haml-rails", '~> 0.9.0'
+gem 'hamlit', '~> 2.5'
 
 # Files attachments
-gem "carrierwave", '~> 0.9.0'
+gem 'carrierwave', '~> 0.10.0'
 
 # Drag and Drop UI
 gem 'dropzonejs-rails', '~> 0.7.1'
 
+# for backups
+gem 'fog-aws', '~> 0.9'
+gem 'fog-azure', '~> 0.0'
+gem 'fog-core', '~> 1.40'
+gem 'fog-local', '~> 0.3'
+gem 'fog-google', '~> 0.3'
+gem 'fog-openstack', '~> 0.1'
+gem 'fog-rackspace', '~> 0.1.1'
+
 # for aws storage
-gem "fog", "~> 1.36.0"
-gem "unf", '~> 0.1.4'
+gem 'unf', '~> 0.1.4'
 
 # Authorization
-gem "six", '~> 0.2.0'
+gem 'six', '~> 0.2.0'
 
 # Seed data
-gem "seed-fu", '~> 2.3.5'
+gem 'seed-fu', '~> 2.3.5'
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'
 gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
-gem 'github-markup', '~> 1.3.1'
+gem 'github-markup', '~> 1.4'
 gem 'redcarpet',     '~> 3.3.3'
-gem 'RedCloth',      '~> 4.2.9'
+gem 'RedCloth',      '~> 4.3.2'
 gem 'rdoc',          '~>3.6'
 gem 'org-ruby',      '~> 0.9.12'
 gem 'creole',        '~> 0.5.0'
 gem 'wikicloth',     '0.8.1'
 gem 'asciidoctor',   '~> 1.5.2'
-gem 'rouge',         '~> 1.10.1'
+gem 'rouge',         '~> 2.0'
 
 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
-gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
+gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8'
 
 # Diffs
 gem 'diffy', '~> 3.0.3'
 
 # Application server
 group :unicorn do
-  gem "unicorn", '~> 4.8.2'
+  gem 'unicorn', '~> 4.9.0'
   gem 'unicorn-worker-killer', '~> 0.4.2'
 end
 
 # State machine
-gem "state_machines-activerecord", '~> 0.3.0'
+gem 'state_machines-activerecord', '~> 0.4.0'
 # Run events after state machine commits
-gem 'after_commit_queue'
+gem 'after_commit_queue', '~> 1.3.0'
 
 # Issue tags
 gem 'acts-as-taggable-on', '~> 3.4'
 
 # Background jobs
-gem 'sinatra', '~> 1.4.4', require: nil
+gem 'sinatra', '~> 1.4.4', require: false
 gem 'sidekiq', '~> 4.0'
 gem 'sidekiq-cron', '~> 0.4.0'
-gem 'redis-namespace'
+gem 'redis-namespace', '~> 1.5.2'
 
 # HTTP requests
-gem "httparty", '~> 0.13.3'
+gem 'httparty', '~> 0.13.3'
 
 # Colored output to console
-gem "colorize", '~> 0.7.0'
+gem 'rainbow', '~> 2.1.0'
 
 # GitLab settings
 gem 'settingslogic', '~> 2.0.9'
@@ -144,7 +156,11 @@ gem 'settingslogic', '~> 2.0.9'
 gem 'version_sorter', '~> 2.0.0'
 
 # Cache
-gem "redis-rails", '~> 4.0.0'
+gem 'redis-rails', '~> 4.0.0'
+
+# Redis
+gem 'redis', '~> 3.2'
+gem 'connection_pool', '~> 2.0'
 
 # Campfire integration
 gem 'tinder', '~> 1.10.0'
@@ -153,13 +169,13 @@ gem 'tinder', '~> 1.10.0'
 gem 'hipchat', '~> 1.5.0'
 
 # Flowdock integration
-gem "gitlab-flowdock-git-hook", "~> 1.0.1"
+gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
 
 # Gemnasium integration
-gem "gemnasium-gitlab-service", "~> 0.2"
+gem 'gemnasium-gitlab-service', '~> 0.2'
 
 # Slack integration
-gem "slack-notifier", "~> 1.2.0"
+gem 'slack-notifier', '~> 1.2.0'
 
 # Asana integration
 gem 'asana', '~> 0.4.0'
@@ -170,24 +186,24 @@ gem 'ruby-fogbugz', '~> 0.2.1'
 # d3
 gem 'd3_rails', '~> 3.5.0'
 
-#cal-heatmap
-gem 'cal-heatmap-rails', '~> 3.5.0'
-
 # underscore-rails
-gem "underscore-rails", "~> 1.8.0"
+gem 'underscore-rails', '~> 1.8.0'
 
 # Sanitize user input
-gem "sanitize", '~> 2.0'
+gem 'sanitize', '~> 2.0'
 gem 'babosa', '~> 1.0.2'
 
 # Sanitizes SVG input
-gem "loofah", "~> 2.0.3"
+gem 'loofah', '~> 2.0.3'
+
+# Working with license
+gem 'licensee', '~> 8.0.0'
 
 # Protect against bruteforcing
-gem "rack-attack", '~> 4.3.1'
+gem 'rack-attack', '~> 4.3.1'
 
 # Ace editor
-gem 'ace-rails-ap', '~> 2.0.1'
+gem 'ace-rails-ap', '~> 4.0.2'
 
 # Keyboard shortcuts
 gem 'mousetrap-rails', '~> 1.4.6'
@@ -195,49 +211,49 @@ gem 'mousetrap-rails', '~> 1.4.6'
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.3'
 
-gem "sass-rails", '~> 5.0.0'
-gem "coffee-rails", '~> 4.1.0'
-gem "uglifier", '~> 2.7.2'
+# Parse duration
+gem 'chronic_duration', '~> 0.10.6'
+
+gem 'sass-rails', '~> 5.0.0'
+gem 'coffee-rails', '~> 4.1.0'
+gem 'uglifier', '~> 2.7.2'
 gem 'turbolinks', '~> 2.5.0'
 gem 'jquery-turbolinks', '~> 2.1.0'
 
 gem 'addressable',        '~> 2.3.8'
 gem 'bootstrap-sass',     '~> 3.3.0'
-gem 'font-awesome-rails', '~> 4.2'
-gem 'gitlab_emoji',       '~> 0.3.0'
+gem 'font-awesome-rails', '~> 4.6.1'
+gem 'gemojione',          '~> 3.0'
 gem 'gon',                '~> 6.0.1'
 gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails',       '~> 4.0.0'
-gem 'jquery-scrollto-rails', '~> 1.4.3'
+gem 'jquery-rails',       '~> 4.1.0'
 gem 'jquery-ui-rails',    '~> 5.0.0'
-gem 'nprogress-rails',    '~> 0.1.6.7'
-gem 'raphael-rails',      '~> 2.1.2'
-gem 'request_store',      '~> 1.2.0'
+gem 'request_store',      '~> 1.3.0'
 gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
 gem 'net-ssh',            '~> 3.0.1'
+gem 'base32',             '~> 0.3.0'
 
 # Sentry integration
-gem 'sentry-raven', '~> 0.15'
+gem 'sentry-raven', '~> 1.1.0'
+
+gem 'premailer-rails', '~> 1.9.0'
 
 # Metrics
 group :metrics do
   gem 'allocations', '~> 1.0', require: false, platform: :mri
   gem 'method_source', '~> 0.8', require: false
   gem 'influxdb', '~> 0.2', require: false
-  gem 'connection_pool', '~> 2.0', require: false
 end
 
 group :development do
-  gem "foreman"
-  gem 'brakeman', '~> 3.1.0', require: false
+  gem 'foreman', '~> 0.78.0'
+  gem 'brakeman', '~> 3.3.0', require: false
 
-  gem "annotate", "~> 2.6.0"
-  gem "letter_opener", '~> 1.1.2'
-  gem 'quiet_assets', '~> 1.0.2'
+  gem 'letter_opener_web', '~> 1.3.0'
   gem 'rerun', '~> 0.11.0'
-  gem 'bullet', require: false
-  gem 'rblineprof', platform: :mri, require: false
+  gem 'bullet', '~> 5.0.0', require: false
+  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
   gem 'web-console', '~> 2.0'
 
   # Better errors handler
@@ -245,23 +261,25 @@ group :development do
   gem 'binding_of_caller', '~> 0.7.2'
 
   # Docs generator
-  gem "sdoc", '~> 0.3.20'
+  gem 'sdoc', '~> 0.3.20'
 
   # thin instead webrick
-  gem 'thin', '~> 1.6.1'
+  gem 'thin', '~> 1.7.0'
 end
 
 group :development, :test do
-  gem 'byebug', platform: :mri
-  gem 'pry-rails'
+  gem 'byebug', '~> 8.2.1', platform: :mri
+  gem 'pry-rails', '~> 0.3.4'
 
   gem 'awesome_print', '~> 1.2.0', require: false
   gem 'fuubar', '~> 2.0.0'
 
-  gem 'database_cleaner', '~> 1.4.0'
-  gem 'factory_girl_rails', '~> 4.3.0'
-  gem 'rspec-rails',      '~> 3.3.0'
-  gem 'spinach-rails', '~> 0.2.1'
+  gem 'database_cleaner',   '~> 1.4.0'
+  gem 'factory_girl_rails', '~> 4.6.0'
+  gem 'rspec-rails',        '~> 3.5.0'
+  gem 'rspec-retry',        '~> 0.4.5'
+  gem 'spinach-rails',      '~> 0.2.1'
+  gem 'spinach-rerun-reporter', '~> 0.0.2'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.7.0'
@@ -269,26 +287,30 @@ group :development, :test do
   # Generate Fake data
   gem 'ffaker', '~> 2.0.0'
 
-  gem 'capybara',            '~> 2.4.0'
+  gem 'capybara',            '~> 2.6.2'
   gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'poltergeist',         '~> 1.8.1'
+  gem 'poltergeist',         '~> 1.9.0'
 
-  gem 'teaspoon', '~> 1.0.0'
+  gem 'teaspoon', '~> 1.1.0'
   gem 'teaspoon-jasmine', '~> 2.2.0'
 
-  gem 'spring', '~> 1.3.6'
+  gem 'spring',                   '~> 1.7.0'
   gem 'spring-commands-rspec',    '~> 1.0.4'
-  gem 'spring-commands-spinach',  '~> 1.0.0'
+  gem 'spring-commands-spinach',  '~> 1.1.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
 
-  gem 'rubocop', '~> 0.35.0', require: false
-  gem 'coveralls',  '~> 0.8.2', require: false
-  gem 'simplecov', '~> 0.10.0', require: false
-  gem 'flog', require: false
-  gem 'flay', require: false
-  gem 'bundler-audit', require: false
+  gem 'rubocop', '~> 0.41.2', require: false
+  gem 'rubocop-rspec', '~> 1.5.0', require: false
+  gem 'scss_lint', '~> 0.47.0', require: false
+  gem 'simplecov', '~> 0.11.0', require: false
+  gem 'flog', '~> 4.3.2', require: false
+  gem 'flay', '~> 2.6.1', require: false
+  gem 'bundler-audit', '~> 0.5.0', require: false
+
+  gem 'benchmark-ips', '~> 2.3.0', require: false
 
-  gem 'benchmark-ips', require: false
+  gem 'license_finder', '~> 2.1.0', require: false
+  gem 'knapsack', '~> 1.11.0'
 end
 
 group :test do
@@ -296,30 +318,36 @@ group :test do
   gem 'email_spec', '~> 1.6.0'
   gem 'webmock', '~> 1.21.0'
   gem 'test_after_commit', '~> 0.4.2'
-  gem 'sham_rack'
+  gem 'sham_rack', '~> 1.3.6'
 end
 
 group :production do
-  gem "gitlab_meta", '7.0'
+  gem 'gitlab_meta', '7.0'
 end
 
-gem "newrelic_rpm", '~> 3.14'
+gem 'newrelic_rpm', '~> 3.14'
 
-gem 'octokit', '~> 3.8.0'
+gem 'octokit', '~> 4.3.0'
 
-gem "mail_room", "~> 0.6.1"
+gem 'mail_room', '~> 0.8'
 
 gem 'email_reply_parser', '~> 0.5.8'
 
 ## CI
-gem 'activerecord-deprecated_finders', '~> 1.0.3'
-gem 'activerecord-session_store', '~> 0.1.0'
-gem "nested_form", '~> 0.3.2'
+gem 'activerecord-session_store', '~> 1.0.0'
+gem 'nested_form', '~> 0.3.2'
 
 # OAuth
-gem 'oauth2', '~> 1.0.0'
+gem 'oauth2', '~> 1.2.0'
 
 # Soft deletion
-gem "paranoia", "~> 2.0"
+gem 'paranoia', '~> 2.0'
+
+# Health check
+gem 'health_check', '~> 2.1.0'
+
+# System information
+gem 'vmstat', '~> 2.1.1'
+gem 'sys-filesystem', '~> 1.1.6'
 
 gem "activerecord-nulldb-adapter"
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 8c3ddf3b570..1919acecc61 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -1,46 +1,46 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
-    RedCloth (4.2.9)
-    ace-rails-ap (2.0.1)
-    actionmailer (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
+    RedCloth (4.3.2)
+    ace-rails-ap (4.0.2)
+    actionmailer (4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
-      actionview (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionpack (4.2.7)
+      actionview (= 4.2.7)
+      activesupport (= 4.2.7)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionview (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activejob (4.2.7)
+      activesupport (= 4.2.7)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activemodel (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activerecord (4.2.7)
+      activemodel (= 4.2.7)
+      activesupport (= 4.2.7)
       arel (~> 6.0)
-    activerecord-deprecated_finders (1.0.4)
-    activerecord-nulldb-adapter (0.3.2)
+    activerecord-nulldb-adapter (0.3.3)
       activerecord (>= 2.0.0)
-    activerecord-session_store (0.1.2)
-      actionpack (>= 4.0.0, < 5)
-      activerecord (>= 4.0.0, < 5)
-      railties (>= 4.0.0, < 5)
-    activesupport (4.2.5.2)
+    activerecord-session_store (1.0.0)
+      actionpack (>= 4.0, < 5.1)
+      activerecord (>= 4.0, < 5.1)
+      multi_json (~> 1.11, >= 1.11.2)
+      rack (>= 1.5.2, < 3)
+      railties (>= 4.0, < 5.1)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -52,10 +52,7 @@ GEM
     after_commit_queue (1.3.0)
       activerecord (>= 3.0)
     akismet (2.0.0)
-    allocations (1.0.4)
-    annotate (2.6.10)
-      activerecord (>= 3.2, <= 4.3)
-      rake (~> 10.4)
+    allocations (1.0.5)
     arel (6.0.3)
     asana (0.4.0)
       faraday (~> 0.9)
@@ -63,11 +60,9 @@ GEM
       faraday_middleware-multi_json (~> 0.0)
       oauth2 (~> 1.0)
     asciidoctor (1.5.3)
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    attr_encrypted (1.3.4)
-      encryptor (>= 1.3.0)
+    ast (2.3.0)
+    attr_encrypted (3.0.1)
+      encryptor (~> 3.0.0)
     attr_required (1.0.0)
     autoprefixer-rails (6.2.3)
       execjs
@@ -77,8 +72,24 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    azure (0.7.5)
+      addressable (~> 2.3)
+      azure-core (~> 0.1)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.10)
+      json (~> 1.8)
+      mime-types (>= 1, < 3.0)
+      nokogiri (~> 1.6)
+      systemu (~> 2.6)
+      thor (~> 0.19)
+      uuid (~> 2.0)
+    azure-core (0.1.2)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.10)
+      nokogiri (~> 1.6)
     babosa (1.0.2)
-    bcrypt (3.1.10)
+    base32 (0.3.2)
+    bcrypt (3.1.11)
     benchmark-ips (2.3.0)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
@@ -88,29 +99,18 @@ GEM
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    brakeman (3.1.4)
-      erubis (~> 2.6)
-      fastercsv (~> 1.5)
-      haml (>= 3.0, < 5.0)
-      highline (>= 1.6.20, < 2.0)
-      multi_json (~> 1.2)
-      ruby2ruby (>= 2.1.1, < 2.3.0)
-      ruby_parser (~> 3.7.0)
-      safe_yaml (>= 1.0)
-      sass (~> 3.0)
-      slim (>= 1.3.6, < 4.0)
-      terminal-table (~> 1.4)
-    browser (1.0.1)
+    brakeman (3.3.2)
+    browser (2.2.0)
     builder (3.2.2)
-    bullet (4.14.10)
+    bullet (5.0.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.9.0)
-    bundler-audit (0.4.0)
+    bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (8.2.1)
-    cal-heatmap-rails (3.5.1)
-    capybara (2.4.4)
+    capybara (2.6.2)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -119,37 +119,35 @@ GEM
     capybara-screenshot (1.0.11)
       capybara (>= 1.0, < 3)
       launchy
-    carrierwave (0.9.0)
+    carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
+      mime-types (>= 1.16)
     cause (0.1)
     charlock_holmes (0.7.3)
+    chronic_duration (0.10.6)
+      numerizer (~> 0.1.1)
     chunky_png (1.3.5)
     cliver (0.3.2)
     coderay (1.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
     colorize (0.7.7)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.2)
     connection_pool (2.2.0)
-    coveralls (0.8.9)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     creole (0.5.0)
+    css_parser (1.4.1)
+      addressable
     d3_rails (3.5.11)
       railties (>= 3.1.0)
     daemons (1.2.3)
@@ -160,46 +158,41 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.5.4)
+    devise (4.1.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise-async (0.9.0)
-      devise (~> 3.2)
-    devise-two-factor (2.0.1)
+    devise-two-factor (3.0.0)
       activesupport
-      attr_encrypted (~> 1.3.2)
-      devise (~> 3.5.0)
+      attr_encrypted (>= 1.3, < 4, != 2)
+      devise (~> 4.0)
       railties
-      rotp (~> 2)
+      rotp (~> 2.0)
     diff-lcs (1.2.5)
     diffy (3.0.7)
     docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (2.2.2)
-      railties (>= 3.2)
+    doorkeeper (4.0.0)
+      railties (>= 4.2)
     dropzonejs-rails (0.7.2)
       rails (> 3.1)
     email_reply_parser (0.5.8)
     email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
-    encryptor (1.3.0)
+    encryptor (3.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
-    escape_utils (1.1.0)
+    escape_utils (1.1.1)
     eventmachine (1.0.8)
-    excon (0.45.4)
+    excon (0.49.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
-    factory_girl (4.3.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.3.0)
-      factory_girl (~> 4.3.0)
+    factory_girl_rails (4.6.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -208,11 +201,8 @@ GEM
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
-    fastercsv (1.5.5)
     ffaker (2.0.0)
     ffi (1.9.10)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
     flay (2.6.1)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
@@ -222,114 +212,43 @@ GEM
     flowdock (0.7.1)
       httparty (~> 0.7)
       multi_json
-    fog (1.36.0)
-      fog-aliyun (>= 0.1.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.32)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (<= 0.1.0)
-      fog-json
-      fog-local
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xenserver
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-aliyun (0.1.0)
+    fog-aws (0.9.2)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
+      fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.8.1)
+    fog-azure (0.0.2)
+      azure (~> 0.6)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.10.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.35.0)
+    fog-core (1.40.0)
       builder
-      excon (~> 0.45)
+      excon (~> 0.49)
       formatador (~> 0.2)
-    fog-dynect (0.0.2)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.1.0)
+    fog-google (0.3.2)
       fog-core
       fog-json
       fog-xml
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.2.1)
-      fog-core (~> 1.27)
-    fog-powerdns (0.1.1)
+    fog-local (0.3.0)
       fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.5)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.7.5)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.0.3)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-xenserver (0.2.2)
-      fog-core
-      fog-xml
+    fog-openstack (0.1.6)
+      fog-core (>= 1.39)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
+    fog-rackspace (0.1.1)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.5.0.0)
-      railties (>= 3.2, < 5.0)
+    font-awesome-rails (4.6.1.0)
+      railties (>= 3.2, < 5.1)
     foreman (0.78.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
@@ -338,32 +257,30 @@ GEM
       ruby-progressbar (~> 1.4)
     gemnasium-gitlab-service (0.2.6)
       rugged (~> 0.21)
-    gemojione (2.2.1)
+    gemojione (3.0.1)
       json
     get_process_mem (0.2.0)
     gherkin-ruby (0.3.2)
-    github-linguist (4.7.5)
+    github-linguist (4.7.6)
       charlock_holmes (~> 0.7.3)
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
       rugged (>= 0.23.0b)
-    github-markup (1.3.3)
+    github-markup (1.4.0)
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
       gitlab-grit (>= 2.4.1)
       multi_json
-    gitlab-grit (2.7.3)
+    gitlab-grit (2.8.1)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
+      mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-    gitlab_emoji (0.3.1)
-      gemojione (~> 2.2, >= 2.2.1)
-    gitlab_git (8.2.0)
+    gitlab_git (10.3.2)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
       github-linguist (~> 4.7.0)
-      rugged (~> 0.24.0b13)
+      rugged (~> 0.24.0)
     gitlab_meta (7.0)
     gitlab_omniauth-ldap (1.2.1)
       net-ldap (~> 0.9)
@@ -372,15 +289,18 @@ GEM
       rubyntlm (~> 0.3)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    gollum-grit_adapter (1.0.0)
+    gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.1.0)
-      github-markup (~> 1.3.3)
+    gollum-lib (4.2.1)
+      github-markup (~> 1.4.0)
       gollum-grit_adapter (~> 1.0)
       nokogiri (~> 1.6.4)
-      rouge (~> 1.9)
+      rouge (~> 2.0)
       sanitize (~> 2.1.0)
       stringex (~> 2.5.1)
+    gollum-rugged_adapter (0.4.2)
+      mime-types (>= 1.15)
+      rugged (~> 0.24.0, >= 0.21.3)
     gon (6.0.1)
       actionpack (>= 3.0)
       json
@@ -399,30 +319,20 @@ GEM
     grape-entity (0.4.8)
       activesupport
       multi_json (>= 1.3.2)
-    haml (4.0.7)
+    hamlit (2.5.0)
+      temple (~> 0.7.6)
+      thor
       tilt
-    haml-rails (0.9.0)
-      actionpack (>= 4.0.1)
-      activesupport (>= 4.0.1)
-      haml (>= 4.0.6, < 5.0)
-      html2haml (>= 1.0.1)
-      railties (>= 4.0.1)
     hashie (3.4.3)
-    highline (1.7.8)
-    hike (1.2.3)
+    health_check (2.1.0)
+      rails (>= 4.0)
     hipchat (1.5.2)
       httparty
       mimemagic
     html-pipeline (1.11.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
-    html2haml (2.0.0)
-      erubis (~> 2.7.0)
-      haml (~> 4.0.0)
-      nokogiri (~> 1.6.0)
-      ruby_parser (~> 3.5)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
+    htmlentities (4.3.4)
     http_parser.rb (0.5.3)
     httparty (0.13.7)
       json (~> 1.8)
@@ -430,33 +340,45 @@ GEM
     httpclient (2.7.0.1)
     i18n (0.7.0)
     ice_nine (0.11.1)
-    inflecto (0.0.2)
     influxdb (0.2.3)
       cause
       json
-    ipaddress (0.8.2)
+    ipaddress (0.8.3)
     jquery-atwho-rails (1.3.2)
-    jquery-rails (4.0.5)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-scrollto-rails (1.4.3)
-      railties (> 3.1, < 5.0)
     jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    jwt (1.5.2)
-    kaminari (0.16.3)
+    jwt (1.5.4)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
+    knapsack (1.11.0)
+      rake
+      timecop (>= 0.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.1.2)
+    letter_opener (1.4.1)
       launchy (~> 2.2)
+    letter_opener_web (1.3.0)
+      actionmailer (>= 3.2)
+      letter_opener (~> 1.0)
+      railties (>= 3.2)
+    license_finder (2.1.0)
+      bundler
+      httparty
+      rubyzip
+      thor
+      xml-simple
+    licensee (8.0.0)
+      rugged (>= 0.24b)
     listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -464,39 +386,40 @@ GEM
       nokogiri (>= 1.5.9)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mail_room (0.6.1)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mail_room (0.8.0)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.99.2)
     mimemagic (0.3.0)
     mini_portile2 (2.0.0)
     minitest (5.7.0)
     mousetrap-rails (1.4.6)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql2 (0.3.20)
     nested_form (0.3.2)
     net-ldap (0.12.1)
     net-ssh (3.0.1)
-    netrc (0.11.0)
     newrelic_rpm (3.14.1.311)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    nprogress-rails (0.1.6.7)
+    numerizer (0.1.1)
     oauth (0.4.7)
-    oauth2 (1.0.0)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    octokit (3.8.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
+      rack (>= 1.2, < 3)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
     omniauth (1.3.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
+    omniauth-auth0 (1.4.1)
+      omniauth-oauth2 (~> 1.1)
     omniauth-azure-oauth2 (0.0.6)
       jwt (~> 1.0)
       omniauth (~> 1.0)
@@ -517,7 +440,7 @@ GEM
     omniauth-gitlab (1.0.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.2.10)
+    omniauth-google-oauth2 (0.4.1)
       addressable (~> 2.3)
       jwt (~> 1.0)
       multi_json (~> 1.3)
@@ -534,9 +457,9 @@ GEM
     omniauth-oauth2 (1.3.1)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-saml (1.4.2)
-      omniauth (~> 1.1)
-      ruby-saml (~> 1.1, >= 1.1.1)
+    omniauth-saml (1.6.0)
+      omniauth (~> 1.3)
+      ruby-saml (~> 1.3)
     omniauth-shibboleth (1.2.1)
       omniauth (>= 1.0.0)
     omniauth-twitter (1.2.1)
@@ -551,16 +474,23 @@ GEM
     orm_adapter (0.5.0)
     paranoia (2.1.4)
       activerecord (~> 4.0)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
+    parser (2.3.1.2)
+      ast (~> 2.2)
     pg (0.18.4)
-    poltergeist (1.8.1)
+    pkg-config (1.1.7)
+    poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
+    premailer (1.8.6)
+      css_parser (>= 1.3.6)
+      htmlentities (>= 4.0.0)
+    premailer-rails (1.9.2)
+      actionmailer (>= 3, < 6)
+      premailer (~> 1.7, >= 1.7.9)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -568,8 +498,6 @@ GEM
     pry-rails (0.3.4)
       pry (>= 0.9.10)
     pyu-ruby-sasl (0.0.3.3)
-    quiet_assets (1.0.3)
-      railties (>= 3.1, < 5.0)
     rack (1.6.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -588,16 +516,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.2)
-      actionmailer (= 4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activerecord (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    rails (4.2.7)
+      actionmailer (= 4.2.7)
+      actionpack (= 4.2.7)
+      actionview (= 4.2.7)
+      activejob (= 4.2.7)
+      activemodel (= 4.2.7)
+      activerecord (= 4.2.7)
+      activesupport (= 4.2.7)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
+      railties (= 4.2.7)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -607,15 +535,14 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    railties (4.2.7)
+      actionpack (= 4.2.7)
+      activesupport (= 4.2.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.0.0)
+    rainbow (2.1.0)
     raindrops (0.15.0)
     rake (10.5.0)
-    raphael-rails (2.1.2)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -623,7 +550,7 @@ GEM
       debugger-ruby_core_source (~> 1.3)
     rdoc (3.12.2)
       json (~> 1.4)
-    recaptcha (1.0.2)
+    recaptcha (3.0.0)
       json
     redcarpet (3.3.3)
     redis (3.2.2)
@@ -645,118 +572,114 @@ GEM
       redis-store (~> 1.1.0)
     redis-store (1.1.7)
       redis (>= 2.2)
-    request_store (1.2.1)
+    request_store (1.3.0)
     rerun (0.11.0)
       listen (~> 3.0)
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rinku (1.7.3)
-    rotp (2.1.1)
-    rouge (1.10.1)
+    rinku (2.0.0)
+    rotp (2.1.2)
+    rouge (2.0.5)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.3)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-retry (0.4.5)
+      rspec-core
+    rspec-support (3.5.0)
+    rubocop (0.41.2)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.5.0)
+      rubocop (>= 0.40.0)
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
-    ruby-progressbar (1.7.5)
-    ruby-saml (1.1.1)
+    ruby-progressbar (1.8.1)
+    ruby-saml (1.3.0)
       nokogiri (>= 1.5.10)
-      uuid (~> 2.3)
-    ruby2ruby (2.2.0)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.7.2)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
     rubyntlm (0.5.2)
     rubypants (0.2.0)
+    rubyzip (1.2.0)
     rufus-scheduler (3.1.10)
-    rugged (0.24.0b13)
+    rugged (0.24.0)
     safe_yaml (1.0.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.4.20)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass (3.4.22)
+    sass-rails (5.0.5)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
+    scss_lint (0.47.1)
+      rake (>= 0.9, < 11)
+      sass (~> 3.4.15)
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
-    seed-fu (2.3.5)
-      activerecord (>= 3.1, < 4.3)
-      activesupport (>= 3.1, < 4.3)
+    seed-fu (2.3.6)
+      activerecord (>= 3.1)
+      activesupport (>= 3.1)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
-    sentry-raven (0.15.6)
+    sentry-raven (1.1.0)
       faraday (>= 0.7.6)
     settingslogic (2.0.9)
-    sexp_processor (4.6.0)
+    sexp_processor (4.7.0)
     sham_rack (1.3.6)
       rack
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (4.0.1)
+    sidekiq (4.1.4)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
-      json (~> 1.0)
       redis (~> 3.2, >= 3.2.1)
+      sinatra (>= 1.4.7)
     sidekiq-cron (0.4.0)
       redis-namespace (>= 1.5.2)
       rufus-scheduler (>= 2.0.24)
       sidekiq (>= 4.0.0)
     simple_oauth (0.1.9)
-    simplecov (0.10.0)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     six (0.2.0)
     slack-notifier (1.2.1)
-    slim (3.0.6)
-      temple (~> 0.7.3)
-      tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spinach (0.8.10)
       colorize
@@ -766,50 +689,50 @@ GEM
       capybara (>= 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
-    spring (1.3.6)
+    spinach-rerun-reporter (0.0.2)
+      spinach (~> 0.8)
+    spring (1.7.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    spring-commands-spinach (1.0.0)
+    spring-commands-spinach (1.1.0)
       spring (>= 0.9.1)
     spring-commands-teaspoon (0.0.2)
       spring (>= 0.9.1)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     state_machines (0.4.0)
-    state_machines-activemodel (0.3.0)
-      activemodel (~> 4.1)
+    state_machines-activemodel (0.4.0)
+      activemodel (>= 4.1, < 5.1)
       state_machines (>= 0.4.0)
-    state_machines-activerecord (0.3.0)
-      activerecord (~> 4.1)
+    state_machines-activerecord (0.4.0)
+      activerecord (>= 4.1, < 5.1)
       state_machines-activemodel (>= 0.3.0)
     stringex (2.5.2)
+    sys-filesystem (1.1.6)
+      ffi
     systemu (2.6.5)
     task_list (1.0.2)
       html-pipeline
-    teaspoon (1.0.2)
-      railties (>= 3.2.5, < 5)
+    teaspoon (1.1.5)
+      railties (>= 3.2.5, < 6)
     teaspoon-jasmine (2.2.0)
       teaspoon (>= 1.0.0)
-    temple (0.7.6)
-    term-ansicolor (1.3.2)
-      tins (~> 1.0)
-    terminal-table (1.5.2)
+    temple (0.7.7)
     test_after_commit (0.4.2)
       activerecord (>= 3.2)
-    thin (1.6.4)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (~> 1.0)
+      rack (>= 1, < 3)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.5)
+    timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
     tinder (1.10.1)
       eventmachine (~> 1.0)
@@ -820,7 +743,6 @@ GEM
       mime-types
       multi_json (~> 1.7)
       twitter-stream (~> 0.1)
-    tins (1.6.0)
     turbolinks (2.5.3)
       coffee-rails
     twitter-stream (0.1.16)
@@ -829,14 +751,16 @@ GEM
       simple_oauth (~> 0.1.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    u2f (0.2.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.8.3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
-    unicorn (4.8.3)
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.1.0)
+    unicorn (4.9.0)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -852,9 +776,10 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.4)
+    vmstat (2.1.1)
+    warden (1.2.6)
       rack (>= 1.0)
-    web-console (2.2.1)
+    web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
@@ -877,86 +802,93 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth (~> 4.2.9)
-  ace-rails-ap (~> 2.0.1)
-  activerecord-deprecated_finders (~> 1.0.3)
+  RedCloth (~> 4.3.2)
+  ace-rails-ap (~> 4.0.2)
   activerecord-nulldb-adapter
-  activerecord-session_store (~> 0.1.0)
+  activerecord-session_store (~> 1.0.0)
   acts-as-taggable-on (~> 3.4)
   addressable (~> 2.3.8)
-  after_commit_queue
+  after_commit_queue (~> 1.3.0)
   akismet (~> 2.0)
   allocations (~> 1.0)
-  annotate (~> 2.6.0)
   asana (~> 0.4.0)
   asciidoctor (~> 1.5.2)
-  attr_encrypted (~> 1.3.4)
+  attr_encrypted (~> 3.0.0)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
-  benchmark-ips
+  base32 (~> 0.3.0)
+  benchmark-ips (~> 2.3.0)
   better_errors (~> 1.0.1)
   binding_of_caller (~> 0.7.2)
   bootstrap-sass (~> 3.3.0)
-  brakeman (~> 3.1.0)
-  browser (~> 1.0.0)
-  bullet
-  bundler-audit
-  byebug
-  cal-heatmap-rails (~> 3.5.0)
-  capybara (~> 2.4.0)
+  brakeman (~> 3.3.0)
+  browser (~> 2.2)
+  bullet (~> 5.0.0)
+  bundler-audit (~> 0.5.0)
+  byebug (~> 8.2.1)
+  capybara (~> 2.6.2)
   capybara-screenshot (~> 1.0.0)
-  carrierwave (~> 0.9.0)
+  carrierwave (~> 0.10.0)
   charlock_holmes (~> 0.7.3)
+  chronic_duration (~> 0.10.6)
   coffee-rails (~> 4.1.0)
-  colorize (~> 0.7.0)
   connection_pool (~> 2.0)
-  coveralls (~> 0.8.2)
   creole (~> 0.5.0)
   d3_rails (~> 3.5.0)
   database_cleaner (~> 1.4.0)
   default_value_for (~> 3.0.0)
-  devise (~> 3.5.4)
-  devise-async (~> 0.9.0)
-  devise-two-factor (~> 2.0.0)
+  devise (~> 4.0)
+  devise-two-factor (~> 3.0.0)
   diffy (~> 3.0.3)
-  doorkeeper (~> 2.2.0)
+  doorkeeper (~> 4.0)
   dropzonejs-rails (~> 0.7.1)
   email_reply_parser (~> 0.5.8)
   email_spec (~> 1.6.0)
-  factory_girl_rails (~> 4.3.0)
+  factory_girl_rails (~> 4.6.0)
   ffaker (~> 2.0.0)
-  flay
-  flog
-  fog (~> 1.36.0)
-  font-awesome-rails (~> 4.2)
-  foreman
+  flay (~> 2.6.1)
+  flog (~> 4.3.2)
+  fog-aws (~> 0.9)
+  fog-azure (~> 0.0)
+  fog-core (~> 1.40)
+  fog-google (~> 0.3)
+  fog-local (~> 0.3)
+  fog-openstack (~> 0.1)
+  fog-rackspace (~> 0.1.1)
+  font-awesome-rails (~> 4.6.1)
+  foreman (~> 0.78.0)
   fuubar (~> 2.0.0)
   gemnasium-gitlab-service (~> 0.2)
+  gemojione (~> 3.0)
   github-linguist (~> 4.7.0)
-  github-markup (~> 1.3.1)
+  github-markup (~> 1.4)
   gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab_emoji (~> 0.3.0)
-  gitlab_git (~> 8.2)
+  gitlab_git (~> 10.3.2)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (~> 1.2.1)
-  gollum-lib (~> 4.1.0)
+  gollum-lib (~> 4.2)
+  gollum-rugged_adapter (~> 0.4.2)
   gon (~> 6.0.1)
   grape (~> 0.13.0)
   grape-entity (~> 0.4.2)
-  haml-rails (~> 0.9.0)
+  hamlit (~> 2.5)
+  health_check (~> 2.1.0)
   hipchat (~> 1.5.0)
   html-pipeline (~> 1.11.0)
   httparty (~> 0.13.3)
   influxdb (~> 0.2)
   jquery-atwho-rails (~> 1.3.2)
-  jquery-rails (~> 4.0.0)
-  jquery-scrollto-rails (~> 1.4.3)
+  jquery-rails (~> 4.1.0)
   jquery-turbolinks (~> 2.1.0)
   jquery-ui-rails (~> 5.0.0)
-  kaminari (~> 0.16.3)
-  letter_opener (~> 1.1.2)
+  jwt
+  kaminari (~> 0.17.0)
+  knapsack (~> 1.11.0)
+  letter_opener_web (~> 1.3.0)
+  license_finder (~> 2.1.0)
+  licensee (~> 8.0.0)
   loofah (~> 2.0.3)
-  mail_room (~> 0.6.1)
+  mail_room (~> 0.8)
   method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)
@@ -964,88 +896,96 @@ DEPENDENCIES
   nested_form (~> 0.3.2)
   net-ssh (~> 3.0.1)
   newrelic_rpm (~> 3.14)
-  nokogiri (~> 1.6.7, >= 1.6.7.2)
-  nprogress-rails (~> 0.1.6.7)
-  oauth2 (~> 1.0.0)
-  octokit (~> 3.8.0)
+  nokogiri (~> 1.6.7, >= 1.6.7.2, < 1.6.8)
+  oauth2 (~> 1.2.0)
+  octokit (~> 4.3.0)
   omniauth (~> 1.3.1)
+  omniauth-auth0 (~> 1.4.1)
   omniauth-azure-oauth2 (~> 0.0.6)
   omniauth-bitbucket (~> 0.0.2)
   omniauth-cas3 (~> 1.1.2)
   omniauth-facebook (~> 3.0.0)
   omniauth-github (~> 1.1.1)
   omniauth-gitlab (~> 1.0.0)
-  omniauth-google-oauth2 (~> 0.2.0)
+  omniauth-google-oauth2 (~> 0.4.1)
   omniauth-kerberos (~> 0.3.0)
-  omniauth-saml (~> 1.4.2)
+  omniauth-saml (~> 1.6.0)
   omniauth-shibboleth (~> 1.2.0)
   omniauth-twitter (~> 1.2.0)
   omniauth_crowd (~> 2.2.0)
   org-ruby (~> 0.9.12)
   paranoia (~> 2.0)
   pg (~> 0.18.2)
-  poltergeist (~> 1.8.1)
-  pry-rails
-  quiet_assets (~> 1.0.2)
+  poltergeist (~> 1.9.0)
+  premailer-rails (~> 1.9.0)
+  pry-rails (~> 0.3.4)
   rack-attack (~> 4.3.1)
   rack-cors (~> 0.4.0)
   rack-oauth2 (~> 1.2.1)
-  rails (= 4.2.5.2)
+  rails (= 4.2.7)
   rails-deprecated_sanitizer (~> 1.0.3)
-  raphael-rails (~> 2.1.2)
-  rblineprof
+  rainbow (~> 2.1.0)
+  rblineprof (~> 0.3.6)
   rdoc (~> 3.6)
-  recaptcha
+  recaptcha (~> 3.0)
   redcarpet (~> 3.3.3)
-  redis-namespace
+  redis (~> 3.2)
+  redis-namespace (~> 1.5.2)
   redis-rails (~> 4.0.0)
-  request_store (~> 1.2.0)
+  request_store (~> 1.3.0)
   rerun (~> 0.11.0)
   responders (~> 2.0)
-  rouge (~> 1.10.1)
+  rouge (~> 2.0)
   rqrcode-rails3 (~> 0.1.7)
-  rspec-rails (~> 3.3.0)
-  rubocop (~> 0.35.0)
+  rspec-rails (~> 3.5.0)
+  rspec-retry (~> 0.4.5)
+  rubocop (~> 0.41.2)
+  rubocop-rspec (~> 1.5.0)
   ruby-fogbugz (~> 0.2.1)
   sanitize (~> 2.0)
   sass-rails (~> 5.0.0)
+  scss_lint (~> 0.47.0)
   sdoc (~> 0.3.20)
   seed-fu (~> 2.3.5)
   select2-rails (~> 3.5.9)
-  sentry-raven (~> 0.15)
+  sentry-raven (~> 1.1.0)
   settingslogic (~> 2.0.9)
-  sham_rack
+  sham_rack (~> 1.3.6)
   shoulda-matchers (~> 2.8.0)
   sidekiq (~> 4.0)
   sidekiq-cron (~> 0.4.0)
-  simplecov (~> 0.10.0)
+  simplecov (~> 0.11.0)
   sinatra (~> 1.4.4)
   six (~> 0.2.0)
   slack-notifier (~> 1.2.0)
   spinach-rails (~> 0.2.1)
-  spring (~> 1.3.6)
+  spinach-rerun-reporter (~> 0.0.2)
+  spring (~> 1.7.0)
   spring-commands-rspec (~> 1.0.4)
-  spring-commands-spinach (~> 1.0.0)
+  spring-commands-spinach (~> 1.1.0)
   spring-commands-teaspoon (~> 0.0.2)
-  sprockets (~> 2.12.3)
-  state_machines-activerecord (~> 0.3.0)
+  sprockets (~> 3.6.0)
+  state_machines-activerecord (~> 0.4.0)
+  sys-filesystem (~> 1.1.6)
   task_list (~> 1.0.2)
-  teaspoon (~> 1.0.0)
+  teaspoon (~> 1.1.0)
   teaspoon-jasmine (~> 2.2.0)
   test_after_commit (~> 0.4.2)
-  thin (~> 1.6.1)
+  thin (~> 1.7.0)
   tinder (~> 1.10.0)
   turbolinks (~> 2.5.0)
+  u2f (~> 0.2.1)
   uglifier (~> 2.7.2)
   underscore-rails (~> 1.8.0)
   unf (~> 0.1.4)
-  unicorn (~> 4.8.2)
+  unicorn (~> 4.9.0)
   unicorn-worker-killer (~> 0.4.2)
   version_sorter (~> 2.0.0)
   virtus (~> 1.0.1)
+  vmstat (~> 2.1.1)
   web-console (~> 2.0)
   webmock (~> 1.21.0)
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index c3aef17513f..fadb14dc782 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -24,20 +24,19 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.5.12";
+  version = "8.10.3";
 
-  buildInputs = [ ruby bundler tzdata git nodejs procps ];
+  buildInputs = [ env ruby bundler tzdata git nodejs procps ];
 
   src = fetchFromGitHub {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "144i97ywnr0xgm7gnwnwiy7kk5z1d71ccawl8qdhapz0705993l8";
+    sha256 = "0fhnwrgrpccc2j9wgdmwwi9h1ym3ll97lhmddq0xfzivc302ri3w";
   };
 
   patches = [
     ./remove-hardcoded-locations.patch
-    ./disable-dump-schema-after-migration.patch
     ./nulladapter.patch
   ];
 
@@ -66,9 +65,10 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
-    export GEM_HOME=${env}/${ruby.gemPath}
     mv config/gitlab.yml.example config/gitlab.yml
-    GITLAB_DATABASE_ADAPTER=nulldb bundle exec rake assets:precompile RAILS_ENV=production
+    GITLAB_DATABASE_ADAPTER=nulldb \
+      SKIP_STORAGE_VALIDATION=true \
+      rake assets:precompile RAILS_ENV=production
     mv config/gitlab.yml config/gitlab.yml.example
     mv config config.dist
   '';
diff --git a/pkgs/applications/version-management/gitlab/disable-dump-schema-after-migration.patch b/pkgs/applications/version-management/gitlab/disable-dump-schema-after-migration.patch
deleted file mode 100644
index bc1f638cee0..00000000000
--- a/pkgs/applications/version-management/gitlab/disable-dump-schema-after-migration.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/config/environments/production.rb b/config/environments/production.rb
-index 3316ece..d60566c 100644
---- a/config/environments/production.rb
-+++ b/config/environments/production.rb
-@@ -77,4 +77,6 @@ Gitlab::Application.configure do
-   config.eager_load = true
- 
-   config.allow_concurrency = false
-+
-+  config.active_record.dump_schema_after_migration = false
- end
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 870f5e79f3a..ce7ecd9f030 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -2,98 +2,82 @@
   ace-rails-ap = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "082n12rkd9j7d89030nhmi4fx1gqaf13knps6cknsyvwix7fryvv";
+      sha256 = "1y1xdjmdb7fg1w0ym7xizpfvll8bicnhli2s65bzvpk3zp7h8qmi";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "4.0.2";
   };
   actionmailer = {
-    dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "8cee5f2f1e58c8ada17cca696377443c0cbc9675df2b7eef97a04318876484b5";
+      sha256 = "1fhq3dg3icbi1vrz55xwalzn4wpbrdgm41ma1jkrgbwl4qqqrrsq";
       type = "gem";
     };
-    version = "4.2.5.2";
+    version = "4.2.7";
   };
   actionpack = {
-    dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "a22e1818f06b707433c9a76867932929751b5d57edbeacc258635a7b23da12cf";
+      sha256 = "0swhxylh0mrq7b8am3b90xqnwldvfn52jd2m9zmc27r8hvc0h2fp";
       type = "gem";
     };
-    version = "4.2.5.2";
+    version = "4.2.7";
   };
   actionview = {
-    dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "e8ce01cf6cc822ec023a15a856a0fae0e078ebb232b95b722c23af4117d2d635";
+      sha256 = "0wsxa7zkvacmv4vf528nmid2v5smqy54vh17srj3997bgjyr68f3";
       type = "gem";
     };
-    version = "4.2.5.2";
+    version = "4.2.7";
   };
   activejob = {
-    dependencies = ["activesupport" "globalid"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "cecb9bbc55292dee064ca479990c6e50fa3e2273aac6722ce058d18c22383026";
+      sha256 = "19bf6fpl1vw6qnpsqcvdhljrvp67a7j72x1ydz4rj2s7g4xbjas3";
       type = "gem";
     };
-    version = "4.2.5.2";
+    version = "4.2.7";
   };
   activemodel = {
-    dependencies = ["activesupport" "builder"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09ce967be3086b34ae9fcbd919e714b2bdf72b8ab6e89b64aa74627267d93962";
+      sha256 = "0v991wipszd5ly1fba8qzfyg86r06k8l8y353dv7438sngwd7slk";
       type = "gem";
     };
-    version = "4.2.5.2";
+    version = "4.2.7";
   };
   activerecord = {
-    dependencies = ["activemodel" "activesupport" "arel"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "c2b1b6a4c6b8542c2464b457dce4cac4915efcbd3d5acfba57102e58474c33f2";
+      sha256 = "0m04absj00hxj4q527ng0w0ydgbfc1cgxlcksjixgnx4j1visibn";
       type = "gem";
     };
-    version = "4.2.5.2";
-  };
-  activerecord-deprecated_finders = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03xplckz7v3nm6inqkwdd44h6gpbpql0v02jc1rz46a38rd6cj6m";
-      type = "gem";
-    };
-    version = "1.0.4";
+    version = "4.2.7";
   };
   activerecord-nulldb-adapter = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ym3paxp5lqr2kr4hkqj6xxqvgl57fv8jqhvgjfxb9lk7k5jlfmp";
+      sha256 = "1m8jlbzmwc1cx4fb54m9adw962anpz5cazbyirb4qs5brxma63fp";
       type = "gem";
     };
-    version = "0.3.2";
+    version = "0.3.3";
   };
   activerecord-session_store = {
-    dependencies = ["actionpack" "activerecord" "railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rp5q0q5i5syfgw7qpiq3a42x13p7myyv1c5hmnczpdlh57axs3p";
+      sha256 = "1b8q5p7wl0xpmlcjig2im1yryzj4aipvw7zq3z1ig8fdg4m2m943";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "1.0.0";
   };
   activesupport = {
-    dependencies = ["i18n" "json" "minitest" "thread_safe" "tzinfo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "80ad345adf7e2b72c5d90753c0df91eacc34f4de02b34cfbf60bcf6c83483031";
+      sha256 = "1pm0gw4ykq9137n8i815vayyah0mk2m920clgg02jr3l23w6gsnj";
       type = "gem";
     };
-    version = "4.2.5.2";
+    version = "4.2.7";
   };
   acts-as-taggable-on = {
     dependencies = ["activerecord"];
@@ -132,19 +116,10 @@
   allocations = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0iynf7gkbnbr5mgl2wgbgvxmjdiawh7ywwbnyjm94bj3pkybzgkc";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  annotate = {
-    dependencies = ["activerecord" "rake"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1wdw9phsv2dndgid3pd8h0hl4zycwy11jc9iz6prwza0xax0i7hg";
+      sha256 = "1y7z66lpzabyvviphk1fnzvrj5vhv7v9vppcnkrf0n5wh8qwx2zi";
       type = "gem";
     };
-    version = "2.6.10";
+    version = "1.0.5";
   };
   arel = {
     source = {
@@ -174,28 +149,18 @@
   ast = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "102bywfxrv0w3n4s6lg25d7xxshd344sc7ijslqmganj5bany1pk";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-  astrolabe = {
-    dependencies = ["parser"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ybbmjxaf529vvhrj4y8d4jpf87f3hgczydzywyg1d04gggjx7l7";
+      sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "2.3.0";
   };
   attr_encrypted = {
-    dependencies = ["encryptor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hm2844qm37kflqq5v0x2irwasbhcblhp40qk10m3wlkj4m9wp8p";
+      sha256 = "0xqb753sjgwxpb2s375j8nkrk8kjhjijzywyl6vps5r3nbs0l51k";
       type = "gem";
     };
-    version = "1.3.4";
+    version = "3.0.1";
   };
   attr_required = {
     source = {
@@ -231,6 +196,22 @@
     };
     version = "0.1.1";
   };
+  azure = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vfnx47ihizg1d6szdyf48xfdghjfk66k4r39z6b0gl5i40vcm8v";
+      type = "gem";
+    };
+    version = "0.7.5";
+  };
+  azure-core = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "016krlc7wfg27zgg5i6j0pys32ra8jszgls8wz4dz64h2zf1kd7a";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
   babosa = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -239,13 +220,21 @@
     };
     version = "1.0.2";
   };
+  base32 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b7y8sy6j9v1lvfzd4va88k5vg9yh0xcjzzn3llcw7yxqlcrnbjk";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
   bcrypt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15cf7zzlj9b0xcx12jf8fmnpc8g1b0yhxal1yr5p7ny3mrz5pll6";
+      sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50";
       type = "gem";
     };
-    version = "3.1.10";
+    version = "3.1.11";
   };
   benchmark-ips = {
     source = {
@@ -283,21 +272,20 @@
     version = "3.3.6";
   };
   brakeman = {
-    dependencies = ["erubis" "fastercsv" "haml" "highline" "multi_json" "ruby2ruby" "ruby_parser" "safe_yaml" "sass" "slim" "terminal-table"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15v13yizpvp1rm86raqggmsmm51v6p8fqw3pfgi6xpvx1ba06cfm";
+      sha256 = "0v2yllqcn2zyi60ahgi8ds8pix6a82703ln25p9pkm1bvrwj3fsq";
       type = "gem";
     };
-    version = "3.1.4";
+    version = "3.3.2";
   };
   browser = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01bkb64w2ld2q5r3chc4f6spbjrmginyg8wlzg130zmx2z4jia2h";
+      sha256 = "055r4wyc3z61r7mg2bgqpzabpkg8db2q5rciwfx9lwfyhjx19pbv";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "2.2.0";
   };
   builder = {
     source = {
@@ -308,22 +296,20 @@
     version = "3.2.2";
   };
   bullet = {
-    dependencies = ["activesupport" "uniform_notifier"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h3iaflcz5a1xr32bdb8sk4nx06yhh5d8y7w294w49xigfv4hzj3";
+      sha256 = "14i3ci990sygxzdsy9jsgzfs5zkzgx6fd56i0d58s77wmn2myham";
       type = "gem";
     };
-    version = "4.14.10";
+    version = "5.0.0";
   };
   bundler-audit = {
-    dependencies = ["thor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0msv3k2277y7al5lbnw7q9lmb5fnrscpkmsb36wpn189pdq0akfv";
+      sha256 = "1gr7k6m9fda7m66irxzydm8v9xbmlryjj65cagwm1zyi5f317srb";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.0";
   };
   byebug = {
     source = {
@@ -333,22 +319,13 @@
     };
     version = "8.2.1";
   };
-  cal-heatmap-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lrmcyj3iixkprqi9fb9vcn97wpp779sl5hxxgx57r3rb7l4d20w";
-      type = "gem";
-    };
-    version = "3.5.1";
-  };
   capybara = {
-    dependencies = ["mime-types" "nokogiri" "rack" "rack-test" "xpath"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f";
+      sha256 = "0ln77a5wwhd5sbxsh3v26xrwjnza0rgx2hn23yjggdlha03b00yw";
       type = "gem";
     };
-    version = "2.4.4";
+    version = "2.6.2";
   };
   capybara-screenshot = {
     dependencies = ["capybara" "launchy"];
@@ -360,13 +337,12 @@
     version = "1.0.11";
   };
   carrierwave = {
-    dependencies = ["activemodel" "activesupport" "json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b1av1ancby6brhmypl5k8xwrasd8bd3kqp9ri8kbq7z8nj6k445";
+      sha256 = "0h9179vcsv5mhdd83zx13bisk6x5c7j97mhqaxagimjbkszwsvr0";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.10.0";
   };
   cause = {
     source = {
@@ -376,21 +352,21 @@
     };
     version = "0.1";
   };
-  CFPropertyList = {
+  charlock_holmes = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mjb46368z4hiax3fcsgxk14fxrhwnvcmakc2f5sx8nz0wvvkwg2";
+      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "0.7.3";
   };
-  charlock_holmes = {
+  chronic_duration = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+      sha256 = "1k7sx3xqbrn6s4pishh2pgr4kw6fmw63h00lh503l66k8x0qvigs";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.10.6";
   };
   chunky_png = {
     source = {
@@ -426,13 +402,12 @@
     version = "1.0.0";
   };
   coffee-rails = {
-    dependencies = ["coffee-script" "railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0p3zhs44gsy1p90nmghihzfyl7bsk8kv6j3q7rj3bn74wg8w7nqs";
+      sha256 = "1mv1kaw3z4ry6cm51w8pfrbby40gqwxanrqyqr0nvs8j1bscc1gw";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "4.1.1";
   };
   coffee-script = {
     dependencies = ["coffee-script-source" "execjs"];
@@ -462,10 +437,10 @@
   concurrent-ruby = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qqdgcfkzv90nznrpsvg3cgg5xiqz4c8hnv7va5gm4fp4lf4k85v";
+      sha256 = "1kb4sav7yli12pjr8lscv8z49g52a5xzpfg3z9h8clzw6z74qjsw";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.2";
   };
   connection_pool = {
     source = {
@@ -475,15 +450,6 @@
     };
     version = "2.2.0";
   };
-  coveralls = {
-    dependencies = ["json" "rest-client" "simplecov" "term-ansicolor" "thor" "tins"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03vnvcw1fdmkp3405blcxpsjf89jxd2061474a32fchsmv2das9y";
-      type = "gem";
-    };
-    version = "0.8.9";
-  };
   crack = {
     dependencies = ["safe_yaml"];
     source = {
@@ -501,6 +467,14 @@
     };
     version = "0.5.0";
   };
+  css_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ql5q4n39278prbdjdsxx9wkxkxblgzzn0qcdqnwibgd1dkvb5av";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
   d3_rails = {
     dependencies = ["railties"];
     source = {
@@ -561,31 +535,20 @@
     version = "0.0.4";
   };
   devise = {
-    dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "thread_safe" "warden"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00h0xdl4a8pjpb0gbgy4w6q9j2mpczkmj23195zmjrg2b1gl8f2q";
-      type = "gem";
-    };
-    version = "3.5.4";
-  };
-  devise-async = {
-    dependencies = ["devise"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11llg7ggzpmg4lb9gh4sx55spvp98sal5r803gjzamps9crfq6mm";
+      sha256 = "1i5glkxmn0ymj50pz05nh6xcffc9giqajgfg6qrcbs2n552hbr5k";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "4.1.1";
   };
   devise-two-factor = {
-    dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v2wva971ds48af47rj4ywavlmz7qzbmf1jpf1l3xn3mscz52hln";
+      sha256 = "1pkldws5lga4mlv4xmcrfb0yivl6qad0l8qyb2hdb50adv6ny4gs";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "3.0.0";
   };
   diff-lcs = {
     source = {
@@ -611,23 +574,13 @@
     };
     version = "1.1.5";
   };
-  domain_name = {
-    dependencies = ["unf"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16qvfrmcwlzz073aas55mpw2nhyhjcn96s524w0g1wlml242hjav";
-      type = "gem";
-    };
-    version = "0.5.25";
-  };
   doorkeeper = {
-    dependencies = ["railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wim84wkvx758cfb8q92w3hhvnfbwr990x1mmfv1ss1ivjz8fmm0";
+      sha256 = "0lillrbd2sy7zzni6a2kf3p09lfd0br831zzv22zsv4ffr6n1va1";
       type = "gem";
     };
-    version = "2.2.2";
+    version = "4.0.0";
   };
   dropzonejs-rails = {
     dependencies = ["rails"];
@@ -658,10 +611,10 @@
   encryptor = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04wqqda081h7hmhwjjx1yqxprxjk8s5jgv837xqv1bpxiv7f4v1y";
+      sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "3.0.0";
   };
   equalizer = {
     source = {
@@ -682,10 +635,10 @@
   escape_utils = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hb8nmrgmd9n5dhih86fp91sf26mmw14sdn5vswg5g20svrqxc7x";
+      sha256 = "088r5c2mz2vy2jbbx1xjbi8msnzg631ggli29nhik2spbcp1z6vh";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.1";
   };
   eventmachine = {
     source = {
@@ -698,10 +651,10 @@
   excon = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1shb4g3dhsfkywgjv6123yrvp2c8bvi8hqmq47iqa5lp72sn4b4w";
+      sha256 = "0jmdgc4lhlbxccpg79a32vn3qngqipcaaq8bxa0ivfw5mvz0zc0z";
       type = "gem";
     };
-    version = "0.45.4";
+    version = "0.49.0";
   };
   execjs = {
     source = {
@@ -720,22 +673,20 @@
     version = "0.9.0";
   };
   factory_girl = {
-    dependencies = ["activesupport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13z20a4b7z1c8vbz0qz5ranssdprldwvwlgjmn38x311sfjmp9dz";
+      sha256 = "0qn34ba1midnzms1854yzx0g16sgy7bd9wcsvs66rxd65idsay20";
       type = "gem";
     };
-    version = "4.3.0";
+    version = "4.5.0";
   };
   factory_girl_rails = {
-    dependencies = ["factory_girl" "railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jj0yl6mfildb4g79dwgc1q5pv2pa65k9b1ml43mi8mg62j8mrhz";
+      sha256 = "00vngc59bww75hqkr1hbnvnqm5763w0jlv3lsq3js1r1wxdzix2r";
       type = "gem";
     };
-    version = "4.3.0";
+    version = "4.6.0";
   };
   faraday = {
     dependencies = ["multipart-post"];
@@ -764,14 +715,6 @@
     };
     version = "0.0.6";
   };
-  fastercsv = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h";
-      type = "gem";
-    };
-    version = "1.5.5";
-  };
   ffaker = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -788,15 +731,6 @@
     };
     version = "1.9.10";
   };
-  fission = {
-    dependencies = ["CFPropertyList"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
   flay = {
     dependencies = ["ruby_parser" "sexp_processor"];
     source = {
@@ -824,86 +758,37 @@
     };
     version = "0.7.1";
   };
-  fog = {
-    dependencies = ["fog-aliyun" "fog-atmos" "fog-aws" "fog-brightbox" "fog-core" "fog-dynect" "fog-ecloud" "fog-google" "fog-json" "fog-local" "fog-powerdns" "fog-profitbricks" "fog-radosgw" "fog-riakcs" "fog-sakuracloud" "fog-serverlove" "fog-softlayer" "fog-storm_on_demand" "fog-terremark" "fog-vmfusion" "fog-voxel" "fog-xenserver" "fog-xml" "ipaddress" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ml31jdycqdm8w7w3l9pbyrgbnmrrnhmkppa2x4bwi9as1n1jmwq";
-      type = "gem";
-    };
-    version = "1.36.0";
-  };
-  fog-aliyun = {
-    dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-atmos = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
   fog-aws = {
-    dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pzfahq8h3alfflb5dr8lm02q27x81vm96qn5zyfdlx86yy7bq96";
+      sha256 = "0imhhxrw8m031lc912bnlqzgac41sjsip1fa8v845ldmn56kn9zg";
       type = "gem";
     };
-    version = "0.8.1";
-  };
-  fog-brightbox = {
-    dependencies = ["fog-core" "fog-json" "inflecto"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0p7rbx587hb1d1am90dcr3zdp6y50c2zddh97yfgl62vji0pbkkd";
-      type = "gem";
-    };
-    version = "0.10.1";
-  };
-  fog-core = {
-    dependencies = ["builder" "excon" "formatador"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02z91r3f5a64hlalm6h39v0778yl2kk3qvva0zvplpp9hpwbwzhl";
-      type = "gem";
-    };
-    version = "1.35.0";
+    version = "0.9.2";
   };
-  fog-dynect = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
+  fog-azure = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18lqmdkm22254z86jh3aa9v9vqk8bgbd3d1m0w7az3ij47ak7kch";
+      sha256 = "1bdgzn1a1z79drfvashs6gzpg98dijvxm168cq0czzkx3wvbrfcl";
       type = "gem";
     };
     version = "0.0.2";
   };
-  fog-ecloud = {
-    dependencies = ["fog-core" "fog-xml"];
+  fog-core = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06";
+      sha256 = "1flkprsdm1qr38bzd80wxpkbcwm5zshivbg2k8pjls9i6jh6a0z7";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "1.40.0";
   };
   fog-google = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z4vmswpqwph04c0wqzrscns1d1wdm8kbxx457bv156mawzrhfj3";
+      sha256 = "0vzwid3s4c39fqixg1zb0dr5g3q6lafm9pan6bk3csys62v6fnm9";
       type = "gem";
     };
-    version = "0.1.0";
+    version = "0.3.2";
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
@@ -915,122 +800,29 @@
     version = "1.0.2";
   };
   fog-local = {
-    dependencies = ["fog-core"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3";
+      sha256 = "0256l3q2f03q8fk49035h5jij388rcz9fqlwri7y788492b4vs3c";
       type = "gem";
     };
-    version = "0.2.1";
-  };
-  fog-powerdns = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  fog-profitbricks = {
-    dependencies = ["fog-core" "fog-xml" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "154sqs2dcmvg21v4m3fj8f09z5i70sq8a485v6rdygsffs8xrycn";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
-  fog-radosgw = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nslgv8yp5qkiryj3zsm91gs7s6i626igj61kwxjjwk2yv6swyr6";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
-  fog-riakcs = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-sakuracloud = {
-    dependencies = ["fog-core" "fog-json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08krsn9sk5sx0aza812g31r169bd0zanb8pq5am3a64j6azarimd";
-      type = "gem";
-    };
-    version = "1.7.5";
-  };
-  fog-serverlove = {
-    dependencies = ["fog-core" "fog-json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci";
-      type = "gem";
-    };
-    version = "0.1.2";
+    version = "0.3.0";
   };
-  fog-softlayer = {
-    dependencies = ["fog-core" "fog-json"];
+  fog-openstack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zax2wws0q8pm787jnlxd2xlj23f2acz0s6jl5nzczyxjgll571r";
+      sha256 = "1pw2ypxbbmfscmhcz05ry5kc7c5rjr61lv9zj6zpr98fg1wad3a6";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "0.1.6";
   };
-  fog-storm_on_demand = {
-    dependencies = ["fog-core" "fog-json"];
+  fog-rackspace = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y";
+      sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a";
       type = "gem";
     };
     version = "0.1.1";
   };
-  fog-terremark = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-vmfusion = {
-    dependencies = ["fission" "fog-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-voxel = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-xenserver = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ngw8hh8ljk7wi0cp8n4b4jcy2acx0yqzjk7851m3mp0kji5dlgl";
-      type = "gem";
-    };
-    version = "0.2.2";
-  };
   fog-xml = {
     dependencies = ["fog-core" "nokogiri"];
     source = {
@@ -1041,13 +833,12 @@
     version = "0.1.2";
   };
   font-awesome-rails = {
-    dependencies = ["railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09x1bg98sp2v1lsg9h2bal915q811xq84h9d74p1f3378ga63c1x";
+      sha256 = "04cq20l6g5byjnqvm9n02wangakxfj5kaxk1447y5mi0a87x184c";
       type = "gem";
     };
-    version = "4.5.0.0";
+    version = "4.6.1.0";
   };
   foreman = {
     dependencies = ["thor"];
@@ -1087,10 +878,10 @@
   gemojione = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0av60lajn64z1csmkzfaf5wvpd3x48lcshiknkqr8m0zx3sg7w3h";
+      sha256 = "17yy3cp7b75ngc2v4f0cacvq3f1bk3il5a0ykvnypl6fcj6r6b3w";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "3.0.1";
   };
   get_process_mem = {
     source = {
@@ -1111,18 +902,18 @@
   github-linguist = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xxm2lbabkc1xmx2myv56a4fkw3wwg9n8w2bzwrl4s33kf6x62ag";
+      sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd";
       type = "gem";
     };
-    version = "4.7.5";
+    version = "4.7.6";
   };
   github-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq";
+      sha256 = "046bvnbhk3bw021sd88808n71dya0b0dmx8hm64rj0fvs2jzg54z";
       type = "gem";
     };
-    version = "1.3.3";
+    version = "1.4.0";
   };
   gitlab-flowdock-git-hook = {
     dependencies = ["flowdock" "gitlab-grit" "multi_json"];
@@ -1134,29 +925,20 @@
     version = "1.0.1";
   };
   gitlab-grit = {
-    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b";
-      type = "gem";
-    };
-    version = "2.7.3";
-  };
-  gitlab_emoji = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dy746icdmyc548mb5xkavvkn37pk7vv3gznx0p6hff325pan8dj";
+      sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
       type = "gem";
     };
-    version = "0.3.1";
+    version = "2.8.1";
   };
   gitlab_git = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0311dl4vh6h7k8xarmpr61fndrhbmfskzjzkkj1rr8321gn8znfv";
+      sha256 = "00l5dv4k6q21yzxnviqh5ab6i2i6ajzlyjbwm1vgag7663wscny6";
       type = "gem";
     };
-    version = "8.2.0";
+    version = "10.3.2";
   };
   gitlab_meta = {
     source = {
@@ -1185,22 +967,28 @@
     version = "0.3.6";
   };
   gollum-grit_adapter = {
-    dependencies = ["gitlab-grit"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7";
+      sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   gollum-lib = {
-    dependencies = ["github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm";
+      sha256 = "1q668c76gnyyyl8217gnblbj50plm7giacs5lgf7ix2rj8rdxzj7";
+      type = "gem";
+    };
+    version = "4.2.1";
+  };
+  gollum-rugged_adapter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qs5bzjnvk2269jaq7b7vxghhim50sswjf9fclqs33r8bym7zxk3";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "0.4.2";
   };
   gon = {
     dependencies = ["actionpack" "json" "multi_json" "request_store"];
@@ -1229,23 +1017,13 @@
     };
     version = "0.4.8";
   };
-  haml = {
-    dependencies = ["tilt"];
+  hamlit = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
+      sha256 = "00360fr2kq9f31p6mq965z0lpb16vhji3mzgkywcsxym1z9srvwm";
       type = "gem";
     };
-    version = "4.0.7";
-  };
-  haml-rails = {
-    dependencies = ["actionpack" "activesupport" "haml" "html2haml" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hbfznkxab663hxp1v6gpsa7sv6w1fnw9r8b3flixwylnwh3c5dz";
-      type = "gem";
-    };
-    version = "0.9.0";
+    version = "2.5.0";
   };
   hashie = {
     source = {
@@ -1255,21 +1033,13 @@
     };
     version = "3.4.3";
   };
-  highline = {
+  health_check = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      sha256 = "1jhm5342ngm2qfa1s6g0k09rszvb0h9jkxgda7dkwhg2v4cgj976";
       type = "gem";
     };
-    version = "1.7.8";
-  };
-  hike = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
-      type = "gem";
-    };
-    version = "1.2.3";
+    version = "2.1.0";
   };
   hipchat = {
     dependencies = ["httparty" "mimemagic"];
@@ -1289,23 +1059,13 @@
     };
     version = "1.11.0";
   };
-  html2haml = {
-    dependencies = ["erubis" "haml" "nokogiri" "ruby_parser"];
+  htmlentities = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "069zcy8lr010hn4qmbi8g5srdf69brk8nbgx4zcqcgbgsl4m8d4i";
+      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
       type = "gem";
     };
-    version = "2.0.0";
-  };
-  http-cookie = {
-    dependencies = ["domain_name"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw";
-      type = "gem";
-    };
-    version = "1.0.2";
+    version = "4.3.4";
   };
   "http_parser.rb" = {
     source = {
@@ -1348,14 +1108,6 @@
     };
     version = "0.11.1";
   };
-  inflecto = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
   influxdb = {
     dependencies = ["cause" "json"];
     source = {
@@ -1368,10 +1120,10 @@
   ipaddress = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sl0ldvhd6j0qbwhz18w24qy65mdj448b2vhgh2cwn7xrkksmv9l";
+      sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "0.8.3";
   };
   jquery-atwho-rails = {
     source = {
@@ -1382,22 +1134,12 @@
     version = "1.3.2";
   };
   jquery-rails = {
-    dependencies = ["rails-dom-testing" "railties" "thor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "028dv2n0r2r8qj1bqcbzmih0hwzh5km6cvscn2808v5gd44z48r1";
+      sha256 = "1asbrr9hqf43q9qbjf87f5lm7fp12pndh76z89ks6jwxf1350fj1";
       type = "gem";
     };
-    version = "4.0.5";
-  };
-  jquery-scrollto-rails = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12ic0zxw60ryglm1qjq5ralqd6k4jawmjj7kqnp1nkqds2nvinvp";
-      type = "gem";
-    };
-    version = "1.4.3";
+    version = "4.1.1";
   };
   jquery-turbolinks = {
     dependencies = ["railties" "turbolinks"];
@@ -1428,19 +1170,18 @@
   jwt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0is8973si98rsry5igqdag2jb1knj6jhmfkr9r4mc5n0yvgr5n2q";
+      sha256 = "0s5llb4mhpy0phzbrc4jd2jd2b91h1axy4bhci7g1bdz1w2m3a2i";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.5.4";
   };
   kaminari = {
-    dependencies = ["actionpack" "activesupport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14vx3kgssl4lv2kn6grr5v2whsynx5rbl1j9aqiq8nc3d7j74l67";
+      sha256 = "1n063jha143mw4fklpq5f4qs7saakx4s4ps1zixj0s5y8l9pam54";
       type = "gem";
     };
-    version = "0.16.3";
+    version = "0.17.0";
   };
   kgio = {
     source = {
@@ -1450,6 +1191,14 @@
     };
     version = "2.10.0";
   };
+  knapsack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z0bp5al0b8wyzw8ff99jwr6qsh5n52xqryvzvy2nbrma9qr7dam";
+      type = "gem";
+    };
+    version = "1.11.0";
+  };
   launchy = {
     dependencies = ["addressable"];
     source = {
@@ -1460,13 +1209,36 @@
     version = "2.4.3";
   };
   letter_opener = {
-    dependencies = ["launchy"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kzbmc686hfh4jznyckq6g40kn14nhb71znsjjm0rc13nb3n0c5l";
+      sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.4.1";
+  };
+  letter_opener_web = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "050x5cwqbxj2cydd2pzy9vfhmpgn1w6lfbwjaax1m1vpkn3xg9bv";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  license_finder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "092rwf1yjq1l63zbqanmbnbky8g5pj7c3g30mcqbyppbqrsflx80";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  licensee = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "013wrp4sampgypx9ar48cv4ai487l2bg8a2b2z6srd77najf70gr";
+      type = "gem";
+    };
+    version = "8.0.0";
   };
   listen = {
     dependencies = ["rb-fsevent" "rb-inotify"];
@@ -1496,21 +1268,20 @@
     version = "1.7.1";
   };
   mail = {
-    dependencies = ["mime-types"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
+      sha256 = "0c9vqfy0na9b5096i5i4qvrvhwamjnmajhgqi3kdsdfl8l6agmkp";
       type = "gem";
     };
-    version = "2.6.3";
+    version = "2.6.4";
   };
   mail_room = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jpybhgw9yi50g422qvnwadn5jnj563vh70qaml5cxzdqxbd7fj1";
+      sha256 = "00jaj42z6rhgpxprs7wb0a9gq33zsfalah3ddpynxldij5iz8mg0";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.8.0";
   };
   method_source = {
     source = {
@@ -1523,10 +1294,10 @@
   mime-types = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+      sha256 = "06lnv0w9j45llai5qhvc1m7w409j5lhnssdzkvv6yw49d632jxkz";
       type = "gem";
     };
-    version = "1.25.1";
+    version = "2.99.2";
   };
   mimemagic = {
     source = {
@@ -1563,10 +1334,10 @@
   multi_json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
+      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
       type = "gem";
     };
-    version = "1.11.2";
+    version = "1.12.1";
   };
   multi_xml = {
     source = {
@@ -1616,14 +1387,6 @@
     };
     version = "3.0.1";
   };
-  netrc = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
-      type = "gem";
-    };
-    version = "0.11.0";
-  };
   newrelic_rpm = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1633,7 +1396,6 @@
     version = "3.14.1.311";
   };
   nokogiri = {
-    dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
@@ -1641,13 +1403,13 @@
     };
     version = "1.6.7.2";
   };
-  nprogress-rails = {
+  numerizer = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ylq2208i95661ba0p1ng2i38z4978ddwiidvpb614amfdq5pqvn";
+      sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h";
       type = "gem";
     };
-    version = "0.1.6.7";
+    version = "0.1.1";
   };
   oauth = {
     source = {
@@ -1658,21 +1420,20 @@
     version = "0.4.7";
   };
   oauth2 = {
-    dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zaa7qnvizv363apmxx9vxa8f6c6xy70z0jm0ydx38xvhxr8898r";
+      sha256 = "0z25sx8i82wczzhv6xr4g3zi3ik6fr8qr9n7r96gd65fdlw5ka93";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.2.0";
   };
   octokit = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vmknh0vz1g734q32kgpxv0qwz9ifmnw2jfpd2w5rrk6xwq1k7a8";
+      sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np";
       type = "gem";
     };
-    version = "3.8.0";
+    version = "4.3.0";
   };
   omniauth = {
     source = {
@@ -1682,6 +1443,14 @@
     };
     version = "1.3.1";
   };
+  omniauth-auth0 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dhfl01519q1cp4w0ml481j1cg05g7qvam0x4ia9jhdz8yx6npfs";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
   omniauth-azure-oauth2 = {
     dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
     source = {
@@ -1737,13 +1506,12 @@
     version = "1.0.1";
   };
   omniauth-google-oauth2 = {
-    dependencies = ["addressable" "jwt" "multi_json" "omniauth" "omniauth-oauth2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lm4fk6ig9vwzv7398qd861325g678sfr1iv2mm60xswl69964fi";
+      sha256 = "1m6v2vm3h21ychd10wzkdhyhnrk9zhc1bgi4ahp5gwy00pggrppw";
       type = "gem";
     };
-    version = "0.2.10";
+    version = "0.4.1";
   };
   omniauth-kerberos = {
     dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
@@ -1784,10 +1552,10 @@
   omniauth-saml = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c7pypskq9y6wbl7c8gnp48j256snph11br3csgwvy9whjfisx65";
+      sha256 = "0xs7v08s34s2bpyd3i8i8kj73zqb6wgn51ix3pmcwsifns0c8npr";
       type = "gem";
     };
-    version = "1.4.2";
+    version = "1.6.0";
   };
   omniauth-shibboleth = {
     dependencies = ["omniauth"];
@@ -1843,13 +1611,12 @@
     version = "2.1.4";
   };
   parser = {
-    dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14db0gam24j04iprqz4m3hxygkb8h0plnbm0yk4k3lzq6j5wzcac";
+      sha256 = "0fxcs83z28wxn6bphbq5q40c1y5ab8zl8ww17jwkbi032wf6iik6";
       type = "gem";
     };
-    version = "2.2.3.0";
+    version = "2.3.1.2";
   };
   pg = {
     source = {
@@ -1859,14 +1626,21 @@
     };
     version = "0.18.4";
   };
+  pkg-config = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lljiqnm0b4z6iy87lzapwrdfa6ps63x2z5zbs038iig8dqx2g0z";
+      type = "gem";
+    };
+    version = "1.1.7";
+  };
   poltergeist = {
-    dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ppm4isvbxm739508yjhvisq1iwp1q6h8dx4hkndj2krskavz4i9";
+      sha256 = "1fnkly1ks31nf5cdks9jd5c5vynbanrr8pwp801qq2i8bg78rwc0";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.9.0";
   };
   posix-spawn = {
     source = {
@@ -1884,6 +1658,22 @@
     };
     version = "0.1.1";
   };
+  premailer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xhi427j99rgaxf5ga8rairicgbyc1bdky9ipbsw0sy0alv93346";
+      type = "gem";
+    };
+    version = "1.8.6";
+  };
+  premailer-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h2ls42bnqirim2j1blwqa0dk5lhdh6qvczpqilm6n90c2zq3xwx";
+      type = "gem";
+    };
+    version = "1.9.2";
+  };
   pry = {
     dependencies = ["coderay" "method_source" "slop"];
     source = {
@@ -1910,15 +1700,6 @@
     };
     version = "0.0.3.3";
   };
-  quiet_assets = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q4azw4j1xsgd7qwcig110mfdn1fm0y34y87zw9j9v187xr401b1";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1990,13 +1771,12 @@
     version = "0.6.3";
   };
   rails = {
-    dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "aa93c1b9eb8b535eee58280504e30237f88217699fe9bb016e458e5122eefa2e";
+      sha256 = "033wfvqjzlzkm0nrqrjpxxrp0lwhfm8sjlxn5zdhxhkzmhibrnvn";
       type = "gem";
     };
-    version = "4.2.5.2";
+    version = "4.2.7";
   };
   rails-deprecated_sanitizer = {
     dependencies = ["activesupport"];
@@ -2026,21 +1806,20 @@
     version = "1.0.3";
   };
   railties = {
-    dependencies = ["actionpack" "activesupport" "rake" "thor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "cfff64cbc0e409341003c35fa2e576e6a8cd8259a9894d09f15c6123be73f146";
+      sha256 = "0psnr9g436k2fkkjlhs7mq090i7vh0cvh7qwwrb8ppzbcr15hhab";
       type = "gem";
     };
-    version = "4.2.5.2";
+    version = "4.2.7";
   };
   rainbow = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dsnzfjiih2w8npsjab3yx1ssmmvmgjkbxny0i9yzrdy7whfw7b4";
+      sha256 = "11licivacvfqbjx2rwppi8z89qff2cgs67d4wyx42pc5fg7g9f00";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.1.0";
   };
   raindrops = {
     source = {
@@ -2058,14 +1837,6 @@
     };
     version = "10.5.0";
   };
-  raphael-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0sjiaymvfn4al5dr1pza5i142byan0fxnj4rymziyql2bzvdm2bc";
-      type = "gem";
-    };
-    version = "2.1.2";
-  };
   rb-fsevent = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2102,13 +1873,12 @@
     version = "3.12.2";
   };
   recaptcha = {
-    dependencies = ["json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "190qqklirmi31s6ih7png4h9xmx1p5h2n5fi45z90y8hsp5w1sh1";
+      sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "3.0.0";
   };
   redcarpet = {
     source = {
@@ -2121,10 +1891,10 @@
   RedCloth = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
+      sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
       type = "gem";
     };
-    version = "4.2.9";
+    version = "4.3.2";
   };
   redis = {
     source = {
@@ -2191,10 +1961,10 @@
   request_store = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01rxi2hw84y133z0r91jns4aaywd8d83wjq0xgb42iaicf0a90p9";
+      sha256 = "1vw3vkgnpbpgzc1b4cg2ifn3rb5w7bvk62x9jfy9laz40816nvkn";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.3.0";
   };
   rerun = {
     dependencies = ["listen"];
@@ -2214,38 +1984,29 @@
     };
     version = "2.1.1";
   };
-  rest-client = {
-    dependencies = ["http-cookie" "mime-types" "netrc"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
-      type = "gem";
-    };
-    version = "1.8.0";
-  };
   rinku = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jh6nys332brph55i6x6cil6swm086kxjw34wq131nl6mwryqp7b";
+      sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y";
       type = "gem";
     };
-    version = "1.7.3";
+    version = "2.0.0";
   };
   rotp = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nzsc9hfxijnyzjbv728ln9dm80bc608chaihjdk63i2wi4m529g";
+      sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d";
       type = "gem";
     };
-    version = "2.1.1";
+    version = "2.1.2";
   };
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
+      sha256 = "07nda5cfrxxizcd4ff7ad8z3i0j9jaff8q7q6ddpxcj0s80nvvpi";
       type = "gem";
     };
-    version = "1.10.1";
+    version = "2.0.5";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -2266,66 +2027,76 @@
     version = "0.1.7";
   };
   rspec = {
-    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bn5zs71agc0zyns2r3c8myi5bxw3q7xnzp7f3v5b7hbil1qym4r";
+      sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.5.0";
   };
   rspec-core = {
-    dependencies = ["rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xw5qi936j6nz9fixi2mwy03f406761cd72bzyvd61pr854d7hy1";
+      sha256 = "03m0pn5lwlix094khfwlv50n963p75vjsg6w2g0b3hqcvvlch1mx";
       type = "gem";
     };
-    version = "3.3.2";
+    version = "3.5.0";
   };
   rspec-expectations = {
-    dependencies = ["diff-lcs" "rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d0b5hpkxlr9f3xpsbhvl3irnk4smmycx2xnmc8qv3pqaa7mb7ah";
+      sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.5.0";
   };
   rspec-mocks = {
-    dependencies = ["diff-lcs" "rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lfbzscmpyixlbapxmhy2s69596vs1z00lv590l51hgdw70z92vg";
+      sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24";
       type = "gem";
     };
-    version = "3.3.2";
+    version = "3.5.0";
   };
   rspec-rails = {
-    dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m66n9p3a7d3fmrzkbh8312prb6dhrgmp53g1amck308ranasv2a";
+      sha256 = "0zzd75v8vpa1r30j3hsrprza272rcx54hb0klwpzchr9ch6c9z2a";
       type = "gem";
     };
-    version = "3.3.3";
+    version = "3.5.0";
+  };
+  rspec-retry = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0izvxab7jvk25kaprk0i72asjyh1ip3cm70bgxlm8lpid35qjar6";
+      type = "gem";
+    };
+    version = "0.4.5";
   };
   rspec-support = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cyagig8slxjas8mbg5f8bl240b8zgr8mnjsvrznag1fwpkh4h27";
+      sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.5.0";
   };
   rubocop = {
-    dependencies = ["astrolabe" "parser" "powerpack" "rainbow" "ruby-progressbar" "tins"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1grqda2fdknm43zyagh8gcmnhjkypyfw98q92hmvprprwghkq2sg";
+      sha256 = "02adr908a9l8nhdfjz137i20w1dv8mbfiamy0m9z9q0fvslfdxly";
       type = "gem";
     };
-    version = "0.35.1";
+    version = "0.41.2";
+  };
+  rubocop-rspec = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11701iw858vkxmb6khc9apmagz3lmnbdxm8irsxsgg57d0p8bs8p";
+      type = "gem";
+    };
+    version = "1.5.0";
   };
   ruby-fogbugz = {
     dependencies = ["crack"];
@@ -2339,36 +2110,26 @@
   ruby-progressbar = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
+      sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm";
       type = "gem";
     };
-    version = "1.7.5";
+    version = "1.8.1";
   };
   ruby-saml = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "151jbak16y87dbj3ma2nc03rh37z7lixcwgaqahncq80rgnv45a8";
+      sha256 = "0qhma3cdmi9acpsn6r3x5mjjgfqxkhzxgy2pd3bc6rddghpa3x5l";
       type = "gem";
     };
-    version = "1.1.1";
-  };
-  ruby2ruby = {
-    dependencies = ["ruby_parser" "sexp_processor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kmc0503s9mqnjyypx51wsi6zz9zj550ch43rag23wpj4qd6i6pm";
-      type = "gem";
-    };
-    version = "2.2.0";
+    version = "1.3.0";
   };
   ruby_parser = {
-    dependencies = ["sexp_processor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rip6075b4k5a7s8w2klwc3jaqx31h69k004ac5nhl8y0ja92qvz";
+      sha256 = "0wr15wjkvq4wcm2ia3ajfxqwwd5szzpvnrbbq3c2bnd9g7ghqq0c";
       type = "gem";
     };
-    version = "3.7.2";
+    version = "3.8.2";
   };
   rubyntlm = {
     source = {
@@ -2386,6 +2147,14 @@
     };
     version = "0.2.0";
   };
+  rubyzip = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
   rufus-scheduler = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2397,10 +2166,10 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v0cvdw8cgy1hf5h3cx796zpxhbad8d5cm50nykyhwjc00q80zrr";
+      sha256 = "0fnldbha5npdapij6xhrm7qj5qicnswrcfxa5dbk7wjaq482gh6r";
       type = "gem";
     };
-    version = "0.24.0b13";
+    version = "0.24.0";
   };
   safe_yaml = {
     source = {
@@ -2422,28 +2191,34 @@
   sass = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf";
+      sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
       type = "gem";
     };
-    version = "3.4.20";
+    version = "3.4.22";
   };
   sass-rails = {
-    dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f6357vw944w2ayayqmz8ai9myl6xbnry06sx5b5ms4r9lny8hj8";
+      sha256 = "1ag66qa1f4agghdmnmn199s4sp7x54msa3abs31vl89ncbdf933i";
       type = "gem";
     };
-    version = "5.0.4";
+    version = "5.0.5";
   };
   sawyer = {
-    dependencies = ["addressable" "faraday"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fk43bzwn816qj1ksiicm2i1kmzv5675cmnvk57kmfmi4rfsyjpy";
+      sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.7.0";
+  };
+  scss_lint = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0q6yankh4ay4fqz7s19p2r2nqhzv93gihc5c6xnqka3ch1z6v9fv";
+      type = "gem";
+    };
+    version = "0.47.1";
   };
   sdoc = {
     dependencies = ["json" "rdoc"];
@@ -2455,13 +2230,12 @@
     version = "0.3.20";
   };
   seed-fu = {
-    dependencies = ["activerecord" "activesupport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11xja82yxir1kwccrzng29h7w911i9j0xj2y7y949yqnw91v12vw";
+      sha256 = "1nkp1pvkdydclbl2v4qf9cixmiycvlqnrgxd61sv9r85spb01z3p";
       type = "gem";
     };
-    version = "2.3.5";
+    version = "2.3.6";
   };
   select2-rails = {
     dependencies = ["thor"];
@@ -2475,10 +2249,10 @@
   sentry-raven = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0iqnwfmf6rnpgrvl3c8gh2gkix91nhm21j5qf389g4mi2rkc0ky8";
+      sha256 = "0fjfq3hkfv3a415mk6cjwknnxg9d71x0b8x7szgbwhyqa8ahj3j3";
       type = "gem";
     };
-    version = "0.15.6";
+    version = "1.1.0";
   };
   settingslogic = {
     source = {
@@ -2491,10 +2265,10 @@
   sexp_processor = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gxlcpg81wfjf5gpggf8h6l2dbq3ikgavbrr2yfw3m2vqy88yjg2";
+      sha256 = "0gs57v3gvbh83cknzkq20giqygdzhhbm7s7i7kxramf945diyfln";
       type = "gem";
     };
-    version = "4.6.0";
+    version = "4.7.0";
   };
   sham_rack = {
     dependencies = ["rack"];
@@ -2515,13 +2289,12 @@
     version = "2.8.0";
   };
   sidekiq = {
-    dependencies = ["concurrent-ruby" "connection_pool" "json" "redis"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x7jfc2va0x6fcfffdf0wdiyk4krjw8053jzwffa63wkqr5jvg3y";
+      sha256 = "0j0yz9fv79d7sasz7lsrb9fnymxg58jpykgr58r73nv2v8nsx1nm";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "4.1.4";
   };
   sidekiq-cron = {
     dependencies = ["redis-namespace" "rufus-scheduler" "sidekiq"];
@@ -2541,13 +2314,12 @@
     version = "0.1.9";
   };
   simplecov = {
-    dependencies = ["docile" "json" "simplecov-html"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1q2iq2vgrdvvla5y907gkmqx6ry2qvnvc7a90hlcbwgp1w0sv6z4";
+      sha256 = "1p0jhxwsv2ksk4hmp8qbhnr325z9fhs26z9y8in5v5c49y331qw2";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.11.2";
   };
   simplecov-html = {
     source = {
@@ -2558,13 +2330,12 @@
     version = "0.10.0";
   };
   sinatra = {
-    dependencies = ["rack" "rack-protection" "tilt"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7";
+      sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp";
       type = "gem";
     };
-    version = "1.4.6";
+    version = "1.4.7";
   };
   six = {
     source = {
@@ -2582,15 +2353,6 @@
     };
     version = "1.2.1";
   };
-  slim = {
-    dependencies = ["temple" "tilt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k";
-      type = "gem";
-    };
-    version = "3.0.6";
-  };
   slop = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2617,13 +2379,21 @@
     };
     version = "0.2.1";
   };
+  spinach-rerun-reporter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fkmp99cpxrdzkjrxw9y9qp8qxk5d1arpmmlg5njx40rlcvx002k";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
   spring = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xvz2x6nvza5i53p7mddnf11j2wshqmbaphi6ngd6nar8v35y0k1";
+      sha256 = "17clm28dp140rw3761z9g8kjnnlpv9nv4flvpryhaasihjvjgfy1";
       type = "gem";
     };
-    version = "1.3.6";
+    version = "1.7.2";
   };
   spring-commands-rspec = {
     dependencies = ["spring"];
@@ -2635,13 +2405,12 @@
     version = "1.0.4";
   };
   spring-commands-spinach = {
-    dependencies = ["spring"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "138jardqyj96wz68njdgy55qjbpl2d0g8bxbkz97ndaz3c2bykv9";
+      sha256 = "12qa60sclhnclwi6lskhdgr1l007bca831vhp35f06hq1zmimi2x";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.1.0";
   };
   spring-commands-teaspoon = {
     dependencies = ["spring"];
@@ -2653,22 +2422,20 @@
     version = "0.0.2";
   };
   sprockets = {
-    dependencies = ["hike" "multi_json" "rack" "tilt"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15818683yz27w4hgywccf27n91azy9a4nmb5qkklzb08k8jw9gp3";
+      sha256 = "0flynmaaxa53pv15x7kcxr7z6h1hn7ifrxk13dfhhvh6h38jnzkv";
       type = "gem";
     };
-    version = "2.12.4";
+    version = "3.6.3";
   };
   sprockets-rails = {
-    dependencies = ["actionpack" "activesupport" "sprockets"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vsl6ryxdjpp97nl4ghhk1v6p50zh3sx9qv81bhmlffc234r91wn";
+      sha256 = "1sak0as7ka964f6zjb1w8hkvfkkbf55kpcyvh7k6nyrb6pqnwmnf";
       type = "gem";
     };
-    version = "2.3.3";
+    version = "3.1.1";
   };
   state_machines = {
     source = {
@@ -2679,22 +2446,20 @@
     version = "0.4.0";
   };
   state_machines-activemodel = {
-    dependencies = ["activemodel" "state_machines"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bshcm53v2vfpapvhws1h0dq1h4f3p6bvpdkjpydb52a3m0w2z0y";
+      sha256 = "0p6560jsb4flapd1vbc50bqjk6dzykkwbmyivchyjh5ncynsdb8v";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.4.0";
   };
   state_machines-activerecord = {
-    dependencies = ["activerecord" "state_machines-activemodel"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10dplkn4cm49xby8s0sn7wxww4hnxi4dgikfsmhp1rbsa24d76vx";
+      sha256 = "0x5wx1s2i3qc4p2knkf2n9h8b49pla9rjidkwxqzi781qm40wdxx";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.4.0";
   };
   stringex = {
     source = {
@@ -2704,6 +2469,14 @@
     };
     version = "2.5.2";
   };
+  sys-filesystem = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq";
+      type = "gem";
+    };
+    version = "1.1.6";
+  };
   systemu = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2722,13 +2495,12 @@
     version = "1.0.2";
   };
   teaspoon = {
-    dependencies = ["railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cprz18vgf0jgcggcxf4pwx8jcwbiyj1p0dnck5aavlvaxaic58s";
+      sha256 = "1xz5f1w8jm2fg1g194kf17gh36imd7sgs9cx0adqx1l22p7jrkvv";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.1.5";
   };
   teaspoon-jasmine = {
     dependencies = ["teaspoon"];
@@ -2742,27 +2514,10 @@
   temple = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0";
-      type = "gem";
-    };
-    version = "0.7.6";
-  };
-  term-ansicolor = {
-    dependencies = ["tins"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
+      sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6";
       type = "gem";
     };
-    version = "1.3.2";
-  };
-  terminal-table = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s6qyj9ir1agbbi32li9c0c34dcl0klyxqif6mxy0dbvq7kqfp8f";
-      type = "gem";
-    };
-    version = "1.5.2";
+    version = "0.7.7";
   };
   test_after_commit = {
     dependencies = ["activerecord"];
@@ -2774,13 +2529,12 @@
     version = "0.4.2";
   };
   thin = {
-    dependencies = ["daemons" "eventmachine" "rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pyc602sa8fqwjyssn9yvf3fqrr14jk7hj9hsjlan1mq4zvim1lf";
+      sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q";
       type = "gem";
     };
-    version = "1.6.4";
+    version = "1.7.0";
   };
   thor = {
     source = {
@@ -2801,10 +2555,18 @@
   tilt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
+      sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "2.0.5";
+  };
+  timecop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vwbkwqyxhavzvr1820hqwz43ylnfcf6w4x6sag0nghi44sr9kmx";
+      type = "gem";
+    };
+    version = "0.8.1";
   };
   timfel-krb5-auth = {
     source = {
@@ -2823,14 +2585,6 @@
     };
     version = "1.10.1";
   };
-  tins = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
   turbolinks = {
     dependencies = ["coffee-rails"];
     source = {
@@ -2858,6 +2612,14 @@
     };
     version = "1.2.2";
   };
+  u2f = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
   uglifier = {
     dependencies = ["execjs" "json"];
     source = {
@@ -2887,19 +2649,26 @@
   unf_ext = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b";
+      sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8";
       type = "gem";
     };
-    version = "0.0.7.1";
+    version = "0.0.7.2";
+  };
+  unicode-display_width = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "194d70pfxq4d7rrk0vsk1dvj46ns2f350308khi7q5cvnmg3h1xs";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   unicorn = {
-    dependencies = ["kgio" "rack" "raindrops"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kpg2vikx2hxdyrl45bqcr89a0w59hfw7yn7xh87bmlczi34xds4";
+      sha256 = "02xgk7gajnp8zqd2wvk1hbbwz7czlbpk29ahs9ph0jprsssnzzrv";
       type = "gem";
     };
-    version = "4.8.3";
+    version = "4.9.0";
   };
   unicorn-worker-killer = {
     dependencies = ["get_process_mem" "unicorn"];
@@ -2944,23 +2713,29 @@
     };
     version = "1.0.5";
   };
+  vmstat = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02yf9y7050zk1k7mn7dkp81wwa220kpkpdnlv4bg5mp65w33g5jf";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
   warden = {
-    dependencies = ["rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1iyxw1ms3930dh7vcrfyi4ifpdbkfsr8k7fzjryva0r7k3c71gb7";
+      sha256 = "04gpmnvkp312wxmsvvbq834iyab58vjmh6w4x4qpgh4p1lzkiq1l";
       type = "gem";
     };
-    version = "1.2.4";
+    version = "1.2.6";
   };
   web-console = {
-    dependencies = ["activemodel" "binding_of_caller" "railties" "sprockets-rails"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13rwps8m76j45iqhggm810j78i8bg4nqzgi8k7amxplik2zm5blf";
+      sha256 = "0f8mgdjnkwb2gmnd73hnlx8p2clzvpz007alhsglqgylpj6m20jk";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.3.0";
   };
   webmock = {
     dependencies = ["addressable" "crack"];
diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch
index 0d5c1749e83..92a3cb55e4d 100644
--- a/pkgs/applications/version-management/gitlab/nulladapter.patch
+++ b/pkgs/applications/version-management/gitlab/nulladapter.patch
@@ -1,29 +1,70 @@
-index acd1874..f493451 100644
+diff --git a/Gemfile b/Gemfile
+index 92e666c..f97c991 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -318,3 +318,5 @@ gem 'oauth2', '~> 1.0.0'
+@@ -117,7 +117,7 @@ gem 'rouge',         '~> 2.0'
  
- # Soft deletion
- gem "paranoia", "~> 2.0"
+ # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
+ # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
+-gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
++gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8'
+ 
+ # Diffs
+ gem 'diffy', '~> 3.0.3'
+@@ -349,3 +349,5 @@ gem 'health_check', '~> 2.1.0'
+ # System information
+ gem 'vmstat', '~> 2.1.1'
+ gem 'sys-filesystem', '~> 1.1.6'
 +
 +gem "activerecord-nulldb-adapter"
-index 14d2c76..7a010f0 100644
+diff --git a/Gemfile.lock b/Gemfile.lock
+index e2b3d55..23a5454 100644
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
-@@ -34,6 +34,8 @@ GEM
-       activesupport (= 4.2.5.1)
+@@ -32,6 +32,8 @@ GEM
+       activemodel (= 4.2.7)
+       activesupport (= 4.2.7)
        arel (~> 6.0)
-     activerecord-deprecated_finders (1.0.4)
-+    activerecord-nulldb-adapter (0.3.2)
++    activerecord-nulldb-adapter (0.3.3)
 +      activerecord (>= 2.0.0)
-     activerecord-session_store (0.1.2)
-       actionpack (>= 4.0.0, < 5)
-       activerecord (>= 4.0.0, < 5)
-@@ -880,6 +882,7 @@ DEPENDENCIES
-   RedCloth (~> 4.2.9)
-   ace-rails-ap (~> 2.0.1)
-   activerecord-deprecated_finders (~> 1.0.3)
+     activerecord-session_store (1.0.0)
+       actionpack (>= 4.0, < 5.1)
+       activerecord (>= 4.0, < 5.1)
+@@ -390,7 +392,7 @@ GEM
+     method_source (0.8.2)
+     mime-types (2.99.2)
+     mimemagic (0.3.0)
+-    mini_portile2 (2.1.0)
++    mini_portile2 (2.0.0)
+     minitest (5.7.0)
+     mousetrap-rails (1.4.6)
+     multi_json (1.12.1)
+@@ -401,9 +403,8 @@ GEM
+     net-ldap (0.12.1)
+     net-ssh (3.0.1)
+     newrelic_rpm (3.14.1.311)
+-    nokogiri (1.6.8)
+-      mini_portile2 (~> 2.1.0)
+-      pkg-config (~> 1.1.7)
++    nokogiri (1.6.7.2)
++      mini_portile2 (~> 2.0.0.rc2)
+     numerizer (0.1.1)
+     oauth (0.4.7)
+     oauth2 (1.2.0)
+@@ -803,6 +803,7 @@ PLATFORMS
+ DEPENDENCIES
+   RedCloth (~> 4.3.2)
+   ace-rails-ap (~> 4.0.2)
 +  activerecord-nulldb-adapter
-   activerecord-session_store (~> 0.1.0)
+   activerecord-session_store (~> 1.0.0)
    acts-as-taggable-on (~> 3.4)
    addressable (~> 2.3.8)
+@@ -894,7 +895,7 @@ DEPENDENCIES
+   nested_form (~> 0.3.2)
+   net-ssh (~> 3.0.1)
+   newrelic_rpm (~> 3.14)
+-  nokogiri (~> 1.6.7, >= 1.6.7.2)
++  nokogiri (~> 1.6.7, >= 1.6.7.2, < 1.6.8)
+   oauth2 (~> 1.2.0)
+   octokit (~> 4.3.0)
+   omniauth (~> 1.3.1)
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index fbf5a05fc4e..a8a0542a882 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -1,8 +1,8 @@
 diff --git a/config/environments/production.rb b/config/environments/production.rb
-index 9095266..694a4c5 100644
+index a9d8ac4..85f13f5 100644
 --- a/config/environments/production.rb
 +++ b/config/environments/production.rb
-@@ -67,10 +67,10 @@ Rails.application.configure do
+@@ -70,14 +70,16 @@ Rails.application.configure do
  
    config.action_mailer.delivery_method = :sendmail
    # Defaults to:
@@ -17,11 +17,17 @@ index 9095266..694a4c5 100644
    config.action_mailer.perform_deliveries = true
    config.action_mailer.raise_delivery_errors = true
  
+   config.eager_load = true
+ 
+   config.allow_concurrency = false
++
++  config.active_record.dump_schema_after_migration = false
+ end
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 05f127d..6a4ae68 100644
+index 1470a6e..1b2660d 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
-@@ -423,7 +423,7 @@ production: &base
+@@ -476,7 +476,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
@@ -30,6 +36,28 @@ index 05f127d..6a4ae68 100644
      # The next value is the maximum memory size grit can use
      # Given in number of bytes per git object (e.g. a commit)
      # This value can be increased if you have very large commits
+diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
+index 86f5521..3bf006b 100644
+--- a/config/initializers/1_settings.rb
++++ b/config/initializers/1_settings.rb
+@@ -192,7 +192,7 @@ Settings.gitlab['user']       ||= 'git'
+ Settings.gitlab['user_home']  ||= begin
+   Etc.getpwnam(Settings.gitlab['user']).dir
+ rescue ArgumentError # no user configured
+-  '/home/' + Settings.gitlab['user']
++  '/homeless-shelter'
+ end
+ Settings.gitlab['time_zone'] ||= nil
+ Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
+@@ -350,7 +350,7 @@ Settings.backup['upload']['encryption'] ||= nil
+ #
+ Settings['git'] ||= Settingslogic.new({})
+ Settings.git['max_size']  ||= 20971520 # 20.megabytes
+-Settings.git['bin_path']  ||= '/usr/bin/git'
++Settings.git['bin_path']  ||= 'git'
+ Settings.git['timeout']   ||= 10
+ 
+ # Important: keep the satellites.path setting until GitLab 9.0 at
 diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
 index 59b2114..4f4a39a 100644
 --- a/lib/gitlab/logger.rb
@@ -72,7 +100,7 @@ index be8fcc7..7642d74 100644
    end
  end
 diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
-index d59872d..0b8007f 100644
+index 60f4636..157641f 100644
 --- a/lib/tasks/gitlab/check.rake
 +++ b/lib/tasks/gitlab/check.rake
 @@ -223,7 +223,7 @@ namespace :gitlab do
@@ -83,23 +111,22 @@ index d59872d..0b8007f 100644
 +      log_path = ENV["GITLAB_LOG_PATH"]
  
        if File.writable?(log_path)
-         puts "yes".green
-@@ -263,10 +263,12 @@ namespace :gitlab do
+         puts "yes".color(:green)
+@@ -263,10 +263,11 @@ namespace :gitlab do
      def check_uploads
        print "Uploads directory setup correctly? ... "
  
 -      unless File.directory?(Rails.root.join('public/uploads'))
 +      uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
-+
 +      unless File.directory?(uploads_dir)
-         puts "no".red
+         puts "no".color(:red)
          try_fixing_it(
 -          "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
 +          "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
          )
          for_more_information(
            see_installation_guide_section "GitLab"
-@@ -275,7 +277,7 @@ namespace :gitlab do
+@@ -275,7 +276,7 @@ namespace :gitlab do
          return
        end
  
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index e33ce9361ad..f5a6991dc80 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.11.0";
+  version = "1.12.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "05lm9grckbyjmv1292v00vw4h3nv6r7gmq04zhahcjyw7crx06sv";
+      sha256 = "0fkjhmssxyx2q699zcif5fvnpcs50l9pqrvy680dw670wsl3b7s7";
   };
 
   stage1BaseImage = fetchurl {
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 39eb0586f7b..09c36835dad 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -3,7 +3,7 @@
 , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
 , metacity
 , libstartup_notification, libpthreadstubs, libxcb, intltool
-, ORBit2, libXau
+, ORBit2, libXau, libICE, libSM
 , dbus, dbus_glib, librsvg, mesa
 , libXdmcp, libnotify, python
 , hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus
@@ -15,18 +15,18 @@ let
   s = # Generated upstream information
   rec {
     baseName="compiz";
-    version="0.9.12.2";
+    version="0.9.13.0";
     name="${baseName}-${version}";
-    hash="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9";
-    url="https://launchpad.net/compiz/0.9.12/0.9.12.2/+download/compiz-0.9.12.2.tar.bz2";
-    sha256="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9";
+    hash="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph";
+    url="https://launchpad.net/compiz/0.9.13/0.9.13.0/+download/compiz-0.9.13.0.tar.bz2";
+    sha256="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph";
   };
   buildInputs = [cmake pkgconfig
     libXrender renderproto gtk libwnck pango cairo
     GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
     metacity
     libpthreadstubs libxcb intltool
-    ORBit2 libXau
+    ORBit2 libXau libICE libSM
     dbus dbus_glib librsvg mesa
     libXdmcp libnotify python
     hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index dd7f89b2a8d..378001528b1 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk
-, i3lock-color
+, i3lock-color, getopt, fontconfig
 }:
 
 stdenv.mkDerivation rec {
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock
     sed -i -e 's|ICON="$SCRIPTPATH/lockdark.png"|ICON="'$out'/share/i3lock-fancy/lockdark.png"|' lock
     sed -i -e 's|ICON="$SCRIPTPATH/lock.png"|ICON="'$out'/share/i3lock-fancy/lock.png"|' lock
+    sed -i -e "s|getopt |${getopt}/bin/getopt |" lock
+    sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock
   '';
   installPhase = ''
     mkdir -p $out/bin $out/share/i3lock-fancy
diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
index 9396ace84f1..1bdda969653 100644
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh
@@ -7,7 +7,7 @@ mkdir $out/nix-support
 # Force gcc to use ld-wrapper.sh when calling ld.
 cflagsCompile="-B$out/bin/"
 
-if test -z "$nativeLibc"; then
+if test -z "$nativeLibc" -a -n "$libc"; then
     cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc/include"
     ldflags="$ldflags -L$libc/lib"
     # Get the proper dynamic linker for glibc and uclibc. 
diff --git a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
index b66001073f2..fe439c5d11e 100644
--- a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
+++ b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh
@@ -9,7 +9,7 @@ SF_version_dir () {
 }
 
 SF_version_tarball () {
-  version_link '[.]tar[.].*/download$'
+  version_link "${1:-[.]tar[.]}.*/download\$"
 }
 
 GH_latest () {
diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix
index d44517247dd..93c4a55d49e 100644
--- a/pkgs/data/fonts/baekmuk-ttf/default.nix
+++ b/pkgs/data/fonts/baekmuk-ttf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "baekmuk-ttf-2.2";
 
   src = fetchurl {
-    url = "http://kldp.net/frs/download.php/1429/${name}.tar.gz";
+    url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
     sha256 = "08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882";
   };
 
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 3c38be90ded..f49f5c9bb00 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -1,37 +1,21 @@
-{fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}:
+{fetchFromGitHub, stdenv, fontforge, perl, FontTTF}:
 
-let version = "2.35" ; in
+let version = "2.37" ; in
 
 stdenv.mkDerivation rec {
   name = "dejavu-fonts-${version}";
-  #fontconfig is needed only for fc-lang (?)
   buildInputs = [fontforge perl FontTTF];
 
-  unicodeData = fetchurl {
-    url = http://www.unicode.org/Public/6.1.0/ucd/UnicodeData.txt ;
-    sha256 = "1bd6zkzvxfnifrn5nh171ywk7q56sgk8gdvdn43z9i53hljjcrih";
-  };
-  blocks = fetchurl {
-    url = http://www.unicode.org/Public/6.1.0/ucd/Blocks.txt;
-    sha256 = "0w0vkb09nrlc6mrhqyl9npszdi828afgvhvlb1vs5smjv3h8y3dz";
-  };
-
-  src = fetchurl {
-    url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2";
-    sha256 = "1xdbi4llrq1qbkd73352ibrfqcbz93dww8hab216qz5szd95yvv4";
+  src = fetchFromGitHub {
+    owner = "dejavu-fonts";
+    repo = "dejavu-fonts";
+    rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk";
   };
 
   buildFlags = "full-ttf";
 
-  preBuild = ''
-    sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/*
-    sed -e s@/usr/bin/perl@$(type -tP perl)@ -i scripts/*
-    mkdir resources
-    tar xf ${fontconfig.src} --wildcards '*/fc-lang'
-    ln -s $PWD/fontconfig-*/fc-lang -t resources/
-    ln -s ${unicodeData} resources/UnicodeData.txt
-    ln -s ${blocks} resources/Blocks.txt
-  '';
+  preBuild = "patchShebangs scripts";
 
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
@@ -41,6 +25,22 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
+    description = "A typeface family based on the Bitstream Vera fonts";
+    longDescription = ''
+      The DejaVu fonts are TrueType fonts based on the BitStream Vera fonts,
+      providing more styles and with greater coverage of Unicode.
+
+      This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and
+      the TeX Gyre DejaVu Math font.
+    '';
+    homepage = http://dejavu-fonts.org/wiki/Main_Page;
+
+    # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
+    # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+    # DejaVu changes are in public domain
+    # See http://dejavu-fonts.org/wiki/License for details
+    license = stdenv.lib.licenses.free;
+
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix
index 35c53659c6e..28bea4c2c8b 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@@ -1,10 +1,6 @@
 {stdenv, fetchurl, unzip, lib }:
 let
   fonts = {
-    aegean = { version = "8.00"; file = "Aegean.zip"; sha256 = "0jhj4i0262f4zbm979fm01rnvc91a00kwkbcgvzs281256g2ciny";
-               description = "Scripts and symbols of the Aegean world"; };
-    textfonts = { version = "6.00"; file = "Textfonts.zip"; sha256 = "06igp3hdql0yfaj9h2ahh5n7yvj2ni7rj2jdmz534f9618l8qi6r";
-                  description = "Fonts based on early Greek editions"; };
     symbola = { version = "9.00"; file = "Symbola.zip"; sha256 = "0d9zrlvzh8inhr17p99banr0dmrvkwxbk3q7zhqqx2z4gf2yavc5";
                 description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
     aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "10mr54ja9b169fhqfkrw510jybghrpjx7a8a7m38k5v39ck8wz6v";
@@ -21,6 +17,14 @@ let
                description = "Musical Notation"; };
     analecta = { version = "5.00"; file = "Analecta.zip"; sha256 = "0rphylnz42fqm1zpx5jx60k294kax3sid8r2hx3cbxfdf8fnpb1f";
                  description = "Coptic, Gothic, Deseret"; };
+    # the following are also available from http://users.teilar.gr/~g1951d/
+    # but not yet packaged:
+    #  - Aroania
+    #  - Anaktoria
+    #  - Alexander
+    #  - Avdira
+    #  - Asea
+    #  - Aegean
   };
   mkpkg = name_: {version, file, sha256, description}:
     stdenv.mkDerivation rec {
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index a633b9abe83..0e59e2e04e3 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2016e";
+  version = "2016f";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "10dxnv6mwpm1rbv0dp7fhih4jd7lvqgmw7x2gy6h9i4dy6czh05s";
+        sha256 = "1c024mg4gy572vgdj9rk4dqnb33iap06zs8ibasisbyi1089b37d";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "17j5z894cfnid3dhh8y934hn86pvxz2ym672s1bhdag8spyc9n2p";
+        sha256 = "1vb6n29ik7dzhffzzcnskbhmn6h1dxzan3zanbp118wh8hw5yckj";
       })
     ];
 
diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix
new file mode 100644
index 00000000000..d0453ba8ebb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }:
+
+stdenv.mkDerivation rec {
+  inherit (import ./src.nix fetchurl) name src;
+
+  buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    homepage = "https://developer.gnome.org/gtksourceviewmm/";
+    description = "C++ wrapper for gtksourceview";
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.juliendehos ];
+  };
+}
+
diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix
new file mode 100644
index 00000000000..21fecfdc48a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix
@@ -0,0 +1,11 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gtksourceviewmm-3.18.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gtksourceviewmm/3.18/gtksourceviewmm-3.18.0.tar.xz;
+    sha256 = "51081ae3d37975dae33d3f6a40621d85cb68f4b36ae3835eec1513482aacfb39";
+  };
+}
+
diff --git a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix
index 336178f3729..52481395756 100644
--- a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix
@@ -1,14 +1,28 @@
-{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, gnome3, libnotify, file, telepathy_glib, dbus_glib }:
+{ stdenv, fetchurl, lib, makeWrapper
+, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
+, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null
+, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null
+, zlib ? null, libjpeg ? null
+, libXdamage ? null, libXfixes ? null, libXext ? null
+, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
+, networkmanager ? null }:
+
+with lib;
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   doCheck = true;
 
-  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
-                  gnome3.defaultIconTheme dbus_glib telepathy_glib file
-                  makeWrapper ];
+  buildInputs = [
+    makeWrapper
+    pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup
+  ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ]
+    ++ optional gnomeKeyringSupport libgnome_keyring3
+    ++ filter (p: p != null) [
+      libsecret gnutls libgcrypt avahi zlib libjpeg
+      libXdamage libXfixes libXext networkmanager
+    ];
 
   preFixup = ''
     wrapProgram "$out/libexec/vino-server" \
diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix
index 6e7b16e7733..babbed37cc0 100644
--- a/pkgs/desktops/gnome-3/3.20/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/default.nix
@@ -173,6 +173,8 @@ let
 
   gtksourceview = callPackage ./core/gtksourceview { };
 
+  gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
+
   gucharmap = callPackage ./core/gucharmap { };
 
   gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
diff --git a/pkgs/desktops/kde-5/plasma/breeze-grub.nix b/pkgs/desktops/kde-5/plasma/breeze-grub.nix
new file mode 100644
index 00000000000..da0fb6f73ad
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/breeze-grub.nix
@@ -0,0 +1,16 @@
+{
+  plasmaPackage
+}:
+
+plasmaPackage {
+  name = "breeze-grub";
+  outputs = [ "out" ];
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/grub/themes"
+    mv breeze "$out/grub/themes"
+
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix b/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix
new file mode 100644
index 00000000000..0de1ca1f680
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix
@@ -0,0 +1,16 @@
+{
+  plasmaPackage, lib, copyPathsToStore,
+  ecm,
+  plymouth
+}:
+
+plasmaPackage {
+  name = "breeze-plymouth";
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [ plymouth ];
+  outputs = [ "out" ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  postPatch = ''
+      substituteInPlace cmake/FindPlymouth.cmake --subst-var out
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch b/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch
new file mode 100644
index 00000000000..5d5856d122d
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch
@@ -0,0 +1,19 @@
+Index: breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake
+===================================================================
+--- breeze-plymouth-5.7.3.orig/cmake/FindPlymouth.cmake
++++ breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake
+@@ -24,12 +24,8 @@
+ include(FindPkgConfig)
+ 
+ pkg_check_modules(Plymouth ply-boot-client ply-splash-core)
+-exec_program(${PKG_CONFIG_EXECUTABLE}
+-    ARGS ply-splash-core --variable=pluginsdir
+-    OUTPUT_VARIABLE Plymouth_PLUGINSDIR)
+-exec_program(${PKG_CONFIG_EXECUTABLE}
+-    ARGS ply-splash-core --variable=themesdir
+-    OUTPUT_VARIABLE Plymouth_THEMESDIR)
++set(Plymouth_PLUGINSDIR "@out@/lib/plymouth")
++set(Plymouth_THEMESDIR "@out@/share/plymouth/themes")
+ 
+ find_package_handle_standard_args(Plymouth
+     FOUND_VAR
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/series b/pkgs/desktops/kde-5/plasma/breeze-plymouth/series
new file mode 100644
index 00000000000..8920e7ca518
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/series
@@ -0,0 +1 @@
+install-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
index a909e5067f4..ea2776a13c5 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
+++ b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
@@ -1,21 +1,17 @@
-{ plasmaPackage, ecm, frameworkintegration
-, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
-, ki18n, kwindowsystem, makeQtWrapper, plasma-framework, qtx11extras
+{
+  plasmaPackage,
+  ecm,
+  frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
+  kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
 }:
 
 plasmaPackage {
   name = "breeze-qt5";
   sname = "breeze";
-  nativeBuildInputs = [
-    ecm
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
-    frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras
-    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
+    frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
+    kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras
   ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/breeze-settings5"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index 7aff229b4c1..4b502a3119b 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -52,6 +52,8 @@ let
           name = "breeze-${version}";
           paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ];
         };
+    breeze-grub = callPackage ./breeze-grub.nix {};
+    breeze-plymouth = callPackage ./breeze-plymouth {};
     kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
     kde-cli-tools = callPackage ./kde-cli-tools.nix {};
     kde-gtk-config = callPackage ./kde-gtk-config {};
@@ -65,6 +67,7 @@ let
     kscreenlocker = callPackage ./kscreenlocker.nix {};
     ksshaskpass = callPackage ./ksshaskpass.nix {};
     ksysguard = callPackage ./ksysguard.nix {};
+    kwallet-pam = callPackage ./kwallet-pam.nix {};
     kwayland-integration = callPackage ./kwayland-integration.nix {};
     kwin = callPackage ./kwin {};
     kwrited = callPackage ./kwrited.nix {};
diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/kde-5/plasma/kinfocenter.nix
index dd9bdbd31bd..939e4fa62a9 100644
--- a/pkgs/desktops/kde-5/plasma/kinfocenter.nix
+++ b/pkgs/desktops/kde-5/plasma/kinfocenter.nix
@@ -1,16 +1,17 @@
-{ plasmaPackage, ecm, kdoctools, kcmutils
-, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
-, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
-, kservice, kwidgetsaddons, kxmlgui, libraw1394
-, pciutils, solid
+{
+  plasmaPackage,
+  ecm, kdoctools,
+  kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
+  kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
+  kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid
 }:
 
 plasmaPackage {
   name = "kinfocenter";
   nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
-    kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig
-    kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice
-    kwidgetsaddons kxmlgui libraw1394 pciutils solid
+    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
+    kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
+    kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
index 8fb5d9e708b..3c5d7b37472 100644
--- a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
+++ b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
@@ -1,13 +1,15 @@
-{ plasmaPackage, ecm, kcmutils, kcrash, kdeclarative
-, kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland
-, libXcursor, pam, plasma-framework, qtdeclarative, wayland
+{
+  plasmaPackage,
+  ecm, kdoctools,
+  kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
+  kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
 }:
 
 plasmaPackage {
   name = "kscreenlocker";
   nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
-    kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support
-    kglobalaccel kidletime kwayland libXcursor pam wayland
+    kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
+    libXcursor pam plasma-framework qtdeclarative wayland
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/kwallet-pam.nix b/pkgs/desktops/kde-5/plasma/kwallet-pam.nix
new file mode 100644
index 00000000000..86ba52292f9
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/kwallet-pam.nix
@@ -0,0 +1,11 @@
+{ plasmaPackage, ecm, pam, socat, libgcrypt
+}:
+
+plasmaPackage {
+  name = "kwallet-pam";
+
+  nativeBuildInputs = [ ecm ];
+
+  buildInputs = [ pam socat libgcrypt ];
+
+}
diff --git a/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 7a70fec0d2d..00000000000
--- a/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 07:05:22 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- clients/aurorae/src/aurorae.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
-index 781c960..ad5f420 100644
---- a/plugins/kdecorations/aurorae/src/aurorae.cpp
-+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
-@@ -211,7 +211,7 @@ void Helper::init()
-     // so let's try to locate our plugin:
-     QString pluginPath;
-     for (const QString &path : m_engine->importPathList()) {
--        QDirIterator it(path, QDirIterator::Subdirectories);
-+        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             it.next();
-             QFileInfo fileInfo = it.fileInfo();
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/kde-5/plasma/kwin/default.nix
index d121ba84dd0..7af947bcfe8 100644
--- a/pkgs/desktops/kde-5/plasma/kwin/default.nix
+++ b/pkgs/desktops/kde-5/plasma/kwin/default.nix
@@ -1,11 +1,12 @@
-{ plasmaPackage, ecm, kdoctools, epoxy
-, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
-, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
-, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications
-, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem
-, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
-, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
-, makeQtWrapper
+{
+  plasmaPackage, lib, copyPathsToStore,
+  ecm, kdoctools,
+  breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
+  kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
+  ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications,
+  kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem,
+  kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative,
+  qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, xwayland
 }:
 
 plasmaPackage {
@@ -15,13 +16,17 @@ plasmaPackage {
     kdoctools
   ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem
-    plasma-framework qtdeclarative qtmultimedia qtx11extras epoxy kcompletion
-    kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes
-    kidletime kinit knewstuff knotifications kpackage kservice kwayland
-    kwidgetsaddons kxmlgui libinput libICE libSM qtscript udev wayland
-    xcb-util-cursor
+    breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets
+    kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
+    kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
+    kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM
+    plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras udev
+    wayland xcb-util-cursor
   ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  postPatch = ''
+    substituteInPlace main_wayland.cpp \
+        --subst-var-by xwayland ${lib.getBin xwayland}/bin/Xwayland
+  '';
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch
new file mode 100644
index 00000000000..60b8f5ef541
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch
@@ -0,0 +1,13 @@
+Index: kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp
+===================================================================
+--- kwin-5.7.3.orig/plugins/kdecorations/aurorae/src/aurorae.cpp
++++ kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp
+@@ -211,7 +211,7 @@ void Helper::init()
+     // so let's try to locate our plugin:
+     QString pluginPath;
+     for (const QString &path : m_engine->importPathList()) {
+-        QDirIterator it(path, QDirIterator::Subdirectories);
++        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             it.next();
+             QFileInfo fileInfo = it.fileInfo();
diff --git a/pkgs/desktops/kde-5/plasma/kwin/series b/pkgs/desktops/kde-5/plasma/kwin/series
new file mode 100644
index 00000000000..9dbc88f4997
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/kwin/series
@@ -0,0 +1,2 @@
+follow-symlinks.patch
+xwayland.patch
diff --git a/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch b/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch
new file mode 100644
index 00000000000..5fde01d08bf
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch
@@ -0,0 +1,13 @@
+Index: kwin-5.7.3/main_wayland.cpp
+===================================================================
+--- kwin-5.7.3.orig/main_wayland.cpp
++++ kwin-5.7.3/main_wayland.cpp
+@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe
+ 
+     m_xwaylandProcess = new Process(kwinApp());
+     m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
+-    m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
++    m_xwaylandProcess->setProgram(QStringLiteral("@xwayland@"));
+     QProcessEnvironment env = m_environment;
+     env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
+     m_xwaylandProcess->setProcessEnvironment(env);
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
index 15048dc9da2..2e401796cf4 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/bluedevil-5.7.2.tar.xz";
-      sha256 = "0lw7yf38vdxl5q8fyqp7xnhppv0r6ayr7wd3m73f1w7fqpkjd9v6";
-      name = "bluedevil-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/bluedevil-5.7.3.tar.xz";
+      sha256 = "0485lm4d18qv1w0qgb46g318xbb3cd6d5j42j0s95snrg7rlp717";
+      name = "bluedevil-5.7.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/breeze-5.7.2.tar.xz";
-      sha256 = "150lpy6jd2asbx8s5mznyagja31q5xwhhqqisrlnxapln2qj6xay";
-      name = "breeze-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/breeze-5.7.3.tar.xz";
+      sha256 = "1wyj13sw4xrpb155p00wpn2hvvkpjrpf14b15sk3dpbhlzc8m77p";
+      name = "breeze-5.7.3.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/breeze-grub-5.7.2.tar.xz";
-      sha256 = "1qhgqb3wa8mciddwa0v4kw3vs17annib0qy2jpy5qdfjc4yblq5q";
-      name = "breeze-grub-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/breeze-grub-5.7.3.tar.xz";
+      sha256 = "0xlxpg1z67mjn3mf698b2jrls7fyb19i3carmr56c0f45r628lpf";
+      name = "breeze-grub-5.7.3.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/breeze-gtk-5.7.2.tar.xz";
-      sha256 = "08jfvxfmzbnk4jjzljlp9wr37b7rmxcwnmi866x5v01x9iqfbcgw";
-      name = "breeze-gtk-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/breeze-gtk-5.7.3.tar.xz";
+      sha256 = "0bw9hj0ca99kfvfw621l19wm9x81p8pyc19yrlhbr527mhw65i65";
+      name = "breeze-gtk-5.7.3.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/breeze-plymouth-5.7.2.tar.xz";
-      sha256 = "16dwqiq26xxpff0fni7aiq919k7jfmi35sj8xvvafb30wm4y3jix";
-      name = "breeze-plymouth-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/breeze-plymouth-5.7.3.tar.xz";
+      sha256 = "0hiscvdqrnig594w9b0b69wzbqgcrc56p9r0z52pj2zw4df5m3za";
+      name = "breeze-plymouth-5.7.3.tar.xz";
     };
   };
   discover = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/discover-5.7.2.tar.xz";
-      sha256 = "0kp3d7d21zxc8ag6f075r8mvfqd5mmk258aix5pyqc1njzb6rgg0";
-      name = "discover-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/discover-5.7.3.tar.xz";
+      sha256 = "1ylq2mfzqjibfx7g6xd1b83sg9a8s60jjnxzgf808kxqzrb7b6bg";
+      name = "discover-5.7.3.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kactivitymanagerd-5.7.2.tar.xz";
-      sha256 = "0asp3jzl1vaqxs0nvkfxx5d8hnnsvcygbjgc4i63l7fjs64a789r";
-      name = "kactivitymanagerd-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kactivitymanagerd-5.7.3.tar.xz";
+      sha256 = "0ajm5d15qglb7k8js7626mcxi19g0vsgvs7y3ggqngvklpnpgqr0";
+      name = "kactivitymanagerd-5.7.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kde-cli-tools-5.7.2.tar.xz";
-      sha256 = "0y2pwshsiqgcxvj3yc6vyyhg8fkb5ddslnf1f86r92sy66gbjw0s";
-      name = "kde-cli-tools-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kde-cli-tools-5.7.3.tar.xz";
+      sha256 = "1pg6zabll61q8krw3h5i8z0bj6zxm7g21dza5jgvb0vbirr4zgz6";
+      name = "kde-cli-tools-5.7.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kdecoration-5.7.2.tar.xz";
-      sha256 = "1wpb1kivy570ggrd7ip8n3zllyslzk6qlqc02i8g4rbavw0fxscx";
-      name = "kdecoration-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kdecoration-5.7.3.tar.xz";
+      sha256 = "1k20x7ndp8rv8ihphkz68g4m7r73gvswcnxi1ahipqnw5mnywl9c";
+      name = "kdecoration-5.7.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kde-gtk-config-5.7.2.tar.xz";
-      sha256 = "08giv5w4055rd70nb28lwapdcfnywx2whgzpc1gdvsbgl6ap742n";
-      name = "kde-gtk-config-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kde-gtk-config-5.7.3.tar.xz";
+      sha256 = "0ynpk4p4yx2wy0jm1bk9v8rk27w5fb1ra1d2w6gfz33ijp7iah92";
+      name = "kde-gtk-config-5.7.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kdeplasma-addons-5.7.2.tar.xz";
-      sha256 = "1qlr3fgp7gqyjyncn1qjajhbvb45sdbp9aqhz6ccnv3smwm74mp7";
-      name = "kdeplasma-addons-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kdeplasma-addons-5.7.3.tar.xz";
+      sha256 = "0jdc2avjjy0p4rib7k7wd3ns02pyi57dyfqgja606gbipdvw1fwn";
+      name = "kdeplasma-addons-5.7.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kgamma5-5.7.2.tar.xz";
-      sha256 = "0jkk0lz4qaxsmgii3i698anpp0a9q0nakpb5h0kxffx5j01s5s25";
-      name = "kgamma5-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kgamma5-5.7.3.tar.xz";
+      sha256 = "1zzig2iw5wjhvym35vbljqa4ma7jyprqvqxbcw3aqj1hp5z9g35k";
+      name = "kgamma5-5.7.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/khotkeys-5.7.2.tar.xz";
-      sha256 = "02v0q8j65fbc39krc2gcs42yyx3g056w156zg6d59j6srwci5ksm";
-      name = "khotkeys-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/khotkeys-5.7.3.tar.xz";
+      sha256 = "1xq70j2wfxxbhzn3darjx75120j641v8rd20wjcn5bmr1xlr5fb7";
+      name = "khotkeys-5.7.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kinfocenter-5.7.2.tar.xz";
-      sha256 = "1xpyi05y9qxv51j8gazk0qlhy2yscz8lgzgh3lw7lp21jv1frxg4";
-      name = "kinfocenter-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kinfocenter-5.7.3.tar.xz";
+      sha256 = "1s66400kh49wzfsgahdya6w1j2a4f5w47lllpy2i6w1xl3pag219";
+      name = "kinfocenter-5.7.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kmenuedit-5.7.2.tar.xz";
-      sha256 = "0bavsxh3lsnk5h70l81317vqgmms5r0lr7ph2vdlcfrb708xp0xp";
-      name = "kmenuedit-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kmenuedit-5.7.3.tar.xz";
+      sha256 = "0j0qk1p9j25kk8jysx41jnh52yflb2xf2xg64p7x72i6ci8axyaa";
+      name = "kmenuedit-5.7.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kscreen-5.7.2.tar.xz";
-      sha256 = "1d23i6mw1di01386icdq5p64a3gmq6n6cg73v6wfw3vvgl0lls6w";
-      name = "kscreen-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kscreen-5.7.3.tar.xz";
+      sha256 = "1z48sycq6i618ypba78hm5vh8m3c9c0k44jl4lrxvx524axhg11w";
+      name = "kscreen-5.7.3.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kscreenlocker-5.7.2.tar.xz";
-      sha256 = "1c4afc7s5b2q5yc53xpp8q2k0w8lxmvg8rrqb6qnrqz1xrxil3ld";
-      name = "kscreenlocker-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kscreenlocker-5.7.3.tar.xz";
+      sha256 = "1xnzca0mli25mmg0x4pqa1gfhvw4f3m7cqn1ml92z7fnh8rbqw5k";
+      name = "kscreenlocker-5.7.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/ksshaskpass-5.7.2.tar.xz";
-      sha256 = "07annxlr46h7x6dq5vfs6rzgm11x8bv1n1icgji2wabdj3zsy2pa";
-      name = "ksshaskpass-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/ksshaskpass-5.7.3.tar.xz";
+      sha256 = "1ihhavb87xzgb649lxc2z9hcxrc37pgx52f13hbswbzl1086nfqh";
+      name = "ksshaskpass-5.7.3.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/ksysguard-5.7.2.tar.xz";
-      sha256 = "08y9vsdzsq18hgfrk52hk3hmv23x6xv4j73dji97g38z26slvbp6";
-      name = "ksysguard-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/ksysguard-5.7.3.tar.xz";
+      sha256 = "1rkhjjxcp6d0ybpnyjkadx3hyv2r9c1xgby4x042ac0kycvkxdiz";
+      name = "ksysguard-5.7.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kwallet-pam-5.7.2.tar.xz";
-      sha256 = "1701abpwp90vsi5v4n675848gnp17psiagd5hv9yypc2a7g82sf2";
-      name = "kwallet-pam-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kwallet-pam-5.7.3.tar.xz";
+      sha256 = "1nfphzlcwx0l6wa4kl7akwmf8wb1pr1acyaxchivj463wbnbygy4";
+      name = "kwallet-pam-5.7.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kwayland-integration-5.7.2.tar.xz";
-      sha256 = "0jd9cv8ivn71h90xjr53nanx02z95ylsn5pkwx03wjvx4bdwwvpv";
-      name = "kwayland-integration-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kwayland-integration-5.7.3.tar.xz";
+      sha256 = "1wlimrd33fa3wkvw5kdg3y73s6x33rd2i70prb4svr15bb82pfin";
+      name = "kwayland-integration-5.7.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kwin-5.7.2.tar.xz";
-      sha256 = "00f9chy1qg24r6rqpqfhc4jjx6j1nw18gxzpd1m16shkqf5il15h";
-      name = "kwin-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kwin-5.7.3.tar.xz";
+      sha256 = "0rh4mjv9cspv21y5a81cfdi3p3mvybmwvcbyx68svpzpfj6mvpca";
+      name = "kwin-5.7.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/kwrited-5.7.2.tar.xz";
-      sha256 = "06j18395pkyiph9mzvmfjjdm623ggijgkalggsz4a7kllk1v964q";
-      name = "kwrited-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/kwrited-5.7.3.tar.xz";
+      sha256 = "1qx67gv75n9m777g4a6hj75nsbv7wqqb2bb7fm7bm5110lv1j3gl";
+      name = "kwrited-5.7.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/libkscreen-5.7.2.tar.xz";
-      sha256 = "0ympads0iylpsv0idmbgwc8gzc3xskqcgv1bn4mbpfrp360ibmia";
-      name = "libkscreen-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/libkscreen-5.7.3.tar.xz";
+      sha256 = "1zmzhqb2fb6mxilqfyxhgnflqwcf0cx006h3psx3mf634qqh1ixi";
+      name = "libkscreen-5.7.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/libksysguard-5.7.2.tar.xz";
-      sha256 = "0qk14ca9hfbm4ba840yjrar1kqh3dsl2hywqf45lrv42r47k19ak";
-      name = "libksysguard-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/libksysguard-5.7.3.tar.xz";
+      sha256 = "1gcrwlksvv1br03j11v2bhgikkwwhh0ynv2z3g9lbyvbjg8jmwya";
+      name = "libksysguard-5.7.3.tar.xz";
     };
   };
   milou = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/milou-5.7.2.tar.xz";
-      sha256 = "13w9fn1icxaxslk04a3gb41yb6hw705xj0xkmv5wy198m8f9m84a";
-      name = "milou-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/milou-5.7.3.tar.xz";
+      sha256 = "172qvnkniqbhxdzm1inl6adjxfy13a9hnimqfwdgf1f7ss5dmsp7";
+      name = "milou-5.7.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/oxygen-5.7.2.tar.xz";
-      sha256 = "0156v7b9capc1j5kv099fy00dzcqiygvmvs9nsy6m3ly7v9av428";
-      name = "oxygen-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/oxygen-5.7.3.tar.xz";
+      sha256 = "0y3jf5y21dzpyv9vz44qb7kqr1afmad9yvq45kwpjwlnabz75y3r";
+      name = "oxygen-5.7.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/plasma-desktop-5.7.2.tar.xz";
-      sha256 = "0kkw4h1vn32qdpzd16334s2m38wcckc06bx1bs99jj6hpmgh6597";
-      name = "plasma-desktop-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/plasma-desktop-5.7.3.tar.xz";
+      sha256 = "1plfrfzczzz2x2pp8f3vkphds9hfp28qmcyaf2c63snjcply0vjg";
+      name = "plasma-desktop-5.7.3.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/plasma-integration-5.7.2.tar.xz";
-      sha256 = "1j8a0c0dxdl7kyj6hm1r5lq7ykg9xhn51s90gyhr6rqs0hla7n6g";
-      name = "plasma-integration-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/plasma-integration-5.7.3.tar.xz";
+      sha256 = "1wlwmjf4m6f4bps8vbk8f1ixjmd3krm5h1mc27mls35r783kh3hl";
+      name = "plasma-integration-5.7.3.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/plasma-mediacenter-5.7.2.tar.xz";
-      sha256 = "1vgb7mlqqlh338p0mqfc613qcdz1c3kwgg9m7yb5fk8kzh9v1fwn";
-      name = "plasma-mediacenter-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/plasma-mediacenter-5.7.3.tar.xz";
+      sha256 = "0p5pip14y2rfv9gsk40jqbv2hg2m7wg8cvycbc774gi19zr19ajr";
+      name = "plasma-mediacenter-5.7.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/plasma-nm-5.7.2.tar.xz";
-      sha256 = "1aqf2jzljzc1wwswxq9gn74p0169sqq9yrm7ngz1ns11b0q8m1bm";
-      name = "plasma-nm-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/plasma-nm-5.7.3.tar.xz";
+      sha256 = "0xap1mjj1lg9nvys1ld9d4bvx5vi3qi2gc4gvdh7h4i1phyzfqwz";
+      name = "plasma-nm-5.7.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/plasma-pa-5.7.2.tar.xz";
-      sha256 = "0w201rrxjds5i1hc6mn4mpqn6kvpz175r0id9rxqfdzyrqcgknpv";
-      name = "plasma-pa-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/plasma-pa-5.7.3.tar.xz";
+      sha256 = "11dwm848ylm7fx2fgmjxsknqd5vq0832h8d3ak0f0a2gbrqpvgis";
+      name = "plasma-pa-5.7.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/plasma-sdk-5.7.2.tar.xz";
-      sha256 = "0zsbrlmv5kgaa53a906ky071vj38i58kz0wqrr2dy2b47pnx77pl";
-      name = "plasma-sdk-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/plasma-sdk-5.7.3.tar.xz";
+      sha256 = "1xi4gyrcwll8m0ilmqrpaa8anx7bravz25f7j613zmr7c59372cb";
+      name = "plasma-sdk-5.7.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-5.7.2.tar.xz";
-      sha256 = "1k03g6scbgrsrk1dmfaw6s5sahlck81rka7kpzx60rdas6vfw60y";
-      name = "plasma-workspace-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/plasma-workspace-5.7.3.tar.xz";
+      sha256 = "0hlh7qvll48hnpmjkhf53fxx91yx8sdhsyc9y77mfzwavd72354q";
+      name = "plasma-workspace-5.7.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-wallpapers-5.7.2.tar.xz";
-      sha256 = "1wzhrix2nafzlszanh05fbcs746c391wp27i24fvh3rhpg5j57zx";
-      name = "plasma-workspace-wallpapers-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/plasma-workspace-wallpapers-5.7.3.tar.xz";
+      sha256 = "0452k2ic16cf385l057chh2a3wh4hjxxlpnlapfyxsmxhz29ymgz";
+      name = "plasma-workspace-wallpapers-5.7.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.7.2";
+    version = "1-5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/polkit-kde-agent-1-5.7.2.tar.xz";
-      sha256 = "0kx021xjgsp1gpv2s9kigxf1srabkly2l61hf5wpj0hml79dwrc5";
-      name = "polkit-kde-agent-1-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/polkit-kde-agent-1-5.7.3.tar.xz";
+      sha256 = "1j1724dffrpv06xzmgqvm4xbdscflkcx31bshwh2mizcxknb2bbq";
+      name = "polkit-kde-agent-1-5.7.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/powerdevil-5.7.2.tar.xz";
-      sha256 = "132k18dqm487f8v2irxlxhs1ljvcyyig9lkb36isajsw7k6949vb";
-      name = "powerdevil-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/powerdevil-5.7.3.tar.xz";
+      sha256 = "1npbdwhic2bkdzxggkvyl1bqpfb7ihcpa8rds3c6bf6smbkhwiqi";
+      name = "powerdevil-5.7.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/sddm-kcm-5.7.2.tar.xz";
-      sha256 = "19bxbpz80pr66gd9mycwfcw8sagkpzbffm98bzikpdjcll6a6ysh";
-      name = "sddm-kcm-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/sddm-kcm-5.7.3.tar.xz";
+      sha256 = "1s80j6hjjz8n079k8867xbb1q20n7mxrcjlfm44m2p0qz8nv4kjk";
+      name = "sddm-kcm-5.7.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/systemsettings-5.7.2.tar.xz";
-      sha256 = "0f2q0mfhmn0nf4mx76hp3lxciwiivsqq3ayv15s1hzxpi24vsini";
-      name = "systemsettings-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/systemsettings-5.7.3.tar.xz";
+      sha256 = "0776vqnwvpf1x52lz8wpl3y43r5zq6l3wviw0fpbj4fcg8jmryr3";
+      name = "systemsettings-5.7.3.tar.xz";
     };
   };
   user-manager = {
-    version = "5.7.2";
+    version = "5.7.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.2/user-manager-5.7.2.tar.xz";
-      sha256 = "0faf4wnbkcx6wlg92cd8mskp1xhqm0crj886y22ycjiaqhbnc43p";
-      name = "user-manager-5.7.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.3/user-manager-5.7.3.tar.xz";
+      sha256 = "172gl6p6ai0gi2m10b0rpcg69xqf4127cf6gbvv0r22cprhxw1cb";
+      name = "user-manager-5.7.3.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
index 18cf08081c4..c0d5f6dbf59 100755
--- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
+++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
@@ -71,11 +71,14 @@ fi
 configDir=$(qtpaths --writable-path GenericConfigLocation)
 mkdir -p "$configDir"
 
+THEME=org.kde.breeze
 #This is basically setting defaults so we can use them with kstartupconfig5
+#We cannot set the equivilant of THEME here as it will generate an
+#invalid variable name (with dots)
 cat >$configDir/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme 'breeze_cursors'
 kcminputrc Mouse cursorSize ''
-ksplashrc KSplash Theme Breeze
+ksplashrc KSplash Theme ${THEME}.desktop
 ksplashrc KSplash Engine KSplashQML
 kdeglobals KScreen ScreenScaleFactors ''
 kcmfonts General forceFontDPI 0
@@ -144,6 +147,8 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
     fi
 fi
 
+unset THEME
+
 # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
 # from some users that they're confused and don't know what to do. This is
 # especially necessary on slow machines, where starting KDE takes one or two
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 1984e2dbdf9..5bb7424dc6b 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,27 +1,27 @@
 { stdenv, fetchurl, pkgconfig, intltool, mate, gnome3, gtk2, gtk_engines,
-gtk-engine-murrine, gdk_pixbuf, librsvg }:
+  gtk-engine-murrine, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "mate-themes-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = gnome3.version;
   minor-ver = {
-    "3.18" = "2";
-    "3.20" = "8";
+    "3.18" = "3";
+    "3.20" = "10";
   }."${major-ver}";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
     sha256 = {
-      "3.18" = "1yy22nk450wsx0mlsvdalkyj41mijlvy8s6kifh98d4dnk8dvgfj";
-      "3.20" = "14jl3mbhzm7k2ilp8nmdwy9wrbmc7mbg2i0arf479xs2h7dz06f6";
+      "3.18" = "09vglvjnjnm95wxw5b7pn6rf5xrr3nfyqs5c3y1c72z4p3w8qqn5";
+      "3.20" = "0bhhidip8qbsq69a9n0dmxfryhvzngiy59vnms6xhya9n7y19hci";
     }."${major-ver}";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
   buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gtk-engine-murrine
-  gdk_pixbuf librsvg ];
+    gdk_pixbuf librsvg ];
 
   meta = {
     description = "A set of themes from MATE";
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index f1f598c1359..f89947d7d61 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
     description = "Open-source electronics prototyping platform";
     homepage = http://arduino.cc/;
     license = stdenv.lib.licenses.gpl2;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ antono robberer bjornfor ];
   };
 }
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index f9dc99ee2f8..b7773a91d98 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "A programming language for the analysis and transformation of computer languages";
     homepage = http://www.colm.net/open-source/colm;
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
index dc2a0a12138..f6a92b64f6d 100644
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, aeson, aeson-pretty, ansi-terminal, ansi-wl-pprint
+{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-terminal, ansi-wl-pprint
 , base, binary, bytestring, containers, directory, edit-distance
 , fetchgit, filemanip, filepath, HUnit, indents
 , language-ecmascript, language-glsl, mtl, parsec, pretty, process
@@ -16,7 +16,7 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary
+    aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary
     bytestring containers directory edit-distance filepath indents
     language-ecmascript language-glsl mtl parsec pretty process text
     union-find
@@ -25,7 +25,7 @@ mkDerivation {
     aeson base binary directory filepath process text
   ];
   testHaskellDepends = [
-    aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary
+    aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary
     bytestring containers directory edit-distance filemanip filepath
     HUnit indents language-ecmascript language-glsl mtl parsec pretty
     process QuickCheck test-framework test-framework-hunit
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
index ef2d4e9c8e7..faf46e859c9 100644
--- a/pkgs/development/compilers/elm/packages/elm-package.nix
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary
+{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary
 , bytestring, containers, directory, edit-distance, elm-compiler
 , fetchgit, filepath, HTTP, http-client, http-client-tls
 , http-types, mtl, network, optparse-applicative, parallel-io
@@ -16,13 +16,13 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
+    aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers
     directory edit-distance elm-compiler filepath HTTP http-client
     http-client-tls http-types mtl network parallel-io text time
     unordered-containers vector zip-archive
   ];
   executableHaskellDepends = [
-    aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
+    aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers
     directory edit-distance elm-compiler filepath HTTP http-client
     http-client-tls http-types mtl network optparse-applicative
     parallel-io pretty text time unordered-containers vector
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index e0a8b98c21f..7bf3e3bb605 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -56,7 +56,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "4.9.3";
+let version = "4.9.4";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -189,6 +189,9 @@ let version = "4.9.3";
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
             else (if cross.libc == "uclibc" then
+              # libsanitizer requires netrom/netrom.h which is not
+              # available in uclibc.
+              " --disable-libsanitizer" +
               # In uclibc cases, libgomp needs an additional '-ldl'
               # and as I don't know how to pass it, I disable libgomp.
               " --disable-libgomp" else "") +
@@ -213,7 +216,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3";
+    sha256 = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc";
   };
 
   inherit patches;
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 89a452166a1..74f7f37e7f3 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -189,6 +189,9 @@ let version = "5.4.0";
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
             else (if cross.libc == "uclibc" then
+              # libsanitizer requires netrom/netrom.h which is not
+              # available in uclibc.
+              " --disable-libsanitizer" +
               # In uclibc cases, libgomp needs an additional '-ldl'
               # and as I don't know how to pass it, I disable libgomp.
               " --disable-libgomp" else "") +
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index f925499ef0b..844530ae639 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -188,6 +188,9 @@ let version = "6.1.0";
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
             else (if cross.libc == "uclibc" then
+              # libsanitizer requires netrom/netrom.h which is not
+              # available in uclibc.
+              " --disable-libsanitizer" +
               # In uclibc cases, libgomp needs an additional '-ldl'
               # and as I don't know how to pass it, I disable libgomp.
               " --disable-libgomp" else "") +
diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 71f427d4664..bbf2a946ece 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -15,11 +15,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchurl {
     url = "https://github.com/golang/go/archive/go${version}.tar.gz";
-    sha256 = "17sfhg3xfnakk666wlsbhxp4vbn19hlywf5cn1zfcd4zqkcyx30h";
+    sha256 = "1plakydixx0xrp0z3n8ahnwg66psn31791dh56yl4ry41phq0axm";
   };
 
   # perl is used for testing go vet
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 59fb90d78cd..ef4aa44d436 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
+    [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
@@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false; # occasional build problems;
   dontUseCmakeBuildDir = true;
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
-  MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";
-  MYSQL_DIR=mariadb;
 
   # work around broken build system
   NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index d31654cdf2d..adca825b201 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, emscripten }:
 
-let version = "0.8.7"; in
+let version = "0.8.9"; in
 
 stdenv.mkDerivation {
   name = "jsonnet-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "0adg7ijz10mc4xs5lfrby5g9sx96icf6cg39hvkh4wqjl85c6i9g";
+    sha256 = "0phk8dzby5v60r7fwd1qf4as2jdpmdmksjw3g4p3mkkr7sc81119";
   };
 
   buildInputs = [ emscripten ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Purely-functional configuration language that helps you define JSON data";
-    maintainers = [ lib.maintainers.benley ];
+    maintainers = with lib.maintainers; [ benley copumpkin ];
     license = lib.licenses.asl20;
     homepage = https://github.com/google/jsonnet;
     platforms = lib.platforms.unix;
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index d3ce8a4f9ff..42ca4ba70e4 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -50,6 +50,5 @@ in stdenv.mkDerivation {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
     platforms   = stdenv.lib.platforms.all;
-    broken      = true;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/fix-15974.patch b/pkgs/development/compilers/llvm/3.5/fix-15974.patch
new file mode 100644
index 00000000000..446004cd998
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.5/fix-15974.patch
@@ -0,0 +1,15 @@
+diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h
+index f9df378..9d860ec 100644
+--- a/include/llvm/ADT/IntrusiveRefCntPtr.h
++++ b/include/llvm/ADT/IntrusiveRefCntPtr.h
+@@ -134,9 +134,9 @@ public:
+ //===----------------------------------------------------------------------===//
+   template <typename T>
+   class IntrusiveRefCntPtr {
++  public:
+     T* Obj;
+ 
+-  public:
+     typedef T element_type;
+ 
+     explicit IntrusiveRefCntPtr() : Obj(nullptr) {}
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 64df30dc23f..4f54f1438a7 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -53,6 +53,8 @@ in stdenv.mkDerivation rec {
     "-DCAN_TARGET_i386=false"
   ];
 
+  patches = [ ./fix-15974.patch ];
+
   postBuild = ''
     rm -fR $out
 
@@ -75,3 +77,4 @@ in stdenv.mkDerivation rec {
     platforms   = stdenv.lib.platforms.all;
   };
 }
+
diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix
index 4b4ee89f981..130b3311cc5 100644
--- a/pkgs/development/compilers/rust/beta.nix
+++ b/pkgs/development/compilers/rust/beta.nix
@@ -3,13 +3,15 @@
 
 rec {
   rustc = callPackage ./rustc.nix {
-    shortVersion = "beta-1.10.0";
+    shortVersion = "beta-1.11.0";
     forceBundledLLVM = false;
+    needsCmake = true;
     configureFlags = [ "--release-channel=beta" ];
-    srcRev = "d18e321abeecc69e4d1bf9cafba4fba53ddf267d";
-    srcSha = "1ck8mbjrq0bzq5xzwgaqdilakwm2ab0xpzqibjycds62ad4yw774";
-    patches = [ ./patches/disable-lockfile-check.patch ]
-      ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+    srcRev = "9333c420da0da6291740c313d5af3d620b55b8bc";
+    srcSha = "05z6i4s5jjw3c5ypap6kzxk81bg4dib47h51znvsvcvr0svsnkgs";
+    patches = [
+      ./patches/disable-lockfile-check.patch
+    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
     inherit targets;
     inherit targetPatches;
     inherit targetToolchains;
@@ -17,10 +19,15 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "0.10.0";
-    srcRev = "refs/tags/${version}";
-    srcSha = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
-    depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
+    # TODO: We're temporarily tracking master here as Darwin needs the
+    # `http.cainfo` option from .cargo/config which isn't released
+    # yet.
+
+    version = "beta-2016-07-25";
+    srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
+    srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
+    depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc";
+
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
   };
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index bfc82c4317d..1ced865fc90 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchurl, makeWrapper, cacert, zlib }:
 
 let
+  inherit (stdenv.lib) optionalString;
+
   platform =
     if stdenv.system == "i686-linux"
     then "i686-unknown-linux-gnu"
@@ -24,6 +26,8 @@ let
     then "d59b5509e69c1cace20a57072e3b3ecefdbfd8c7e95657b0ff2ac10aa1dfebe6"
     else throw "missing boostrap hash for platform ${stdenv.system}";
 
+  needsPatchelf = stdenv.isLinux;
+
   src = fetchurl {
      url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
      sha256 = bootstrapHash;
@@ -46,9 +50,11 @@ rec {
       ./install.sh --prefix=$out \
         --components=rustc,rust-std-${platform},rust-docs
 
-      patchelf \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        "$out/bin/rustc"
+      ${optionalString needsPatchelf ''
+        patchelf \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          "$out/bin/rustc"
+      ''}
 
       # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
       # (or similar) here. It causes strange effects where rustc loads
@@ -71,9 +77,11 @@ rec {
       ./install.sh --prefix=$out \
         --components=cargo
 
-      patchelf \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        "$out/bin/cargo"
+      ${optionalString needsPatchelf ''
+        patchelf \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          "$out/bin/cargo"
+      ''}
 
       wrapProgram "$out/bin/cargo" \
         --suffix PATH : "${rustc}/bin"
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index fc4bf732cf6..537764ebca2 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchgit, file, curl, pkgconfig, python, openssl, cmake, zlib
-, makeWrapper, libiconv, cacert, rustPlatform, rustc
-, version, srcRev, srcSha, depsSha256 }:
+, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
+, version, srcRev, srcSha, depsSha256
+, patches ? []}:
 
 rustPlatform.buildRustPackage rec {
   name = "cargo-${version}";
@@ -13,11 +14,14 @@ rustPlatform.buildRustPackage rec {
   };
 
   inherit depsSha256;
+  inherit patches;
 
   passthru.rustc = rustc;
 
-  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
-    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper libgit2 ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+
+  LIBGIT2_SYS_USE_PKG_CONFIG=1;
 
   configurePhase = ''
     ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo
@@ -37,9 +41,14 @@ rustPlatform.buildRustPackage rec {
        "$out/lib/rustlib/uninstall.sh" \
        "$out/lib/rustlib/manifest-cargo"
 
+    # NOTE: We override the `http.cainfo` option usually specified in
+    # `.cargo/config`. This is an issue when users want to specify
+    # their own certificate chain as environment variables take
+    # precedence
     wrapProgram "$out/bin/cargo" \
       --suffix PATH : "${rustc}/bin" \
-      --run "export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
       ${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
   '';
 
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index adabdd71a1d..bfab4453a34 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -23,10 +23,15 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "0.11.0";
-    srcRev = "refs/tags/${version}";
-    srcSha = "0ic2093bmwiw6vl2l9yhip87ni6dbz7dhrizy9wdx61229k16hc4";
-    depsSha256 = "0690sgn6fcay7sazlmrbbn4jbhnvmznrpz5z3rvkbaifkjrg4w6d";
+    # TODO: We're temporarily tracking master here as Darwin needs the
+    # `http.cainfo` option from .cargo/config which isn't released
+    # yet.
+
+    version = "master-2016-07-25";
+    srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
+    srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
+    depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
+
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
   };
diff --git a/pkgs/development/compilers/rust/head.nix b/pkgs/development/compilers/rust/head.nix
index bbfe5c9a152..3406fdb317f 100644
--- a/pkgs/development/compilers/rust/head.nix
+++ b/pkgs/development/compilers/rust/head.nix
@@ -3,13 +3,18 @@
 
 rec {
   rustc = callPackage ./rustc.nix {
-    shortVersion = "master-1.11.0";
+    shortVersion = "master-1.12.0";
     forceBundledLLVM = false;
-    srcRev = "298730e7032cd55809423773da397cd5c7d827d4";
-    srcSha = "0hyz5j1z75sjkgsifzgxviv3b1lhgaz8wqwvmq80xx5vd78yd0c1";
-    patches = [ ./patches/disable-lockfile-check.patch
-                ./patches/use-rustc-1.9.0.patch ]
-      ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+    needsCmake = true;
+    configureFlags = [ "--release-channel=nightly" ];
+    srcRev = "d9a911d236cbecb47775276ba51a5f9111bdbc9c";
+    srcSha = "07wybqvnw99fljmcy33vb9iwirmp10cwy47n008p396s7pb852hv";
+    patches = [
+      ./patches/disable-lockfile-check.patch
+      # Drop this patch after
+      # https://github.com/rust-lang/rust/pull/35140 gets merged
+      ./patches/tcp-stress-test-run-a-smaller-number-of-threads.patch
+    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
     inherit targets;
     inherit targetPatches;
     inherit targetToolchains;
@@ -17,10 +22,11 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "2016.06.07";
-    srcRev = "3e70312a2a4ebedace131fc63bb8f27463c5db28";
-    srcSha = "0nibzyfjkiqfnq0c00hhqvs856l5qls8wds252p97q5q92yvp40f";
-    depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
+    version = "master-2016-07-25";
+    srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
+    srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
+    depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
+
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
   };
diff --git a/pkgs/development/compilers/rust/patches/tcp-stress-test-run-a-smaller-number-of-threads.patch b/pkgs/development/compilers/rust/patches/tcp-stress-test-run-a-smaller-number-of-threads.patch
new file mode 100644
index 00000000000..1b1d62160f6
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/tcp-stress-test-run-a-smaller-number-of-threads.patch
@@ -0,0 +1,44 @@
+From b6202b5d602ca8216febe8ce9078581faa32955e Mon Sep 17 00:00:00 2001
+From: Moritz Ulrich <moritz@tarn-vedra.de>
+Date: Sat, 30 Jul 2016 09:01:13 +0200
+Subject: [PATCH] tcp-stress-test: Run a smaller number of threads.
+
+---
+ src/test/run-pass/tcp-stress.rs | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs
+index dfc8649..df8cdc9 100644
+--- a/src/test/run-pass/tcp-stress.rs
++++ b/src/test/run-pass/tcp-stress.rs
+@@ -21,6 +21,8 @@ use std::sync::mpsc::channel;
+ use std::time::Duration;
+ use std::thread::{self, Builder};
+ 
++const TARGET_CNT: usize = 256;
++
+ fn main() {
+     // This test has a chance to time out, try to not let it time out
+     thread::spawn(move|| -> () {
+@@ -42,8 +44,9 @@ fn main() {
+     });
+ 
+     let (tx, rx) = channel();
++
+     let mut spawned_cnt = 0;
+-    for _ in 0..1000 {
++    for _ in 0..TARGET_CNT {
+         let tx = tx.clone();
+         let res = Builder::new().stack_size(64 * 1024).spawn(move|| {
+             match TcpStream::connect(addr) {
+@@ -66,6 +69,6 @@ fn main() {
+     for _ in 0..spawned_cnt {
+         rx.recv().unwrap();
+     }
+-    assert_eq!(spawned_cnt, 1000);
++    assert_eq!(spawned_cnt, TARGET_CNT);
+     process::exit(0);
+ }
+-- 
+2.9.1
+
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index b1b33d57bb2..85e842176f4 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
-, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git
+, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git, cmake, curl
 
 , isRelease ? false
+, needsCmake ? false
 , shortVersion
 , forceBundledLLVM ? false
 , srcSha, srcRev
@@ -13,26 +14,28 @@
 } @ args:
 
 let
-    version = if isRelease then
-        "${shortVersion}"
-      else
-        "${shortVersion}-g${builtins.substring 0 7 srcRev}";
+  inherit (stdenv.lib) optional optionalString;
 
-    name = "rustc-${version}";
+  version = if isRelease then
+      "${shortVersion}"
+    else
+      "${shortVersion}-g${builtins.substring 0 7 srcRev}";
 
-    procps = if stdenv.isDarwin then darwin.ps else args.procps;
+  name = "rustc-${version}";
 
-    llvmShared = llvm.override { enableSharedLibraries = true; };
+  procps = if stdenv.isDarwin then darwin.ps else args.procps;
 
-    target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
+  llvmShared = llvm.override { enableSharedLibraries = true; };
 
-    meta = with stdenv.lib; {
-      homepage = http://www.rust-lang.org/;
-      description = "A safe, concurrent, practical language";
-      maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
-      license = [ licenses.mit licenses.asl20 ];
-      platforms = platforms.linux ++ platforms.darwin;
-    };
+  target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
+
+  meta = with stdenv.lib; {
+    homepage = http://www.rust-lang.org/;
+    description = "A safe, concurrent, practical language";
+    maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
+    license = [ licenses.mit licenses.asl20 ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
 in
 
 stdenv.mkDerivation {
@@ -42,7 +45,7 @@ stdenv.mkDerivation {
 
   __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
+  NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
 
   src = fetchgit {
     url = https://github.com/rust-lang/rust;
@@ -55,11 +58,12 @@ stdenv.mkDerivation {
                 ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
                 # ++ [ "--jemalloc-root=${jemalloc}/lib"
                 ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
-                ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"
-                ++ stdenv.lib.optional (targets != []) "--target=${target}"
-                ++ stdenv.lib.optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
+                ++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
+                ++ optional (targets != []) "--target=${target}"
+                ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
 
   patches = patches ++ targetPatches;
+
   passthru.target = target;
 
   postPatch = ''
@@ -73,7 +77,7 @@ stdenv.mkDerivation {
       --replace "\$\$(subst  /,//," "\$\$(subst /,/,"
 
     # Fix dynamic linking against llvm
-    ${stdenv.lib.optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
+    ${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
 
     # Fix the configure script to not require curl as we won't use it
     sed -i configure \
@@ -84,6 +88,9 @@ stdenv.mkDerivation {
     #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
     #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
 
+    # Disable fragile linker-output-non-utf8 test
+    rm -vr src/test/run-make/linker-output-non-utf8/
+
     # Useful debugging parameter
     #export VERBOSE=1
   '';
@@ -94,10 +101,17 @@ stdenv.mkDerivation {
     configureFlagsArray+=("--infodir=$out/share/info")
   '';
 
+  # New -beta and -unstable unfortunately need cmake for compiling
+  # llvm-rt but don't use it for the normal build. This disables cmake
+  # in Nix.
+  dontUseCmakeConfigure = needsCmake;
+
   # ps is needed for one of the test cases
-  nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ];
+  nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git ]
+    ++ stdenv.lib.optional needsCmake [ cmake curl ];
+
   buildInputs = [ ncurses ] ++ targetToolchains
-    ++ stdenv.lib.optional (!forceBundledLLVM) llvmShared;
+    ++ optional (!forceBundledLLVM) llvmShared;
 
   # https://github.com/rust-lang/rust/issues/30181
   # enableParallelBuilding = false; # missing files during linking, occasionally
@@ -105,8 +119,12 @@ stdenv.mkDerivation {
   outputs = [ "out" "doc" ];
   setOutputFlags = false;
 
-  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
+  preCheck = ''
+    export TZDIR=${tzdata}/share/zoneinfo
+    ${optionalString stdenv.isDarwin "export TMPDIR=/tmp"}
+  '';
 
+  # Disable doCheck on Darwin to work around upstream issue
   doCheck = true;
   dontSetConfigureCross = true;
 }
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 296f81d271d..35467080e83 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.7";
+  version = "1.3.8";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0fjdqnb2rsm2vi9794ywp27jr239ddvzc4xfr0dk49jd4v7p2kc5";
+    sha256 = "0jfhrzsydgxzx0g90bl3fjys0i5biah76lkxjgh16l7h7577y8rh";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index d9c448970c9..638b10f76d5 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, openssl, mlton
+{ stdenv, lib, fetchurl, file, openssl, mlton
 , mysql, postgresql, sqlite
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "08km96hli5yp754nsxxjzih2la0m89j5wc2cq12rkas43nqqgr65";
   };
 
-  buildInputs = [ openssl mlton mysql postgresql sqlite ];
+  buildInputs = [ openssl mlton mysql.client postgresql sqlite ];
 
   prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export PGHEADER="${postgresql}/include/libpq-fe.h";
-    export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
+    export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h";
     export SQHEADER="${sqlite.dev}/include/sqlite3.h";
 
     export CCARGS="-I$out/include \
-                   -L${mysql.lib}/lib/mysql \
+                   -L${lib.getLib mysql.client}/lib/mysql \
                    -L${postgresql.lib}/lib \
                    -L${sqlite.out}/lib";
   '';
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d2339c7e297..8177afc037b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -165,7 +165,9 @@ self: super: {
   # FSEvents API is very buggy and tests are unreliable. See
   # http://openradar.appspot.com/10207999 and similar issues.
   # https://github.com/haskell-fswatch/hfsnotify/issues/62
-  fsnotify = dontCheck super.fsnotify; # if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify;
+  fsnotify = if pkgs.stdenv.isDarwin
+    then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
+    else dontCheck super.fsnotify;
 
   # the system-fileio tests use canonicalizePath, which fails in the sandbox
   system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
@@ -969,4 +971,46 @@ self: super: {
     url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch";
     sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29";
   });
+
+  # https://github.com/GaloisInc/HaNS/pull/12
+  hans = overrideCabal super.hans (drv: {
+    src = pkgs.fetchFromGitHub {
+      owner = "GaloisInc";
+      repo = "HaNS";
+      rev = "53e4af3ee46fc06b31754cec620209a81bbef456";
+      sha256 = "079205fqglzhh931h4n7qlrih18117m3w82ih19b8ygr55ps4ldj";
+    };
+    doHaddock = false;
+    patches = [(pkgs.fetchpatch {
+          url = "https://patch-diff.githubusercontent.com/raw/GaloisInc/HaNS/pull/12.patch";
+          sha256 = "0xa5b7i9wx32ji0zzlh1a1pws677iffby3bg39kv3c9srdb4by1g";
+      })];
+  });
+
+  # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for
+  # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config
+  # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH.
+  #
+  # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the
+  # RPATH also needs to be propagated when using static linking. GHC automatically handles this for
+  # us when we patch the cabal file (Link options will be recored in the ghc package registry).
+  GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
+
+  # https://github.com/gwern/mueval/issues/14
+  mueval = overrideCabal super.mueval (drv: {
+    revision = null;
+    editedCabalFile = null;
+    patches = [(pkgs.fetchpatch {
+      url = "https://github.com/gwern/mueval/commit/866f895e0b671bcaa232b46ed93dd7d47a4b32b2.patch";
+      sha256 = "16pb9nfr52hwidxv0f7j4yg8yd86959kzbcw9lmnzpvgdy5qyvkg";
+    })];
+  });
+
+  # remove if a version > 0.1.0.1 ever gets released
+  stunclient = overrideCabal super.stunclient (drv: {
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" ""
+    '';
+  });
+
 }
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 66f7d4763b4..d594170d458 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -63,6 +63,8 @@ self: super: {
   nats = dontHaddock super.nats;
   bytestring-builder = dontHaddock super.bytestring-builder;
 
+  hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
+
   # Setup: At least the following dependencies are missing: base <4.8
   hspec-expectations = overrideCabal super.hspec-expectations (drv: {
     postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
@@ -115,6 +117,8 @@ self: super: {
     license = pkgs.stdenv.lib.licenses.bsd3;
   }) {};
 
+  mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
+
   # diagrams/monoid-extras#19
   monoid-extras = overrideCabal super.monoid-extras (drv: {
     prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
@@ -186,7 +190,8 @@ self: super: {
   vty-ui = enableCabalFlag super.vty-ui "no-tests";
 
   # https://github.com/fpco/stackage/issues/1112
-  vector-algorithms = dontCheck super.vector-algorithms;
+  vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms)
+    [ self.mtl self.mwc-random ];
 
   # Trigger rebuild to mitigate broken packaes on Hydra.
   amazonka-core = triggerRebuild super.amazonka-core 1;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 1c4951a6c19..b09680574b0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -54,20 +54,16 @@ self: super: {
     broken = true;   # needs template-haskell >=2.9 && <2.11
   }) {};
 
-  # ghc-mod has a ghc-8 branch that has not yet been merged
-  ghc-mod = super."ghc-mod".overrideDerivation (attrs: rec {
-    src = pkgs.fetchFromGitHub {
-      owner  = "DanielG";
-      repo   = "ghc-mod";
-      rev    = "f2c7b01e372dd8c516b1ccbe5a1025cc7814347c";
-      sha256 = "1i45196qrzlhgbisnvkzni4n54saky0i1kyla162xcb5cg3kf2ji";
-    };
-  });
-
   # https://github.com/ygale/timezone-series/issues/2
   timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch {
     url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch";
     sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a";
   });
 
+  # https://github.com/bmillwood/applicative-quoters/issues/6
+  applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
+    sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
+  });
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ffa3405d6eb..2328e9f34cc 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -107,6 +107,7 @@ package-maintainers:
     - shakespeare
   abbradar:
     - Agda
+    - lambdabot
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
@@ -2212,7 +2213,6 @@ dont-distribute-packages:
   hinotify-bytestring:                          [ x86_64-darwin ]
   hinstaller:                                   [ i686-linux, x86_64-linux ]
   hint-server:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
-  hint:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   hinvaders:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   hinze-streams:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   hip:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2797,15 +2797,6 @@ dont-distribute-packages:
   lambda-devs:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   lambda-toolbox:                               [ i686-linux, x86_64-linux ]
   lambdaBase:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
-  lambdabot-core:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
-  lambdabot-haskell-plugins:                    [ i686-linux, x86_64-darwin, x86_64-linux ]
-  lambdabot-irc-plugins:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
-  lambdabot-misc-plugins:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
-  lambdabot-novelty-plugins:                    [ i686-linux, x86_64-darwin, x86_64-linux ]
-  lambdabot-reference-plugins:                  [ i686-linux, x86_64-darwin, x86_64-linux ]
-  lambdabot-social-plugins:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
-  lambdabot-utils:                              [ i686-linux, x86_64-linux ]
-  lambdabot:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   LambdaCalculator:                             [ i686-linux, x86_64-linux ]
   lambdacat:                                    [ i686-linux, x86_64-linux ]
   lambdacms-core:                               [ i686-linux, x86_64-linux ]
diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix
index f05b2059833..3acc98754ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts.nix
+++ b/pkgs/development/haskell-modules/configuration-lts.nix
@@ -467,6 +467,7 @@ self: super: {
   "HaLeX" = dontDistribute super."HaLeX";
   "HaMinitel" = dontDistribute super."HaMinitel";
   "HaPy" = dontDistribute super."HaPy";
+  "HaRe" = doDistribute super."HaRe_0_8_2_3";
   "HaTeX-meta" = dontDistribute super."HaTeX-meta";
   "HaTeX-qq" = dontDistribute super."HaTeX-qq";
   "HaVSA" = dontDistribute super."HaVSA";
@@ -1755,6 +1756,7 @@ self: super: {
   "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
+  "case-insensitive-match" = dontDistribute super."case-insensitive-match";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "casr-logbook" = dontDistribute super."casr-logbook";
@@ -1858,7 +1860,13 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_21";
+  "clash-lib" = doDistribute super."clash-lib_0_6_19";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_10";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_7";
+  "clash-verilog" = doDistribute super."clash-verilog_0_6_7";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_15";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_8";
@@ -2025,6 +2033,7 @@ self: super: {
   "console-program" = dontDistribute super."console-program";
   "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
   "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-dynamic" = dontDistribute super."constrained-dynamic";
   "constrained-normal" = dontDistribute super."constrained-normal";
   "constraint-classes" = dontDistribute super."constraint-classes";
   "constructible" = dontDistribute super."constructible";
@@ -2072,6 +2081,7 @@ self: super: {
   "copilot-theorem" = dontDistribute super."copilot-theorem";
   "copr" = dontDistribute super."copr";
   "core" = dontDistribute super."core";
+  "core-compiler" = dontDistribute super."core-compiler";
   "core-haskell" = dontDistribute super."core-haskell";
   "corebot-bliki" = dontDistribute super."corebot-bliki";
   "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
@@ -2245,6 +2255,7 @@ self: super: {
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
   "data-filepath" = dontDistribute super."data-filepath";
+  "data-files-gen" = dontDistribute super."data-files-gen";
   "data-fin" = dontDistribute super."data-fin";
   "data-fin-simple" = dontDistribute super."data-fin-simple";
   "data-fix" = dontDistribute super."data-fix";
@@ -2479,6 +2490,7 @@ self: super: {
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
+  "dlist" = doDistribute super."dlist_0_7_1_2";
   "dnscache" = dontDistribute super."dnscache";
   "dnsrbl" = dontDistribute super."dnsrbl";
   "dnssd" = dontDistribute super."dnssd";
@@ -2720,6 +2732,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "execs" = dontDistribute super."execs";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2819,6 +2832,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed-poly" = dontDistribute super."file-embed-poly";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2948,6 +2962,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vector-spaces" = dontDistribute super."free-vector-spaces";
   "freekick2" = dontDistribute super."freekick2";
   "freer" = dontDistribute super."freer";
   "freesect" = dontDistribute super."freesect";
@@ -3097,6 +3112,7 @@ self: super: {
   "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
   "ghc-make" = dontDistribute super."ghc-make";
   "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-mod" = doDistribute super."ghc-mod_5_5_0_0";
   "ghc-options" = dontDistribute super."ghc-options";
   "ghc-parmake" = dontDistribute super."ghc-parmake";
   "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
@@ -3545,6 +3561,7 @@ self: super: {
   "hakyll-convert" = dontDistribute super."hakyll-convert";
   "hakyll-elm" = dontDistribute super."hakyll-elm";
   "hakyll-filestore" = dontDistribute super."hakyll-filestore";
+  "hakyll-ogmarkup" = dontDistribute super."hakyll-ogmarkup";
   "halberd" = dontDistribute super."halberd";
   "halfs" = dontDistribute super."halfs";
   "halipeto" = dontDistribute super."halipeto";
@@ -3555,6 +3572,7 @@ self: super: {
   "hampp" = dontDistribute super."hampp";
   "hamtmap" = dontDistribute super."hamtmap";
   "hamusic" = dontDistribute super."hamusic";
+  "handa-data" = dontDistribute super."handa-data";
   "handa-gdata" = dontDistribute super."handa-gdata";
   "handa-geodata" = dontDistribute super."handa-geodata";
   "handa-opengl" = dontDistribute super."handa-opengl";
@@ -3675,6 +3693,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-exts-simple" = dontDistribute super."haskell-src-exts-simple";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-tools-ast" = dontDistribute super."haskell-tools-ast";
@@ -3893,6 +3912,7 @@ self: super: {
   "hgeos" = dontDistribute super."hgeos";
   "hgithub" = dontDistribute super."hgithub";
   "hgl-example" = dontDistribute super."hgl-example";
+  "hgmp" = dontDistribute super."hgmp";
   "hgom" = dontDistribute super."hgom";
   "hgopher" = dontDistribute super."hgopher";
   "hgrev" = dontDistribute super."hgrev";
@@ -4307,6 +4327,7 @@ self: super: {
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
   "http-response-decoder" = dontDistribute super."http-response-decoder";
+  "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_3";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4673,6 +4694,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kawaii" = dontDistribute super."kawaii";
   "kawhi" = dontDistribute super."kawhi";
   "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
@@ -4715,6 +4737,8 @@ self: super: {
   "kit" = dontDistribute super."kit";
   "kmeans-par" = dontDistribute super."kmeans-par";
   "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knead" = dontDistribute super."knead";
+  "knead-arithmetic" = dontDistribute super."knead-arithmetic";
   "knots" = dontDistribute super."knots";
   "koellner-phonetic" = dontDistribute super."koellner-phonetic";
   "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
@@ -5055,6 +5079,7 @@ self: super: {
   "lui" = dontDistribute super."lui";
   "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_11_0_2";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -5198,6 +5223,7 @@ self: super: {
   "microlens" = doDistribute super."microlens_0_4_5_0";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_4_5_0";
+  "microlens-mtl" = doDistribute super."microlens-mtl_0_1_9_0";
   "microlens-platform" = doDistribute super."microlens-platform_0_3_3_0";
   "micrologger" = dontDistribute super."micrologger";
   "microtimer" = dontDistribute super."microtimer";
@@ -5422,6 +5448,7 @@ self: super: {
   "mysql-effect" = dontDistribute super."mysql-effect";
   "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
   "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mystem" = dontDistribute super."mystem";
   "mywatch" = dontDistribute super."mywatch";
   "mzv" = dontDistribute super."mzv";
   "n-m" = dontDistribute super."n-m";
@@ -5488,6 +5515,7 @@ self: super: {
   "netwire" = dontDistribute super."netwire";
   "netwire-input" = dontDistribute super."netwire-input";
   "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network" = doDistribute super."network_2_6_2_1";
   "network-address" = dontDistribute super."network-address";
   "network-api-support" = dontDistribute super."network-api-support";
   "network-bitcoin" = dontDistribute super."network-bitcoin";
@@ -5555,6 +5583,7 @@ self: super: {
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
   "non-empty" = dontDistribute super."non-empty";
+  "non-empty-sequence" = dontDistribute super."non-empty-sequence";
   "non-negative" = dontDistribute super."non-negative";
   "nondeterminism" = dontDistribute super."nondeterminism";
   "nonempty-alternative" = dontDistribute super."nonempty-alternative";
@@ -5614,6 +5643,7 @@ self: super: {
   "oden-go-packages" = dontDistribute super."oden-go-packages";
   "oeis" = dontDistribute super."oeis";
   "off-simple" = dontDistribute super."off-simple";
+  "ogmarkup" = dontDistribute super."ogmarkup";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
   "oi" = dontDistribute super."oi";
   "oidc-client" = dontDistribute super."oidc-client";
@@ -5669,6 +5699,7 @@ self: super: {
   "opentheory-probability" = dontDistribute super."opentheory-probability";
   "opentheory-stream" = dontDistribute super."opentheory-stream";
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational" = doDistribute super."operational_0_2_3_2";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
@@ -5754,6 +5785,7 @@ self: super: {
   "parsec-numbers" = dontDistribute super."parsec-numbers";
   "parsec-parsers" = dontDistribute super."parsec-parsers";
   "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-pratt" = dontDistribute super."parsec-pratt";
   "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
   "parsec-trace" = dontDistribute super."parsec-trace";
   "parsec-utils" = dontDistribute super."parsec-utils";
@@ -5907,6 +5939,7 @@ self: super: {
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-protolude" = dontDistribute super."pipes-protolude";
   "pipes-random" = dontDistribute super."pipes-random";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-s3" = dontDistribute super."pipes-s3";
@@ -6120,6 +6153,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psqueues" = doDistribute super."psqueues_0_2_2_1";
+  "pstemmer" = dontDistribute super."pstemmer";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20160522";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6224,6 +6258,7 @@ self: super: {
   "radium-formula-parser" = dontDistribute super."radium-formula-parser";
   "radix" = dontDistribute super."radix";
   "rados-haskell" = dontDistribute super."rados-haskell";
+  "raft" = dontDistribute super."raft";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
   "rake" = dontDistribute super."rake";
@@ -6374,6 +6409,7 @@ self: super: {
   "relational-record-examples" = dontDistribute super."relational-record-examples";
   "relative-date" = dontDistribute super."relative-date";
   "relit" = dontDistribute super."relit";
+  "reload" = dontDistribute super."reload";
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
@@ -6670,6 +6706,8 @@ self: super: {
   "serv-wai" = dontDistribute super."serv-wai";
   "servant-aeson-specs" = dontDistribute super."servant-aeson-specs";
   "servant-auth-cookie" = dontDistribute super."servant-auth-cookie";
+  "servant-auth-token" = dontDistribute super."servant-auth-token";
+  "servant-auth-token-api" = dontDistribute super."servant-auth-token-api";
   "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6677,6 +6715,7 @@ self: super: {
   "servant-github" = dontDistribute super."servant-github";
   "servant-haxl-client" = dontDistribute super."servant-haxl-client";
   "servant-jquery" = dontDistribute super."servant-jquery";
+  "servant-matrix-param" = dontDistribute super."servant-matrix-param";
   "servant-pandoc" = dontDistribute super."servant-pandoc";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
@@ -6808,6 +6847,7 @@ self: super: {
   "simseq" = dontDistribute super."simseq";
   "simtreelo" = dontDistribute super."simtreelo";
   "sindre" = dontDistribute super."sindre";
+  "singleton-bool" = dontDistribute super."singleton-bool";
   "singleton-nats" = dontDistribute super."singleton-nats";
   "singletons" = doDistribute super."singletons_2_0_1";
   "sink" = dontDistribute super."sink";
@@ -7357,6 +7397,7 @@ self: super: {
   "text-utf7" = dontDistribute super."text-utf7";
   "text-xml-generic" = dontDistribute super."text-xml-generic";
   "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text-zipper" = doDistribute super."text-zipper_0_4";
   "text-zipper-monad" = dontDistribute super."text-zipper-monad";
   "text1" = dontDistribute super."text1";
   "textPlot" = dontDistribute super."textPlot";
@@ -7490,6 +7531,7 @@ self: super: {
   "total-maps" = dontDistribute super."total-maps";
   "touched" = dontDistribute super."touched";
   "toysolver" = dontDistribute super."toysolver";
+  "tpar" = dontDistribute super."tpar";
   "tpdb" = dontDistribute super."tpdb";
   "trace" = dontDistribute super."trace";
   "trace-call" = dontDistribute super."trace-call";
@@ -7616,6 +7658,7 @@ self: super: {
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
   "type-settheory" = dontDistribute super."type-settheory";
+  "type-spec" = dontDistribute super."type-spec";
   "type-spine" = dontDistribute super."type-spine";
   "type-structure" = dontDistribute super."type-structure";
   "type-sub-th" = dontDistribute super."type-sub-th";
@@ -7630,7 +7673,6 @@ self: super: {
   "typelevel-tensor" = dontDistribute super."typelevel-tensor";
   "typeof" = dontDistribute super."typeof";
   "typeparams" = dontDistribute super."typeparams";
-  "typerbole" = dontDistribute super."typerbole";
   "typesafe-endian" = dontDistribute super."typesafe-endian";
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
@@ -7855,6 +7897,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_5";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7885,9 +7928,11 @@ self: super: {
   "wai-middleware-route" = dontDistribute super."wai-middleware-route";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = doDistribute super."wai-middleware-verbs_0_2_0";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_6";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
+  "wai-routing" = doDistribute super."wai-routing_0_12_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-mysql" = dontDistribute super."wai-session-mysql";
@@ -7897,9 +7942,11 @@ self: super: {
   "wai-test" = dontDistribute super."wai-test";
   "wai-thrift" = dontDistribute super."wai-thrift";
   "wai-throttler" = dontDistribute super."wai-throttler";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_9";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_7";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index dff47c509f9..a3c87a5ef9a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7101,15 +7101,17 @@ self: {
      }) {inherit (pkgs) fuse;};
 
   "HGE2D" = callPackage
-    ({ mkDerivation, base, GLUT, OpenGL, safe, time }:
+    ({ mkDerivation, base, GLUT, hspec, OpenGL, QuickCheck, safe, time
+     }:
      mkDerivation {
        pname = "HGE2D";
-       version = "0.1.9.0";
-       sha256 = "59777250da5b74324c92fb7b2c9a306f2be670877eb32655e0d844690f9b09c4";
+       version = "0.1.9.2";
+       sha256 = "7b19fae05b9e60c03244f80abd46865ac7387f8fdb8ddadf24a199f44f507c65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base GLUT OpenGL safe time ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/I3ck/HGE2D";
        description = "2D game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -8466,7 +8468,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "HaRe" = callPackage
+  "HaRe_0_8_2_3" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-helper, containers
      , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod
      , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit
@@ -8508,6 +8510,52 @@ self: {
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HaRe" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-helper, containers
+     , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod
+     , ghc-paths, ghc-prim, ghc-syb-utils, gitrev, hslogger, hspec
+     , HUnit, monad-control, monoid-extras, mtl, old-time
+     , optparse-applicative, optparse-simple, parsec, pretty, process
+     , QuickCheck, rosezipper, semigroups, silently
+     , Strafunski-StrategyLib, stringbuilder, syb, syz, time
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "HaRe";
+       version = "0.8.3.0";
+       sha256 = "11e302f5379fe88aa8740a886f321e3e14c29b0b39417ab0621f3a070c1edcd2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal cabal-helper containers directory filepath ghc
+         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger
+         monad-control monoid-extras mtl old-time pretty rosezipper
+         semigroups Strafunski-StrategyLib syb syz time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         array base Cabal cabal-helper containers directory filepath ghc
+         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils gitrev
+         hslogger monad-control monoid-extras mtl old-time
+         optparse-applicative optparse-simple parsec pretty rosezipper
+         semigroups Strafunski-StrategyLib syb syz time transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base Cabal cabal-helper containers deepseq Diff directory filepath
+         ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils
+         hslogger hspec HUnit monad-control monoid-extras mtl old-time
+         process QuickCheck rosezipper semigroups silently
+         Strafunski-StrategyLib stringbuilder syb syz time transformers
+         transformers-base
+       ];
+       doCheck = false;
+       homepage = "https://github.com/RefactoringTools/HaRe/wiki";
+       description = "the Haskell Refactorer";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
@@ -19655,6 +19703,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "active_0_2_0_11" = callPackage
+    ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
+     , semigroups, vector
+     }:
+     mkDerivation {
+       pname = "active";
+       version = "0.2.0.11";
+       sha256 = "0305aefae4d0cecb0854536b1d2f3c9dc8f88eadb344f3684070538b3a3e4e18";
+       libraryHaskellDepends = [
+         base lens linear semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base lens linear QuickCheck semigroupoids semigroups vector
+       ];
+       jailbreak = true;
+       description = "Abstractions for animation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "activehs" = callPackage
     ({ mkDerivation, activehs-base, array, base, blaze-html, bytestring
      , cmdargs, containers, data-pprint, deepseq, dia-base
@@ -20215,15 +20283,15 @@ self: {
 
   "aeson-injector" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens
-     , QuickCheck, quickcheck-text, swagger2, tasty, tasty-hunit
-     , tasty-quickcheck, text, unordered-containers
+     , QuickCheck, quickcheck-text, servant-docs, swagger2, tasty
+     , tasty-hunit, tasty-quickcheck, text, unordered-containers
      }:
      mkDerivation {
        pname = "aeson-injector";
-       version = "1.0.2.0";
-       sha256 = "7944a3e56660d83774adafa78a4f3e740af714b0dd6e32f98c87a668ca12bec1";
+       version = "1.0.3.0";
+       sha256 = "218676310c07f9286df1df9bd1c38bbbf599ab4a825c1980acb0f8555d54e2e5";
        libraryHaskellDepends = [
-         aeson base bifunctors deepseq lens swagger2 text
+         aeson base bifunctors deepseq lens servant-docs swagger2 text
          unordered-containers
        ];
        testHaskellDepends = [
@@ -26243,10 +26311,9 @@ self: {
     ({ mkDerivation, attoparsec, base, text }:
      mkDerivation {
        pname = "attoparsec-csv";
-       version = "0.1.0.1";
-       sha256 = "1be03800c7f8fcfade041affd567716f4102984464e068f5ec2ddb834c7a017e";
+       version = "0.1.1.0";
+       sha256 = "f7f8436b8d5bc5f846c6cb25041768bdbb4fb6d9d8be66af481144a885787f39";
        libraryHaskellDepends = [ attoparsec base text ];
-       jailbreak = true;
        homepage = "https://github.com/robinbb/attoparsec-csv";
        description = "A parser for CSV files that uses Attoparsec";
        license = "unknown";
@@ -27027,6 +27094,7 @@ self: {
          resourcet tagged tasty tasty-hunit tasty-quickcheck text time
          transformers transformers-base
        ];
+       doCheck = false;
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -30785,8 +30853,8 @@ self: {
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.2.0";
-       sha256 = "daed7af121b14dfbe493b15eb470323a17c1bf28ba330d73e8690e76f13dc8c2";
+       version = "0.2.1";
+       sha256 = "3085dd865c075555a8d67049840d0cd9ce66d5565d55aee48f54950354b9c72f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33770,6 +33838,7 @@ self: {
          QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/haskell/bytestring";
        description = "Fast, compact, strict and lazy byte strings with a list interface";
        license = stdenv.lib.licenses.bsd3;
@@ -34582,36 +34651,6 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.7.1.0";
-       sha256 = "7c78b875b5f246b8422b641923d2ffe593bf65ce9e99373e19ef8372df8db66f";
-       revision = "2";
-       editedCabalFile = "b84eff37825d78f316e9712e175937b54b35d7c67eed8741a3db160800fbd177";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base Cabal directory filepath ghc-prim mtl process transformers
-       ];
-       executableHaskellDepends = [
-         base bytestring Cabal directory filepath ghc-prim process
-         template-haskell temporary transformers utf8-string
-       ];
-       testHaskellDepends = [
-         base bytestring Cabal directory extra filepath ghc-prim mtl process
-         template-haskell temporary transformers unix utf8-string
-       ];
-       testToolDepends = [ cabal-install ];
-       doCheck = false;
-       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
-       license = stdenv.lib.licenses.agpl3;
-     }) {};
-
-  "cabal-helper_0_7_2_0" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory
-     , extra, filepath, ghc-prim, mtl, process, template-haskell
-     , temporary, transformers, unix, utf8-string
-     }:
-     mkDerivation {
-       pname = "cabal-helper";
        version = "0.7.2.0";
        sha256 = "90572b1e4aeb780464f7d5f2f88c4f59ebb4539fe303f0b86d42ef3b9078a362";
        isLibrary = true;
@@ -34631,7 +34670,6 @@ self: {
        doCheck = false;
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-info" = callPackage
@@ -36411,6 +36449,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "case-insensitive-match" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, QuickCheck, text }:
+     mkDerivation {
+       pname = "case-insensitive-match";
+       version = "0.1.1.0";
+       sha256 = "4f5003124b840d05d60e0256d18ae25aa4d5fd78d106c821f26687392adba437";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring text ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring mtl QuickCheck text ];
+       homepage = "https://github.com/mikehat/case-insensitive-match";
+       description = "A simplified, faster way to do case-insensitive matching";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cased" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -38662,7 +38716,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-ghc" = callPackage
+  "clash-ghc_0_6_21" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
      , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
      , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra
@@ -38687,10 +38741,38 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-ghc" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
+     , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
+     , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra
+     , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl
+     , process, text, time, transformers, unbound-generics, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "0.6.22";
+       sha256 = "26fabe321e4f27974428672d69e39699368674978559242ea28699bd76d35e4d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bifunctors bytestring clash-lib clash-prelude
+         clash-systemverilog clash-verilog clash-vhdl containers deepseq
+         directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise
+         hashable haskeline lens mtl process text time transformers
+         unbound-generics unix unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware";
+       license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "clash-lib" = callPackage
+  "clash-lib_0_6_19" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process
@@ -38711,9 +38793,33 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-prelude" = callPackage
+  "clash-lib" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
+     , concurrent-supply, containers, deepseq, directory, errors, fgl
+     , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process
+     , template-haskell, text, time, transformers, unbound-generics
+     , unordered-containers, uu-parsinglib, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-lib";
+       version = "0.6.20";
+       sha256 = "93e5c409bf5bcc27a2623876c53a7123ed5bbb5c9b0839a6bca406b5823b8304";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clash-prelude concurrent-supply
+         containers deepseq directory errors fgl filepath ghc hashable
+         integer-gmp lens mtl pretty process template-haskell text time
+         transformers unbound-generics unordered-containers uu-parsinglib
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - As a Library";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "clash-prelude_0_10_10" = callPackage
     ({ mkDerivation, array, base, data-default, doctest, ghc-prim
      , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
      , QuickCheck, reflection, singletons, template-haskell
@@ -38728,6 +38834,28 @@ self: {
          singletons template-haskell
        ];
        testHaskellDepends = [ base doctest ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Prelude library";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-prelude" = callPackage
+    ({ mkDerivation, array, base, data-default, deepseq, doctest
+     , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise
+     , integer-gmp, lens, QuickCheck, reflection, singletons
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "0.10.11";
+       sha256 = "6b502cd0ceceee1f61d9150f29453b17246e128d5a6d5b21eeb301095351a627";
+       libraryHaskellDepends = [
+         array base data-default deepseq ghc-prim ghc-typelits-extra
+         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
+         singletons template-haskell
+       ];
+       testHaskellDepends = [ base doctest ];
        doCheck = false;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
@@ -38747,7 +38875,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "clash-systemverilog" = callPackage
+  "clash-systemverilog_0_6_7" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -38762,9 +38890,27 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-verilog" = callPackage
+  "clash-systemverilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-systemverilog";
+       version = "0.6.8";
+       sha256 = "2d8847467c0c6e0d20125c36c806f6fbd7e39ccf38fbb50572e76f5399010a28";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "clash-verilog_0_6_7" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -38779,9 +38925,27 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-vhdl" = callPackage
+  "clash-verilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-verilog";
+       version = "0.6.8";
+       sha256 = "3f7ba6a32c6313c55e856038a13b214f51d9084a273209692323700ee2ee2ce3";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Verilog backend";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "clash-vhdl_0_6_15" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -38796,6 +38960,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-vhdl" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-vhdl";
+       version = "0.6.16";
+       sha256 = "42f4be26a545144c0e950c2a0b3d59516e93e73ed2c6d32d3c449e233d32b0c8";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - VHDL backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "classify" = callPackage
@@ -39582,8 +39764,8 @@ self: {
      }:
      mkDerivation {
        pname = "cloud-haskell";
-       version = "0.2.0.0";
-       sha256 = "0698fe456337b7ebe084d5e980d8e322392ca0dd4f336a9de67eefe1fec92286";
+       version = "0.3.0.0";
+       sha256 = "d7ca57607e3f802eea1c86efbcf8e7805281ec716bc5cfc5758ea0ddedab48e7";
        libraryHaskellDepends = [
          distributed-process distributed-process-async
          distributed-process-client-server distributed-process-execution
@@ -39592,7 +39774,6 @@ self: {
          rank1dynamic
        ];
        doHaddock = false;
-       jailbreak = true;
        homepage = "http://github.com/haskell-distributed/cloud-haskell";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -40512,12 +40693,14 @@ self: {
      }) {};
 
   "colonnade" = callPackage
-    ({ mkDerivation, base, contravariant, vector }:
+    ({ mkDerivation, base, bytestring, contravariant, text, vector }:
      mkDerivation {
        pname = "colonnade";
-       version = "0.3";
-       sha256 = "eab23a4fc5a24b3ab1c40254a63ccfdacf19c59fdead79258ee58e2d42f111c7";
-       libraryHaskellDepends = [ base contravariant vector ];
+       version = "0.4";
+       sha256 = "110c695a853da086472ce1126db36f15eac0f5d8b43b5451d8ff63200a921699";
+       libraryHaskellDepends = [
+         base bytestring contravariant text vector
+       ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Generic types and functions for columnar encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
@@ -42204,14 +42387,12 @@ self: {
      }) {};
 
   "config-value" = callPackage
-    ({ mkDerivation, alex, array, base, happy, pretty, text
-     , transformers
-     }:
+    ({ mkDerivation, alex, array, base, happy, pretty, text }:
      mkDerivation {
        pname = "config-value";
-       version = "0.4.0.2";
-       sha256 = "214481f20acac05b7a67dad3ce11b0965b19429c4ddb95ed1f869caffaaefc57";
-       libraryHaskellDepends = [ array base pretty text transformers ];
+       version = "0.5";
+       sha256 = "2a2d825c1f23516c64d5ca6b587951b80be44006c09832177e61cfc0743692fa";
+       libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
        description = "Simple, layout-based value language similar to YAML or JSON";
@@ -42224,6 +42405,8 @@ self: {
        pname = "config-value-getopt";
        version = "0.1.0.0";
        sha256 = "00b65bcf60b26f7004665f183d7114dfb6380230c2f50e093403ca8a74bfaccb";
+       revision = "1";
+       editedCabalFile = "bcabc9ce380b21989fc45664b654c2cf1474bd3dc4caa1a7961f8d1181fbd49b";
        libraryHaskellDepends = [ base config-value text ];
        homepage = "https://github.com/GaloisInc/config-value-getopt";
        description = "Interface between config-value and System.GetOpt";
@@ -42518,6 +42701,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "constrained-dynamic" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "constrained-dynamic";
+       version = "0.1.0.0";
+       sha256 = "20952857c40fcb730584000d2a98e6a89f9f457b86e5e035ae055b40919c8f49";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Dynamic typing with retained constraints";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "constrained-normal" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -43492,6 +43687,26 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "core-compiler" = callPackage
+    ({ mkDerivation, alex, array, base, containers, happy, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "core-compiler";
+       version = "0.1.0.0";
+       sha256 = "06fe348263225cf8410f59b848e2f91ee1618735cde87ac0ec2989b76af8072e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers text unordered-containers
+       ];
+       executableHaskellDepends = [ array base ];
+       executableToolDepends = [ alex happy ];
+       homepage = "https://github.com/aneksteind/Core#readme";
+       description = "compile your own mini functional language with Core";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "core-haskell" = callPackage
     ({ mkDerivation, base, haskeline, haskell-src-exts, hint }:
      mkDerivation {
@@ -47367,6 +47582,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-files-gen" = callPackage
+    ({ mkDerivation, base, containers, data-default, directory
+     , filepath, hspec
+     }:
+     mkDerivation {
+       pname = "data-files-gen";
+       version = "0.0.0.1";
+       sha256 = "8da5e450dce9d20d31014d107c9359e00544bda02b13cc2f31b4277a6b5d23de";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-default directory filepath
+       ];
+       executableHaskellDepends = [ base containers data-default ];
+       testHaskellDepends = [ base containers data-default hspec ];
+       homepage = "https://github.com/JPMoresmau/data-files-gen#readme";
+       description = "Generate data-files Cabal file field from existing files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-fin" = callPackage
     ({ mkDerivation, base, lazysmallcheck, prelude-safeenum, QuickCheck
      , reflection, smallcheck, tagged
@@ -49200,12 +49435,12 @@ self: {
     ({ mkDerivation, base, doctest, mtl, QuickCheck }:
      mkDerivation {
        pname = "decimal-arithmetic";
-       version = "0.2.0.0";
-       sha256 = "a9092bfd2ee11e744dccfd7c9f4e90c24efafa98eaa285ebb8f2f0fa46fb257c";
+       version = "0.4.0.0";
+       sha256 = "b632462fcc18b8b6f4f0eb21b2b29c6075f7335dcad1ddb1a268264c513b4d0f";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "https://github.com/verement/decimal-arithmetic#readme";
-       description = "An implementation of Mike Cowlishaw's General Decimal Arithmetic Specification";
+       description = "An implementation of the General Decimal Arithmetic Specification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -52720,7 +52955,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "dlist" = callPackage
+  "dlist_0_7_1_2" = callPackage
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
      mkDerivation {
        pname = "dlist";
@@ -52731,9 +52966,10 @@ self: {
        homepage = "https://github.com/spl/dlist";
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dlist_0_8_0_1" = callPackage
+  "dlist" = callPackage
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
      mkDerivation {
        pname = "dlist";
@@ -52742,10 +52978,10 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/spl/dlist";
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dlist-instances" = callPackage
@@ -53230,8 +53466,8 @@ self: {
     ({ mkDerivation, base, impure-containers, text }:
      mkDerivation {
        pname = "dot";
-       version = "0.2.0";
-       sha256 = "58d5e5d0848f3fa255d61a48a98e005d0c460088d6e5dc6b160ec4f0e50bb25d";
+       version = "0.2.2";
+       sha256 = "438175f3d74ef9770cba1a7148ddb7311e1ea53a19dc467cd8ee995ad73e9b48";
        libraryHaskellDepends = [ base impure-containers text ];
        homepage = "https://github.com/andrewthad/dot#readme";
        description = "Data types and encoding for graphviz dot files";
@@ -54419,13 +54655,12 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-graph";
-       version = "0.1.0.8";
-       sha256 = "b32c42edb14b0c0e4e112981ebd7169bbce9bc546c4275fc5fda865a3fe507d2";
+       version = "0.1.0.9";
+       sha256 = "179f607c961865739ad0b6ba07d3e324473b4845d6173c0959e45e008b4f4a5d";
        libraryHaskellDepends = [
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -56345,8 +56580,8 @@ self: {
      }:
      mkDerivation {
        pname = "encoding";
-       version = "0.8";
-       sha256 = "518a32d95a29cb1dff49afac6235287730dd675cf6e14b9ddc17e7be53ea4e78";
+       version = "0.8.1";
+       sha256 = "d96f985432a78693bfd26b4881ff3a139a15ad1f7abebacc771fed3eaa90adb9";
        libraryHaskellDepends = [
          array base binary bytestring containers extensible-exceptions
          ghc-prim HaXml mtl regex-compat
@@ -56639,15 +56874,12 @@ self: {
     ({ mkDerivation, base, containers, deepseq, template-haskell }:
      mkDerivation {
        pname = "enummapset-th";
-       version = "0.6.1.0";
-       sha256 = "bd7ec9fd9063dcf9c8504fe509abdd15466261ef2ba9ec62d6e6abb51e8694f6";
-       revision = "1";
-       editedCabalFile = "2544cf675da1fd28debde06f5d2c9747da0d8b48aa66f2374886d38333f8dc17";
+       version = "0.6.1.1";
+       sha256 = "7cc2028dfb41b1450be788f4b600f602965c3f7f70428c586a7ba3c97556d52a";
        libraryHaskellDepends = [
          base containers deepseq template-haskell
        ];
-       jailbreak = true;
-       homepage = "https://github.com/liyang/enummapset-th";
+       homepage = "https://github.com/tsurucapital/enummapset-th";
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -57564,23 +57796,21 @@ self: {
      }) {};
 
   "euphoria" = callPackage
-    ({ mkDerivation, base, containers, data-default, deepseq, elerea
-     , enummapset-th, hashable, HUnit, test-framework
-     , test-framework-hunit, test-framework-th, transformers
-     , unordered-containers
+    ({ mkDerivation, base, containers, deepseq, elerea, enummapset-th
+     , hashable, HUnit, test-framework, test-framework-hunit
+     , test-framework-th, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "euphoria";
-       version = "0.6.0.1";
-       sha256 = "a92641035be6dba46d44b9c24d227ba6a5c59e19eba862e91ac883216939b4ae";
+       version = "0.8.0.0";
+       sha256 = "30703f7bc6063fbce127b0b1631ca4236ec59adfc2d7de436c7c5daaeafe118a";
        libraryHaskellDepends = [
-         base containers data-default deepseq elerea enummapset-th hashable
-         HUnit transformers unordered-containers
+         base containers deepseq elerea enummapset-th hashable HUnit
+         transformers unordered-containers
        ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
-       jailbreak = true;
        homepage = "http://github.com/tsurucapital/euphoria";
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
@@ -58020,6 +58250,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "execs" = callPackage
+    ({ mkDerivation, base, directory, process, text }:
+     mkDerivation {
+       pname = "execs";
+       version = "0.1.0.0";
+       sha256 = "024cb1f39efb7ab8e9bf2dbd9c4ef20872faf0dc4aa39c5f2070860cd455d313";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base directory process text ];
+       jailbreak = true;
+       homepage = "https://github.com/wapxmas/execs#readme";
+       description = "Tool to run stack exec prj-exe more easy";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "executable-hash" = callPackage
     ({ mkDerivation, base, bytestring, cryptohash, directory
      , executable-path, file-embed, template-haskell
@@ -60022,11 +60268,10 @@ self: {
     ({ mkDerivation, base, fftw }:
      mkDerivation {
        pname = "fftwRaw";
-       version = "0.1.0.0";
-       sha256 = "24cf427a14bc30d6d333ad71e1e5de25497564016a1d627655322bf2c4b173b6";
+       version = "0.1.0.1";
+       sha256 = "dfdb8165b63b335d7736f5e28ea5c8c4450569849a157a5485b98261674545cd";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fftw ];
-       jailbreak = true;
        homepage = "https://github.com/adamwalker/haskell-fftw-simple";
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
@@ -60226,6 +60471,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "file-embed-poly" = callPackage
+    ({ mkDerivation, base, bytestring, directory, file-embed, filepath
+     , hspec, template-haskell
+     }:
+     mkDerivation {
+       pname = "file-embed-poly";
+       version = "0.1.0";
+       sha256 = "46c80ed8670818a2f92acc81fc11306e2f32cbe27496ed360093c57aa1f3a985";
+       libraryHaskellDepends = [
+         base bytestring directory filepath template-haskell
+       ];
+       testHaskellDepends = [
+         base bytestring directory file-embed filepath hspec
+       ];
+       homepage = "https://github.com/sasinestro/file-embed";
+       description = "Use Template Haskell to embed file contents directly";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "file-location" = callPackage
     ({ mkDerivation, base, containers, HUnit, lifted-base, process
      , template-haskell, th-orphans, transformers
@@ -62952,6 +63216,18 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "free-vector-spaces" = callPackage
+    ({ mkDerivation, base, lens, linear, MemoTrie, vector-space }:
+     mkDerivation {
+       pname = "free-vector-spaces";
+       version = "0.1.0.0";
+       sha256 = "9b8d239b900d47869d019fb67c36f369e9ca53a8e95cdad14d00486e7992dbbc";
+       libraryHaskellDepends = [ base lens linear MemoTrie vector-space ];
+       homepage = "https://github.com/leftaroundabout/free-vector-spaces";
+       description = "Instantiate the classes from the vector-space package with types from linear";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "free-vl" = callPackage
     ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
      mkDerivation {
@@ -65308,15 +65584,15 @@ self: {
      }:
      mkDerivation {
        pname = "geolite-csv";
-       version = "0.1.0";
-       sha256 = "c7c707f20c4f2f42f842bf18485a58555dc3dd62b8ef314cc54a10f003b2baa6";
+       version = "0.2";
+       sha256 = "17b66c7164a2f93eb489611dde877617bf0cc1e1e995d7f502e4c71440151208";
        libraryHaskellDepends = [ base colonnade ip pipes siphon text ];
        testHaskellDepends = [
          base colonnade directory HUnit pipes pipes-bytestring pipes-text
          siphon test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/andrewthad/colonnade";
-       description = "Initial project template from stack";
+       description = "Geolite CSV Parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -65570,6 +65846,8 @@ self: {
        pname = "ghc-events";
        version = "0.4.4.0";
        sha256 = "ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d";
+       revision = "1";
+       editedCabalFile = "a52145a9a2f5e75daa15fd0ecc22262a93f1213351cb37b6df84ca0a828fdc65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65581,7 +65859,6 @@ self: {
        testHaskellDepends = [
          array base binary bytestring containers mtl
        ];
-       jailbreak = true;
        doCheck = false;
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -65754,6 +66031,7 @@ self: {
          monad-journal mtl optparse-applicative parsec process
          process-streaming safe syb transformers
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
@@ -65791,7 +66069,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-mod" = callPackage
+  "ghc-mod_5_5_0_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, cabal-helper, containers
      , deepseq, directory, djinn-ghc, doctest, extra, fclabels, filepath
      , ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec
@@ -65822,6 +66100,45 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ghc-mod" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
+     , containers, deepseq, directory, djinn-ghc, doctest, extra
+     , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils
+     , haskell-src-exts, hlint, hspec, monad-control, monad-journal, mtl
+     , old-time, optparse-applicative, pipes, pretty, process, safe
+     , split, syb, template-haskell, temporary, text, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "ghc-mod";
+       version = "5.6.0.0";
+       sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [
+         base Cabal containers filepath process template-haskell
+         transformers
+       ];
+       libraryHaskellDepends = [
+         base binary bytestring cabal-helper containers deepseq directory
+         djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths
+         ghc-syb-utils haskell-src-exts hlint monad-control monad-journal
+         mtl old-time optparse-applicative pipes pretty process safe split
+         syb template-haskell temporary text time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         base binary deepseq directory fclabels filepath ghc monad-control
+         mtl old-time optparse-applicative pretty process split time
+       ];
+       testHaskellDepends = [ base doctest hspec ];
+       doCheck = false;
+       homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
+       description = "Happy Haskell Programming";
+       license = stdenv.lib.licenses.agpl3;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -66134,10 +66451,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-presburger";
-       version = "0.1.0.0";
-       sha256 = "b1680ec1b8c0d687f3212b17028e199cbcb74cfdeb7810cf032b84c37db96e57";
-       revision = "6";
-       editedCabalFile = "36bbf66eb11f1937d0c389922c9d515705a35ec86f6a4f9ca796de0602d66df4";
+       version = "0.1.1.0";
+       sha256 = "bcb005e8c4ae609a75ceef344abe5b2282d23f0dc409426bda9965e02d2d4f92";
        libraryHaskellDepends = [
          base equational-reasoning ghc ghc-tcplugins-extra presburger
          reflection
@@ -66426,15 +66741,15 @@ self: {
      }:
      mkDerivation {
        pname = "ghcjs-hplay";
-       version = "0.3.2";
-       sha256 = "13909a7390cc963def4ae053950f0ef8346df85c9370c2ae5a650cb4f29793f6";
+       version = "0.3.4";
+       sha256 = "7a3b5d91883912b0f768129cde6a89ed71ab0d3a94749fcf8b9d9197959541f8";
        libraryHaskellDepends = [
          base containers ghcjs-perch mtl transformers transient
          transient-universe
        ];
        homepage = "https://github.com/agocorona/ghcjs-hplay";
-       description = "client-side Web EDSL for transient nodes running in the Web browser";
-       license = stdenv.lib.licenses.bsd3;
+       description = "Client-side web EDSL for transient nodes running in the web browser";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -67551,31 +67866,8 @@ self: {
      }:
      mkDerivation {
        pname = "gipeda";
-       version = "0.3.0.1";
-       sha256 = "09cf582109f33e6946a7bbac3d9c123a9323cb2af18df207d65413c74b770ce8";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring cassava concurrent-output containers
-         directory extra file-embed filepath gitlib gitlib-libgit2
-         scientific shake split tagged text transformers
-         unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/nomeata/gipeda";
-       description = "Git Performance Dashboard";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gipeda_0_3_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava
-     , concurrent-output, containers, directory, extra, file-embed
-     , filepath, gitlib, gitlib-libgit2, scientific, shake, split
-     , tagged, text, transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "gipeda";
-       version = "0.3.1";
-       sha256 = "965d79f58dcad40ae67d0b4a896710a5fd81ffab163e32501ed3f5aa4f93895d";
+       version = "0.3.2.1";
+       sha256 = "e0a9fd77407463537078d69c99cc5a025476b8b2881658eff30346cae35c0118";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67587,7 +67879,6 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "giphy-api" = callPackage
@@ -68826,25 +69117,26 @@ self: {
      }) {};
 
   "glirc" = callPackage
-    ({ mkDerivation, array, async, attoparsec, base, bytestring
-     , config-value, connection, containers, data-default-class
+    ({ mkDerivation, async, attoparsec, base, bytestring, Cabal
+     , config-value, connection, containers, data-default-class, deepseq
      , directory, filepath, hashable, lens, memory, network, profunctors
      , split, stm, text, text-icu, time, tls, transformers
      , unordered-containers, vector, vty, x509, x509-store, x509-system
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.1";
-       sha256 = "d0bb86a2d632255bce3d23b0e7e5cefd1432b9f36d986d05030460aee0e645e8";
+       version = "2.2";
+       sha256 = "b543a8c1193d8f436984bf4d68cd88f9df4305f144778605b15623b470c1cd07";
        isLibrary = false;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal ];
        executableHaskellDepends = [
-         array async attoparsec base bytestring config-value connection
-         containers data-default-class directory filepath hashable lens
-         memory network profunctors split stm text text-icu time tls
-         transformers unordered-containers vector vty x509 x509-store
-         x509-system
+         async attoparsec base bytestring config-value connection containers
+         data-default-class deepseq directory filepath hashable lens memory
+         network profunctors split stm text text-icu time tls transformers
+         unordered-containers vector vty x509 x509-store x509-system
        ];
+       homepage = "https://github.com/glguy/irc-core";
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -75492,22 +75784,23 @@ self: {
      }) {};
 
   "hakyll-convert" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cmdargs, directory, feed
-     , filepath, hakyll, old-locale, text, time, xml
+    ({ mkDerivation, base, binary, bytestring, cmdargs, containers
+     , data-default, directory, feed, filepath, hakyll, text, time, xml
      }:
      mkDerivation {
        pname = "hakyll-convert";
-       version = "0.1.0.0";
-       sha256 = "a3e7e0f9e59f9e704b2ee464b9e7f8a1a1cb432af1a247e167cedcad8c7071b7";
+       version = "0.2.0.0";
+       sha256 = "27feaacd5a6c6d9f633bfb0ffc731528f216bd295d4a801b2bcbd47af5ed985c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring feed hakyll old-locale text time xml
+         base binary bytestring containers data-default feed filepath hakyll
+         text time xml
        ];
        executableHaskellDepends = [
-         base bytestring cmdargs directory feed filepath hakyll text xml
+         base bytestring cmdargs directory feed filepath text time xml
        ];
-       homepage = "http://github.com/kowey/hakyll-convert";
+       homepage = "http://github.com/Minoru/hakyll-convert";
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -75546,6 +75839,18 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "hakyll-ogmarkup" = callPackage
+    ({ mkDerivation, base, hakyll, ogmarkup }:
+     mkDerivation {
+       pname = "hakyll-ogmarkup";
+       version = "1.0";
+       sha256 = "eee4e2f63409f209f77903cc18c86a68529b46e4af7eaa2497af849a4588ce24";
+       libraryHaskellDepends = [ base hakyll ogmarkup ];
+       homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
+       description = "Integrate ogmarkup document with Hakyll";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hakyll-sass" = callPackage
     ({ mkDerivation, base, data-default-class, filepath, hakyll, hsass
      }:
@@ -75792,6 +76097,18 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "handa-data" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "handa-data";
+       version = "0.2.9.9";
+       sha256 = "b60feddecff35e6e2e39aece7db409408006628329693c1a869b2798fcc0aed1";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://bitbucket.org/functionally/raft";
+       description = "This package is deprecated. It formerly contained Haskell utilities for data structures and data manipulation.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "handa-gdata" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
      , case-insensitive, cmdargs, data-default, directory, filepath
@@ -75952,25 +76269,24 @@ self: {
      }) {};
 
   "hans" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cereal
-     , containers, fingertree, HTTP, monadLib, network, old-locale
-     , random, stm, time, unix
+    ({ mkDerivation, array, base, BoundedChan, bytestring, cereal
+     , containers, cryptonite, hashable, heaps, memory, monadLib
+     , psqueues, QuickCheck, random, tasty, tasty-ant-xml
+     , tasty-quickcheck, time, unix
      }:
      mkDerivation {
        pname = "hans";
-       version = "2.6.0.0";
-       sha256 = "2853847c2d8823e43904ddcd2fa4ad1e1b15178a18e703293459866601c057a5";
-       isLibrary = true;
-       isExecutable = true;
+       version = "3.0.0.1";
+       sha256 = "a5ff03477183088516c889b9a5447b2adf93e3f39131878ff9e832cdb2c0ee96";
        libraryHaskellDepends = [
-         base bytestring cereal containers fingertree monadLib random stm
-         time unix
+         array base BoundedChan bytestring cereal containers cryptonite
+         hashable heaps memory monadLib psqueues random time unix
        ];
-       executableHaskellDepends = [
-         base blaze-html blaze-markup bytestring cereal containers HTTP
-         monadLib network old-locale time
+       testHaskellDepends = [
+         base bytestring cereal QuickCheck tasty tasty-ant-xml
+         tasty-quickcheck
        ];
-       description = "IPv4 Network Stack";
+       description = "Network Stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -78527,6 +78843,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-src-exts-simple" = callPackage
+    ({ mkDerivation, base, haskell-src-exts }:
+     mkDerivation {
+       pname = "haskell-src-exts-simple";
+       version = "1.18.0.1";
+       sha256 = "5d2193a64b6979e541a2897fffbd4c57c420b41d386b4fb24c817921f97a0715";
+       libraryHaskellDepends = [ base haskell-src-exts ];
+       jailbreak = true;
+       homepage = "https://github.com/int-e/haskell-src-exts-simple";
+       description = "A simplified view on the haskell-src-exts AST";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "haskell-src-meta" = callPackage
     ({ mkDerivation, base, haskell-src-exts, pretty, syb
      , template-haskell, th-orphans
@@ -78587,15 +78916,15 @@ self: {
      }) {};
 
   "haskell-tools-ast" = callPackage
-    ({ mkDerivation, base, ghc, references, structural-traversal
+    ({ mkDerivation, base, ghc, mtl, references, template-haskell
      , uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.1.2.1";
-       sha256 = "cc2f8ef82cffd9746223bab33cd70ffdb64d1a6759f4ab656a7c11f7316213eb";
+       version = "0.1.3.0";
+       sha256 = "af93c177b3abd37fd5a5891417745d3ff2d0068877a720fd7b8a6b8ec1503919";
        libraryHaskellDepends = [
-         base ghc references structural-traversal uniplate
+         base ghc mtl references template-haskell uniplate
        ];
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Haskell AST for efficient tooling";
@@ -78605,16 +78934,16 @@ self: {
 
   "haskell-tools-ast-fromghc" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc
-     , haskell-tools-ast, mtl, references, safe, split
-     , structural-traversal, template-haskell, uniplate
+     , haskell-tools-ast, mtl, references, safe, split, template-haskell
+     , uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-ast-fromghc";
-       version = "0.1.2.0";
-       sha256 = "1d7a09adb0daed1acffacf909ba5d0447cda1401bcf5a9664b33c0297249a8fb";
+       version = "0.1.3.0";
+       sha256 = "4e58dabaf0ebaa645cdee231db480f7e83d7399808f91fdacd5b1bc6ca60e6c9";
        libraryHaskellDepends = [
          base bytestring containers ghc haskell-tools-ast mtl references
-         safe split structural-traversal template-haskell uniplate
+         safe split template-haskell uniplate
        ];
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Creating the Haskell-Tools AST from GHC's representations";
@@ -78624,15 +78953,15 @@ self: {
 
   "haskell-tools-ast-gen" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast
-     , haskell-tools-ast-trf, mtl, references, structural-traversal
+     , haskell-tools-ast-trf, mtl, references
      }:
      mkDerivation {
        pname = "haskell-tools-ast-gen";
-       version = "0.1.2.0";
-       sha256 = "c4de8717be3a8365ac870421c9bb327c4ab2255b0c6d4e0ba220450aeee4d431";
+       version = "0.1.3.0";
+       sha256 = "e46579666308e844f9df962ec8dadcf0051fec170283eafa3dc087331d3862e5";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl
-         references structural-traversal
+         references
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Facilities for generating new parts of the Haskell-Tools AST";
@@ -78642,15 +78971,15 @@ self: {
 
   "haskell-tools-ast-trf" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, MissingH
-     , mtl, references, structural-traversal, uniplate
+     , mtl, references, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-ast-trf";
-       version = "0.1.2.0";
-       sha256 = "16df4de302b9304009d345bba2110f0a9ea6becc01cfc09f29c9329a3d859a72";
+       version = "0.1.3.0";
+       sha256 = "7b9de75660f093456d6f58cc6e4831db4aa5caa66deb3b4d084bed1dffa2b843";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast MissingH mtl references
-         structural-traversal uniplate
+         uniplate
        ];
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Conversions on Haskell-Tools AST to prepare for refactorings";
@@ -78661,15 +78990,14 @@ self: {
   "haskell-tools-prettyprint" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast
      , haskell-tools-ast-trf, mtl, references, split
-     , structural-traversal
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.1.2.0";
-       sha256 = "0e4a34d210ad5d45c146ba071d5dcf3b11e7090db79778268eba4405544b1431";
+       version = "0.1.3.0";
+       sha256 = "0163779686402c6592dc969d4caeb680b4e6a2957149281e1240ff16695041ac";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl
-         references split structural-traversal
+         references split
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Pretty printing of Haskell-Tools AST";
@@ -78682,19 +79010,17 @@ self: {
      , ghc-paths, haskell-tools-ast, haskell-tools-ast-fromghc
      , haskell-tools-ast-gen, haskell-tools-ast-trf
      , haskell-tools-prettyprint, mtl, references, split
-     , structural-traversal, template-haskell, time, transformers
-     , uniplate
+     , template-haskell, time, transformers, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.1.2.0";
-       sha256 = "e038d377d2ae4837793e0b9ae5fd9406a5918da8ba3c88e7d6f8244ef28ccc39";
+       version = "0.1.3.0";
+       sha256 = "a8a527a9a9b036f7dd7b761817c5844ac6750e3959bc46377ca5f26808e326a4";
        libraryHaskellDepends = [
          base containers directory either filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen
          haskell-tools-ast-trf haskell-tools-prettyprint mtl references
-         split structural-traversal template-haskell time transformers
-         uniplate
+         split template-haskell time transformers uniplate
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
@@ -79515,6 +79841,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
        ];
+       doCheck = false;
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the core Bitcoin protocol features";
        license = stdenv.lib.licenses.publicDomain;
@@ -83143,8 +83470,8 @@ self: {
     ({ mkDerivation, base, geos_c, MissingH, mtl, transformers }:
      mkDerivation {
        pname = "hgeos";
-       version = "0.1.4.0";
-       sha256 = "2c2c0524c599ac0770be7c094932a4b6bcaf0521e7ecc024f0e6da9aa7f4bc66";
+       version = "0.1.5.1";
+       sha256 = "7a9160fd2f575e84c6b18de2e2721497a392b161412516fc61622885d5fdce5d";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ geos_c ];
        testHaskellDepends = [ base MissingH mtl transformers ];
@@ -83213,6 +83540,19 @@ self: {
        broken = true;
      }) {HTam = null;};
 
+  "hgmp" = callPackage
+    ({ mkDerivation, base, ghc-prim, integer-gmp, QuickCheck }:
+     mkDerivation {
+       pname = "hgmp";
+       version = "0.1.0.0";
+       sha256 = "dc72eae07df9c94c1cc404cb823a0cde3a19dc7e640eef35b1b05f1218831fbc";
+       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
+       testHaskellDepends = [ base QuickCheck ];
+       homepage = "https://code.mathr.co.uk/hgmp";
+       description = "Haskell interface to GMP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hgom" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
      , wl-pprint
@@ -84511,8 +84851,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.0.0.0";
-       sha256 = "f2d1ad345ff76e3bc3d738ebc3179bdec64a97ff66f7ade29aaf416c13f38787";
+       version = "1.1.0.0";
+       sha256 = "63c5ca58ae62475bf2dbaa9ab87fda7f758676dca7a2b13790ee832cd027b5b8";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hjsonpointer
          http-client http-types pcre-heavy profunctors QuickCheck scientific
@@ -85562,8 +85902,8 @@ self: {
     ({ mkDerivation, base, integer-gmp, mpfr }:
      mkDerivation {
        pname = "hmpfr";
-       version = "0.4.0.2";
-       sha256 = "c6f0bfdc5ea4f19892e40d67169808445bdeff50dcdc0d2b40f621d1e1013f90";
+       version = "0.4.1";
+       sha256 = "76019426328c9c9d8538a893bb865d510434fb94bd77f0ca47a17d0962d15b98";
        libraryHaskellDepends = [ base integer-gmp ];
        librarySystemDepends = [ mpfr ];
        homepage = "https://github.com/michalkonecny/hmpfr";
@@ -92446,7 +92786,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "http-reverse-proxy" = callPackage
+  "http-reverse-proxy_0_4_3" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -92471,6 +92811,34 @@ self: {
        homepage = "https://github.com/fpco/http-reverse-proxy";
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http-reverse-proxy" = callPackage
+    ({ mkDerivation, async, base, blaze-builder, bytestring
+     , case-insensitive, conduit, conduit-extra, containers
+     , data-default-class, hspec, http-client, http-conduit, http-types
+     , lifted-base, monad-control, network, resourcet, streaming-commons
+     , text, transformers, wai, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "http-reverse-proxy";
+       version = "0.4.3.1";
+       sha256 = "579285aa58836631f8393f733b524a8c74591ed0318632bed97d4eaa090783eb";
+       libraryHaskellDepends = [
+         async base blaze-builder bytestring case-insensitive conduit
+         conduit-extra containers data-default-class http-client http-types
+         lifted-base monad-control network resourcet streaming-commons text
+         transformers wai wai-logger word8
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra hspec
+         http-conduit http-types lifted-base network resourcet
+         streaming-commons transformers wai warp
+       ];
+       homepage = "https://github.com/fpco/http-reverse-proxy";
+       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "http-server" = callPackage
@@ -93245,8 +93613,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-bits";
-       version = "0.0.0.7";
-       sha256 = "16e58787b6a39fb6602926480be7eb5486f2e652668e0fb70b0ec1467b755926";
+       version = "0.0.0.10";
+       sha256 = "c02e7398bbac3e1e92060b6bfb4245a5c6252a213ed3a2b918836b99515468ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring hw-prim parsec vector ];
@@ -93262,29 +93630,6 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
-  "hw-bits_0_0_0_8" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
-     , parsec, QuickCheck, resourcet, vector
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.0.0.8";
-       sha256 = "039ab7bb84f1cbb1b9ad72db2955c529622a64f267cd41d3948f165df08266cb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring hw-prim parsec vector ];
-       executableHaskellDepends = [
-         base criterion mmap resourcet vector
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hw-prim QuickCheck vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-bits#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
      , hw-bits, resourcet, word8
@@ -93455,8 +93800,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.0.3.4";
-       sha256 = "086f811f8b420aa385519f483db7bb35e0a74527f9648c1a7af2b8d5d1711d56";
+       version = "0.0.3.5";
+       sha256 = "dd6f4b25ad1180c2706323451e2f2663f977353678945319ccc59b61f008db10";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring random vector ];
@@ -93494,8 +93839,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.0.0.5";
-       sha256 = "89adedf5e37497430bec4546f096fb1ba8a324156e95535c9d450ee9a59892b0";
+       version = "0.1.0.1";
+       sha256 = "57a11f88cfe37be4d18ce5f9497a139bd2e7eb2b9e25b8413c602da2f0f41d5c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hw-bits hw-prim vector ];
@@ -95111,6 +95456,7 @@ self: {
          base containers directory filepath haskeline process time
          transformers
        ];
+       doCheck = false;
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
@@ -95175,12 +95521,15 @@ self: {
      }) {};
 
   "ifcxt" = callPackage
-    ({ mkDerivation, base, template-haskell }:
+    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
+     , template-haskell
+     }:
      mkDerivation {
        pname = "ifcxt";
-       version = "0.1.0.0";
-       sha256 = "7c09ff72dc72b288bb2020970adabc87ef1e5913175a745dd1573faf3422169d";
+       version = "0.1.1";
+       sha256 = "cc01adb330a6bbe0574d1e437ac98d79c274b44225a89599e43c3aad66555d55";
        libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/ifcxt";
        description = "put if statements within type constraints";
@@ -96068,18 +96417,18 @@ self: {
   "impure-containers" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hashable, HUnit
      , primitive, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, vector
+     , test-framework-quickcheck2, transformers, vector
      }:
      mkDerivation {
        pname = "impure-containers";
-       version = "0.3";
-       sha256 = "fb0e9e0664ff60da9126b416ed6407b85d0d1cff2d9a311f8186c312d864fcb5";
+       version = "0.4.0";
+       sha256 = "6e311d28492f515a786a35652f6b52d822821e3c3f2a5513e23551eab04b933b";
        libraryHaskellDepends = [
          base containers ghc-prim hashable primitive vector
        ];
        testHaskellDepends = [
          base containers HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
+         test-framework-hunit test-framework-quickcheck2 transformers vector
        ];
        homepage = "https://github.com/andrewthad/impure-containers#readme";
        description = "Mutable containers in haskell";
@@ -96970,12 +97319,9 @@ self: {
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
        pname = "instant-generics";
-       version = "0.5";
-       sha256 = "79d7cccead455f00637a182e0639cd7b8e6ef67e054d53098064772981dd8a9c";
-       revision = "2";
-       editedCabalFile = "c4a76fc7f7aebe8c003c9a80a127f627724d9444bd983bcacb2613d993295017";
+       version = "0.6";
+       sha256 = "b15e0566c0b060341e11ddd6bae9550c9a73c1b75c0e9acd6dc9092f4ce7ef15";
        libraryHaskellDepends = [ base containers syb template-haskell ];
-       jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
@@ -97415,8 +97761,8 @@ self: {
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.6.1";
-       sha256 = "da202b4ce7d57dd675695fedfbf5bbc2a203d160e72c5fae8994a7bb7eca254c";
+       version = "0.6.2";
+       sha256 = "dce6907980d4b3e9eace2e4e5f5192459992a365d12d2c22860ff1afe2ffb5c7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97749,8 +98095,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "0.8.4";
-       sha256 = "8c0d0de5b927310848f3c17702637ed2ea15bffab5a82b6df61d5df88b74c1b6";
+       version = "0.8.6";
+       sha256 = "e8e53531f7165234845a58f2a6b893dbf0bbb75ac3f08870005f9c3fd67c4d6b";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -98472,17 +98818,20 @@ self: {
 
   "isobmff-builder" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-default, hspec
-     , lens, singletons, text, time, type-list, vector-sized
+     , singletons, tagged, text, time, type-list, type-spec
+     , vector-sized
      }:
      mkDerivation {
        pname = "isobmff-builder";
-       version = "0.10.0.0";
-       sha256 = "6a246c26e4ef173fafc190e6fe79cffc44c9513855d5e2d0f4710315ece1ac2d";
+       version = "0.10.5.0";
+       sha256 = "b7dfa97397a823beb2d327fd97ed57cc9cec6c615659eaaa238c86b9bd4c2bf1";
        libraryHaskellDepends = [
-         base bytestring data-default lens singletons text time type-list
-         vector-sized
+         base bytestring data-default singletons tagged text time type-list
+         type-spec vector-sized
+       ];
+       testHaskellDepends = [
+         base binary bytestring hspec text type-spec
        ];
-       testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "https://github.com/sheyll/isobmff-builder#readme";
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
@@ -100309,8 +100658,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-generic";
-       version = "0.2.0.1";
-       sha256 = "92cc61f7d04c8d8d867d9b7da97c592d933c34e0da570a457cd39c4611bacd0d";
+       version = "0.2.1.1";
+       sha256 = "5ba74a92cad226738161db4f5c7f216c4a6bb743665dc4341901e57f30c4cffd";
        libraryHaskellDepends = [
          aeson base bytestring containers dlist scientific text transformers
          unordered-containers vector
@@ -101104,6 +101453,35 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "kawaii" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default, hakyll
+     , hakyll-serve, hspec, lens, lifted-base, monad-control
+     , monad-logger, mtl, optparse-applicative, QuickCheck, safe
+     , streaming-commons, text, wai, wai-app-static, wai-extra, warp
+     , warp-tls
+     }:
+     mkDerivation {
+       pname = "kawaii";
+       version = "0.0.1.0";
+       sha256 = "93901fdb028401d96461ff75fad794933bedc090f7cab7947d878ec36fe90228";
+       libraryHaskellDepends = [
+         base bytestring containers data-default hakyll lens lifted-base
+         monad-control monad-logger mtl optparse-applicative safe
+         streaming-commons text wai wai-app-static wai-extra warp warp-tls
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default hakyll hakyll-serve hspec
+         lens lifted-base monad-control monad-logger mtl
+         optparse-applicative QuickCheck safe streaming-commons text wai
+         wai-app-static wai-extra warp warp-tls
+       ];
+       jailbreak = true;
+       homepage = "https://phabricator.chromabits.com/diffusion/KWAI/";
+       description = "Utilities for serving static sites and blogs with Wai/Warp";
+       license = stdenv.lib.licenses.asl20;
+       broken = true;
+     }) {hakyll-serve = null;};
+
   "kawhi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
      , http-conduit, http-types, mtl, safe, scientific, smallcheck
@@ -101988,6 +102366,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "knead" = callPackage
+    ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record
+     , storable-tuple, utility-ht
+     }:
+     mkDerivation {
+       pname = "knead";
+       version = "0.2";
+       sha256 = "3a4b110042f0a6080ef36597fca2498daad8800bb054856aaa480885d6670803";
+       libraryHaskellDepends = [
+         base llvm-extra llvm-tf storable-record storable-tuple utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/knead/";
+       description = "Repa array processing using LLVM JIT";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "knead-arithmetic" = callPackage
+    ({ mkDerivation, base, knead, llvm-extra, llvm-tf, utility-ht }:
+     mkDerivation {
+       pname = "knead-arithmetic";
+       version = "0.0";
+       sha256 = "64ffb6727d9848a04f7287a4ee7954f9150af18b8bd1ac4b475ae15c540e7f3e";
+       libraryHaskellDepends = [
+         base knead llvm-extra llvm-tf utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/knead-arithmetic/";
+       description = "Linear algebra and interpolation using LLVM JIT";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "knob" = callPackage
     ({ mkDerivation, base, bytestring, transformers }:
      mkDerivation {
@@ -103988,8 +104396,8 @@ self: {
     ({ mkDerivation, base, HUnit, parsec, wl-pprint }:
      mkDerivation {
        pname = "language-webidl";
-       version = "0.1.3.1";
-       sha256 = "4e04013c57078e72217a60dcaf2e1e29e6ac2d219e5fd3113ac8771a771c9127";
+       version = "0.1.4.0";
+       sha256 = "6420bab2e66d34bcf491e71c75a67753e35e5f1015747b3a256105f74915fd1a";
        libraryHaskellDepends = [ base parsec wl-pprint ];
        testHaskellDepends = [ base HUnit ];
        description = "Parser and Pretty Printer for WebIDL";
@@ -107606,8 +108014,8 @@ self: {
     ({ mkDerivation, base, llvm }:
      mkDerivation {
        pname = "llvm-ffi";
-       version = "3.0.0";
-       sha256 = "9b012f897d95f852e69221b87225d0b16ecfe06685007d65bef581c98f250b1e";
+       version = "3.5.0";
+       sha256 = "ff292c630a7a9460ffad569afeb932d1471f15cbc54ceadf6b4ed5294c4aacef";
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ llvm ];
        homepage = "http://haskell.org/haskellwiki/LLVM";
@@ -107766,18 +108174,18 @@ self: {
      }) {};
 
   "llvm-tf" = callPackage
-    ({ mkDerivation, base, containers, llvm-ffi, non-empty, process
-     , storable-record, tfp, transformers, utility-ht
+    ({ mkDerivation, base, containers, fixed-length, llvm-ffi
+     , non-empty, process, storable-record, tfp, transformers
+     , utility-ht
      }:
      mkDerivation {
        pname = "llvm-tf";
-       version = "3.0.3.1";
-       sha256 = "096c1de602ca2ae1d09e0a8ffa3bd3746aaa9619d078db2109fcb8b29f417d2e";
+       version = "3.0.3.1.9";
+       sha256 = "e35b74bdb1770647520e1dab28e692d0b3bfd83588010dc2fb426e3a5a897e44";
        libraryHaskellDepends = [
-         base containers llvm-ffi non-empty process storable-record tfp
-         transformers utility-ht
+         base containers fixed-length llvm-ffi non-empty process
+         storable-record tfp transformers utility-ht
        ];
-       jailbreak = true;
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109216,7 +109624,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {objc = null;};
 
-  "luminance" = callPackage
+  "luminance_0_11_0_2" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
      }:
@@ -109232,6 +109640,25 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "luminance" = callPackage
+    ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
+     , mtl, resourcet, semigroups, transformers, vector, void
+     }:
+     mkDerivation {
+       pname = "luminance";
+       version = "0.11.0.3";
+       sha256 = "94d7d9c62727cc3eceddf2f4653cba5bcbf9858855effec6687d60d3848a9547";
+       libraryHaskellDepends = [
+         base containers contravariant dlist gl linear mtl resourcet
+         semigroups transformers vector void
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/phaazon/luminance";
+       description = "Type-safe, type-level and stateless graphics framework";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "luminance-samples" = callPackage
@@ -112494,7 +112921,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens-mtl" = callPackage
+  "microlens-mtl_0_1_9_0" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
      }:
@@ -112508,6 +112935,23 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "microlens support for Reader/Writer/State from mtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microlens-mtl" = callPackage
+    ({ mkDerivation, base, microlens, mtl, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "microlens-mtl";
+       version = "0.1.10.0";
+       sha256 = "b1dec4f000f324ae3e1915f683577bd53af218a68d07b0acf437def74e14b39d";
+       libraryHaskellDepends = [
+         base microlens mtl transformers transformers-compat
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens support for Reader/Writer/State from mtl";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "microlens-platform_0_3_3_0" = callPackage
@@ -112535,8 +112979,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.3.4.0";
-       sha256 = "ef6bb97b8c58344b5ab6eed7d47dd4cadbdb6052089f28d44e27bd37eada149d";
+       version = "0.3.5.0";
+       sha256 = "7c51fe542759951daf7eb79c5e5644c214da89a0057797845da3971423cdc9aa";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -112561,14 +113005,17 @@ self: {
      }) {};
 
   "micrologger" = callPackage
-    ({ mkDerivation, base, text, text-format, time, transformers }:
+    ({ mkDerivation, aeson, base, containers, hspec, text, text-format
+     , time, transformers
+     }:
      mkDerivation {
        pname = "micrologger";
-       version = "0.2.0.1";
-       sha256 = "4778a90b7953ddde7391304c8f87b9cbe3f3657fb6284a5890a42681db7ef469";
+       version = "0.3.0.0";
+       sha256 = "9c23cb35299beab63e47255f04de67d436ce12ea0f793386a4d588a9d0b5a0e1";
        libraryHaskellDepends = [
-         base text text-format time transformers
+         aeson base containers text text-format time transformers
        ];
+       testHaskellDepends = [ aeson base hspec text ];
        jailbreak = true;
        homepage = "https://github.com/savannidgerinel/micrologger#readme";
        description = "A super simple logging module. Only for use for very simple projects.";
@@ -114229,6 +114676,7 @@ self: {
          transformers transformers-base
        ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
+       doCheck = false;
        homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme";
        description = "Add prefixes to your monad-logger output";
        license = stdenv.lib.licenses.asl20;
@@ -115372,8 +115820,8 @@ self: {
      }:
      mkDerivation {
        pname = "monoidal-containers";
-       version = "0.2.0.0";
-       sha256 = "328fad49563d9793e786107361216bf346e8ea9922158dd48258dbcd5c4bb48d";
+       version = "0.3.0.0";
+       sha256 = "b9e2a70f92831aac6ac2216d79c319893514fce182439c40e5e33daf65499c55";
        libraryHaskellDepends = [
          base containers deepseq hashable lens newtype unordered-containers
        ];
@@ -116748,14 +117196,13 @@ self: {
      }:
      mkDerivation {
        pname = "murmur3";
-       version = "1.0.2";
-       sha256 = "8bc485e0f30d7f67611f70e56a5908a6b1b05273fe95eedaaf65e544a1f9c0cc";
+       version = "1.0.3";
+       sha256 = "102c81e0e6ae604f51bccced6d2d493f4de0b65e856cd0492a17f9f8e4d51f2a";
        libraryHaskellDepends = [ base bytestring cereal ];
        testHaskellDepends = [
          base base16-bytestring bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://github.com/plaprade/murmur3";
        description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm";
        license = stdenv.lib.licenses.publicDomain;
@@ -117481,6 +117928,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mystem" = callPackage
+    ({ mkDerivation, attoparsec, base, data-default, directory, process
+     , text
+     }:
+     mkDerivation {
+       pname = "mystem";
+       version = "0.1.0.0";
+       sha256 = "3d42ce765daee82a3a4d60270ce8ef85c95f71f0374a2562f91a6d5a2251645d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base data-default directory process text
+       ];
+       executableHaskellDepends = [ base text ];
+       jailbreak = true;
+       homepage = "https://github.com/wapxmas/mystem#readme";
+       description = "Bindings for Mystem morphological analyzer executabe";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mywatch" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ConfigFile
      , data-default-class, docopt, fast-logger, http-types
@@ -118787,7 +119254,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "network" = callPackage
+  "network_2_6_2_1" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, test-framework
      , test-framework-hunit, unix
      }:
@@ -118803,24 +119270,25 @@ self: {
        homepage = "https://github.com/haskell/network";
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network_2_6_3_0" = callPackage
+  "network" = callPackage
     ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
      , test-framework-hunit, unix
      }:
      mkDerivation {
        pname = "network";
-       version = "2.6.3.0";
-       sha256 = "854aab832f3f84a33a6d417f9692232208ec1d9604cded252018f52fd091945d";
+       version = "2.6.3.1";
+       sha256 = "57045f5e2bedc095670182130a6d1134fcc65d097824ac5b03933876067d82e6";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring doctest HUnit test-framework test-framework-hunit
        ];
+       doCheck = false;
        homepage = "https://github.com/haskell/network";
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-address" = callPackage
@@ -119146,6 +119614,7 @@ self: {
        version = "0.2";
        sha256 = "22edd54234b97336910dd35d2e3d083aae15411cf30c8a5407e85faccf1cef05";
        libraryHaskellDepends = [ base bytestring hans parsec ];
+       jailbreak = true;
        description = "HaNS to Network shims for easier HaNS integration";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120314,6 +120783,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "non-empty-sequence" = callPackage
+    ({ mkDerivation, base, containers, semigroups }:
+     mkDerivation {
+       pname = "non-empty-sequence";
+       version = "0.2.0.2";
+       sha256 = "d9a3604c0c140197731895af56413edbf1cf6866f9c0636ece9d8314366dd1e1";
+       libraryHaskellDepends = [ base containers semigroups ];
+       homepage = "http://www.github.com/massysett/non-empty-sequence";
+       description = "Non-empty sequence";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "non-negative" = callPackage
     ({ mkDerivation, base, QuickCheck, utility-ht }:
      mkDerivation {
@@ -121484,6 +121965,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ogmarkup" = callPackage
+    ({ mkDerivation, base, blaze-html, hspec, mtl, parsec, shakespeare
+     , text, yesod
+     }:
+     mkDerivation {
+       pname = "ogmarkup";
+       version = "2.1";
+       sha256 = "1ba3c05aa8723ec24951b71db70ea06a676d092c9570ddda2a5af4e6e77881eb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl parsec ];
+       executableHaskellDepends = [
+         base blaze-html parsec shakespeare text yesod
+       ];
+       testHaskellDepends = [ base hspec parsec shakespeare text ];
+       homepage = "http://github.com/ogma-project/ogmarkup";
+       description = "A lightweight markup language for story writers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ohloh-hs" = callPackage
     ({ mkDerivation, base, cmdargs, data-lens, hxt, hxt-curl
      , pretty-show, QuickCheck, test-framework
@@ -122695,7 +123196,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "operational" = callPackage
+  "operational_0_2_3_2" = callPackage
     ({ mkDerivation, base, mtl, random }:
      mkDerivation {
        pname = "operational";
@@ -122708,6 +123209,22 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Operational";
        description = "Implementation of difficult monads made easy with operational semantics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "operational" = callPackage
+    ({ mkDerivation, base, mtl, random }:
+     mkDerivation {
+       pname = "operational";
+       version = "0.2.3.3";
+       sha256 = "25489ee5475e5dd8bc5fb415a0189ef6f7e84253f4e392ff5f40b3c3ff1e406c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl ];
+       executableHaskellDepends = [ random ];
+       homepage = "http://wiki.haskell.org/Operational";
+       description = "Implementation of difficult monads made easy with operational semantics";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "operational-alacarte" = callPackage
@@ -122925,6 +123442,7 @@ self: {
        testHaskellDepends = [
          base chell chell-quickcheck containers monads-tf transformers
        ];
+       doCheck = false;
        homepage = "https://john-millikin.com/software/haskell-options/";
        description = "A powerful and easy-to-use command-line option parser";
        license = stdenv.lib.licenses.mit;
@@ -124660,6 +125178,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsec-pratt" = callPackage
+    ({ mkDerivation, base, containers, mtl, parsec, pretty }:
+     mkDerivation {
+       pname = "parsec-pratt";
+       version = "0.1.1";
+       sha256 = "8c6030d4d53830e68bbc8cbf8897c5220b6558c8a373ce616c3139e2d3837916";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers parsec ];
+       executableHaskellDepends = [ base containers mtl parsec pretty ];
+       homepage = "http://github.com/jh3141/parsec-pratt/";
+       description = "Pratt Parser combinator for Parsec";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "parsec-tagsoup" = callPackage
     ({ mkDerivation, base, parsec, tagsoup }:
      mkDerivation {
@@ -127381,10 +127914,8 @@ self: {
      }:
      mkDerivation {
        pname = "pia-forward";
-       version = "0.1.0.1";
-       sha256 = "59b49b7506a597802e6798d2cd4e892ace4ad69e08021bde37ddadb962743e0b";
-       revision = "1";
-       editedCabalFile = "7ace7bfcb4b05c4099a28ec12b7e12682669ddfe6d4e5f68c4d74c05914b7582";
+       version = "0.1.0.2";
+       sha256 = "6189410d115b163237006b15fda448256c313d03c8e94c9422f6bc05415fb3f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128364,6 +128895,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pipes-protolude" = callPackage
+    ({ mkDerivation, async, base, deepseq, exceptions, foldl, free, mtl
+     , pipes, pipes-concurrency, pipes-extras, pipes-group, pipes-parse
+     , pipes-safe, pipes-text, text-show, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-protolude";
+       version = "0.1.0.0";
+       sha256 = "e4ac3b48483efe76378cfbc1c6401f44de735f3431a5900d36e3b920c27f4979";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base deepseq exceptions foldl free mtl pipes
+         pipes-concurrency pipes-extras pipes-group pipes-parse pipes-safe
+         pipes-text text-show transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/mckeankylej/pipes-protolude#readme";
+       description = "Alternate Prelude for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-random" = callPackage
     ({ mkDerivation, base, mwc-random, pipes, vector }:
      mkDerivation {
@@ -129773,8 +130328,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.5.1";
-       sha256 = "4bcfeb21bd86d912dbfc8c1574f76ee3b099fda2e35302a7f6fd4dca4f33a475";
+       version = "0.5.2";
+       sha256 = "c47f4b2991dc7c6de04bc6f2cc9adebe5fecca6008a446a7747345cb40e626da";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -132890,6 +133445,7 @@ self: {
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
          tasty-th temporary
        ];
+       jailbreak = true;
        homepage = "https://github.com/msakai/pseudo-boolean";
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
@@ -132968,6 +133524,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pstemmer" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "pstemmer";
+       version = "0.1.0.0";
+       sha256 = "413930ab93d41b60b0b992b286f350f4c30b184abab990ef70da3d4714a69599";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base text ];
+       homepage = "https://github.com/wapxmas/pstemmer#readme";
+       description = "A Haskell Implementation of the Porter Stemmer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pub" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, ConfigFile, containers
      , groom, hedis, hslogger, mtl, network, pipes, pipes-bytestring
@@ -133519,12 +134090,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "purescript_0_9_2" = callPackage
+  "purescript_0_9_3" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
      , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring
      , clock, containers, directory, dlist, edit-distance, file-embed
      , filepath, fsnotify, Glob, haskeline, hspec, hspec-discover
-     , http-types, HUnit, language-javascript, lifted-base
+     , http-client, http-types, HUnit, language-javascript, lifted-base
      , monad-control, monad-logger, mtl, network, optparse-applicative
      , parallel, parsec, pattern-arrows, pipes, pipes-http, process
      , protolude, regex-tdfa, safe, semigroups, silently, sourcemap
@@ -133534,21 +134105,19 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.9.2";
-       sha256 = "08a09bb101a900bf5ec3954cddfbfac11e81550d1ec92221559922f0e5b1acb3";
-       revision = "1";
-       editedCabalFile = "15708813a8ed4626208a5e44f6e7d9132ed7c82f0dc8b478388520ccc8e90e3c";
+       version = "0.9.3";
+       sha256 = "0e4628232508a37568103d3ffcce68355258af388bba1b0bb3847c1fb33b91e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-better-errors ansi-terminal base base-compat bower-json
          boxes bytestring clock containers directory dlist edit-distance
-         filepath fsnotify Glob haskeline http-types language-javascript
-         lifted-base monad-control monad-logger mtl parallel parsec
-         pattern-arrows pipes pipes-http process protolude regex-tdfa safe
-         semigroups sourcemap spdx split stm syb text time transformers
-         transformers-base transformers-compat unordered-containers
-         utf8-string vector
+         filepath fsnotify Glob haskeline http-client http-types
+         language-javascript lifted-base monad-control monad-logger mtl
+         parallel parsec pattern-arrows pipes pipes-http process protolude
+         regex-tdfa safe semigroups sourcemap spdx split stm syb text time
+         transformers transformers-base transformers-compat
+         unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base base-compat boxes
@@ -133563,7 +134132,6 @@ self: {
          HUnit mtl optparse-applicative parsec process protolude silently
          stm text time transformers transformers-compat utf8-string vector
        ];
-       jailbreak = true;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
@@ -134127,29 +134695,31 @@ self: {
          qtc_opengl = null; qtc_script = null; qtc_tools = null;};
 
   "qtah-cpp-qt5" = callPackage
-    ({ mkDerivation, base, qtah-generator }:
+    ({ mkDerivation, base, qtah-generator, qtbase }:
      mkDerivation {
        pname = "qtah-cpp-qt5";
-       version = "0.1.0";
-       sha256 = "3fb79a7dbccdf84dfbde714be8f2a18cd57fdacd17463b2c72d392f8985107a8";
+       version = "0.1.1";
+       sha256 = "474d1add4e58ab817679d1d6d51508737c3f45d272836efbbf883bf600149cce";
        libraryHaskellDepends = [ base qtah-generator ];
+       librarySystemDepends = [ qtbase ];
        homepage = "http://khumba.net/projects/qtah";
        description = "Qt bindings for Haskell - C++ library";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs.qt5) qtbase;};
 
   "qtah-examples" = callPackage
-    ({ mkDerivation, base, binary, bytestring, hoppy-runtime, qtah-qt5
+    ({ mkDerivation, base, binary, bytestring, filepath, hoppy-runtime
+     , qtah-qt5
      }:
      mkDerivation {
        pname = "qtah-examples";
-       version = "0.1.0";
-       sha256 = "12c9a78193e5e2986e734487c94e95be5fc638204b051839a257fb60c2cddd2a";
+       version = "0.1.1";
+       sha256 = "2af216f46beaf1c491b5fee0cd25876561ecd3af98bad87e45e3f4210e6bf55f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base binary bytestring hoppy-runtime qtah-qt5
+         base binary bytestring filepath hoppy-runtime qtah-qt5
        ];
        jailbreak = true;
        homepage = "http://khumba.net/projects/qtah";
@@ -134182,7 +134752,7 @@ self: {
 
   "qtah-qt5" = callPackage
     ({ mkDerivation, base, binary, bytestring, hoppy-runtime, HUnit
-     , qtah, qtah-cpp-qt5, qtah-generator
+     , qtah, qtah-cpp-qt5, qtah-generator, qtbase
      }:
      mkDerivation {
        pname = "qtah-qt5";
@@ -134192,6 +134762,7 @@ self: {
          base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator
        ];
        librarySystemDepends = [ qtah ];
+       libraryToolDepends = [ qtbase ];
        testHaskellDepends = [ base hoppy-runtime HUnit ];
        testSystemDepends = [ qtah ];
        jailbreak = true;
@@ -134199,7 +134770,7 @@ self: {
        description = "Qt bindings for Haskell";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {qtah = null;};
+     }) {qtah = null; inherit (pkgs.qt5) qtbase;};
 
   "quadratic-irrational" = callPackage
     ({ mkDerivation, arithmoi, base, containers, directory, doctest
@@ -135181,6 +135752,24 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {rados = null;};
 
+  "raft" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , containers, data-default, ghc-prim, mtl, scientific, split, text
+     , time, tostring, zlib
+     }:
+     mkDerivation {
+       pname = "raft";
+       version = "0.3.2.2";
+       sha256 = "1a22a4de6376889553263fc04f76e3fdfa7f2932db6df3512edd71d8955c7096";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring containers data-default
+         ghc-prim mtl scientific split text time tostring zlib
+       ];
+       homepage = "https://bitbucket.org/functionally/raft";
+       description = "Miscellaneous Haskell utilities for data structures and data manipulation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rail-compiler-editor" = callPackage
     ({ mkDerivation, base, cairo, containers, gtk, HUnit, llvm-general
      , llvm-general-pure, mtl, process, transformers
@@ -136122,8 +136711,8 @@ self: {
      }:
      mkDerivation {
        pname = "react-flux";
-       version = "1.1.1";
-       sha256 = "d249c417b28028bda6c3f2a479c91d622a9e69356749e0175be9f00631434dc1";
+       version = "1.2.1";
+       sha256 = "5d2b4decb013edd5e90c1bc109d13cb8f49f3e1dd8a657249df52c8639819e34";
        libraryHaskellDepends = [
          aeson base bytestring deepseq mtl template-haskell text time
          unordered-containers
@@ -136820,8 +137409,8 @@ self: {
      }:
      mkDerivation {
        pname = "reddit";
-       version = "0.2.0.0";
-       sha256 = "1969dea9612d12611b73f209466e6567e46a2706b59f2f243234d47bf2749ec0";
+       version = "0.2.1.0";
+       sha256 = "49e5ad14a04e0ab7bed9c4a02b3b03c42f20319a51df76c41d8386502fd7e420";
        libraryHaskellDepends = [
          aeson api-builder base bytestring data-default-class free
          http-client http-client-tls http-types network text time
@@ -136831,7 +137420,6 @@ self: {
          aeson api-builder base bytestring Cabal hspec http-client
          http-client-tls text time transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/intolerable/reddit";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
@@ -138413,6 +139001,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reload" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers
+     , data-default, directory, filepath, ghcid, hspec, hspec-wai
+     , hspec-wai-json, http-types, mime-types, process, scotty, text
+     , transformers, unordered-containers, wai, wai-extra
+     , wai-handler-launch, wai-middleware-static, wai-websockets, warp
+     , websockets
+     }:
+     mkDerivation {
+       pname = "reload";
+       version = "0.0.0.1";
+       sha256 = "4515ad09d61062a04aa34f610bbc4d6176c5468081ca30ea971a3fec36160f50";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring Cabal containers data-default directory
+         filepath ghcid http-types mime-types process scotty text
+         transformers wai wai-extra wai-handler-launch wai-middleware-static
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson async base bytestring Cabal containers data-default directory
+         filepath ghcid hspec hspec-wai hspec-wai-json http-types mime-types
+         process scotty text transformers unordered-containers wai wai-extra
+         wai-handler-launch wai-middleware-static wai-websockets warp
+         websockets
+       ];
+       homepage = "https://github.com/jpmoresmau/dbIDE/reload#readme";
+       description = "A web based Haskell IDE";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rematch" = callPackage
     ({ mkDerivation, base, hspec, HUnit }:
      mkDerivation {
@@ -141249,12 +141870,11 @@ self: {
     ({ mkDerivation, base, c2hs, rtl-sdr }:
      mkDerivation {
        pname = "rtlsdr";
-       version = "0.1.0.4";
-       sha256 = "ffad3e6ba6d38e6995fd5b90fbeadbebc8c4f2363346bf3cca1dbc2435461524";
+       version = "0.1.0.5";
+       sha256 = "2d19640003dd8dddb77591b97bba4cf32d52306d4a98a1c4a2733d1253d62321";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ rtl-sdr ];
        libraryToolDepends = [ c2hs ];
-       jailbreak = true;
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
@@ -142382,8 +143002,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "1.0.1";
-       sha256 = "e1f369043af7d306ec485778a0f1629103d96513eb19a30c944bee0207a90ae9";
+       version = "1.1.0";
+       sha256 = "9eb577cf6529958cc551629f6ee0306e495b3a7e657de8a4e15ca7c344519060";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143686,8 +144306,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdr";
-       version = "0.1.0.6";
-       sha256 = "bf6344447783ec530ef27c8e2c55aff57e4581696d156d1d8781f54577b33135";
+       version = "0.1.0.8";
+       sha256 = "bdad09c6df50719aa70760568914a6ccdeb7e183fc11e85888963a35db326f78";
        libraryHaskellDepends = [
          array base bytestring cairo cereal Chart Chart-cairo colour
          containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random
@@ -143699,7 +144319,6 @@ self: {
          base primitive QuickCheck storable-complex test-framework
          test-framework-quickcheck2 vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/adamwalker/sdr";
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
@@ -144852,8 +145471,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-aeson-specs";
-       version = "0.2";
-       sha256 = "3d965c6da5ee92762325dc28fb4e51138f0e9efef4251c87ae90de182b878c0f";
+       version = "0.4";
+       sha256 = "7a409bb60daedd077575f5c8f8d300660131c2d5dfed2c4c7b0808d1bf9cb56a";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath hspec
          QuickCheck random servant
@@ -144866,7 +145485,7 @@ self: {
        jailbreak = true;
        homepage = "https://github.com/plow-technologies/servant-aeson-specs#readme";
        description = "generic tests for aeson serialization in servant";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -144901,6 +145520,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-auth-token" = callPackage
+    ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl
+     , persistent, persistent-postgresql, persistent-template
+     , pwstore-fast, servant-auth-token-api, servant-server, text, time
+     , transformers, uuid
+     }:
+     mkDerivation {
+       pname = "servant-auth-token";
+       version = "0.1.0.0";
+       sha256 = "8e024143fc82d5564b4408c5e4fae964261002e52aa7b0a7a67e1154d114dccc";
+       libraryHaskellDepends = [
+         aeson-injector base bytestring containers mtl persistent
+         persistent-postgresql persistent-template pwstore-fast
+         servant-auth-token-api servant-server text time transformers uuid
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
+       description = "Servant based API and server for token based authorisation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-auth-token-api" = callPackage
+    ({ mkDerivation, aeson, aeson-injector, base, lens, servant
+     , servant-docs, servant-swagger, swagger2, text
+     }:
+     mkDerivation {
+       pname = "servant-auth-token-api";
+       version = "0.1.2.0";
+       sha256 = "3f63d151599a7f52a8d097ec9bc1bed5303246a8ab46562add9fc32a74836335";
+       libraryHaskellDepends = [
+         aeson aeson-injector base lens servant servant-docs servant-swagger
+         swagger2 text
+       ];
+       homepage = "https://github.com/ncrashed/servant-auth-token-api#readme";
+       description = "Servant based API for token based authorisation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-blaze" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
@@ -145301,6 +145958,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-matrix-param" = callPackage
+    ({ mkDerivation, base, doctest, hspec, servant, servant-aeson-specs
+     }:
+     mkDerivation {
+       pname = "servant-matrix-param";
+       version = "0.1.0.1";
+       sha256 = "eedf69940d621282b42eb3f06474851a4903fdaa29c399f3747426c8474ebeb9";
+       libraryHaskellDepends = [ base servant ];
+       testHaskellDepends = [
+         base doctest hspec servant servant-aeson-specs
+       ];
+       jailbreak = true;
+       description = "Matrix parameter combinator for servant";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servant-mock" = callPackage
     ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
      , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server
@@ -145476,19 +146149,18 @@ self: {
 
   "servant-router" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, http-api-data
-     , http-types, mtl, network-uri, servant, servant-blaze
-     , servant-server, text, warp
+     , http-types, network-uri, servant, servant-blaze, servant-server
+     , text, warp
      }:
      mkDerivation {
        pname = "servant-router";
-       version = "0.8.1";
-       sha256 = "fe94b7f998f96f29ca148dd89c5367ddacf6c925692660162a0f2c5e9696cbec";
+       version = "0.9.0";
+       sha256 = "5db685c2a05b222dc862c564877a8b5a802bf12cdd91f8b452825aef3de5653c";
        libraryHaskellDepends = [
-         base bytestring http-api-data http-types mtl network-uri servant
-         text
+         base bytestring http-api-data http-types network-uri servant text
        ];
        testHaskellDepends = [
-         base blaze-html mtl servant servant-blaze servant-server warp
+         base blaze-html servant servant-blaze servant-server warp
        ];
        homepage = "https://github.com/ElvishJerricco/servant-router";
        description = "Servant router for non-server applications";
@@ -146662,8 +147334,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakespeare";
-       version = "2.0.10";
-       sha256 = "b5544f1a9e246a45357c37507b2228ebb12a8828907e9280fcade23761b0f6f8";
+       version = "2.0.11";
+       sha256 = "8ea8a21ee989427378844e80b8955e89f4660df3a743df874f11f1cdec0650aa";
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim parsec process scientific template-haskell text
@@ -148363,6 +149035,18 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs.xorg) libXft;};
 
+  "singleton-bool" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "singleton-bool";
+       version = "0.1.1.0";
+       sha256 = "c196a542ff65f3357219f8c8b294b31e84b0f1a5341c426160bb2909f1523d95";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/phadej/singleton-bool#readme";
+       description = "Type level booleans";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "singleton-nats" = callPackage
     ({ mkDerivation, base, singletons }:
      mkDerivation {
@@ -148455,8 +149139,8 @@ self: {
      }:
      mkDerivation {
        pname = "siphon";
-       version = "0.1";
-       sha256 = "9035f961ddc57cf6f552b38a943aa9d57368dbfa7c5e5928150b3eae9140f4a6";
+       version = "0.2";
+       sha256 = "e55afce422fa4724636f7383624239a817f580cfedae68714df10ab0ff6ecc2d";
        libraryHaskellDepends = [
          attoparsec base bytestring colonnade contravariant pipes text
          vector
@@ -148563,6 +149247,7 @@ self: {
          base constraints deepseq equational-reasoning hashable monomorphic
          singletons template-haskell type-natural
        ];
+       jailbreak = true;
        homepage = "https://github.com/konn/sized-vector";
        description = "Size-parameterized vector types and functions";
        license = stdenv.lib.licenses.bsd3;
@@ -152819,32 +153504,8 @@ self: {
      }:
      mkDerivation {
        pname = "stache";
-       version = "0.1.2";
-       sha256 = "67b8e3cfd8e1d31aa3e3c518292ccaf84841bbdd08aefcf533b3b4d77686d680";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory exceptions
-         filepath megaparsec mtl template-haskell text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec text yaml
-       ];
-       homepage = "https://github.com/stackbuilders/stache";
-       description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stache_0_1_3" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , directory, exceptions, file-embed, filepath, hspec
-     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
-       version = "0.1.3";
-       sha256 = "2ffd7f2c215ebf9ccf528c6bb82bb87e9aebf443656b4f056627410f8839d819";
+       version = "0.1.4";
+       sha256 = "43638fcebb20101edbb4b0e7919eae44f2021754fcb7aa6b145df5f91db203dd";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -152854,11 +153515,9 @@ self: {
          aeson base bytestring containers file-embed hspec hspec-megaparsec
          megaparsec text yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/stackbuilders/stache";
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack" = callPackage
@@ -155777,6 +156436,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stylish-haskell_0_6_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
+     , strict, syb, test-framework, test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.6.2.0";
+       sha256 = "2f4fcef31803e5f671fc65c20c480ebc664d7efb28e757ba4ca27f58811b18ec";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl optparse-applicative strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/jaspervdj/stylish-haskell";
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stylized" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -158194,17 +158884,17 @@ self: {
      }) {};
 
   "tagsoup-megaparsec" = callPackage
-    ({ mkDerivation, base, hspec, megaparsec, raw-strings-qq, tagsoup
+    ({ mkDerivation, base, containers, hspec, megaparsec
+     , raw-strings-qq, tagsoup
      }:
      mkDerivation {
        pname = "tagsoup-megaparsec";
-       version = "0.1.0.0";
-       sha256 = "6e77efecb8188cc938194e94784b4944c76cc54443ba9c271033ec592b1bae5c";
-       libraryHaskellDepends = [ base megaparsec tagsoup ];
+       version = "0.2.0.0";
+       sha256 = "c4fc2300deb6bfd2f4b2aff925206794a7698b829b1ce46402db05be061550a3";
+       libraryHaskellDepends = [ base containers megaparsec tagsoup ];
        testHaskellDepends = [
          base hspec megaparsec raw-strings-qq tagsoup
        ];
-       jailbreak = true;
        homepage = "https://github.com/kseo/tagsoup-megaparsec#readme";
        description = "A Tag token parser and Tag specific parsing combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -160956,7 +161646,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "text-zipper" = callPackage
+  "text-zipper_0_4" = callPackage
     ({ mkDerivation, base, text, vector }:
      mkDerivation {
        pname = "text-zipper";
@@ -160965,14 +161655,26 @@ self: {
        libraryHaskellDepends = [ base text vector ];
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "text-zipper" = callPackage
+    ({ mkDerivation, base, deepseq, text, vector }:
+     mkDerivation {
+       pname = "text-zipper";
+       version = "0.5";
+       sha256 = "e27d2671da0686e14171213f7ed83ba3f0319dedbeb3a2390e6b98cda56c4b9a";
+       libraryHaskellDepends = [ base deepseq text vector ];
+       description = "A text editor zipper library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "text-zipper-monad" = callPackage
     ({ mkDerivation, base, hspec, mtl, text-zipper }:
      mkDerivation {
        pname = "text-zipper-monad";
-       version = "0.1.0.0";
-       sha256 = "39d3c7bd5b79226e477bb9fd3be1cbcadb2674969525ff2e441642e5de42756b";
+       version = "0.2.0.0";
+       sha256 = "8629d0897046167fa96c9a9ba7292a827845e943e19e45a9b77373474b389b35";
        libraryHaskellDepends = [ base mtl text-zipper ];
        testHaskellDepends = [ base hspec text-zipper ];
        homepage = "https://github.com/kseo/text-zipper-monad#readme";
@@ -161588,6 +162290,28 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "th-utilities_0_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , hspec, primitive, syb, template-haskell, text, th-orphans, vector
+     }:
+     mkDerivation {
+       pname = "th-utilities";
+       version = "0.2.0.1";
+       sha256 = "65c64cee69c0d9bf8d0d5d4590aaea7dcf4177f97818526cbb3fac20901671d6";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath primitive syb
+         template-haskell text th-orphans
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory filepath hspec primitive syb
+         template-haskell text th-orphans vector
+       ];
+       homepage = "https://github.com/fpco/th-utilities#readme";
+       description = "Collection of useful functions for use with Template Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "themoviedb" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, either
      , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit
@@ -161647,8 +162371,8 @@ self: {
      }:
      mkDerivation {
        pname = "thentos-cookie-session";
-       version = "0.9.0";
-       sha256 = "b1550fa69251a85c29f0396b6fdac937a21fe151151162e8834233284239ec77";
+       version = "0.9.1";
+       sha256 = "e4f72fc67472d3ae5eb44faf8167b2ee1a20dd7b2a6fe13d93fee1530fb7f0b7";
        libraryHaskellDepends = [
          aeson base bytestring cookie cryptonite digestive-functors lens
          memory mtl resourcet sandi servant servant-server
@@ -163769,6 +164493,37 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "tpar" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary
+     , bytestring, containers, distributed-process, errors, exceptions
+     , friendly-time, ghc-prim, heaps, network
+     , network-transport-inmemory, network-transport-tcp
+     , optparse-applicative, parsers, pipes, pipes-bytestring
+     , pipes-concurrency, pipes-safe, process, QuickCheck, stm, time
+     , transformers, trifecta
+     }:
+     mkDerivation {
+       pname = "tpar";
+       version = "0.1.0.0";
+       sha256 = "9f6b47bafecd5fa8f042e1c6682a2b7d80d66d7d274cbdf2900390955869a154";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint async base binary bytestring containers
+         distributed-process errors exceptions friendly-time ghc-prim heaps
+         network network-transport-tcp optparse-applicative parsers pipes
+         pipes-bytestring pipes-concurrency pipes-safe process stm time
+         transformers trifecta
+       ];
+       testHaskellDepends = [
+         base binary containers distributed-process exceptions
+         network-transport-inmemory pipes QuickCheck stm transformers
+       ];
+       homepage = "http://github.com/bgamari/tpar/";
+       description = "simple, parallel job scheduling";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tpdb" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, hashable
      , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text
@@ -164180,8 +164935,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, stm, time, transformers }:
      mkDerivation {
        pname = "transient";
-       version = "0.4.1";
-       sha256 = "e862734582b0d9a70cbfcdbcb786f7945b7158c3ae7ba3c23882debc6126e4c0";
+       version = "0.4.2";
+       sha256 = "f84b40d51daff310cfb1563fb6e813d1b047a14a1157d67375efdc05da694bda";
        libraryHaskellDepends = [
          base containers mtl stm time transformers
        ];
@@ -164193,35 +164948,14 @@ self: {
 
   "transient-universe" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , directory, filepath, hashable, HTTP, mtl, network, network-info
-     , network-uri, process, random, stm, TCache, text, time
-     , transformers, transient, vector, websockets
-     }:
-     mkDerivation {
-       pname = "transient-universe";
-       version = "0.3.1.2";
-       sha256 = "cee59c9fd920435ac47913002bccea58348e4923ac557ca7727a86699799e133";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers directory filepath
-         hashable HTTP mtl network network-info network-uri process random
-         stm TCache text time transformers transient vector websockets
-       ];
-       homepage = "http://www.fpcomplete.com/user/agocorona";
-       description = "Remote execution and map-reduce: distributed computing for Transient";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" ];
-     }) {};
-
-  "transient-universe_0_3_2" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
      , network-info, network-uri, process, random, stm, TCache, text
      , time, transformers, transient, vector, websockets
      }:
      mkDerivation {
        pname = "transient-universe";
-       version = "0.3.2";
-       sha256 = "2c5871cc7d15b666c78651501d006cb6a9759ea547a97cb9ee70ced6e88c3297";
+       version = "0.3.2.3";
+       sha256 = "ea861a538231bfa6a495f22b764ce80cfa8e65512419c9ab16c811b708625b2f";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers directory filepath
          hashable HTTP iproute mtl network network-info network-uri process
@@ -164231,7 +164965,7 @@ self: {
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "Remote execution and map-reduce: distributed computing for Transient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
   "translatable-intset" = callPackage
@@ -166124,8 +166858,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-natural";
-       version = "0.4.1.1";
-       sha256 = "aebf48c5ecee80effa51d564783cb26be918b3e9ece9feffd4854ad7f3a15ea1";
+       version = "0.6.0.0";
+       sha256 = "6b09df942a2613f540534b3dfe014ccd649afb3e3923f3d140a0ba69dee0bc05";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger monomorphic singletons template-haskell
@@ -166208,6 +166942,19 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "type-spec" = callPackage
+    ({ mkDerivation, base, pretty, show-type }:
+     mkDerivation {
+       pname = "type-spec";
+       version = "0.2.0.0";
+       sha256 = "8203f98c53d9d533da9e20e6e3c74ed5d144fad2ee21f58d8b3addd78cd172fa";
+       libraryHaskellDepends = [ base pretty show-type ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/sheyll/type-spec#readme";
+       description = "Type Level Specification by Example";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "type-spine" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -166482,33 +167229,6 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "typerbole" = callPackage
-    ({ mkDerivation, base, bifunctors, checkers, containers
-     , data-ordlist, either, fgl, generic-random, hspec, lens
-     , megaparsec, mtl, QuickCheck, safe, semigroups, syb
-     , template-haskell, th-lift
-     }:
-     mkDerivation {
-       pname = "typerbole";
-       version = "0.0.0.5";
-       sha256 = "69c659f118017ef1bb99267d64b5c330115a589801481f3ee25c41067e0781a6";
-       revision = "1";
-       editedCabalFile = "62f89e02f7752d24111a37f753a4024f84828a4af7dc7de3af25d70d5b17981b";
-       libraryHaskellDepends = [
-         base bifunctors containers data-ordlist either fgl generic-random
-         lens megaparsec mtl QuickCheck safe semigroups syb template-haskell
-         th-lift
-       ];
-       testHaskellDepends = [
-         base bifunctors checkers containers either hspec QuickCheck
-         semigroups syb
-       ];
-       jailbreak = true;
-       homepage = "https://github.com/Lokidottir/typerbole";
-       description = "A typesystems library with exaggerated claims";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "types-compat" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -166695,8 +167415,8 @@ self: {
     ({ mkDerivation, aeson, base, hspec, text, webapi }:
      mkDerivation {
        pname = "uber";
-       version = "0.1.0.0";
-       sha256 = "ab7ecef408cc04b51c1253d5c19274f8e92e974d114b434e48cc7814ecc0da30";
+       version = "0.1.1.0";
+       sha256 = "756ab823573ef431b0b538ded572ffa3861880bf517d467a21fd0b4a3adb95a7";
        libraryHaskellDepends = [ aeson base text webapi ];
        testHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/byteally/webapi-uber.git";
@@ -167190,8 +167910,8 @@ self: {
      }:
      mkDerivation {
        pname = "uni-htk";
-       version = "2.2.1.2";
-       sha256 = "d357582ef386f97ff87f6e299632c2b58a6fad7d5b5016b724fc35f3a578abfd";
+       version = "2.2.1.3";
+       sha256 = "c93fb0b1e291eddafa61f1632e67a467d0337e26039be5a6a745d0f80e0b5044";
        libraryHaskellDepends = [
          base containers directory uni-events uni-posixutil uni-reactor
          uni-util
@@ -168181,6 +168901,7 @@ self: {
          attoparsec interspersed QuickCheck quickcheck-instances rebase
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/unsequential";
        description = "An extension removing the sequentiality from monads";
        license = stdenv.lib.licenses.mit;
@@ -171250,7 +171971,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-app-static" = callPackage
+  "wai-app-static_3_1_5" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
      , bytestring, containers, cryptonite, directory, file-embed
      , filepath, hspec, http-date, http-types, memory, mime-types
@@ -171282,6 +172003,41 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-app-static" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
+     , bytestring, containers, cryptonite, directory, file-embed
+     , filepath, hspec, http-date, http-types, memory, mime-types
+     , mockery, network, old-locale, optparse-applicative
+     , template-haskell, temporary, text, time, transformers
+     , unix-compat, unordered-containers, wai, wai-extra, warp, zlib
+     }:
+     mkDerivation {
+       pname = "wai-app-static";
+       version = "3.1.6";
+       sha256 = "a7096d9ebb371e75953dc3e2895d90761f3b2ded6d01382530544810fdd94214";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder blaze-html blaze-markup bytestring containers
+         cryptonite directory file-embed filepath http-date http-types
+         memory mime-types old-locale optparse-applicative template-haskell
+         text time transformers unix-compat unordered-containers wai
+         wai-extra warp zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec http-date http-types mime-types
+         mockery network old-locale temporary text time transformers
+         unix-compat wai wai-extra zlib
+       ];
+       homepage = "http://www.yesodweb.com/book/web-application-interface";
+       description = "WAI application for static serving";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-conduit" = callPackage
@@ -172197,7 +172953,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-predicates" = callPackage
+  "wai-predicates_0_8_6" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, cookie, http-types
      , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers
@@ -172220,6 +172976,30 @@ self: {
        homepage = "https://gitlab.com/twittner/wai-predicates/";
        description = "WAI request predicates";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-predicates" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , bytestring-conversion, case-insensitive, cookie, http-types
+     , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers
+     , vault, vector, wai
+     }:
+     mkDerivation {
+       pname = "wai-predicates";
+       version = "0.9.0";
+       sha256 = "1802d3aa8cec1ce0049cc115166504a83e6866e279d0345e1a72986f1d4e1b50";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-conversion case-insensitive
+         cookie http-types singletons transformers vault vector wai
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive http-types tasty
+         tasty-hunit tasty-quickcheck wai
+       ];
+       homepage = "https://gitlab.com/twittner/wai-predicates/";
+       description = "WAI request predicates";
+       license = "unknown";
      }) {};
 
   "wai-request-spec" = callPackage
@@ -172310,7 +173090,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "wai-routing" = callPackage
+  "wai-routing_0_12_3" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, containers, cookie
      , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers
@@ -172333,6 +173113,31 @@ self: {
        homepage = "https://gitlab.com/twittner/wai-routing/";
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-routing" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , bytestring-conversion, case-insensitive, containers, cookie
+     , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers
+     , wai, wai-predicates, wai-route
+     }:
+     mkDerivation {
+       pname = "wai-routing";
+       version = "0.13.0";
+       sha256 = "f4841b028e20f49e3617d13247c04f457c850421321a92e7ab4e372ee85cde8f";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-conversion case-insensitive
+         cookie http-types transformers wai wai-predicates wai-route
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring bytestring-conversion
+         case-insensitive containers http-types tasty tasty-hunit
+         tasty-quickcheck wai wai-predicates
+       ];
+       homepage = "https://gitlab.com/twittner/wai-routing/";
+       description = "Declarative routing for WAI";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "wai-session" = callPackage
@@ -172565,7 +173370,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "wai-websockets" = callPackage
+  "wai-websockets_3_0_0_9" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , file-embed, http-types, network, text, transformers, wai
      , wai-app-static, warp, websockets
@@ -172588,6 +173393,32 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-websockets" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
+     , file-embed, http-types, network, text, transformers, wai
+     , wai-app-static, warp, websockets
+     }:
+     mkDerivation {
+       pname = "wai-websockets";
+       version = "3.0.1";
+       sha256 = "6416ec322e4a93486342f73df6f47dd6a54c660739fdb09ca97df8bedeba4c1a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring case-insensitive http-types network
+         transformers wai websockets
+       ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring case-insensitive file-embed
+         http-types network text transformers wai wai-app-static warp
+         websockets
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provide a bridge between WAI and the websockets package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wait-handle" = callPackage
@@ -172663,7 +173494,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "warp" = callPackage
+  "warp_3_2_7" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
@@ -172693,6 +173524,39 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "warp" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
+     , text, time, transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.8";
+       sha256 = "09de2d19cf0d1af8afe9f96e916aa7dafda82ddab3258fdec31963db81c2cf3c";
+       libraryHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers ghc-prim hashable
+         http-date http-types http2 iproute network simple-sendfile stm
+         streaming-commons text unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network process QuickCheck silently
+         simple-sendfile stm streaming-commons text time transformers unix
+         unix-compat vault wai word8
+       ];
+       doCheck = false;
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -173250,19 +174114,20 @@ self: {
   "webapi" = callPackage
     ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring
      , bytestring-lexing, bytestring-trie, case-insensitive, containers
-     , cookie, exceptions, hspec, hspec-wai, http-client
+     , cookie, directory, exceptions, hspec, hspec-wai, http-client
      , http-client-tls, http-media, http-types, network-uri, QuickCheck
      , resourcet, text, time, transformers, vector, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "webapi";
-       version = "0.2.2.0";
-       sha256 = "b908d6b1a03750fa6ef45a2ac445eb9d52afb2fd3de73898081d80a791d843eb";
+       version = "0.3";
+       sha256 = "da79c7547b1b0325b3d965d19bc0009fe91433b6fffdbf3a40aa33d2c8aedd4b";
        libraryHaskellDepends = [
          aeson base binary blaze-builder bytestring bytestring-lexing
-         bytestring-trie case-insensitive containers cookie exceptions
-         http-client http-client-tls http-media http-types network-uri
-         QuickCheck resourcet text time transformers vector wai wai-extra
+         bytestring-trie case-insensitive containers cookie directory
+         exceptions http-client http-client-tls http-media http-types
+         network-uri QuickCheck resourcet text time transformers vector wai
+         wai-extra
        ];
        testHaskellDepends = [
          aeson base bytestring case-insensitive hspec hspec-wai http-media
diff --git a/pkgs/development/haskell-modules/patches/GLUT.patch b/pkgs/development/haskell-modules/patches/GLUT.patch
new file mode 100644
index 00000000000..3025812213b
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/GLUT.patch
@@ -0,0 +1,12 @@
+diff --git a/GLUT.cabal b/GLUT.cabal
+index f370d6c..a404e1e 100644
+--- a/GLUT.cabal
++++ b/GLUT.cabal
+@@ -103,6 +103,7 @@ library
+   else
+     cpp-options: "-DCALLCONV=ccall"
+     cc-options: "-DUSE_DLSYM"
++  pkgconfig-depends: freeglut
+ 
+ executable BOGLGP01-OnYourOwn1
+   if !flag(BuildExamples)
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 84b474b08cb..16042091a47 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.31.0";
+    version = "2.31.1";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "03a0gmz95di62552dv873iwwy1ym96kpyrc0s708assjlslr9716";
+    sha256 = "00z0x2w1dnfd2h8xvmq3qy2n8gqxyi9gxwnsz0q420by8vnrljmh";
   };
   buildInputs = [
     unzip
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 25fa3d0bc74..8679c7122c9 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -7,11 +7,11 @@
  else stdenv.mkDerivation)
 
 (rec {
-  name = "guile-2.0.11";
+  name = "guile-2.0.12";
 
   src = fetchurl {
     url = "mirror://gnu/guile/${name}.tar.xz";
-    sha256 = "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f";
+    sha256 = "1sdpjq0jf1h65w29q0zprj4x6kdp5jskkvbnlwphy9lvdxrqg0fy";
   };
 
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix
index 0db23e0efed..284773fe660 100644
--- a/pkgs/development/interpreters/lolcode/default.nix
+++ b/pkgs/development/interpreters/lolcode/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, doxygen, cmake }:
+{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "lolcode-${version}";
-  version = "0.10.5";
+  version = "0.11.2";
 
   src = fetchurl {
     url = "https://github.com/justinmeza/lci/archive/v${version}.tar.gz";
-    sha256 = "0g6k1jxnvgjxyidrvgk8pdb8y8mai456j9zpzmvhm6fr22c4skrc";
+    sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b";
   };
 
-  buildInputs = [ pkgconfig doxygen cmake ];
+  nativeBuildInputs = [ pkgconfig cmake doxygen ];
+  buildInputs = [ readline ];
 
   # Maybe it clashes with lci scientific logic software package...
   postInstall = "mv $out/bin/lci $out/bin/lolcode-lci";
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index bffd4ce38a2..2841a70ddcf 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -107,7 +107,7 @@ let
         };
 
         mysql = {
-          configureFlags = ["--with-mysql=${mysql.lib}"];
+          configureFlags = ["--with-mysql"];
           buildInputs = [ mysql.lib ];
         };
 
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index 66913fc0159..23a0924ad3b 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchsvn, SDL2} :
+{stdenv, fetchsvn, SDL2}:
 
 let rev = 5; in
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \
       $out/include/SDL2/*.h
-    
+
     ln -s $out/include/SDL2/SDL2_framerate.h $out/include/SDL2/SDL_framerate.h;
     ln -s $out/include/SDL2/SDL2_gfxPrimitives.h $out/include/SDL2/SDL_gfxPrimitives.h;
     ln -s $out/include/SDL2/SDL2_rotozoom.h $out/include/SDL2/SDL_rotozoom.h;
@@ -27,28 +27,28 @@ stdenv.mkDerivation rec {
   meta = {
     description = "SDL graphics drawing primitives and support functions";
 
-    longDescription =
-      '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code
-	 which provided basic drawing routines such as lines, circles or
-	 polygons and SDL_rotozoom which implemented a interpolating
-	 rotozoomer for SDL surfaces.
+    longDescription = ''
+      The SDL_gfx library evolved out of the SDL_gfxPrimitives code
+      which provided basic drawing routines such as lines, circles or
+      polygons and SDL_rotozoom which implemented a interpolating
+      rotozoomer for SDL surfaces.
 
-	 The current components of the SDL_gfx library are:
+      The current components of the SDL_gfx library are:
 
-	    * Graphic Primitives (SDL_gfxPrimitves.h)
-	    * Rotozoomer (SDL_rotozoom.h)
-	    * Framerate control (SDL_framerate.h)
-	    * MMX image filters (SDL_imageFilter.h)
-	    * Custom Blit functions (SDL_gfxBlitFunc.h)
+          * Graphic Primitives (SDL_gfxPrimitves.h)
+          * Rotozoomer (SDL_rotozoom.h)
+          * Framerate control (SDL_framerate.h)
+          * MMX image filters (SDL_imageFilter.h)
+          * Custom Blit functions (SDL_gfxBlitFunc.h)
 
-	 The library is backwards compatible to the above mentioned
-         code. Its is written in plain C and can be used in C++ code.
-       '';
+      The library is backwards compatible to the above mentioned
+      code. Its is written in plain C and can be used in C++ code.
+    '';
 
     homepage = https://sourceforge.net/projects/sdlgfx/;
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.bjg ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index eab9b1fb55d..7253fc7b4da 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "SDL image library";
     homepage = "http://www.libsdl.org/projects/SDL_image/";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index e41546512e9..6f096577819 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.libsdl.org/projects/SDL_net;
     license = licenses.zlib;
     maintainers = [ maintainers.MP2E ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix
index 200ff1ca2e7..fe2892c9627 100644
--- a/pkgs/development/libraries/alure/default.nix
+++ b/pkgs/development/libraries/alure/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "A utility library to help manage common tasks with OpenAL applications";
     homepage = http://kcat.strangesoft.net/alure.html;
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 3511c3331bc..5fbc45a7c08 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
     homepage = http://assimp.sourceforge.net/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ ehmry ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 3a3acbf67b9..6e8a8cd8d7f 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.10";
-  revision = "12";
-  sha256 = "09xcbrs48c9sgy6cj37qbc69gi6wlkjd6r3fi4zr8xwmj5wkmz5g";
+  revision = "13";
+  sha256 = "144vl65z7bys43sxgb09mbisyf2nmh49wh0d957y0ksa9cyrgv13";
   extraConfigureFlags = "--with-gnump";
 })
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index d952b50aeb8..4e004da3217 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "29";
-  sha256 = "157bp8716h17agrxyj7xpsj2i5sqhafj1nfx4gpzccx7y2kyq176";
+  revision = "30";
+  sha256 = "09d1cvg6dnfi225wipc1fw691bq7xxdcmgkq8smldc5kivf3mbwd";
   openssl = null;
   postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
 })
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index 8675b046b20..809037bb5ed 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     description = "MIDI libraries for Qt5/C++";
     homepage = http://drumstick.sourceforge.net/;
     license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix
index 25892e18684..84e6f57c523 100644
--- a/pkgs/development/libraries/ffmpeg/3.1.nix
+++ b/pkgs/development/libraries/ffmpeg/3.1.nix
@@ -1,7 +1,12 @@
-{ callPackage, ... } @ args:
+{ callPackage
+# Darwin frameworks
+, Cocoa, CoreMedia
+, ...
+}@args:
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}.1";
   branch = "3.1";
   sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55";
+  darwinFrameworks = [ Cocoa CoreMedia ];
 })
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 0c4e9df3df1..33ee2f80a6e 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -13,7 +13,7 @@
 , optimizationsDeveloper ? true
 , extraWarningsDeveloper ? false
 # Darwin frameworks
-, Cocoa
+, Cocoa, darwinFrameworks ? [ Cocoa ]
 # Inherit generics
 , branch, sha256, version, patches ? [], ...
 }:
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
     ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
     ++ optional ((isLinux || isFreeBSD) && !isArm) libva
     ++ optional isLinux alsaLib
-    ++ optional isDarwin Cocoa
+    ++ optionals isDarwin darwinFrameworks
     ++ optional vdpauSupport libvdpau
     ++ optional sdlSupport SDL;
 
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index a7a02521c69..6b92848fd0f 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -1,24 +1,34 @@
-{ fetchurl, stdenv, lib, precision ? "double" }:
+{ fetchFromGitHub , stdenv, lib, ocaml, perl, indent, transfig, ghostscript, texinfo, libtool, gettext, automake, autoconf, precision ? "double" }:
 
 with lib;
 
 assert elem precision [ "single" "double" "long-double" "quad-precision" ];
 
-let version = "3.3.4"; in
+let version = "3.3.5-rc1"; in
 
 stdenv.mkDerivation rec {
   name = "fftw-${precision}-${version}";
 
-  src = fetchurl {
-    url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
-    sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g";
+  src = fetchFromGitHub {
+    owner = "FFTW";
+    repo = "fftw3";
+    rev = "fftw-${version}";
+    sha256 = "1gc57xvdqbapq30ylj3fxwkv61la4kzyf7ji0q0xqjwpji2ynqi4";
   };
 
+  nativeBuildInputs = [ ocaml perl indent transfig ghostscript texinfo libtool gettext automake autoconf ];
+
+  # remove the ./configure lines, so we can use nix's configureFlags
+  patchPhase = "sed -e '27,29d' -i bootstrap.sh";
+
+  preConfigurePhases =  "./bootstrap.sh";
+
   outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
   outputBin = "dev"; # fftw-wisdom
 
   configureFlags =
-    [ "--enable-shared" "--disable-static"
+    [ "--enable-maintainer-mode"
+      "--enable-shared" "--disable-static"
       "--enable-threads"
     ]
     ++ optional (precision != "double") "--enable-${precision}"
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index c2121f31f1d..2d7e26b9e1a 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, vtk }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.6";
+  version = "2.6.4";
   name = "gdcm-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
-    sha256 = "0rgqgkjyqgld0hpa311z8cddp42v9ihzidyanwyxqpv3jmcrlsfk";
+    sha256 = "14bysjdldq7xb9k1ayskxijm08dy2n45v9bg379dqrcz1q5xq5mi";
   };
 
   dontUseCmakeBuildDir = true;
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 7aaac299b0e..0a0c5858917 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }:
+{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
 
 stdenv.mkDerivation (rec {
   version = "0.24.1";
@@ -10,10 +10,20 @@ stdenv.mkDerivation (rec {
     sha256 = "0rw80480dx2f6a2wbb1bwixygg1iwq3r7vwhxdmkkf4lpxd35jhd";
   };
 
+  # TODO: `cargo` (rust's package manager) surfaced a serious bug in
+  # libgit2 when the `Security.framework` transport is used on Darwin.
+  # The upstream issue is tracked at
+  # https://github.com/libgit2/libgit2/issues/3885 - feel free to
+  # remove this patch as soon as it's resolved (i.E. when cargo is
+  # working fine without this patch)
+  patches = stdenv.lib.optionals stdenv.isDarwin [
+    ./disable-security.framework.patch
+  ];
+
   cmakeFlags = "-DTHREADSAFE=ON";
 
   nativeBuildInputs = [ cmake python pkgconfig ];
-  buildInputs = [ zlib libssh2 openssl http-parser ];
+  buildInputs = [ zlib libssh2 openssl http-parser curl ];
 
   meta = {
     description = "The Git linkable library";
diff --git a/pkgs/development/libraries/git2/disable-security.framework.patch b/pkgs/development/libraries/git2/disable-security.framework.patch
new file mode 100644
index 00000000000..ce6a008b1c4
--- /dev/null
+++ b/pkgs/development/libraries/git2/disable-security.framework.patch
@@ -0,0 +1,58 @@
+From fbc2ea65406236a740b8734dd41dc5ddbc24f8c9 Mon Sep 17 00:00:00 2001
+From: mulrich <mulrich@entwicklerheld.local>
+Date: Mon, 8 Aug 2016 15:36:07 +0200
+Subject: [PATCH] disable security.framework
+
+---
+ CMakeLists.txt    | 7 +++----
+ src/curl_stream.c | 9 ++++++++-
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 93a9e47..331e148 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,7 +49,8 @@ ENDIF()
+ 
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ 	SET( USE_ICONV ON )
+-	FIND_PACKAGE(Security)
++	# FIND_PACKAGE(Security)
++  SET(SECURITY_FOUND "NO")
+ 	FIND_PACKAGE(CoreFoundation REQUIRED)
+ ENDIF()
+ 
+@@ -87,9 +88,7 @@ IF(MSVC)
+ 	OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF)
+ ENDIF()
+ 
+-IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-	OPTION( USE_OPENSSL                     "Link with and use openssl library"             ON )
+-ENDIF()
++OPTION( USE_OPENSSL                     "Link with and use openssl library"             ON )
+ 
+ CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h"
+ 	HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C)
+diff --git a/src/curl_stream.c b/src/curl_stream.c
+index 98de187..a8a9f4c 100644
+--- a/src/curl_stream.c
++++ b/src/curl_stream.c
+@@ -309,7 +309,14 @@ int git_curl_stream_new(git_stream **out, const char *host, const char *port)
+ 	curl_easy_setopt(handle, CURLOPT_HTTPPROXYTUNNEL, 1);
+ 	curl_easy_setopt(handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+ 
+-	/* curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); */
++  const char* cainfo = getenv("SSL_CERT_FILE");
++  if(cainfo != NULL) {
++    curl_easy_setopt(handle, CURLOPT_CAINFO, cainfo);
++  }
++
++  /*
++	curl_easy_setopt(handle, CURLOPT_VERBOSE, 1);
++  */
+ 
+ 	st->parent.version = GIT_STREAM_VERSION;
+ 	st->parent.encrypted = 0; /* we don't encrypt ourselves */
+-- 
+2.3.8 (Apple Git-58)
+
diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix
new file mode 100644
index 00000000000..a7dd47aaeb4
--- /dev/null
+++ b/pkgs/development/libraries/globalplatform/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, zlib, openssl, pcsclite }:
+
+stdenv.mkDerivation rec {
+  name = "globalplatform-${version}";
+  version  = "6.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
+    sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
+  };
+
+  buildInputs = [ zlib pkgconfig openssl pcsclite ];
+
+  meta = with stdenv.lib; {
+    homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;
+    description = "Library for interacting with smart card devices";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
new file mode 100644
index 00000000000..f147305220c
--- /dev/null
+++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, globalplatform, openssl, pcsclite }:
+
+stdenv.mkDerivation rec {
+  name = "gppcscconnectionplugin-${version}";
+  version  = "1.1.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
+    sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
+  };
+
+  buildInputs = [ pkgconfig globalplatform openssl pcsclite ];
+
+  meta = with stdenv.lib; {
+    homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;
+    description = "GlobalPlatform pcsc connection plugin";
+    license = [ licenses.lgpl3 licenses.gpl3 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 0f33f2a5f7f..1a5931d9828 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   ver_maj = "3.20";
-  ver_min = "6";
+  ver_min = "8";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2";
+    sha256 = "9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3";
   };
 
   outputs = [ "dev" "out" ];
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index e8a8ecee95e..df3f68b1249 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -42,6 +42,6 @@ in stdenv.mkDerivation {
     homepage = https://github.com/joyent/http-parser;
 
     license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux; # Broken on pure-darwin, wants xcode
   };
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix
index c77ff49bfea..a48ba32be22 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-env.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-env.nix
@@ -5,7 +5,7 @@ drv: pkgs:
 stdenv.mkDerivation {
   name = "kde-env-${drv.name}";
   nativeBuildInputs = [ lndir ];
-  propagatedUserEnvPkgs = builtins.map lib.getBin ([drv] ++ pkgs);
+  envPkgs = builtins.map lib.getBin ([drv] ++ pkgs);
   unpackPhase = "true";
   configurePhase = "runHook preConfigure; runHook postConfigure";
   buildPhase = "true";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     runHook preInstall
 
     propagated=""
-    for i in $propagatedUserEnvPkgs; do
+    for i in $envPkgs; do
         findInputs $i propagated propagated-user-env-packages
     done
 
@@ -26,6 +26,15 @@ stdenv.mkDerivation {
         done
     done
 
+    for p in $propagated; do
+        for s in applications dbus-1 desktop-directories icons mime polkit-1; do
+            if [ -d "$p/share/$s" ]; then
+                propagatedUserEnvPkgs+=" $p"
+                break
+            fi
+        done
+    done
+
     runHook postInstall
   '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
index 95f9cdcecb7..d340a5edbf7 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
@@ -37,11 +37,7 @@ stdenv.mkDerivation {
         fi
     done
 
-    for s in applications dbus-1 desktop-directories icons mime polkit-1; do
-        if [ -d "$env/share/$s" ]; then
-            mkdir -p "$out/share"
-            ln -s "$env/share/$s" "$out/share/$s"
-        fi
-    done
+    mkdir -p "$out/nix-support"
+    ln -s "$env/nix-support/propagated-user-env-packages" "$out/nix-support/"
   '';
 }
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index cf74ed3b5f6..174c633bf0d 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libatomic_ops";
-    version="7.4.2";
+    version="7.4.4";
     name="${baseName}-${version}";
-    hash="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";
-    url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz";
-    sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";
+    hash="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
+    url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.4.tar.gz";
+    sha256="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
   };
   
   buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index f64174778b2..77c09f3ed15 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     "--with-dbi-libdir=${libdbi}/lib"
   ] ++ optionals (libmysql != null) [
     "--with-mysql"
-    "--with-mysql-incdir=${libmysql}/include/mysql"
-    "--with-mysql-libdir=${libmysql}/lib/mysql"
   ] ++ optionals (postgresql != null) [
     "--with-pgsql"
     "--with-pgsql_incdir=${postgresql}/include"
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index 0f3ea26eb04..806f0e9cd82 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio }:
+{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+
+in stdenv.mkDerivation rec {
   name = "libmikmod-3.3.7";
   src = fetchurl {
     url = "mirror://sourceforge/mikmod/${name}.tar.gz";
@@ -8,11 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ texinfo ]
-    ++ stdenv.lib.optional stdenv.isLinux [ alsaLib libpulseaudio ];
+    ++ optionals stdenv.isLinux [ alsaLib libpulseaudio ]
+    ++ optional stdenv.isDarwin CoreAudio;
   propagatedBuildInputs =
-    stdenv.lib.optional stdenv.isLinux libpulseaudio;
+    optional stdenv.isLinux libpulseaudio;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound";
+  NIX_LDFLAGS = optionalString stdenv.isLinux "-lasound";
 
   meta = with stdenv.lib; {
     description = "A library for playing tracker music module files";
diff --git a/pkgs/development/libraries/libmsgpack/1.4.nix b/pkgs/development/libraries/libmsgpack/1.4.nix
new file mode 100644
index 00000000000..2779162feb8
--- /dev/null
+++ b/pkgs/development/libraries/libmsgpack/1.4.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner = "msgpack";
+    repo = "msgpack-c";
+    rev = "cpp-${version}";
+    sha256 = "0zlanifi5hmm303pzykpidq5jbapl891zwkwhkllfn8ab1jvzbaa";
+  };
+})
diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index 7354111e131..fc2ed6c6086 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.7";
+    version="0.3.8";
     name="${baseName}-${version}";
-    hash="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5";
-    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.7/libmwaw-0.3.7.tar.xz";
-    sha256="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5";
+    hash="019vk8cj3lgbrpgj48zy25mpkgmllwxznkfd94hh9vbb1cjvpz3a";
+    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.8/libmwaw-0.3.8.tar.xz";
+    sha256="019vk8cj3lgbrpgj48zy25mpkgmllwxznkfd94hh9vbb1cjvpz3a";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 2dce91bc014..e4cb2e61eeb 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -11,14 +11,14 @@ let
     owner = "publicsuffix";
   };
 
-  libVersion = "0.13.0";
+  libVersion = "0.14.0";
 
 in stdenv.mkDerivation rec {
   name = "libpsl-${version}";
   version = "${libVersion}-list-${listVersion}";
 
   src = fetchFromGitHub {
-    sha256 = "12inl984r2qks51wyrzgll83y7k79q2lbhyc545dpk19qnfvp7gz";
+    sha256 = "1nqawm41rxaxddrqnwhxw1cgcpf74q6jw756sh0x8zbsjc73mbfq";
     rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h
-    patchShebangs src/make_dafsa.py
+    patchShebangs src/psl-make-dafsa
   '';
 
   preAutoreconf = ''
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 3038b9f83d3..f266841ffaf 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.4.16";
+  version = "0.4.17";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "0aabz9hjw47xqis2xr3rvxw1slpig4hq9wkl8fbdpgq2fgrzqdmw";
+    sha256 = "1630228xbsmasbmkx3s7g4r8mzkdlzila4j2f6m2mp0996v8kq1c";
   };
   buildInputs = [zlib openssl];
   makeFlags = [
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index f0ff549c716..771e31f7b79 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, libsndfile }:
+{ stdenv, fetchurl, pkgconfig, libsndfile, ApplicationServices, Carbon, CoreServices }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (stdenv.lib) optionals optionalString;
+
+in stdenv.mkDerivation rec {
   name = "libsamplerate-0.1.8";
 
   src = fetchurl {
@@ -9,7 +12,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libsndfile ];
+  buildInputs = [ libsndfile ]
+    ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
 
   # maybe interesting configure flags:
   #--disable-fftw          disable usage of FFTW
@@ -17,14 +21,13 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "bin" "out" ];
 
-  postConfigure = stdenv.lib.optionalString stdenv.isDarwin
-    ''
-      # need headers from the Carbon.framework in /System/Library/Frameworks to
-      # compile this on darwin -- not sure how to handle
-      NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
+  postConfigure = optionalString stdenv.isDarwin ''
+    # need headers from the Carbon.framework in /System/Library/Frameworks to
+    # compile this on darwin -- not sure how to handle
+    NIX_CFLAGS_COMPILE+=" -I${Carbon}/Library/Frameworks/Carbon.framework/Headers"
 
-      substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
-    '';
+    substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
+  '';
 
   meta = with stdenv.lib; {
     description = "Sample Rate Converter for audio";
diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix
index 1cf937586c3..0e1d3a4bb4c 100644
--- a/pkgs/development/libraries/libshout/default.nix
+++ b/pkgs/development/libraries/libshout/default.nix
@@ -4,11 +4,11 @@
 # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
 
 stdenv.mkDerivation rec {
-  name = "libshout-2.3.1";
+  name = "libshout-2.4.1";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
-    sha256 = "cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e";
+    sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.icecast.org;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
- 
     platforms = with stdenv.lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 1d293f9ffcb..44db602f1eb 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -19,10 +19,9 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
   # TODO: share libs between minimal and !minimal - perhaps just symlink them
 
-  configureFlags = lib.optionals (!minimal) [
-    "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
-    "--enable-glx"
-  ];
+  configureFlags =
+    [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++
+    lib.optionals (!minimal) [ "--enable-glx" ];
 
   installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
 
diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix
new file mode 100644
index 00000000000..3c3a874c8ad
--- /dev/null
+++ b/pkgs/development/libraries/mdds/0.12.1.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "0.12.1";
+  name = "mdds-${version}";
+
+  src = fetchurl {
+    url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
+    sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
+  };
+
+  meta = {
+    homepage = https://code.google.com/p/multidimalgorithm/;
+    description = "A collection of multi-dimensional data structure and indexing algorithm";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index f379d8c4e32..3d0c594b61b 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.12.1";
+  version = "1.2.1";
   name = "mdds-${version}";
 
   src = fetchurl {
-    url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
-    sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
+    url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2";
+    sha256 = "0yzwdl8mf8xdj8rif1qq0qnlq7vlk5q86r3hs2x49m5rqzgljbqy";
   };
 
   postInstall = ''
diff --git a/pkgs/development/libraries/mdds/default.upstream b/pkgs/development/libraries/mdds/default.upstream
index 94b6c78b06b..96c5bc35d16 100644
--- a/pkgs/development/libraries/mdds/default.upstream
+++ b/pkgs/development/libraries/mdds/default.upstream
@@ -1,6 +1,6 @@
 url https://gitlab.com/mdds/mdds
-version_link '[.]tar[.][a-z0-9]+$'
-version '.*_([0-9.]+)[.]tar[.].*' '\1'
+version_link 'mdds-.*[.]tar[.][a-z0-9]+$'
+version '.*-([0-9.]+)[.]tar[.].*' '\1'
 
 do_overwrite(){
   ensure_hash
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5ddc7bf3ddb..4ed47f46a32 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -144,8 +144,6 @@ stdenv.mkDerivation {
 
   '' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
     substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
-  '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
-    mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
   '';
   #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM */
 
diff --git a/pkgs/development/libraries/mesa/symlink-drivers.patch b/pkgs/development/libraries/mesa/symlink-drivers.patch
index 6c800e5dfce..b96e8e0b816 100644
--- a/pkgs/development/libraries/mesa/symlink-drivers.patch
+++ b/pkgs/development/libraries/mesa/symlink-drivers.patch
@@ -11,7 +11,7 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am mesa-11.1.
  install-data-hook:
  	for i in $(TARGET_DRIVERS); do                                  \
 -		ln -f $(DESTDIR)$(dridir)/gallium_dri.so                \
-+		ln -sf $(DESTDIR)$(dridir)/gallium_dri.so               \
++		ln -srf $(DESTDIR)$(dridir)/gallium_dri.so               \
  		      $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
  	done;                                                           \
 -	$(RM) $(DESTDIR)$(dridir)/gallium_dri.*
@@ -36,7 +36,7 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am mesa-11.
  		k=libvdpau_$${i}.$(LIB_EXT);				\
  		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
 -		ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
-+		ln -sf $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
++		ln -srf $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
  		      $${dest_dir}/$${l};				\
  		ln -sf $${l}						\
  		       $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
@@ -62,7 +62,7 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/mesa/drivers/dri/Makefile.am mesa-11.1.4/s
  install-data-hook:
  	for i in $(MEGADRIVERS); do \
 -		ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
-+		ln -sf $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
++		ln -srf $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
  		      $(DESTDIR)$(dridir)/$$i; \
  	done;
 -	$(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.*
diff --git a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
new file mode 100644
index 00000000000..84b62dcd4eb
--- /dev/null
+++ b/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
@@ -0,0 +1,7 @@
+--- a/bindings/xmbind.alias
++++ b/bindings/xmbind.alias
+@@ -62,3 +62,4 @@
+ "Sun Microsystems, Inc."				sun
+ ! "Sun Microsystems, Inc."				sun_at
+ "Tektronix, Inc."					tek
++"The X.Org Foundation"				tpc
diff --git a/pkgs/development/libraries/motif/Do-not-compile-demos.patch b/pkgs/development/libraries/motif/Do-not-compile-demos.patch
new file mode 100644
index 00000000000..1b8df94d007
--- /dev/null
+++ b/pkgs/development/libraries/motif/Do-not-compile-demos.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,6 @@ SUBDIRS   = bindings bitmaps \
+              include \
+              tools \
+              clients \
+-             doc \
+-             demos
++             doc
+ AUTOMAKE_OPTIONS = 1.4
+ ACLOCAL_AMFLAGS = -I .
diff --git a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
new file mode 100644
index 00000000000..801310ba41c
--- /dev/null
+++ b/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
@@ -0,0 +1,12 @@
+--- a/lib/Xm/XmP.h
++++ b/lib/Xm/XmP.h
+@@ -1437,7 +1437,7 @@ extern void _XmDestroyParentCallback(
+ 
+ #endif /* NO_XM_1_2_BC */
+ 
+-#if __GNUC__
++#if __GNUC__ && ! __APPLE__
+ #  define XM_DEPRECATED  __attribute__((__deprecated__))
+ #  define XM_ALIAS(sym)  __attribute__((__weak__,alias(#sym)))
+ #else
+
diff --git a/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch b/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch
new file mode 100644
index 00000000000..d91e43ba2d3
--- /dev/null
+++ b/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch
@@ -0,0 +1,19 @@
+--- a/demos/programs/workspace/xrmLib.c
++++ b/demos/programs/workspace/xrmLib.c
+@@ -30,7 +30,14 @@ static char rcsid[] = "$XConsortium: xrmLib.c /main/6 1995/07/14 10:01:41 drk $"
+ #endif
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#if defined(__cplusplus) || defined(__STDC__) || defined(__EXTENSIONS__)
++#  include <stdlib.h>
++#  if defined(HAVE_MALLOC_H)
++#  include <malloc.h>
++#  elif defined(HAVE_SYS_MALLOC_H)
++#  include <sys/malloc.h>
++#  endif
++#endif
+ #include <Xm/Xm.h>
+ #include "wsm.h"
+ #include "wsmDebug.h"
+
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix
index 4d9f1d56b3e..1f86af0a2e8 100644
--- a/pkgs/development/libraries/motif/default.nix
+++ b/pkgs/development/libraries/motif/default.nix
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig libtool
+    libtool
     xlibsWrapper xbitmaps libXrender libXmu libXt
     expat libjpeg libpng libiconv
-  ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ];
+  ];
 
-  nativeBuildInputs = [ flex ];
+  nativeBuildInputs = [ pkgconfig flex ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ];
 
   propagatedBuildInputs = [ libXp libXau ];
 
@@ -30,18 +30,18 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "CFLAGS=-fno-strict-aliasing" ];
 
-  patchPhase = ''
-    rm lib/Xm/Xm.h
-    echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
-  '' + stdenv.lib.optionalString (!demoSupport)
-  ''
-    sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-  '';
+  prePatch = ''rm lib/Xm/Xm.h'';
+
+  patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch
+              ./Use-correct-header-for-malloc.patch
+              ./Add-X.Org-to-bindings-file.patch
+            ]
+            ++ stdenv.lib.optional (!demoSupport) ./Do-not-compile-demos.patch;
 
   meta = with stdenv.lib; {
     homepage = http://motif.ics.com;
     description = "Unix standard widget-toolkit and window-manager";
-    platforms = with platforms; linux;
+    platforms = with platforms; linux ++ darwin;
     license = with licenses; [ lgpl21 ];
     maintainers = with maintainers; [ ];
   };
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
new file mode 100644
index 00000000000..819160a8d7c
--- /dev/null
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "nlohmann_json-${version}";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = "nlohmann";
+    repo = "json";
+    rev = "v${version}";
+    sha256 = "10sk8d23vh0c7b3qafjz2n8r5jv8vc275bl069ikhqnx1zxv6hwp";
+  };
+
+  buildInputs = [ cmake ];
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "Header only C++ library for the JSON file format";
+    homepage = https://github.com/nlohmann/json;
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index c95e2304e40..008494818e5 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.23";
+  version = "3.26";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_23_RTM/src/${name}.tar.gz";
-    sha256 = "1kqidv91icq96m9m8zx50n7px08km2l88458rkgyjwcn3kiq7cwl";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_26_RTM/src/${name}.tar.gz";
+    sha256 = "0r65s5q8kk0vr48s0zr8xi610k7h072lgkkpp4z6jlxr19bkly4i";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index 03e7718a3ae..37afa3fd507 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
 
+let
+  inherit (stdenv.lib) getDev getLib;
+in
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
 
@@ -9,10 +12,10 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    export CPPFLAGS="-I${mysql.lib}/include/mysql"
-    export LDFLAGS="-L${mysql.lib}/lib/mysql"
+    export CPPFLAGS="-I${getDev mysql.client}/include/mysql"
+    export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib"
     configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
   '';
 
-  buildInputs = [ readline mysql.lib postgresql sqlite ];
+  buildInputs = [ readline mysql.client postgresql sqlite ];
 }
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index b38f1e5711a..42a8d00eec0 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
+{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
 , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private
 }:
 
 stdenv.mkDerivation rec {
-  name = "pcl-1.7.2";
+  name = "pcl-1.8.0";
 
-  src = fetchzip {
-    name = name + "-src";
-    url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz";
-    sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8";
+  src = fetchFromGitHub {
+    owner = "PointCloudLibrary";
+    repo = "pcl";
+    rev = name;
+    sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index aa2601a7bd3..604f246e711 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -2,20 +2,20 @@
 , openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "ptlib-2.10.10";
+  name = "ptlib-2.10.11";
 
   src = fetchurl {
     url = "mirror://gnome/sources/ptlib/2.10/${name}.tar.xz";
-    sha256 = "7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4";
+    sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs";
   };
 
-  buildInputs = [ pkgconfig bison flex unixODBC openssl openldap 
+  buildInputs = [ pkgconfig bison flex unixODBC openssl openldap
                   cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ];
 
   enableParallelBuilding = true;
 
-  patches = [ ./bison.patch ];
-      
+  patches = [ ./bison.patch ./sslv3.patch ];
+
   meta = with stdenv.lib; {
     description = "Portable Tools from OPAL VoIP";
     maintainers = [ maintainers.raskin ];
diff --git a/pkgs/development/libraries/ptlib/sslv3.patch b/pkgs/development/libraries/ptlib/sslv3.patch
new file mode 100644
index 00000000000..1ccf3593ec1
--- /dev/null
+++ b/pkgs/development/libraries/ptlib/sslv3.patch
@@ -0,0 +1,16 @@
+--- ptlib-2.10.11/src/ptclib/pssl.cxx	2016-02-07 09:54:36.326325637 +0000
++++ ptlib-2.10.11/src/ptclib/pssl.cxx	2016-02-07 09:55:55.677870908 +0000
+@@ -805,11 +805,13 @@
+   SSL_METHOD * meth;
+ 
+   switch (method) {
++#if !defined(OPENSSL_NO_SSL3)
+     case SSLv3:
+       meth = SSLv3_method();
+       break;
++#endif
+     case TLSv1:
+       meth = TLSv1_method(); 
+       break;
+     case SSLv23:
+     default:
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index ffbc7f27386..6d92de001cb 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
       -I${randrproto}/include" else "-no-xrandr"}
     ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"}
     ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""}
-    ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
+    ${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" else ""}
     ${if xftSupport then "-xft
       -L${libXft.out}/lib -I${libXft.dev}/include
       -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include
diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 8401e9f0d3d..27f6e66a125 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -92,7 +92,7 @@ let
       qtsensors = callPackage ./qtsensors.nix {};
       qtserialport = callPackage ./qtserialport {};
       qtsvg = callPackage ./qtsvg.nix {};
-      qttools = callPackage ./qttools.nix {};
+      qttools = callPackage ./qttools {};
       qttranslations = callPackage ./qttranslations.nix {};
       /* qtwayland = not packaged */
       /* qtwebchannel = not packaged */
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch
new file mode 100644
index 00000000000..fe5bcadbe9a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch
@@ -0,0 +1,72 @@
+Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+===================================================================
+--- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
++++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+@@ -2,11 +2,10 @@
+ if (NOT TARGET Qt5::qcollectiongenerator)
+     add_executable(Qt5::qcollectiongenerator IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_Help_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::qcollectiongenerator PROPERTIES
+Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
+===================================================================
+--- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
++++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
+@@ -44,11 +44,10 @@ endmacro()
+ if (NOT TARGET Qt5::lrelease)
+     add_executable(Qt5::lrelease IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lrelease PROPERTIES
+@@ -59,11 +58,10 @@ endif()
+ if (NOT TARGET Qt5::lupdate)
+     add_executable(Qt5::lupdate IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lupdate PROPERTIES
+@@ -74,11 +72,10 @@ endif()
+ if (NOT TARGET Qt5::lconvert)
+     add_executable(Qt5::lconvert IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lconvert PROPERTIES
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools/default.nix
index 47ebd17c08f..d72d7b6c64c 100644
--- a/pkgs/development/libraries/qt-5/5.5/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qttools/default.nix
@@ -1,8 +1,9 @@
-{ qtSubmodule, qtbase }:
+{ qtSubmodule, lib, copyPathsToStore, qtbase }:
 
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postFixup = ''
     moveToOutput "bin/qdbus" "$out"
     moveToOutput "bin/qtpaths" "$out"
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/series b/pkgs/development/libraries/qt-5/5.5/qttools/series
new file mode 100644
index 00000000000..6cc1d3b87bc
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/qttools/series
@@ -0,0 +1 @@
+cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 94b75f1c18b..5276bcb73dc 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -90,7 +90,7 @@ let
       qtsensors = callPackage ./qtsensors.nix {};
       qtserialport = callPackage ./qtserialport {};
       qtsvg = callPackage ./qtsvg.nix {};
-      qttools = callPackage ./qttools.nix {};
+      qttools = callPackage ./qttools {};
       qttranslations = callPackage ./qttranslations.nix {};
       /* qtwayland = not packaged */
       qtwebchannel = callPackage ./qtwebchannel.nix {};
diff --git a/pkgs/development/libraries/qt-5/5.6/qttools.nix b/pkgs/development/libraries/qt-5/5.6/qttools.nix
deleted file mode 100644
index 4aeaea729a2..00000000000
--- a/pkgs/development/libraries/qt-5/5.6/qttools.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qttools";
-  qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    moveToOutput "bin/qdbus" "$out"
-    moveToOutput "bin/qtpaths" "$out"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.6/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.6/qttools/cmake-paths.patch
new file mode 100644
index 00000000000..fe5bcadbe9a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qttools/cmake-paths.patch
@@ -0,0 +1,72 @@
+Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+===================================================================
+--- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
++++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+@@ -2,11 +2,10 @@
+ if (NOT TARGET Qt5::qcollectiongenerator)
+     add_executable(Qt5::qcollectiongenerator IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_Help_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::qcollectiongenerator PROPERTIES
+Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
+===================================================================
+--- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
++++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
+@@ -44,11 +44,10 @@ endmacro()
+ if (NOT TARGET Qt5::lrelease)
+     add_executable(Qt5::lrelease IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lrelease PROPERTIES
+@@ -59,11 +58,10 @@ endif()
+ if (NOT TARGET Qt5::lupdate)
+     add_executable(Qt5::lupdate IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lupdate PROPERTIES
+@@ -74,11 +72,10 @@ endif()
+ if (NOT TARGET Qt5::lconvert)
+     add_executable(Qt5::lconvert IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lconvert PROPERTIES
diff --git a/pkgs/development/libraries/qt-5/5.6/qttools/default.nix b/pkgs/development/libraries/qt-5/5.6/qttools/default.nix
new file mode 100644
index 00000000000..d72d7b6c64c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qttools/default.nix
@@ -0,0 +1,11 @@
+{ qtSubmodule, lib, copyPathsToStore, qtbase }:
+
+qtSubmodule {
+  name = "qttools";
+  qtInputs = [ qtbase ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  postFixup = ''
+    moveToOutput "bin/qdbus" "$out"
+    moveToOutput "bin/qtpaths" "$out"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qttools/series b/pkgs/development/libraries/qt-5/5.6/qttools/series
new file mode 100644
index 00000000000..6cc1d3b87bc
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qttools/series
@@ -0,0 +1 @@
+cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index 90bd6b0726e..a84a429695c 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -86,7 +86,7 @@ let
       qtsensors = callPackage ./qtsensors.nix {};
       qtserialport = callPackage ./qtserialport {};
       qtsvg = callPackage ./qtsvg.nix {};
-      qttools = callPackage ./qttools.nix {};
+      qttools = callPackage ./qttools {};
       qttranslations = callPackage ./qttranslations.nix {};
       qtwebchannel = callPackage ./qtwebchannel.nix {};
       qtwebengine = callPackage ./qtwebengine.nix {};
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools.nix b/pkgs/development/libraries/qt-5/5.7/qttools.nix
deleted file mode 100644
index 4aeaea729a2..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttools.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qttools";
-  qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    moveToOutput "bin/qdbus" "$out"
-    moveToOutput "bin/qtpaths" "$out"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
new file mode 100644
index 00000000000..fe5bcadbe9a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
@@ -0,0 +1,72 @@
+Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+===================================================================
+--- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
++++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+@@ -2,11 +2,10 @@
+ if (NOT TARGET Qt5::qcollectiongenerator)
+     add_executable(Qt5::qcollectiongenerator IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_Help_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::qcollectiongenerator PROPERTIES
+Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
+===================================================================
+--- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
++++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
+@@ -44,11 +44,10 @@ endmacro()
+ if (NOT TARGET Qt5::lrelease)
+     add_executable(Qt5::lrelease IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lrelease PROPERTIES
+@@ -59,11 +58,10 @@ endif()
+ if (NOT TARGET Qt5::lupdate)
+     add_executable(Qt5::lupdate IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lupdate PROPERTIES
+@@ -74,11 +72,10 @@ endif()
+ if (NOT TARGET Qt5::lconvert)
+     add_executable(Qt5::lconvert IMPORTED)
+ 
+-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+-    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+-!!ELSE
+-    set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
+-!!ENDIF
++    set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
++    if(NOT EXISTS \"${imported_location}\")
++        set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
++    endif()
+     _qt5_LinguistTools_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::lconvert PROPERTIES
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix b/pkgs/development/libraries/qt-5/5.7/qttools/default.nix
new file mode 100644
index 00000000000..d72d7b6c64c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.7/qttools/default.nix
@@ -0,0 +1,11 @@
+{ qtSubmodule, lib, copyPathsToStore, qtbase }:
+
+qtSubmodule {
+  name = "qttools";
+  qtInputs = [ qtbase ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  postFixup = ''
+    moveToOutput "bin/qdbus" "$out"
+    moveToOutput "bin/qtpaths" "$out"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/series b/pkgs/development/libraries/qt-5/5.7/qttools/series
new file mode 100644
index 00000000000..6cc1d3b87bc
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.7/qttools/series
@@ -0,0 +1 @@
+cmake-paths.patch
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 80b39bd4cab..233fdd90254 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -37,7 +37,7 @@
     };
 
     nativeBuildInputs = [ cmake ];
-    buildInputs = [ unixODBC mariadb ];
+    buildInputs = [ unixODBC mariadb.lib ];
 
     cmakeFlags = [
       "-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql"
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 59063645232..20e2213e3e7 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -5,24 +5,25 @@ with stdenv.lib;
 
 let
   os = stdenv.lib.optionalString;
-  majorVersion = "5.10";
-  minorVersion = "1";
+  majorVersion = "7.0";
+  minorVersion = "0";
   version = "${majorVersion}.${minorVersion}";
 in
 
 stdenv.mkDerivation rec {
   name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
   src = fetchurl {
-    url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz";
-    sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi";
+    url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
+    sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq";
   };
 
-  # https://bugzilla.redhat.com/show_bug.cgi?id=1138466
-  postPatch = "sed '/^#define GL_GLEXT_LEGACY/d' -i ./Rendering/vtkOpenGL.h";
-
   buildInputs = [ cmake mesa libX11 xproto libXt ]
     ++ optional (qtLib != null) qtLib;
 
+  preBuild = ''
+    export LD_LIBRARY_PATH="$(pwd)/lib";
+  '';
+
   # Shared libraries don't work, because of rpath troubles with the current
   # nixpkgs camke approach. It wants to call a binary at build time, just
   # built and requiring one of the shared objects.
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 3bdb1392bd9..efe64581893 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -2,29 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
-  version = "4.75.0";
+  version = "4.80.0";
 
   enableParallelBuilding = true;
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
 
-  patches = [
-    # backported from
-    # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5
-    ./wavpack_clang.patch
-  ];
-
-  preConfigure = ''
-    sed -i '2iexec_prefix=@exec_prefix@' wavpack.pc.in
-  '';
-
-  # --disable-asm is required for clang
-  # https://github.com/dbry/WavPack/issues/3
-  configureFlags = lib.optionalString stdenv.cc.isClang "--disable-asm";
-
   src = fetchurl {
     url = "http://www.wavpack.com/${name}.tar.bz2";
-    sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6";
+    sha256 = "1sbbwvqixg87h02avg0d5r64mpjz8cmhcc6j3s9wmlbvbykjw63r";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/wavpack/wavpack_clang.patch b/pkgs/development/libraries/wavpack/wavpack_clang.patch
deleted file mode 100644
index dfbe4718143..00000000000
--- a/pkgs/development/libraries/wavpack/wavpack_clang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru -x '*~' wavpack-4.75.0_orig/src/wavpack_local.h wavpack-4.75.0/src/wavpack_local.h
---- wavpack-4.75.0_orig/src/wavpack_local.h	2015-05-21 06:50:26.000000000 +0900
-+++ wavpack-4.75.0/src/wavpack_local.h	2015-09-14 21:48:09.000000000 +0900
-@@ -650,9 +650,9 @@
- void scan_word (WavpackStream *wps, int32_t *samples, uint32_t num_samples, int dir);
- void update_error_limit (WavpackStream *wps);
- 
--const uint32_t bitset [32];
--const uint32_t bitmask [32];
--const char nbits_table [256];
-+extern const uint32_t bitset [32];
-+extern const uint32_t bitmask [32];
-+extern const char nbits_table [256];
- 
- int log2s (int32_t value);
- int32_t exp2s (int log);
-@@ -734,7 +734,7 @@
- /////////////////////////////////// common utilities ////////////////////////////////////
- // module: common_utils.c
- 
--const uint32_t sample_rates [16];
-+extern const uint32_t sample_rates [16];
- uint32_t WavpackGetLibraryVersion (void);
- const char *WavpackGetLibraryVersionString (void);
- uint32_t WavpackGetSampleRate (WavpackContext *wpc);
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/2.10.nix
index cf22eb3aadd..a76a19ad41d 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/2.10.nix
@@ -13,7 +13,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.10.4";
+  version = "2.10.9";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,17 +28,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v";
+    sha256 = "0sg935wpkgyd5ypd5fj25vd7ri8s6sbrmssb53xbgcc02xs8vcdv";
   };
 
   patches = [
     ./finding-harfbuzz-icu.patch
-    (fetchpatch {
-      name = "glibc-isnan.patch";
-      url = "http://trac.webkit.org/changeset/194518/trunk/Source/JavaScriptCore"
-        + "/runtime/Options.cpp?format=diff&new=194518";
-      sha256 = "0pzdv1zmlym751n9d310cx3yp752yzsc49cysbvgnrib4dh68nbm";
-    })
   ] ++ optional stdenv.isDarwin ./adding-libintl.patch;
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index b3145302d30..ca883cc79e7 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.9.6";
+  version = "3.9.8";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     rev = "v${version}";
-    sha256 = "19k3pqd567jfxyps4i6mk7sblwzaj1rixmsdwscw63pdgcgf260g";
+    sha256 = "0b1a9rmzpzjblj0gsrzas2aljivd0gfimcsj8gjl80ng25zgmaxr";
   };
 
   outputs = [ "dev" "out" "doc" "lib" ];
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index e8ec8f2aa24..abadf07a574 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -192,7 +192,7 @@ let lispPackages = rec {
     version = "git-20150514";
     description = "Common Lisp SQL Interface library";
     deps = [uffi];
-    buildInputs = [pkgs.mysql.lib pkgs.zlib];
+    buildInputs = [pkgs.mysql.client pkgs.zlib];
     # Source type: git
     src = pkgs.fetchgit {
       url =
@@ -204,8 +204,8 @@ let lispPackages = rec {
     };
     overrides = x:{
       preConfigure = ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.lib}/include/mysql"
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.lib}/lib/mysql"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${stdenv.lib.getDev pkgs.mysql.client}/include/mysql"
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.lib.getLib pkgs.mysql.client}/lib/mysql"
       '';
     };
   };
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index 4a3ed5723dd..fbbf0fc7414 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result
+, qcheck }:
 
 let
 
@@ -6,7 +7,7 @@ let
     let v = stdenv.lib.getVersion ocaml; in
       "${p}/lib/ocaml/${v}/site-lib";
 
-  version = "0.16";
+  version = "0.18";
 
 in
 
@@ -17,10 +18,10 @@ stdenv.mkDerivation {
     owner = "c-cube";
     repo = "ocaml-containers";
     rev = "${version}";
-    sha256 = "1mc33b4nvn9k3r4k56amxr804bg5ndhxv92cmjzg5pf4qh220c2h";
+    sha256 = "169j8vqg8h70wbldjg610jqikfk23ggw8zypmpzv3piym5p1dfiw";
   };
 
-  buildInputs = [ ocaml findlib cppo gen sequence qtest ounit ocaml_oasis ];
+  buildInputs = [ ocaml findlib cppo gen sequence qtest ounit ocaml_oasis qcheck ];
 
   propagatedBuildInputs = [ result ];
 
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 3131d8212e4..ce3487a80a0 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -23,15 +23,11 @@ stdenv.mkDerivation {
      "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql"
   ];
 
-  buildInputs = [ocaml findlib mysql.lib camlp4 ];
+  buildInputs = [ocaml findlib camlp4 ];
 
   createFindlibDestdir = true;
 
-  propagatedBuildInputs = [ mysql.lib ];
-
-  preConfigure = ''
-    export LDFLAGS="-L${mysql.lib}/lib/mysql"
-  '';
+  propagatedBuildInputs = [ mysql.client ];
 
   buildPhase = ''
     make
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
index 22d2bc17738..af13e856632 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
     preConfigure = ''
       substituteInPlace configure \
-        --replace /usr/include/mysql ${libmysql}/include/mysql
+        --replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql
     '';
     configureFlags = [ "--enable-dl"
                        "--enable-odbc"
diff --git a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
index 7757691bfca..be196d000bc 100644
--- a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch
+++ b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch
@@ -13,12 +13,12 @@ diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgda
 diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
 --- a/django/contrib/gis/geos/libgeos.py
 +++ b/django/contrib/gis/geos/libgeos.py
-@@ -23,7 +23,7 @@ try:
-     lib_path = settings.GEOS_LIBRARY_PATH
- except (AttributeError, EnvironmentError,
-         ImportError, ImproperlyConfigured):
--    lib_path = None
-+    lib_path = "@geos@/lib/libgeos_c.so"
+@@ -26,7 +26,7 @@ try:
+         lib_path = settings.GEOS_LIBRARY_PATH
+     except (AttributeError, EnvironmentError,
+             ImportError, ImproperlyConfigured):
+-        lib_path = None
++        lib_path = "@geos@/lib/libgeos_c.so"
  
- # Setting the appropriate names for the GEOS-C library.
- if lib_path:
+     # Setting the appropriate names for the GEOS-C library.
+     if lib_path:
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index b2d5b93d9f7..746cc747d72 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation {
     ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}"
   '';
 
-  buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
+  buildInputs = [ pkgconfig makeWrapper qt4 lndir ];
 
-  propagatedBuildInputs = [ pythonPackages.sip_4_16 ];
+  propagatedBuildInputs = [ pythonPackages.sip_4_16 python ];
 
   postInstall = ''
     for i in $out/bin/*; do
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 7ec89ffd7ee..69fb6e266ea 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -20,11 +20,11 @@ in stdenv.mkDerivation {
   };
 
   buildInputs = [
-    python pkgconfig makeWrapper lndir
+    pkgconfig makeWrapper lndir
     qtbase qtsvg qtwebkit qmakeHook
   ];
 
-  propagatedBuildInputs = [ sip ];
+  propagatedBuildInputs = [ sip python ];
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index e54436f5a2f..618d87f8b0a 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, git, mercurial }:
+{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.28.0";
+  version = "0.30.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1xryv1366zc385r82r6n832xkaqcm63zs1baizl02qchfzfa3am2";
+    sha256 = "1s6l3570r53qjyqs8ghqqgb51rb0skijwjgm6av43xi7b7knkd35";
   };
 
   installPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [ ocaml libelf git mercurial ] # git and mercurial are necessary because of https://github.com/facebook/flow/issues/1981
+  buildInputs = [ ocaml libelf ]
     ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index c103d11ac6e..e49697084e4 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "Build tool that builds code quickly and reliably";
     license = stdenv.lib.licenses.asl20;
     maintainers = [ stdenv.lib.maintainers.philandstuff ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 32e16751395..52822178c02 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -10,8 +10,8 @@ assert wantPS -> (ps != null);
 
 let
   os = stdenv.lib.optionalString;
-  majorVersion = "3.4";
-  minorVersion = "3";
+  majorVersion = "3.6";
+  minorVersion = "0";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1yl0z422gr7zfc638chifv343vx0ig5gasvrh7nzf7b15488qgxp";
+    sha256 = "0w3n2i02jpbgai4dxsigm1c1i1qb5v70wyxckzwrxvs0ri0fs1gx";
   };
 
   patches =
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
         --subst-var-by glibc_bin ${getBin glibc} \
         --subst-var-by glibc_dev ${getDev glibc} \
         --subst-var-by glibc_lib ${getLib glibc}
+      substituteInPlace Modules/FindCxxTest.cmake \
+        --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
     '';
   configureFlags =
     [ "--docdir=share/doc/${name}"
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 8fd519073cc..03968d15b12 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
-  version = "8.01.00";
+  version = "9.00.00";
 
   src = fetchFromGitHub {
-    sha256 = "1vgjywbc4w1agkakfndr2qf0z0ncxisihdv8sz9ipry9f170np39";
+    sha256 = "028rxx4ygy0z48m30m5pdach7kcp41swchhs8i15wag1mppllcy2";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";
diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
index 170f07ca5c3..e252362a059 100644
--- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "gocd-agent-${version}-${rev}";
-  version = "16.5.0";
-  rev = "3305";
+  version = "16.7.0";
+  rev = "3819";
 
   src = fetchurl {
     url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip";
-    sha256 = "2cb988d36ec747b2917f3be040b430f2a8289c07353a6b6bdc95bf741fa1ed97";
+    sha256 = "24cc47099d2e9cc1d3983e1ab65957316770f791632e572189b1e6c0183403b7";
   };
   meta = with stdenv.lib; {
     description = "A continuous delivery server specializing in advanced workflow modeling and visualization";
     homepage = http://www.go.cd;
     license = licenses.asl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ swarren83 ];
+    maintainers = with maintainers; [ grahamc swarren83 ];
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
index d08d72c394e..474bcba6c71 100644
--- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix
+++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "gocd-server-${version}-${rev}";
-  version = "16.6.0";
-  rev = "3590";
+  version = "16.7.0";
+  rev = "3819";
 
   src = fetchurl {
     url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip";
-    sha256 = "6e737c8b419544deb5089e9a2540892a6faec73c962ee7c4e526a799056acca1";
+    sha256 = "3fae89741726eac69adab8dd64cd18918343188eeb43496e88d4f3abbe0998ad";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix
new file mode 100644
index 00000000000..a4ed3a44f35
--- /dev/null
+++ b/pkgs/development/tools/misc/gpshell/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }:
+
+stdenv.mkDerivation rec {
+  name = "gpshell-${version}";
+  version = "1.4.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/globalplatform/gpshell-${version}.tar.gz";
+    sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
+  };
+
+  buildInputs = [ pkgconfig globalplatform pcsclite ];
+
+  meta = with stdenv.lib; {
+    homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;
+    description = "Smartcard management application";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index a4f1a96c6a4..e3d2c4950bc 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -118,7 +118,7 @@ in releaseTools.nixBuild rec {
 
   preCheck = ''
     patchShebangs .
-    export LOGNAME=${LOGNAME:-foo}
+    export LOGNAME=''${LOGNAME:-foo}
   '';
 
   postInstall = ''
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 02ab4c06a50..2884b23049a 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
     # mv effect-*/effect                 $out/pkgs/effect
     mv requests-*/requests              $out/pkgs/
 
-    if [ "$IN_NIX_SHELL" != "1" ]; then
+    if [ -z "$IN_NIX_SHELL" ]; then
       if [ -e git-export ]; then
         mv git-export/src/pypi2nix      $out/pkgs/pypi2nix
       else
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 9b24a8fe8ea..06ab4ffed3c 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/andersbakken/rtags;
 
     license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.allBut [ "i686-linux" ];
   };
 }
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 8f89770ffc8..0a72e6bb91e 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -4,7 +4,7 @@
 , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
 , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
 , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb
-, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp
+, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp, chromium
 }:
 
 let
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper fakeroot file getopt ];
 
-  outputs = [ "out" "monodevelop" "sandbox" ];
+  outputs = [ "out" "monodevelop" ];
 
   unpackPhase = ''
     echo -e 'q\ny' | fakeroot sh $src
@@ -91,12 +91,10 @@ in stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    install -Dm755 Editor/chrome-sandbox $sandbox/bin/unity-chrome-sandbox
-
     unitydir="$out/opt/Unity/Editor"
     mkdir -p $unitydir
     mv Editor/* $unitydir
-    ln -sf /var/setuid-wrappers/unity-chrome-sandbox $unitydir/chrome-sandbox
+    ln -sf /var/setuid-wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
 
     mkdir -p $out/share/applications
     sed "/^Exec=/c\Exec=$out/bin/unity-editor" \
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 6dfbb6978db..242782161d7 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -15,6 +15,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "vagrant-${version}";
+  inherit version;
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -39,10 +40,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
 
   unpackPhase = ''
-    ${dpkg}/bin/dpkg-deb -x ${src} .
+    ${dpkg}/bin/dpkg-deb -x "$src" .
   '';
 
-  buildPhase = false;
+  buildPhase = "";
 
   installPhase = ''
     sed -i "s|/opt|$out/opt|" usr/bin/vagrant
@@ -55,6 +56,8 @@ stdenv.mkDerivation rec {
     ln -s ${curl.dev}/bin/curl-config opt/vagrant/embedded/bin
 
     # libarchive: bsdtar, bsdcpio
+    rm opt/vagrant/embedded/lib/libarchive*
+    ln -s ${libarchive}/lib/libarchive.so opt/vagrant/embedded/lib/libarchive.so
     rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}
     ln -s ${libarchive}/bin/bsdtar opt/vagrant/embedded/bin
     ln -s ${libarchive}/bin/bsdcpio opt/vagrant/embedded/bin
@@ -74,6 +77,10 @@ stdenv.mkDerivation rec {
     ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin
     ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
 
+    # ruby libs
+    rm -rf opt/vagrant/embedded/lib
+    ln -s ${ruby}/lib opt/vagrant/embedded/lib
+
     # libiconv: iconv
     rm opt/vagrant/embedded/bin/iconv
     ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
@@ -92,17 +99,17 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"
     cp -r opt "$out"
     cp -r usr/bin "$out"
-    wrapProgram $out/bin/vagrant --prefix LD_LIBRARY_PATH : $out/opt/vagrant/embedded/lib
+    wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib"
   '';
 
   preFixup = ''
     # 'hide' the template file from shebang-patching
-    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable
-    chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
+    chmod -x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable"
+    chmod -x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh"
   '';
 
   postFixup = ''
-    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable
-    chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
+    chmod +x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable"
+    chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh"
   '';
 }
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index f0f4d71e391..c10fe99f74a 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -40,6 +40,10 @@ in stdenv.mkDerivation {
     sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
+  postInstall = ''
+    PATH=$out/bin:$PATH patchShebangs $out
+  '';
+
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
 
   buildInputs = extraBuildInputs
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index cb04e9c4750..bb6cffdb122 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -1,6 +1,8 @@
 { stdenv, callPackage, fetchurl, makeWrapper
 , alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu
+, factorio-utils
 , releaseType
+, mods ? []
 , username ? "" , password ? ""
 }:
 
@@ -8,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless";
 
 with stdenv.lib;
 let
-  version = "0.13.8";
+  version = "0.13.13";
   isHeadless = releaseType == "headless";
 
   arch = if stdenv.system == "x86_64-linux" then {
@@ -23,14 +25,14 @@ let
 
   fetch = rec {
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
-    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; # TODO take this from 302 redirection somehow? fetchurl doesn't help.
+    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz";
     x64 = {
-      headless = fetchurl        { inherit name url; sha256 = "0dliympqnnawfw65n5gnda9mljyqwshmq2hvplf1h8nrp1rw3pgj"; };
-      alpha = authenticatedFetch { inherit      url; sha256 = "12safa8b4g5cpwxbkf8ldkb17lgf33rslr7p81l7gr1lyzfnf82c"; };
+      headless = fetchurl        { inherit name url; sha256 = "1ip0h2kh16s07nk6xqpm0i0yb0x32zn306414j15gqg3j0j0mzpn"; };
+      alpha = authenticatedFetch { inherit      url; sha256 = "1hvj51cggp6cbxyndbl4z07kadzxxk3diiqkkv0jm9s0nrwvq9zr"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha = authenticatedFetch { inherit      url; sha256 = "0m4m183avnqxkw28vb7za14dsmcd01sdldgga0br1clilxmgph2w"; };
+      alpha = authenticatedFetch { inherit      url; sha256 = "14dwlakn7z8jziy0hgm3nskr7chp7753z1dakxlymz9h5653cx8b"; };
     };
   };
 
@@ -54,14 +56,16 @@ let
     fi
   '';
 
+  modDir = factorio-utils.mkModDirDrv mods;
+
   base = {
     name = "factorio-${releaseType}-${version}";
 
     src = fetch.${arch.inTar}.${releaseType};
 
+    preferLocalBuild = true;
     dontBuild = true;
 
-    # TODO detangle headless/normal mode wrapping, libs, etc.  test all urls 32/64/headless/gfx
     installPhase = ''
       mkdir -p $out/{bin,share/factorio}
       cp -a data $out/share/factorio
@@ -71,8 +75,6 @@ let
         $out/bin/factorio
     '';
 
-    preferLocalBuild = true;
-
     meta = {
       description = "A game in which you build and maintain factories";
       longDescription = ''
@@ -112,7 +114,23 @@ let
       wrapProgram $out/bin/factorio                                \
         --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
         --run "$out/share/factorio/update-config.sh"               \
-        --add-flags "-c \$HOME/.factorio/config.cfg"
+        --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}"
+
+        # TODO Currently, every time a mod is changed/added/removed using the
+        # modlist, a new derivation will take up the entire footprint of the
+        # client. The only way to avoid this is to remove the mods arg from the
+        # package function. The modsDir derivation will have to be built
+        # separately and have the user specify it in the .factorio config or
+        # right along side it using a symlink into the store I think i will
+        # just remove mods for the client derivation entirely. this is much
+        # cleaner and more useful for headless mode.
+
+        # TODO: trying to toggle off a mod will result in read-only-fs-error.
+        # not much we can do about that except warn the user somewhere. In
+        # fact, no exit will be clean, since this error will happen on close
+        # regardless. just prints an ugly stacktrace but seems to be otherwise
+        # harmless, unless maybe the user forgets and tries to use the mod
+        # manager.
 
       install -m0644 <(cat << EOF
       ${configBaseCfg}
diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix
new file mode 100644
index 00000000000..501665494eb
--- /dev/null
+++ b/pkgs/games/factorio/mods.nix
@@ -0,0 +1,213 @@
+# This file is here for demo purposes only, populated with a small sampling of
+# mods. It will eventually be replaced by a nixos-channel that will provide
+# derivations for most or all of the mods tracked through the official mod
+# manager site.
+{ stdenv, fetchurl
+, factorio-utils
+, allRecommendedMods ? true
+, allOptionalMods ? false
+}:
+with stdenv.lib;
+let
+  modDrv = factorio-utils.modDrv { inherit allRecommendedMods allOptionalMods; };
+in
+rec {
+
+  bobassembly = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobassembly_0.13.0.zip
+      ];
+      sha256 = "0c0m7sb45r37g882x0aq8mc82yhfh9j9h8g018d4s5pf93vzr6d1";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig ];
+    recommendedDeps = [ bobplates ];
+  };
+
+  bobconfig = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobconfig_0.13.1.zip
+      ];
+      sha256 = "0z4kmggm1slbr3qiy5xahc9nhdffllp21n9nv5gh1zbzv72sb1rp";
+    };
+  };
+
+  bobelectronics = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobelectronics_0.13.1.zip
+      ];
+      sha256 = "16sn5w33s0ckiwqxx7b2pcsqmhxbxjm2w4h4vd99hwpvdpjyav52";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig ];
+    recommendedDeps = [ bobplates ];
+  };
+
+  bobenemies = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobenemies_0.13.1.zip
+      ];
+      sha256 = "1wnb5wsvh9aa3i9mj17f36ybbd13qima3iwshw60i6xkzzqfk44d";
+    };
+    optionalDeps = [ bobconfig ];
+  };
+
+  bobgreenhouse = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobgreenhouse_0.13.2.zip
+      ];
+      sha256 = "1ql26875dvz2lqln289jg1w6yjzsd0x0pqmd570jffwi5m320rrw";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig ];
+    recommendedDeps = [ bobplates ];
+  };
+
+  bobinserters = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobinserters_0.13.3.zip
+      ];
+      sha256 = "0nys9zhaw0v3w2xzrhawr8g2hcxkzdmyqd4s8xm5bnbrgrq86g9z";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig ];
+    recommendedDeps = [ ];
+  };
+
+  boblibrary = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/boblibrary_0.13.1.zip
+      ];
+      sha256 = "04fybs626lzxf0p21jl8kakh2mddah7l9m57srk7a87jw5bj1zx8";
+    };
+  };
+
+  boblogistics = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/boblogistics_0.13.7.zip
+      ];
+      sha256 = "0c91zmyxwsmyv6vm6gp498vb7flqlcyzkbp9s5q1651hpyd378hx";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig ];
+    recommendedDeps = [ bobplates ];
+  };
+
+  bobmining = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobmining_0.13.1.zip
+      ];
+      sha256 = "1l7k3v4aizihppgi802fr5b8zbnq2h05c2bbsk5hds239qgxy80m";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig bobores bobplates ];
+  };
+
+  bobmodules = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobmodules_0.13.0.zip
+      ];
+      sha256 = "0ggd2gc4s5sbld7gyncbzdgq8gc00mvxjcfv7i2dchcrdzrlr556";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig ];
+    recommendedDeps = [ bobplates bobassembly bobelectronics ];
+  };
+
+  bobores = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobores_0.13.1.zip
+      ];
+      sha256 = "1rri70655kj77sdr3zgp56whmcl0gfjmw90jm7lj1jp8l1pdfzb9";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig ];
+  };
+
+  bobplates = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobplates_0.13.2.zip
+      ];
+      sha256 = "0iczpa26hflj17k84p4n6wz0pwhbbrfk86dgac4bfz28kqg58nj1";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig bobenemies ];
+    recommendedDeps = [ bobores bobtech ];
+  };
+
+  bobpower = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobpower_0.13.1.zip
+      ];
+      sha256 = "18sblnlvprrm2vzlczlki09yj9lr4y64808zrwmcasf7470skar3";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobconfig ];
+    recommendedDeps = [ bobplates ];
+  };
+
+  bobrevamp = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobrevamp_0.13.0.zip
+      ];
+      sha256 = "0rkyf61clh8fjg72z9i7r4skvdzgd49ky6s0486xxljhbil4nxb7";
+    };
+    deps = [ boblibrary ];
+  };
+
+  bobtech = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobtech_0.13.0.zip
+      ];
+      sha256 = "0arc9kilxzdpapn3gh5h8269ssgsjxib4ny0qissq2sg95gxlsn0";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ bobenemies ];
+  };
+
+  bobtechsave = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobtechsave_0.13.0.zip
+      ];
+      sha256 = "1vlv4sgdfd9ldjm8y79n95ms5k6x2i7khjc422lp9080m03v1hcl";
+    };
+  };
+
+  bobwarfare = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/bobwarfare_0.13.4.zip
+      ];
+      sha256 = "07wzn16i4r0qjm41wfyl17rrhry2vrph08a0kq8w5iy6qcbqqfd3";
+    };
+    deps = [ boblibrary ];
+    optionalDeps = [ boblibrary bobplates ];
+    recommendedDeps = [ bobtech ];
+  };
+
+  clock = modDrv {
+    src = fetchurl {
+      urls = [
+        https://f.xor.us/factorio-mods/clock_0.13.0.zip
+      ];
+      sha256 = "0nflywbj6p2kz2w9wff78vskzljrzaf32ib56k3z456d9y8mlxfd";
+    };
+  };
+
+}
diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix
new file mode 100644
index 00000000000..563ece6cb9c
--- /dev/null
+++ b/pkgs/games/factorio/utils.nix
@@ -0,0 +1,49 @@
+# This file provides a top-level function that will be used by both nixpkgs and nixos
+# to generate mod directories for use at runtime by factorio.
+{ stdenv }:
+with stdenv.lib;
+{
+  mkModDirDrv = mods: # a list of mod derivations
+    let
+      recursiveDeps = modDrv: [modDrv] ++ optionals (modDrv.deps == []) (map recursiveDeps modDrv.deps);
+      modDrvs = unique (flatten (map recursiveDeps mods));
+    in
+    stdenv.mkDerivation {
+      name = "factorio-mod-directory";
+
+      preferLocalBuild = true;
+      buildCommand = ''
+        mkdir -p $out
+        for modDrv in ${toString modDrvs}; do
+          # NB: there will only ever be a single zip file in each mod derivation's output dir
+          ln -s $modDrv/*.zip $out
+        done
+      '';
+    };
+
+    modDrv = { allRecommendedMods, allOptionalMods }:
+      { src
+      , name ? null
+      , deps ? []
+      , optionalDeps ? []
+      , recommendedDeps ? []
+      }: stdenv.mkDerivation {
+
+        inherit src;
+
+        # Use the name of the zip, but endstrip ".zip" and possibly the querystring that gets left in by fetchurl
+        name = replaceStrings ["_"] ["-"] (if name != null then name else removeSuffix ".zip" (head (splitString "?" src.name)));
+
+        deps = deps ++ optionals allOptionalMods optionalDeps
+                    ++ optionals allRecommendedMods recommendedDeps;
+
+        preferLocalBuild = true;
+        buildCommand = ''
+          mkdir -p $out
+          srcBase=$(basename $src)
+          srcBase=''${srcBase#*-}  # strip nix hash
+          srcBase=''${srcBase%\?*} # strip querystring leftover from fetchurl
+          cp $src $out/$srcBase
+        '';
+      };
+}
diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix
index 969f231deda..dabcfb19db0 100644
--- a/pkgs/games/gambatte/default.nix
+++ b/pkgs/games/gambatte/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ scons qt4 ];
 
+  patches = [ ./fix-scons-paths.patch ];
+
   buildPhase = ''
     ./build_qt.sh
   '';
diff --git a/pkgs/games/gambatte/fix-scons-paths.patch b/pkgs/games/gambatte/fix-scons-paths.patch
new file mode 100644
index 00000000000..ea10ee4163b
--- /dev/null
+++ b/pkgs/games/gambatte/fix-scons-paths.patch
@@ -0,0 +1,15 @@
+diff --git a/libgambatte/SConstruct b/libgambatte/SConstruct
+index e882514..87e1eaa 100644
+--- a/libgambatte/SConstruct
++++ b/libgambatte/SConstruct
+@@ -5,7 +5,9 @@ vars = Variables()
+ vars.Add('CC')
+ vars.Add('CXX')
+ 
+-env = Environment(CPPPATH = ['src', 'include', '../common'],
++import os
++env = Environment(ENV = os.environ,
++                  CPPPATH = ['src', 'include', '../common'],
+                   CFLAGS = global_cflags + global_defines,
+                   CXXFLAGS = global_cxxflags + global_defines,
+                   variables = vars)
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index 7d0f59a4e0d..2486d1da470 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -5,7 +5,8 @@
 
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2
+          network vector utf8-string bytestring-show random hslogger
+          dataenc SHA entropy zlib_0_5_4_2
         ]);
 in
 stdenv.mkDerivation rec {
@@ -21,6 +22,10 @@ stdenv.mkDerivation rec {
     qt4 ghc ffmpeg freeglut makeWrapper physfs
   ];
 
+  postPatch = ''
+    substituteInPlace gameServer/CMakeLists.txt --replace mask evaluate
+  '';
+
   preBuild = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib
                                      -rpath ${SDL_mixer}/lib
@@ -65,7 +70,7 @@ stdenv.mkDerivation rec {
        contact with explosions, to zero (the damage dealt to the attacked
        hedgehog or hedgehogs after a player's or CPU turn is shown only when
        all movement on the battlefield has ceased).'';
-    maintainers = with maintainers; [ kragniz ];
+    maintainers = with maintainers; [ kragniz fpletz ];
     platforms = ghc.meta.platforms;
   };
 }
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 03f94afd94f..7a7571a9fa5 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -21,11 +21,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "1cjf9gz7d0sn7893wv9d00q724sxv3d81bgb0c5f5ppz2ssyc4jc";
+    sha256 = "1ak32fj5xkk2fvmm3g8i7wzmk4bh2ijsp8fzvvw5wj6365p9j24v";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.openttd.org/;
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny fpletz ];
   };
 }
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index 59dabf2f9cd..5fcb5063bbc 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp -r Linux $out/
+    chmod +x "$out/Linux/TerrariaServer.bin.x86_64"
     ln -s "$out/Linux/TerrariaServer.bin.x86_64" $out/bin/TerrariaServer
     # Fix "/lib64/ld-linux-x86-64.so.2" like references in ELF executables.
     find "$out" | while read filepath; do
diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix
index f85fd267485..34b9a606fb9 100644
--- a/pkgs/games/vessel/default.nix
+++ b/pkgs/games/vessel/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
       message = goBuyItNow;
       name = "${name}-bin";
       sha256 = "1vpwcrjiln2mx43h7ib3jnccyr3chk7a5x2bw9kb4lw8ycygvg96";
-    } else throw "unsupported platform ${stdenv.s:ystem} only i686-linux supported for now.";
+    } else throw "unsupported platform ${stdenv.system} only i686-linux supported for now.";
 
   phases = "installPhase";
   ld_preload = ./isatty.c;
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 8d57b48481e..46d3873659f 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="xboard";
-    version="4.9.0";
+    version="4.9.1";
     name="${baseName}-${version}";
-    hash="1av6r3s5vyclwf3c9i1pkr2442ryrf4ixhhf2i44a4j1xyhlp5jb";
-    url="http://ftp.gnu.org/gnu/xboard/xboard-4.9.0.tar.gz";
-    sha256="1av6r3s5vyclwf3c9i1pkr2442ryrf4ixhhf2i44a4j1xyhlp5jb";
+    hash="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
+    url="http://ftp.gnu.org/gnu/xboard/xboard-4.9.1.tar.gz";
+    sha256="1mkh36xnnacnz9r00b5f9ld9309k32jv6mcavklbdnca8bl56bib";
   };
   buildInputs = [
     libX11 xproto libXt libXaw libSM libICE libXmu 
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index 9975aa1b15b..d7a0a62f5bd 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql
     makeWrapper ];
 
-  NIX_LDFLAGS="-L${libmysql}/lib/mysql";
+  NIX_LDFLAGS="-L${stdenv.lib.getLib libmysql}/lib/mysql";
 
   installPhase = ''
     mkdir -p $out/bin $out/share/zod
diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix
index 0956bc59b42..da28f1892df 100644
--- a/pkgs/misc/themes/flat-plat/default.nix
+++ b/pkgs/misc/themes/flat-plat/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/share/themes
+    mkdir -p $out/share/themes/Flat-Plat
     rm .gitignore COPYING README.md
-    cp -r . $out/share/themes
+    cp -r . $out/share/themes/Flat-Plat
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index e9fcf5d8c4d..8ab4da2da8c 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="eudev";
-    version = "3.1.5";
+    version = "3.2";
     name="${baseName}-${version}";
     url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
-    sha256 = "0akg9gcc3c2p56xbhlvbybqavcprly5q0bvk655zwl6d62j8an7p";
+    sha256 = "099w62ncq78nxpxizf910mx18hc8x4qvzw3azjd00fir89wmyjnq";
   };
   buildInputs = [
     glib pkgconfig gperf utillinux
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index dac0eb0d0f5..ce2f860efc8 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.40";
+    version="0.9.42-rc1";
     name="${baseName}-${version}";
-    hash="1vr0z694wibjkcpmyg7lz68r53z857c8hsb02cqxi4lfkkcmzgh2";
-    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.40-rc1.tar.bz2";
-    sha256="1vr0z694wibjkcpmyg7lz68r53z857c8hsb02cqxi4lfkkcmzgh2";
+    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42~rc1.tar.bz2";
+    sha256="11br6xp86bxs1ic2x683hbvg1hk8v2wp8cw6blj0zz3cdl0pcjqf";
   };
   buildInputs = [
     which
@@ -18,6 +17,7 @@ stdenv.mkDerivation {
   inherit buildInputs;
   src = fetchurl {
     inherit (s) url sha256;
+    name = "${s.name}.tar.bz2";
   };
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 9bce875570e..f6fcef11eb0 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, libsysfs, gnutls, openssl, libcap, sp, docbook_sgml_dtd_31
-, SGMLSpm }:
+, SGMLSpm, libgcrypt }:
 
 assert stdenv ? glibc;
 
 let
-  time = "20121221";
+  time = "20151218";
 in
 stdenv.mkDerivation rec {
   name = "iputils-${time}";
 
   src = fetchurl {
     url = "http://www.skbuff.net/iputils/iputils-s${time}.tar.bz2";
-    sha256 = "17riqp8dh8dvx32zv3hyrghpxz6xnxa6vai9b4yc485nqngm83s5";
+    sha256 = "189592jlkhxdgy8jc07m4bsl41ik9r6i6aaqb532prai37bmi7sl";
   };
 
   prePatch = ''
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = "USE_GNUTLS=no";
 
-  buildInputs = [ libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm ];
+  buildInputs = [
+    libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt
+  ];
 
   buildFlags = "man all ninfod";
 
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index 7a341b9e82b..60415c0d009 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,9 +1,9 @@
 { fetchzip }:
 
 rec {
-  version = "3.4.2";
+  version = "3.4.4";
   src = fetchzip {
-    url = "https://www.jool.mx/download/Jool-${version}.zip";
-    sha256 = "1qv7wwipylb76n8m8vphbf9rgxrryb42dsyw6mm43zjc9knsz7r0";
+    url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip";
+    sha256 = "1k5iyfzjdzl5q64234r806pf6b3qdflvjpw06pnwl0ycj05p5frr";
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 37e3859cd05..f591bdf13d6 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -112,11 +112,21 @@ with stdenv.lib;
     IPV6_PRIVACY y
   ''}
   NETFILTER_ADVANCED y
+  IP_ROUTE_VERBOSE y
+  IP_MROUTE_MULTIPLE_TABLES y
   IP_VS_PROTO_TCP y
   IP_VS_PROTO_UDP y
   IP_VS_PROTO_ESP y
   IP_VS_PROTO_AH y
   IP_DCCP_CCID3 n # experimental
+  IPV6_ROUTER_PREF y
+  IPV6_ROUTE_INFO y
+  IPV6_OPTIMISTIC_DAD y
+  IPV6_MULTIPLE_TABLES y
+  IPV6_SUBTREES y
+  IPV6_MROUTE y
+  IPV6_MROUTE_MULTIPLE_TABLES y
+  IPV6_PIMSM_V2 y
   CLS_U32_PERF y
   CLS_U32_MARK y
   ${optionalString (stdenv.system == "x86_64-linux") ''
@@ -126,6 +136,10 @@ with stdenv.lib;
     NET_CLS_BPF m
     NET_ACT_BPF m
   ''}
+  L2TP_V3 y
+  L2TP_IP m
+  L2TP_ETH m
+  BRIDGE_VLAN_FILTERING y
 
   # Wireless networking.
   CFG80211_WEXT? y # Without it, ipw2200 drivers don't build
@@ -165,6 +179,8 @@ with stdenv.lib;
   # Allow specifying custom EDID on the kernel command line
   DRM_LOAD_EDID_FIRMWARE y
   VGA_SWITCHEROO y # Hybrid graphics support
+  DRM_GMA600 y
+  DRM_GMA3600 y
 
   # Sound.
   SND_DYNAMIC_MINORS y
@@ -255,7 +271,7 @@ with stdenv.lib;
   DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages
 
   # Security related features.
-  RANDOMIZE_BASE y
+  RANDOMIZE_BASE? y
   STRICT_DEVMEM y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   DEVKMEM n # Disable /dev/kmem
@@ -482,7 +498,7 @@ with stdenv.lib;
   # zram support (e.g for in-memory compressed swap).
   ZSMALLOC y
   ZRAM m
-  ZSWAP y
+  ZSWAP? y
 
   # Enable PCIe and USB for the brcmfmac driver
   BRCMFMAC_USB? y
diff --git a/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch b/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch
deleted file mode 100644
index 7f94669a9f4..00000000000
--- a/pkgs/os-specific/linux/kernel/ecryptfs-fix-mmap-bug.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Signed-off-by: Tyler Hicks <tyhicks@xxxxxxxxxxxxx>
-Tested-by: Tyler Hicks <tyhicks@xxxxxxxxxxxxx> # 4.4.y, 3.18.y
-Cc: <stable@xxxxxxxxxxxxxxx> # 4.5-
----
- fs/ecryptfs/kthread.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c
-index e818f5a..b9faeab 100644
---- a/fs/ecryptfs/kthread.c
-+++ b/fs/ecryptfs/kthread.c
-@@ -171,7 +171,7 @@ int ecryptfs_privileged_open(struct file **lower_file,
- 		goto out;
- 	}
- have_file:
--	if ((*lower_file)->f_op->mmap == NULL) {
-+	if ((*lower_file)->f_op->mmap == NULL && !d_is_dir(lower_dentry)) {
- 		fput(*lower_file);
- 		*lower_file = NULL;
- 		rc = -EMEDIUMTYPE;
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index 20abe1015c3..e5fa780c6e7 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -134,7 +134,7 @@ close CONFIG;
 
 foreach my $name (sort (keys %answers)) {
     my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1"
-        ? sub { die @_; } : sub { warn @_; };
+        ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; };
     &$f("unused option: $name\n") unless defined $config{$name};
     &$f("option not set correctly: $name\n")
         if $config{$name} && $config{$name} ne $answers{$name};
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 4dd3444d524..56ab62e95e5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.16";
+  version = "4.4.17";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18v4n7yypl4c8k69zrnf9g09pilh47y0ciy3mwbksz2kmw4yq573";
+    sha256 = "10ags1n345irx1bi3fyal326b3m5myndz19v0klbvxhd3i3m350m";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 375f0e3b0b4..56963d89efa 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -148,8 +148,4 @@ rec {
         sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy";
       };
     };
-  ecryptfs_fix_mmap_bug =
-    { name = "ecryptfs_fix_mmap_bug";
-      patch = ./ecryptfs-fix-mmap-bug.patch;
-    };
 }
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 122ca9d5522..84b66ac0d9c 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
index 2935990755c..3d617ece1c0 100644
--- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
+++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
@@ -15,11 +15,16 @@ stdenv.lib.overrideDerivation systemd (p: {
     make $makeFlags systemd-cryptsetup-generator
   '';
 
+  # For some reason systemd-cryptsetup-generator is a wrapper-script
+  # with the current release of systemd. We want the real one.
+
+  # TODO: Revert 3efadce when the wrapper-script is gone
   installPhase = ''
     mkdir -p $out/lib/systemd/
     cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup
+    cp .libs/*.so $out/lib/
 
     mkdir -p $out/lib/systemd/system-generators/
-    cp systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator
+    cp .libs/systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator
   '';
 })
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index c64297f0529..81c8b7b4df7 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -106,6 +106,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.uclibc.org/;
     description = "A small implementation of the C library";
+    maintainers = with stdenv.lib.maintainers; [ rasendubi ];
     license = stdenv.lib.licenses.lgpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/uksmtools/default.nix b/pkgs/os-specific/linux/uksmtools/default.nix
deleted file mode 100644
index 4efc2d42f2b..00000000000
--- a/pkgs/os-specific/linux/uksmtools/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchgit, cmake }:
-
-stdenv.mkDerivation rec {
-  name = "uksmtools-${version}";
-  version = "2015-09-25";
-
-  # This project uses git submodules, which fetchFromGitHub doesn't support:
-  src = fetchgit {
-    sha256 = "1nj53f24qjp0d87fzrz0y72rmv6lhxyiaqrsbd9v423h5zpmkrnj";
-    rev = "9f59a3a0b494b758aa91d7d8fa04e21b5e6463c0";
-    url = "https://github.com/pfactum/uksmtools.git";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  enableParallelBuilding = true;
-
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Tools to control Linux UKSM (Ultra Kernel Same-page Merging)";
-    homepage = https://github.com/pfactum/uksmtools/;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-}
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 4ade0af9815..ab347961375 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchgit, libmnl, kernel ? null }:
 
+# module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements
+assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";
+
 let
   name = "wireguard-unstable-${version}";
 
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 5bf3f2e693e..7725a7272ed 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     ''
-      echo 'PATH=${erlang}/bin:${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
+      echo 'PATH=${erlang}/bin:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
     ''; # */
 
   meta = {
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index f898034719f..2078e2e2d42 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -1,17 +1,17 @@
 { fetchurl, stdenv, libtool, gettext, zlib, readline, gsasl
-, guile, python, pcre, libffi }:
+, guile, python, pcre, libffi, groff }:
 
 stdenv.mkDerivation rec {
-  name = "dico-2.2";
+  name = "dico-2.3";
 
   src = fetchurl {
     url = "mirror://gnu/dico/${name}.tar.xz";
-    sha256 = "04pjks075x20d19l623mj50bw64g8i41s63z4kzzqcbg9qg96x64";
+    sha256 = "13by0zimx90v2j8v7n4k9y3xwmh4q9jdc2f4f8yjs3x7f5bzm2pk";
   };
 
   # XXX: Add support for GNU SASL.
   buildInputs =
-    [ libtool gettext zlib readline gsasl guile python pcre libffi ];
+    [ libtool gettext zlib readline gsasl guile python pcre libffi groff ];
 
   # dicod fails to load modules, so the tests fail
   doCheck = false;
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index c576bcf8736..1cad76bbf20 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.0.6020";
+  version = "3.0.6030";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
-    sha256 = "1hpzprhvwwrxjx3qijwvcnjprvx9g58idqnms7d9qql53a20scaq";
+    sha256 = "14fmgb8pwj11n57c1rm002ylwqapdqywbpsv7z6skairbaf6ny09";
   };
 
   propagatedBuildInputs = with pkgs; [
diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix
index 3c1430157d0..63a71633923 100644
--- a/pkgs/servers/games/ghost-one/default.nix
+++ b/pkgs/servers/games/ghost-one/default.nix
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2";
   };
 
-  buildInputs = [ unzip gmp zlib bzip2 boost mysql.lib ];
+  buildInputs = [ unzip gmp zlib bzip2 boost mysql.client ];
 
   patchPhase = ''
-    substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql.lib}/lib/mysql"
+    substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \
+      "${stdenv.lib.getLib mysql.client}/lib/mysql"
   '';
 
   buildPhase = ''
@@ -49,5 +50,6 @@ stdenv.mkDerivation rec {
     description = "A Warcraft III: Reign of Chaos and Warcraft III: The Frozen Throne game hosting bot";
     license = licenses.asl20;
     maintainers = [ maintainers.phreedom ];
+    broken = true; # can't even get downloaded
   };
 }
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 6e4c49abc5b..3991e2b99d5 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.11.2";
-  sha256 = "02khwad28ar2jjdfssysx262bgwgirm9967gnfhw9ga7wvipncm0";
+  version = "1.11.3";
+  sha256 = "042689m88bjhf7gsly4kl4gjyqdabcnizshxvdlp14gkz507yrja";
 })
diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index 1ac47fbf722..6f52e62aab7 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     "--enable-preferences-extension"
     "--enable-long-usernames"
     "--enable-external-lookup"
-  ] ++ lib.optional withMySQL "--with-mysql-includes=${libmysql}/include/mysql"
+  ] ++ lib.optional withMySQL "--with-mysql-includes=${lib.getDev libmysql}/include/mysql"
     ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib";
 
   # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR"
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index cf93b11ba9a..5e5170afbc7 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl libevent
-    libasr python2 lua5 perl mariadb postgresql sqlite hiredis ];
+    libasr python2 lua5 perl mariadb.client postgresql sqlite hiredis ];
 
   configureFlags = [
     "--sysconfdir=/etc"
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 9caa41ddcb6..43cdffd660c 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -10,7 +10,7 @@ let
     "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
     "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
    ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
-     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysql}/include/mysql" ]
+     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ]
      ++ lib.optional withSQLite "-DHAS_SQLITE");
    auxlibs = lib.concatStringsSep " " ([
      "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl"
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 96f874139d5..b228ab82609 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -12,13 +12,13 @@ let
 in
 buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.16.1-r1";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0flgaa26j9gga9a9h67b0q3yi0mpnbrjik55220cvvzhy9fnvwa9";
+    sha256 = "0rkaadc1vkg6p3d91yid2y6a0l7drbvpkqa8v7f50gpcbdzn1l93";
   };
 
   patches = [ ./matrix-synapse.patch ];
@@ -28,6 +28,7 @@ buildPythonApplication rec {
     pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2
     service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml
     matrix-angular-sdk bleach netaddr jinja2 psycopg2 python.modules.curses
+    ldap3 psutil
   ];
 
   # Checks fail because of Tox.
diff --git a/pkgs/servers/nosql/cassandra/1.2.nix b/pkgs/servers/nosql/cassandra/1.2.nix
index 8380a21b2ca..87cb4a11f9a 100644
--- a/pkgs/servers/nosql/cassandra/1.2.nix
+++ b/pkgs/servers/nosql/cassandra/1.2.nix
@@ -1,52 +1,6 @@
-{ stdenv
-, fetchurl
-, jre
-, python
-, makeWrapper
-, gawk
-, bash
-, getopt
-, procps
-}:
-
-let
+{ callPackage, ... } @ args:
 
+callPackage ./generic.nix (args // {
   version = "1.2.19";
   sha256 = "0zkq3ggpk8ra2siar43vmrn6lmvn902p1g2lrgb46ak1vii6w30w";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "cassandra-${version}";
-
-  src = fetchurl {
-    inherit sha256;
-    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir $out
-    mv * $out
-
-    for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade
-      do wrapProgram $out/bin/$cmd \
-        --set JAVA_HOME ${jre} \
-        --prefix PATH : ${bash}/bin \
-        --prefix PATH : ${getopt}/bin \
-        --prefix PATH : ${gawk}/bin \
-        --prefix PATH : ${procps}/bin
-    done
-
-    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = http://cassandra.apache.org/;
-    description = "A massively scalable open source NoSQL database";
-    platforms = platforms.all;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bcarrell ];
-  };
-}
+})
diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix
index 026ae476691..68bee0c124b 100644
--- a/pkgs/servers/nosql/cassandra/2.0.nix
+++ b/pkgs/servers/nosql/cassandra/2.0.nix
@@ -1,52 +1,6 @@
-{ stdenv
-, fetchurl
-, jre
-, python
-, makeWrapper
-, gawk
-, bash
-, getopt
-, procps
-}:
-
-let
+{ callPackage, ... } @ args:
 
+callPackage ./generic.nix (args // {
   version = "2.0.16";
   sha256 = "1fpvgmakmxy1lnygccpc32q53pa36bwy0lqdvb6hsifkxymdw8y5";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "cassandra-${version}";
-
-  src = fetchurl {
-    inherit sha256;
-    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir $out
-    mv * $out
-
-    for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade
-      do wrapProgram $out/bin/$cmd \
-        --set JAVA_HOME ${jre} \
-        --prefix PATH : ${bash}/bin \
-        --prefix PATH : ${getopt}/bin \
-        --prefix PATH : ${gawk}/bin \
-        --prefix PATH : ${procps}/bin
-    done
-
-    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = http://cassandra.apache.org/;
-    description = "A massively scalable open source NoSQL database";
-    platforms = platforms.all;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nckx rushmorem ];
-  };
-}
+})
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index 5e9a57bfe55..3514ae84350 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -1,52 +1,6 @@
-{ stdenv
-, fetchurl
-, jre
-, python
-, makeWrapper
-, gawk
-, bash
-, getopt
-, procps
-}:
-
-let
+{ callPackage, ... } @ args:
 
+callPackage ./generic.nix (args // {
   version = "2.1.15";
   sha256 = "1yc6r4gmxz9c4zghzn6bz5wswz7dz61w7p4x9s5gqnixfp2mlapp";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "cassandra-${version}";
-
-  src = fetchurl {
-    inherit sha256;
-    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir $out
-    mv * $out
-
-    for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade
-      do wrapProgram $out/bin/$cmd \
-        --set JAVA_HOME ${jre} \
-        --prefix PATH : ${bash}/bin \
-        --prefix PATH : ${getopt}/bin \
-        --prefix PATH : ${gawk}/bin \
-        --prefix PATH : ${procps}/bin
-    done
-
-    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = http://cassandra.apache.org/;
-    description = "A massively scalable open source NoSQL database";
-    platforms = platforms.all;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nckx rushmorem ];
-  };
-}
+})
diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix
index 68c2815ddd3..b0975c7a93c 100644
--- a/pkgs/servers/nosql/cassandra/3.0.nix
+++ b/pkgs/servers/nosql/cassandra/3.0.nix
@@ -1,49 +1,6 @@
-{ stdenv
-, fetchurl
-, jre
-, python
-, makeWrapper
-, gawk
-, bash
-, getopt
-, procps
-}:
-
-let
+{ callPackage, ... } @ args:
 
+callPackage ./generic.nix (args // {
   version = "3.0.8";
   sha256 = "02chk8q3pbl0y6rijfk2gbd0p1ani8daypsx9m9ingqkdx8ajljq";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "cassandra-${version}";
-
-  src = fetchurl {
-    inherit sha256;
-    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir $out
-    mv * $out
-
-    for cmd in cassandra nodetool sstableloader sstableupgrade
-      do wrapProgram $out/bin/$cmd \
-        --set JAVA_HOME ${jre} \
-        --prefix PATH : ${stdenv.lib.makeBinPath [ bash getopt gawk procps ]}
-    done
-
-    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = http://cassandra.apache.org/;
-    description = "A massively scalable open source NoSQL database";
-    platforms = platforms.all;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nckx rushmorem ];
-  };
-}
+})
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
new file mode 100644
index 00000000000..5e364ba3e68
--- /dev/null
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps
+, which, jre, version, sha256, ...
+}:
+
+let
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
+  binPath = stdenv.lib.makeBinPath [ bash getopt gawk procps which jre ];
+in
+
+stdenv.mkDerivation rec {
+  name = "cassandra-${version}";
+
+  src = fetchurl {
+    inherit sha256;
+    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir $out
+    mv * $out
+    for cmd in bin/cassandra bin/nodetool bin/sstablekeys \
+      bin/sstableloader bin/sstableupgrade \
+      tools/bin/cassandra-stress tools/bin/cassandra-stressd \
+      tools/bin/sstablemetadata tools/bin/sstableofflinerelevel \
+      tools/bin/token-generator tools/bin/sstablelevelreset; do
+
+      # check if file exists because some bin tools don't exist across all
+      # cassandra versions
+      if [ -f $out/$cmd ]; then
+        wrapProgram $out/$cmd \
+          --suffix-each LD_LIBRARY_PATH : ${libPath} \
+          --prefix PATH : ${binPath} \
+          --set JAVA_HOME ${jre}
+      fi
+    done
+
+    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://cassandra.apache.org/;
+    description = "A massively scalable open source NoSQL database";
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nckx rushmorem cransom ];
+  };
+}
diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix
index dfce4c34a11..733f33288ce 100644
--- a/pkgs/servers/nosql/hyperdex/libe.nix
+++ b/pkgs/servers/nosql/hyperdex/libe.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     description = "Library containing high-performance datastructures and utilities for C++";
     homepage = https://github.com/rescrv/e;
     license = licenses.bsd3;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix
index 8a831f7ff69..acca1af6055 100644
--- a/pkgs/servers/restund/default.nix
+++ b/pkgs/servers/restund/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
   ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
   ;
-  NIX_LDFLAGS='' -L${mysql.lib}/lib/mysql '';
+  NIX_LDFLAGS='' -L${stdenv.lib.getLib mysql.client}/lib/mysql '';
   meta = {
     homepage = "http://www.creytiv.com/restund.html";
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 902be532222..1d3b4e92cce 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,55 +1,133 @@
-{ stdenv, fetchurl, cmake, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
+{ stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
 , openssl, pcre, boost, judy, bison, libxml2
 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
-, makeWrapper
 }:
 
 with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "mariadb-${version}";
-  version = "10.1.9";
+
+let # in mariadb # spans the whole file
+
+mariadb = everything // {
+  inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin
+  server = everything; # a full single-output build, including everything in `client` again
+  lib = client; # compat. with the old mariadb split
+};
+
+
+common = rec { # attributes common to both builds
+  version = "10.1.16";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "0471vwg9c5c17m7679krjha16ib6d48fcsphkchb9v9cf8k5i74f";
+    sha256 = "14s3wq1c25n62n75hkixl8n7cni4m73w055nsx4czm655k33bjv7";
   };
 
+  prePatch = ''
+    substituteInPlace cmake/libutils.cmake \
+      --replace /usr/bin/libtool libtool
+    sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
   buildInputs = [
-    cmake ncurses openssl zlib xz lzo lz4 bzip2
-    # temporary due to https://mariadb.atlassian.net/browse/MDEV-9000
-    (if stdenv.is64bit then snappy else null)
-    pcre libxml2 boost judy bison libevent cracklib
-    makeWrapper
-  ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ]
-    ++ stdenv.lib.optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]
+    ncurses openssl zlib pcre jemalloc
+  ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch;
-
   cmakeFlags = [
     "-DBUILD_CONFIG=mysql_release"
+    "-DMANUFACTURER=NixOS.org"
     "-DDEFAULT_CHARSET=utf8"
     "-DDEFAULT_COLLATION=utf8_general_ci"
-    "-DENABLED_LOCAL_INFILE=ON"
+    "-DSECURITY_HARDENED=ON"
+
     "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+
+    "-DWITH_ZLIB=system"
+    "-DWITH_SSL=system"
+    "-DWITH_PCRE=system"
+  ]
+    ++ optional stdenv.isDarwin "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
+    ;
+
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DINSTALL_INCLUDEDIR=''${!outputDev}/include/mysql"
+  '';
+
+  postInstall = ''
+    rm "$out"/lib/*.a
+    find "''${!outputBin}/bin" -name '*test*' -delete
+  '';
+
+  passthru.mysqlVersion = "5.6";
+
+  meta = with stdenv.lib; {
+    description = "An enhanced, drop-in replacement for MySQL";
+    homepage    = https://mariadb.org/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ thoughtpolice wkennington ];
+    platforms   = platforms.all;
+  };
+};
+
+
+client = stdenv.mkDerivation (common // {
+  name = "mariadb-client-${common.version}";
+
+  outputs = [ "dev" "out" "bin" ];
+
+  propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc
+
+  cmakeFlags = common.cmakeFlags ++ [
+    "-DWITHOUT_SERVER=ON"
+  ];
+
+  preConfigure = common.preConfigure + ''
+    cmakeFlags="$cmakeFlags \
+      -DINSTALL_BINDIR=$bin/bin -DINSTALL_SCRIPTDIR=$bin/bin \
+      -DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \
+      -DINSTALL_DOCDIR=$bin/share/doc/mysql -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \
+      "
+  '';
+
+  # prevent cycle; it needs to reference $dev
+  postInstall = common.postInstall + ''
+    moveToOutput bin/mysql_config "$dev"
+  '';
+
+  enableParallelBuilding = true; # the client should be OK
+});
+
+
+everything = stdenv.mkDerivation (common // {
+  name = "mariadb-${common.version}";
+
+  nativeBuildInputs = common.nativeBuildInputs ++ [ bison ];
+
+  buildInputs = common.buildInputs ++ [
+    xz lzo lz4 bzip2 snappy
+    libxml2 boost judy libevent cracklib
+  ]
+    ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]
+    ;
+
+  cmakeFlags = common.cmakeFlags ++ [
     "-DMYSQL_DATADIR=/var/lib/mysql"
     "-DINSTALL_SYSCONFDIR=etc/mysql"
     "-DINSTALL_INFODIR=share/mysql/docs"
     "-DINSTALL_MANDIR=share/man"
     "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
     "-DINSTALL_SCRIPTDIR=bin"
-    "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_DOCREADMEDIR=share/mysql"
     "-DINSTALL_SUPPORTFILESDIR=share/mysql"
-    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-    "-DINSTALL_DOCDIR=share/mysql/docs"
+    "-DINSTALL_DOCREADMEDIR=share/doc/mysql"
+    "-DINSTALL_DOCDIR=share/doc/mysql"
     "-DINSTALL_SHAREDIR=share/mysql"
+
+    "-DENABLED_LOCAL_INFILE=ON"
     "-DWITH_READLINE=ON"
-    "-DWITH_ZLIB=system"
-    "-DWITH_SSL=system"
-    "-DWITH_PCRE=system"
-    "-DWITH_EMBEDDED_SERVER=yes"
     "-DWITH_EXTRA_CHARSETS=complex"
     "-DWITH_EMBEDDED_SERVER=ON"
     "-DWITH_ARCHIVE_STORAGE_ENGINE=1"
@@ -58,83 +136,17 @@ stdenv.mkDerivation rec {
     "-DWITH_PARTITION_STORAGE_ENGINE=1"
     "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1"
     "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1"
-    "-DSECURITY_HARDENED=ON"
     "-DWITH_WSREP=ON"
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
     "-DWITHOUT_TOKUDB=1"
-    "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
   ];
 
-  # fails to find lex_token.h sometimes
-  enableParallelBuilding = false;
-
-  outputs = [ "out" "lib" ];
-  setOutputFlags = false;
-  moveToDev = false;
-
-  prePatch = ''
-    substituteInPlace cmake/libutils.cmake \
-      --replace /usr/bin/libtool libtool
-    sed -i "s,SET(DEFAULT_MYSQL_HOME.*$,SET(DEFAULT_MYSQL_HOME /not/a/real/dir),g" CMakeLists.txt
-    sed -i "s,SET(PLUGINDIR.*$,SET(PLUGINDIR $lib/lib/mysql/plugin),g" CMakeLists.txt
-
-    sed -i "s,SET(pkgincludedir.*$,SET(pkgincludedir $lib/include),g" scripts/CMakeLists.txt
-    sed -i "s,SET(pkglibdir.*$,SET(pkglibdir $lib/lib),g" scripts/CMakeLists.txt
-    sed -i "s,SET(pkgplugindir.*$,SET(pkgplugindir $lib/lib/mysql/plugin),g" scripts/CMakeLists.txt
-
-    sed -i "s,set(libdir.*$,SET(libdir $lib/lib),g" storage/mroonga/vendor/groonga/CMakeLists.txt
-    sed -i "s,set(includedir.*$,SET(includedir $lib/include),g" storage/mroonga/vendor/groonga/CMakeLists.txt
-    sed -i "/\"\$[{]CMAKE_INSTALL_PREFIX}\/\$[{]GRN_RELATIVE_PLUGINS_DIR}\"/d" storage/mroonga/vendor/groonga/CMakeLists.txt
-    sed -i "s,set(GRN_PLUGINS_DIR.*$,SET(GRN_PLUGINS_DIR $lib/\$\{GRN_RELATIVE_PLUGINS_DIR}),g" storage/mroonga/vendor/groonga/CMakeLists.txt
-    sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
+  postInstall = common.postInstall + ''
+    rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data
+    rm "$out"/share/man/man1/mysql-test-run.pl.1
   '';
+});
 
-  postInstall = ''
-    substituteInPlace $out/bin/mysql_install_db \
-      --replace basedir=\"\" basedir=\"$out\"
-
-    # Wrap mysqld with --basedir, but as last flag
-    wrapProgram $out/bin/mysqld 
-    sed -i "s,\(^exec.*$\),\1 --basedir=$out,g" $out/bin/mysqld
-
-    # Remove superfluous files
-    rm -r $out/mysql-test $out/sql-bench $out/data # Don't need testing data
-    rm $out/share/man/man1/mysql-test-run.pl.1
-    rm $out/bin/rcmysql # Not needed with nixos units
-    rm $out/bin/mysqlbug # Encodes a path to gcc and not really useful
-    find $out/bin -name \*test\* -exec rm {} \;
-
-    # Separate libs and includes into their own derivation
-    mkdir -p $lib
-    mv $out/lib $lib
-    mv $out/include $lib
-
-    # Fix the mysql_config
-    sed -i $out/bin/mysql_config \
-      -e 's,-lz,-L${zlib.out}/lib -lz,g' \
-      -e 's,-lssl,-L${openssl.out}/lib -lssl,g'
-
-    # Add mysql_config to libs since configure scripts use it
-    mkdir -p $lib/bin
-    cp $out/bin/mysql_config $lib/bin
-    sed -i "/\(execdir\|bindir\)/ s,'[^\"']*',$lib/bin,g" $lib/bin/mysql_config
-
-    # Make sure to propagate lib for compatability
-    mkdir -p $out/nix-support
-    echo "$lib" > $out/nix-support/propagated-native-build-inputs
-
-    # Don't install static libraries.
-    rm $lib/lib/libmysqlclient.a $lib/lib/libmysqld.a
-  '';
-
-  passthru.mysqlVersion = "5.6";
+in mariadb
 
-  meta = with stdenv.lib; {
-    description = "An enhanced, drop-in replacement for MySQL";
-    homepage    = https://mariadb.org/;
-    license     = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice wkennington ];
-    platforms   = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/servers/sql/mariadb/my_context_asm.patch b/pkgs/servers/sql/mariadb/my_context_asm.patch
deleted file mode 100644
index 3a747ed1b03..00000000000
--- a/pkgs/servers/sql/mariadb/my_context_asm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/mysys/my_context.c
-+++ b/mysys/my_context.c
-@@ -206,15 +206,6 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
-     (
-      "movq %%rsp, (%[save])\n\t"
-      "movq %[stack], %%rsp\n\t"
--#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
--     /*
--       This emits a DWARF DW_CFA_undefined directive to make the return address
--       undefined. This indicates that this is the top of the stack frame, and
--       helps tools that use DWARF stack unwinding to obtain stack traces.
--       (I use numeric constant to avoid a dependency on libdwarf includes).
--     */
--     ".cfi_escape 0x07, 16\n\t"
--#endif
-      "movq %%rbp, 8(%[save])\n\t"
-      "movq %%rbx, 16(%[save])\n\t"
-      "movq %%r12, 24(%[save])\n\t"
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 358afb3dfb3..fb333176801 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python
     pythonPackages.docutils];
 
+  buildFlags = "localstatedir=/var/spool";
+
   meta = {
     description = "Web application accelerator also known as a caching HTTP reverse proxy";
     homepage = "https://www.varnish-cache.org";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bdf0ff37043..5660957011c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -244,6 +244,10 @@ in
     outputs = [ "dev" "out" ]; # mainly to avoid propagation
   };
 
+  libpciaccess = attrs: attrs // {
+    meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; };
+  };
+
   setxkbmap = attrs: attrs // {
     postInstall =
       ''
diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 5bb3b1de7ed..ac72de119b3 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "oh-my-zsh-git-${version}";
-  version = "2016-07-15";
+  version = "2016-08-01";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "96a2092e377139fbcd95d7b7ac703b740daa22f6";
-    sha256 = "0v3hzpfj98mfz0y06qch2hf14iz0vpb9pfysw8hc4mnp0jzh5vz1";
+    rev = "f5537241a4fe7f48a5f7f49fff52db9f0247a5cd";
+    sha256 = "0g8wqq3m2qvacxwz6k2zir8vg80fbxccwxpcfs1ypcwp3689fjhk";
   };
 
   phases = "installPhase";
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index f4af6e5682c..09683ce4b8f 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "0xr7w57pb3z8vyn4jrwb61g9hkgfabikxv3lbwk0a94n8rwbxkx5";
+    sha256 = "1dxn9p4xm0zd32xzzd9hs4a542db34clykrrnnv3hrdnc394895p";
   };
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 0488fec4591..7f2d3116603 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "0.7.3";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
-    sha256 = "1kdz1mk2lgf46dc7afjzdyzpdxng2cwirhpm1wsj8dy929hi3687";
+    sha256 = "07b4gmmkk2b28vmmhcg8h2imzccav1qklgvbdg2k6nl9p88zwzkd";
     rev = "v${version}";
     repo = "zstd";
     owner = "Cyan4973";
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index b5d62482bf5..334525e7902 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchgit, ... } @ args:
+{ callPackage, fetchgit, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "9.2.0";
@@ -9,5 +9,12 @@ callPackage ./generic.nix (args // rec {
     sha256 = "0a2v3bgkrbkzardcw7ymlhhyjlwi08qmcm7g34y2sjsxk9bd78an";
   };
 
-  patches = [ ./fix-pythonpath.patch ];
+  patches = [
+    ./fix-pythonpath.patch
+    # For building with xfsprogs 4.5.0:
+    (fetchpatch {
+      url = "https://github.com/ceph/ceph/commit/602425abd5cef741fc1b5d4d1dd70c68e153fc8d.patch";
+      sha256 = "1iyf0ml2n50ki800vjich8lvzmcdviwqwkbs6cdj0vqv2nc5ii1g";
+    })
+  ];
 })
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 3defa6ab123..9da5332ce67 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.7.11";
+    version="3.8.1";
     name="${baseName}-${version}";
-    hash="083dzpz6mafmf4rd55pak5q7x8509y4ggsckcb6i0gmkhzlbf1xd";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.11/glusterfs-3.7.11.tar.gz";
-    sha256="083dzpz6mafmf4rd55pak5q7x8509y4ggsckcb6i0gmkhzlbf1xd";
+    hash="1j3r2wnk1pwwwn02pfnrrgh1if92b5cl51dqg7284qxrkjiafb2k";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.8/3.8.1/glusterfs-3.8.1.tar.gz";
+    sha256="1j3r2wnk1pwwwn02pfnrrgh1if92b5cl51dqg7284qxrkjiafb2k";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix
index dfa6fe3234c..b0e4d5029e0 100644
--- a/pkgs/tools/filesystems/gpart/default.nix
+++ b/pkgs/tools/filesystems/gpart/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       or device.
     '';
     license = licenses.gpl2Plus;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ nckx ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix
index 63d3bbc3373..4e4a139f9ad 100644
--- a/pkgs/tools/filesystems/grive/default.nix
+++ b/pkgs/tools/filesystems/grive/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Grive/grive;
     license = stdenv.lib.licenses.gpl2;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/lizardfs/412.patch b/pkgs/tools/filesystems/lizardfs/412.patch
new file mode 100644
index 00000000000..a2890cad399
--- /dev/null
+++ b/pkgs/tools/filesystems/lizardfs/412.patch
@@ -0,0 +1,43 @@
+From 26a27dedb7bee36f3ac5f48e22b977ea001d5903 Mon Sep 17 00:00:00 2001
+From: Maksymilian Paszkiewicz <mpaszkiewicz@skytechnology.pl>
+Date: Mon, 23 May 2016 12:25:19 +0200
+Subject: [PATCH] common: Fix minor compile and copyright issues
+
+This commit adds include <cmath> directive to
+slice_read_planner.cc and fixes copyright
+statement in filesystem_operations.cc
+
+Closes #411
+Closes #412
+
+Change-Id: I3ac995708a09f64e1389871be2e961d594e4bc68
+---
+ src/common/slice_read_planner.cc    | 2 ++
+ src/master/filesystem_operations.cc | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/slice_read_planner.cc b/src/common/slice_read_planner.cc
+index 94c106c..d0284f1 100644
+--- a/src/common/slice_read_planner.cc
++++ b/src/common/slice_read_planner.cc
+@@ -20,6 +20,8 @@
+ 
+ #include "common/slice_read_planner.h"
+ 
++#include <cmath>
++
+ /*!
+  * Prepares read planner for serving selected parts of a slice type.
+  * Firstly, function checks if:
+diff --git a/src/master/filesystem_operations.cc b/src/master/filesystem_operations.cc
+index 69ff270..dc30b1f 100644
+--- a/src/master/filesystem_operations.cc
++++ b/src/master/filesystem_operations.cc
+@@ -1,5 +1,6 @@
+ /*
+-   Copyright 2013-2015 Skytechnology sp. z o.o..
++   Copyright 2005-2010 Jakub Kruszona-Zawadzki, Gemius SA, 2013-2014 EditShare,
++   2013-2016 Skytechnology sp. z o.o..
+ 
+    This file is part of LizardFS.
+ 
diff --git a/pkgs/tools/filesystems/lizardfs/check-includes.patch b/pkgs/tools/filesystems/lizardfs/check-includes.patch
deleted file mode 100644
index 49aa0375762..00000000000
--- a/pkgs/tools/filesystems/lizardfs/check-includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 60f64d7077ebd2b29b18faa3b25ee593e126e347 Mon Sep 17 00:00:00 2001
-From: Dmitry Smirnov <onlyjob@member.fsf.org>
-Date: Sun, 20 Dec 2015 14:03:20 +1100
-Subject: [PATCH] build: Fix FTBFS with CMake-3.4
-
-Closes: #363
-
-~~~~
- CMake Error at CheckIncludes.cmake:4 (check_include_files):
-   Unknown CMake command "check_include_files".
- Call Stack (most recent call first):
-   CMakeLists.txt:113 (check_includes)
-~~~~
-
-Change-Id: I70f03d829c40ae560083a98c2bcf6344dbac3ad6
-Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
----
- CheckIncludes.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CheckIncludes.cmake b/CheckIncludes.cmake
-index 19ed485..f51075a 100644
---- a/CheckIncludes.cmake
-+++ b/CheckIncludes.cmake
-@@ -1,3 +1,5 @@
-+include(CheckIncludeFiles)
-+
- function(check_includes INCLUDES)
-   set(INCLUDE_MISSING FALSE)
-   foreach(INCLUDE_FILE ${INCLUDES})
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index 7b6f2e17dcf..ac20b735abc 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -4,8 +4,9 @@
 , makeWrapper
 , python
 , fuse
-# The following are required for manpages
-#, asciidoc, libxml2
+, asciidoc
+, libxml2
+, libxslt
 , boost
 , pkgconfig
 , judy
@@ -15,27 +16,25 @@
 
 stdenv.mkDerivation rec {
   name = "lizardfs-${version}";
-  version = "3.9.4";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "lizardfs";
     repo = "lizardfs";
     rev = "v.${version}";
-    sha256 = "1vg33jy280apm4lp5dn3x51pkf7035ijqjm8wbmyha2g35gfjrlx";
+    sha256 = "18p2pj9crjqgxxxzdfcs3j3fqhinmwi7qxcf71jsw17syqwyygh8";
   };
 
-  # Manpages don't build in the current release
-  buildInputs = [ cmake fuse /* asciidoc libxml2.bin */ zlib boost pkgconfig judy pam makeWrapper ];
+  buildInputs = [ cmake fuse asciidoc libxml2 libxslt zlib boost pkgconfig judy pam makeWrapper ];
 
-  # Fixed in upcoming 3.10.0
-  patches = [ ./check-includes.patch ];
+  patches = [ ./412.patch ];
 
   postInstall = ''
     wrapProgram $out/sbin/lizardfs-cgiserver \
         --prefix PATH ":" "${python}/bin"
 
     # mfssnapshot and mfscgiserv are deprecated
-    rm -f $out/bin/mfssnapshot $out/sbin/mfscgiserv
+    rm $out/bin/mfssnapshot $out/sbin/mfscgiserv
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch b/pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch
index c74b75b7e43..622708f7b9c 100644
--- a/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch
+++ b/pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch
@@ -1,5 +1,5 @@
---- xfsprogs-4.2.0/include/buildmacros
-+++ xfsprogs-4.2.0/include/buildmacros
+--- xfsprogs-4.3.0/include/buildmacros
++++ xfsprogs-4.3.0/include/buildmacros
 @@ -70,18 +70,9 @@
  # /usr/lib.
  ifeq ($(ENABLE_SHARED),yes)
@@ -22,8 +22,8 @@
  else
  INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
  endif
---- xfsprogs-4.2.0/libxcmd/Makefile
-+++ xfsprogs-4.2.0/libxcmd/Makefile
+--- xfsprogs-4.3.0/libxcmd/Makefile
++++ xfsprogs-4.3.0/libxcmd/Makefile
 @@ -34,6 +34,9 @@
  
  include $(BUILDRULES)
@@ -35,8 +35,8 @@
 +	$(INSTALL_LTLIB_DEV)
  
  -include .ltdep
---- xfsprogs-4.2.0/libxfs/Makefile
-+++ xfsprogs-4.2.0/libxfs/Makefile
+--- xfsprogs-4.3.0/libxfs/Makefile
++++ xfsprogs-4.3.0/libxfs/Makefile
 @@ -138,6 +138,7 @@
  
  install-dev: install
@@ -45,8 +45,8 @@
  
  # We need to install the headers before building the dependencies.  If we
  # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.2.0/libxlog/Makefile
-+++ xfsprogs-4.2.0/libxlog/Makefile
+--- xfsprogs-4.3.0/libxlog/Makefile
++++ xfsprogs-4.3.0/libxlog/Makefile
 @@ -12,6 +12,8 @@
  
  CFILES = xfs_log_recover.c util.c
@@ -67,19 +67,8 @@
 +	$(INSTALL_LTLIB_DEV)
  
  -include .ltdep
---- xfsprogs-4.2.0/Makefile
-+++ xfsprogs-4.2.0/Makefile
-@@ -81,6 +81,8 @@
- io: libxcmd libhandle
- quota: libxcmd
- repair: libxlog
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
- 
- 
- ifeq ($(HAVE_BUILDDEFS), yes)
---- xfsprogs-4.2.0/quota/Makefile
-+++ xfsprogs-4.2.0/quota/Makefile
+--- xfsprogs-4.3.0/quota/Makefile
++++ xfsprogs-4.3.0/quota/Makefile
 @@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
  
  LLDLIBS = $(LIBXCMD)
@@ -88,8 +77,8 @@
  
  ifeq ($(ENABLE_READLINE),yes)
  LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
---- xfsprogs-4.2.0/mdrestore/Makefile
-+++ xfsprogs-4.2.0/mdrestore/Makefile
+--- xfsprogs-4.3.0/mdrestore/Makefile
++++ xfsprogs-4.3.0/mdrestore/Makefile
 @@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c
  
  LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index e30f67af3e9..96e7931f14c 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gettext, libuuid, readline }:
 
 stdenv.mkDerivation rec {
-  name = "xfsprogs-4.2.0";
+  name = "xfsprogs-4.5.0";
 
   src = fetchurl {
     urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz")
       [ "cmd_tars" "previous" ];
-    sha256 = "0q2j1rrh37kqyihaq5lc31xdi36lgg9asidaad0fada61ynv3six";
+    sha256 = "1y49rwvbbvqdq2a1x7p5i05bcfyv6xhmrfwafl6vvvw494qyp6z4";
   };
 
   prePatch = ''
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     # This patch fixes shared libs installation, still not fixed in 4.2.0
-    ./4.2.0-sharedlibs.patch
+    ./4.3.0-sharedlibs.patch
   ];
 
-  buildInputs = [ gettext libuuid readline ];
+  propagatedBuildInputs = [ libuuid ];
+  buildInputs = [ gettext readline ];
 
   outputs = [ "dev" "out" "bin" ]; # TODO: review xfs
 
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index fb491948a47..adee80d9c5d 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
 
     export BOOST_INCLUDEDIR=${boost.dev}/include
     export BOOST_LIBRARYDIR=${boost.out}/lib
-    export OPENSSL_ROOT_DIR=${openssl.dev}
+    export CMAKE_INCLUDE_PATH=${openssl.dev}/include
+    export CMAKE_LIBRARY_PATH=${openssl.out}/lib
 
     substituteInPlace cpp/cmake/FindValgrind.cmake \
       --replace "/usr/local" "${valgrind}"
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 798c9d80395..408539561c7 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gmic-${version}";
-  version = "1.6.5.0";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "http://gmic.eu/files/source/gmic_${version}.tar.gz";
-    sha256 = "1vb6zm5zpqfnzxjvb9yfvczaqacm55rf010ib0yk9f28b17qrjgb";
+    sha256 = "1k4swqi1adq479b6zdpvy5kdpkvjkfihkj9iwgw9mgi0xdqikjry";
   };
 
   buildInputs = [ fftw zlib libjpeg libtiff libpng ];
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index 9c8a54b5545..f35da52081b 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/wolf9466/cpuminer-multi;
     license = licenses.gpl2;
     maintainers = [ maintainers.ehmry ];
-    platforms = platforms.linux;
+    # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27
+    platforms = [ "x86_64-linux" ]; 
   };
 }
diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index aa1fa8f3c6c..b651caf5a5e 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchgit } :
+{ stdenv, fetchFromGitHub } :
 
-let
-  rev = "61ce53be996189e1c325916e45a7dc0aa89660e3";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  pname = "fasd";
+  name = "${pname}-unstable-2016-08-11";
 
-  name = "fasd-git-2015-03-29";
-
-  src = fetchgit {
-    url = "https://github.com/clvv/fasd.git";
-    inherit rev;
-    sha256 = "1fd36ff065ae73de2d6b1bae2131c18c8c4dea98ca63d96b0396e8b291072b5e";
+  src = fetchFromGitHub {
+    owner = "clvv";
+    repo = "${pname}";
+    rev = "90b531a5daaa545c74c7d98974b54cbdb92659fc";
+    sha256 = "0i22qmhq3indpvwbxz7c472rdyp8grag55x7iyjz8gmyn8gxjc11";
   };
 
   installPhase = ''
@@ -18,9 +16,9 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/clvv/fasd";
+    homepage = "https://github.com/clvv/${pname}";
     description = "Quick command-line access to files and directories for POSIX shells";
-    license = stdenv.lib.licenses.free; # https://github.com/clvv/fasd/blob/master/LICENSE
+    license = stdenv.lib.licenses.mit;
 
     longDescription = ''
       Fasd is a command-line productivity booster.
diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index 64a71846c4b..a87d199d9bd 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "ised-${version}";
-  version = "2.7.0";
+  version = "2.7.1";
   src = fetchurl {
     url = "mirror://sourceforge/project/ised/${name}.tar.bz2";
-    sha256 = "08wzgmyvlhfaxa0m2b6pw2mn03k1a87pzbzxm0x9z84gci9w2g4h";
+    sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb";
   };
 
   meta = {
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
new file mode 100644
index 00000000000..5a3da3788d5
--- /dev/null
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -0,0 +1,28 @@
+{
+  kdeDerivation, kdeWrapper, fetchurl, lib,
+  ecm, kdoctools,
+  kconfig, kinit
+}:
+
+let
+  pname = "kronometer";
+  version = "2.1.0";
+  unwrapped = kdeDerivation rec {
+    name = "${pname}-${version}";
+
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+      sha256 = "1nh7y4c13rscy55f5n8s2v8jij27b55rwkxh9g8r0p7mdwmw8vri";
+    };
+
+    meta = with lib; {
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ peterhoeg ];
+    };
+    nativeBuildInputs = [ ecm kdoctools ];
+    propagatedBuildInputs = [ kconfig kinit ];
+  };
+in
+kdeWrapper unwrapped {
+  targets = [ "bin/kronometer" ];
+}
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 933788f5785..faf79c29e77 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "snapper-${version}";
-  version = "0.2.8";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "snapper";
     rev = "v${version}";
-    sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j";
+    sha256 = "12c2ygaanr4gny4ixnly4vpi0kv7snbg3khr3i5zwridhmdzz9hm";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index cf6890cf257..5574e3274cd 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -3,12 +3,12 @@
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
-  name = "xfstests-2016-01-11";
+  name = "xfstests-2016-08-06";
 
   src = fetchgit {
     url = "git://oss.sgi.com/xfs/cmds/xfstests.git";
-    rev = "dfe582dd396f16ddce1909baab7376e00af07792";
-    sha256 = "1pvqzw4f0r63lzhcw2lii72bp4dwqd50xshv8ch7v529z0f5icwa";
+    rev = "b7d908a0e8eb3bc069275dedfe981f9ea3aeeec2";
+    sha256 = "0dnhqqxmxr3mq2xjnxki92vjmi3y7g9xz3lfa1s1c8ayfcm3qq85";
   };
 
   buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ];
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
       ln -s @out@/lib/xfstests/$f $f
     done
 
-    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH
+    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc utillinux which xfsprogs]}:$PATH
     exec ./check "$@"
   '';
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index eaf427d61a3..5e7010def54 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.50.0";
+  name = "curl-7.50.1";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "16psxjcl25i7v5x71193nkq2anm5mj8pfziq5iwxnj3znwnzx3b0";
+    sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw";
   };
 
   outputs = [ "dev" "out" "bin" "man" "docdev" ];
diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix
new file mode 100644
index 00000000000..82ef3b218d0
--- /dev/null
+++ b/pkgs/tools/networking/dibbler/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "dibbler-${version}";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "http://www.klub.com.pl/dhcpv6/dibbler/${name}.tar.gz";
+    sha256 = "18bnwkvax02scjdg5z8gvrkvy1lhssfnlpsaqb5kkh30w1vri1i7";
+  };
+
+  configureFlags = [
+    "--enable-resolvconf"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Portable DHCPv6 implementation";
+    homepage = http://www.klub.com.pl/dhcpv6/;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix
index 23501c29e23..017da63a1e9 100644
--- a/pkgs/tools/networking/email/default.nix
+++ b/pkgs/tools/networking/email/default.nix
@@ -2,11 +2,10 @@
 
 let
   eMailSrc = fetchFromGitHub {
-    #awaiting acceptance of https://github.com/deanproxy/eMail/pull/29
-    owner = "jerith666";
+    owner = "deanproxy";
     repo = "eMail";
-    rev = "d9fd259f952b573d320916ee34e807dd3dd24b1f";
-    sha256 = "0q4ly4bhlv6lrlj5kmjs491aah1afmkjyw63i9yqnz4d2k6npvl9";
+    rev = "7d23c8f508a52bd8809e2af4290417829b6bb5ae";
+    sha256 = "1cxxzhm36civ6vjdgrk7mfmlzkih44kdii6l2xgy4r434s8rzcpn";
   };
 
   srcRoot = "eMail-${eMailSrc.rev}-src";
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
index 2f95123ba21..c2bf6702c5f 100644
--- a/pkgs/tools/networking/gandi-cli/default.nix
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -5,10 +5,10 @@ with pythonPackages;
 buildPythonPackage rec {
   namePrefix = "";
   name = "gandi-cli-${version}";
-  version = "0.18";
+  version = "0.19";
 
   src = fetchFromGitHub {
-    sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3";
+    sha256 = "0xbf97p75zl6sjxqcgmaa4p5rax2h6ixn8srwdr4rsx2zz9dpwgp";
     rev = version;
     repo = "gandi.cli";
     owner = "Gandi";
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 3eb0e9d2a90..6f280257692 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonApplication }:
 
 buildPythonApplication rec {
-  version = "4.49.0";
+  version = "4.50.0";
   name = "getmail-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "1m0yzxd05fklwbmjj1n2q4sx397c1j5qi9a0r5fv3h8pplz4lv0w";
+    sha256 = "1hcb5079mkcx3gglfycrhglrgg4jsa499br50yjrh9sal6wpgg7w";
   };
 
   doCheck = false;
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index a2204f9664a..213051bdf8d 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -6,7 +6,7 @@
 
 let
   optional = stdenv.lib.optional;
-  version = "3.17";
+  version = "3.18";
   name = "libreswan-${version}";
   binPath = stdenv.lib.makeBinPath [
     bash iproute iptables procps coreutils gnused gawk nss.tools which python
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.libreswan.org/${name}.tar.gz";
-    sha256 = "00qd1n6f5w4xr06yanfpnbnn7y7rq2m878ifa3hh13bdgzsqdhi8";
+    sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index 80feeafdbca..9a7737e0195 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty
+{ stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty
 , makeWrapper, perl, openssl, autoreconfHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s";
   };
 
-  buildInputs = [ autoreconfHook boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
+  buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
 
   patches = [
     # remove automake detection macro patch on next release as it is already on mosh master
diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix
index af3b193798f..5e09bb7229f 100644
--- a/pkgs/tools/networking/network-manager/l2tp.nix
+++ b/pkgs/tools/networking/network-manager/l2tp.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig
-, networkmanager, networkmanagerapplet, ppp, xl2tpd, strongswan, libsecret
-, withGnome ? true, gnome3 }:
+, networkmanager, ppp, xl2tpd, strongswan, libsecret
+, withGnome ? true, gnome3, networkmanagerapplet }:
 
 stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2";
   };
 
-  buildInputs = [ networkmanager ppp networkmanagerapplet libsecret ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
+  buildInputs = [ networkmanager ppp libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring networkmanagerapplet ];
 
   nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ];
 
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 42f72ef7e36..6f74df38ad0 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, sqlite3 }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.0.2";
+  version = "7.0.4";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "1xwblb1nvqq6gkxjynzsw31xja07qday58x5jqak8sp3d4lqw2h2";
+    sha256 = "1ixm4qp3gljbnbi40h8n6j7c0pzk1ry8hpm4bcf7n68gc07r557n";
   };
 
   doCheck = false;
diff --git a/pkgs/tools/networking/openssh/CVE-2015-8325.patch b/pkgs/tools/networking/openssh/CVE-2015-8325.patch
deleted file mode 100644
index c752726aeae..00000000000
--- a/pkgs/tools/networking/openssh/CVE-2015-8325.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 85bdcd7c92fe7ff133bbc4e10a65c91810f88755 Mon Sep 17 00:00:00 2001
-From: Damien Miller <djm@mindrot.org>
-Date: Wed, 13 Apr 2016 10:39:57 +1000
-Subject: [PATCH] ignore PAM environment vars when UseLogin=yes
-
-If PAM is configured to read user-specified environment variables
-and UseLogin=yes in sshd_config, then a hostile local user may
-attack /bin/login via LD_PRELOAD or similar environment variables
-set via PAM.
-
-CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
----
- session.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/session.c b/session.c
-index 4859245..4653b09 100644
---- a/session.c
-+++ b/session.c
-@@ -1322,7 +1322,7 @@ do_setup_env(Session *s, const char *shell)
- 	 * Pull in any environment variables that may have
- 	 * been set by PAM.
- 	 */
--	if (options.use_pam) {
-+	if (options.use_pam && !options.use_login) {
- 		char **p;
- 
- 		p = fetch_pam_child_environment();
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index a0cb0795a26..8f4c0aa54df 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -27,11 +27,12 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   # Please ensure that openssh_with_kerberos still builds when
   # bumping the version here!
-  name = "openssh-7.2p2";
+  name = "openssh-${version}";
+  version = "7.3p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7";
+    sha256 = "1k5y1wi29d47cgizbryxrhc1fbjsba2x8l5mqfa9b9nadnd9iyrz";
   };
 
   prePatch = optionalString hpnSupport
@@ -44,7 +45,6 @@ stdenv.mkDerivation rec {
     [
       ./locale_archive.patch
       ./fix-host-key-algorithms-plus.patch
-      ./CVE-2015-8325.patch
 
       # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
       ./dont_create_privsep_path.patch
diff --git a/pkgs/tools/networking/tlsdate/default.nix b/pkgs/tools/networking/tlsdate/default.nix
index a7721b563b3..66ead809d0b 100644
--- a/pkgs/tools/networking/tlsdate/default.nix
+++ b/pkgs/tools/networking/tlsdate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit
+{ stdenv, fetchFromGitHub, fetchpatch
 , autoconf
 , automake
 , libevent
@@ -7,15 +7,25 @@
 , openssl
 }:
 
-stdenv.mkDerivation {
-  name = "tlsdate-0.0.12";
+stdenv.mkDerivation rec {
+  version = "0.0.13";
+  name = "tlsdate-${version}";
 
-  src = fetchgit {
-    url = https://github.com/ioerror/tlsdate;
-    rev = "fd04f48ed60eb773c8e34d27ef2ee12ee7559a41";
-    sha256 = "0naxlsanpgixj509z4mbzl41r2nn5wi6q2lp10a7xgcmcb4cgnbf";
+  src = fetchFromGitHub {
+    owner = "ioerror";
+    repo = "tlsdate";
+    rev = name;
+    sha256 = "0w3v63qmbhpqlxjsvf4k3zp90k6mdzi8cdpgshan9iphy1f44xgl";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "tlsdate-no_sslv3.patch";
+      url = "https://github.com/ioerror/tlsdate/commit/f9d3cba7536d1679e98172ccbddad32bc9ae490c.patch";
+      sha256 = "0prv46vxvb4paxaswmc6ix0kd5sp0552i5msdldnhg9fysbac8s0";
+    })
+  ];
+
   buildInputs = [
     autoconf
     automake
@@ -32,10 +42,10 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Secure parasitic rdate replacement";
     homepage = https://github.com/ioerror/tlsdate;
-    maintainers = [ stdenv.lib.maintainers.tv ];
-    platforms = stdenv.lib.platforms.allBut [ "darwin" ];
+    maintainers = with maintainers; [ tv fpletz ];
+    platforms = platforms.allBut [ "darwin" ];
   };
 }
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 15ec4e87908..a7bda2578ae 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dpkg-${version}";
-  version = "1.18.9";
+  version = "1.18.10";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "14r011vpzcfsglzl2dr2ywrdxl9r2jhs0iy9nswmxrz92zwlmb46";
+    sha256 = "1ibdidmc8nfiigadfpl3xrccrxw6hvmqiqqizy1v265s87d28m82";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index d89d4c58af3..059f63495d1 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl
+{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pw7igmb4miyxl11sj9g8p8pgxg9nmn1h2hzi8b23v44hcmc1inj";
   };
 
-  buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl
+  buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl libxml2
     autoreconfHook ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix
new file mode 100644
index 00000000000..fb7b8cc9fe7
--- /dev/null
+++ b/pkgs/tools/security/kbfs/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "kbfs-2016-08-02-git";
+  version = "1.0.16";
+
+  goPackagePath = "github.com/keybase/kbfs";
+  subPackages = [ "kbfsfuse" ];
+
+  dontRenameImports = true;
+
+  src = fetchFromGitHub {
+    owner = "keybase";
+    repo = "kbfs";
+    rev = "a8f0714536d15668e0f561ec4d3324762c8cf030";
+    sha256 = "0m4k55akd8cv5k8mfpm3rb3fz13z31l49pml7mgviv0hi3mnisqd";
+  };
+
+  buildFlags = [ "-tags production" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.keybase.io;
+    description = "The Keybase FS FUSE driver";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bennofs ];
+  };
+}
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 351654b6032..415f8f52a47 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -13,11 +13,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.01";
+  version = "7.12";
 
   src = fetchurl {
     url = "http://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "01bpc820fmjl1vd08a3j9fpa84psaa7c3cxc8wpzabms8ckcs7yg";
+    sha256 = "014vagh9ak10hidwzp9s6g30y5h5fhsh8wykcnc1hnn9hwm0ipv3";
   };
 
   patches = ./zenmap.patch;
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage    = http://www.nmap.org;
     license     = licenses.gpl2;
     platforms   = platforms.all;
-    maintainers = with maintainers; [ mornfall thoughtpolice ];
+    maintainers = with maintainers; [ mornfall thoughtpolice fpletz ];
   };
 }
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index a06754cb58d..7fcde2a0350 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -1,29 +1,41 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libidn, ncurses, pcre, libssh, postgresql92 }:
+{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysql, postgresql
+, withGUI ? false, makeWrapper, pkgconfig, gtk2 }:
 
-with stdenv.lib;
+let
+  makeDirs = output: subDir: pkgs: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) pkgs);
 
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   name = "thc-hydra-${version}";
-  version = "7.5";
+  version = "8.2";
 
   src = fetchurl {
     url = "http://www.thc.org/releases/hydra-${version}.tar.gz";
-    sha256 = "1dhavbn2mcm6c2c1qw29ipbpmczax3vhhlxzwn49c8cq471yg4vj";
+    sha256 = "1i2a5glmrxdjr80gfppx6wgakflcpj3ksgng212fjzhxr9m4k24y";
   };
 
   preConfigure = ''
-   substituteInPlace configure --replace "\$LIBDIRS" "${openssl.out}/lib ${pcre.out}/lib ${libssh.out}/lib ${postgresql92.lib}/lib"
-   substituteInPlace configure --replace "\$INCDIRS" "${openssl.dev}/include ${pcre.dev}/include ${libssh.dev}/include ${postgresql92}/include"
+    substituteInPlace configure \
+      --replace "\$LIBDIRS" "${makeDirs "lib" "lib" buildInputs}" \
+      --replace "\$INCDIRS" "${makeDirs "dev" "include" buildInputs}" \
+      --replace "/usr/include/math.h" "${lib.getDev stdenv.cc.libc}/include/math.h" \
+      --replace "libcurses.so" "libncurses.so" \
+      --replace "-lcurses" "-lncurses"
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libidn ncurses pcre libssh ];
+  nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ];
+  buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysql postgresql ]
+                ++ lib.optional withGUI gtk2;
 
-  meta = {
+  postInstall = lib.optionalString withGUI ''
+    wrapProgram $out/bin/xhydra \
+      --add-flags --hydra-path --add-flags "$out/bin/hydra"
+  '';
+
+  meta = with stdenv.lib; {
     description = "A very fast network logon cracker which support many different services";
     license = licenses.agpl3;
     homepage = https://www.thc.org/thc-hydra/;
     maintainers = with maintainers; [offline];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 7c889d89303..c428fb07fac 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -32,12 +32,12 @@
 , net_snmp ? null
 }:
 stdenv.mkDerivation rec {
-  version = "5.5.1";
+  version = "5.5.2";
   name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "0gxwq3jl20wgvb7qawivshpkm4i3kvghpnfcn5yrlhphw4kdbigr";
+    sha256 = "03w2pawbshl2wrl4cmyw8alsi0pvamb6ibxni96mjzhqc903lzq1";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 44e24910296..76f640711a8 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, libgcrypt, readline }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.2";
+  version = "1.5.3";
   name = "freeipmi-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "0xgfwk6lxwwzq8pbyxjl5xxpybs9p4qwgb7q0ykf048xwxha4kvk";
+    sha256 = "0s4q7imc4r3g9lkd92bnvw70679q83b0irrlw895i5nc05dj4djx";
   };
 
   buildInputs = [ libgcrypt readline ];
diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix
index 5449d53229c..d66d4b57578 100644
--- a/pkgs/tools/system/wsmancli/default.nix
+++ b/pkgs/tools/system/wsmancli/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, openwsman }:
+{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, openwsman, openssl }:
 
 stdenv.mkDerivation rec {
   version = "2.6.0";
@@ -9,9 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn";
   };
 
-  buildInputs = [ autoconf automake libtool pkgconfig openwsman ];
+  buildInputs = [ autoconf automake libtool pkgconfig openwsman openssl ];
 
-  preConfigure = "./bootstrap";
+  preConfigure = ''
+    ./bootstrap
+
+    configureFlagsArray=(
+      LIBS="-L${openssl}/lib -lssl -lcrypto"
+    )
+  '';
 
   meta = {
     description = "Openwsman command-line client";
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index 7eb1c022a95..b83f97a4b8d 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "aha-${version}";
-  version = "0.4.8";
+  version = "0.4.9";
 
   src = fetchFromGitHub {
-    sha256 = "1209rda6kc9x88b47y1035zs9lxk0x3qzsb87f8m5b55fdkgxqlj";
+    sha256 = "0g7awnh7z4cj3kkmldg6kl8dsvdvs46vbf273crmpswk0r4hzj80";
     rev = version;
     repo = "aha";
     owner = "theZiz";
diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix
new file mode 100644
index 00000000000..c7a686201b0
--- /dev/null
+++ b/pkgs/tools/text/par/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, fetchpatch}:
+
+stdenv.mkDerivation {
+  name = "par-1.52";
+
+  src = fetchurl {
+    url = http://www.nicemice.net/par/Par152.tar.gz;
+    sha256 = "33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082";
+  };
+
+  patches = [
+    # A patch by Jérôme Pouiller that adds support for multibyte
+    # charsets (like UTF-8), plus Debian packaging.
+    (fetchpatch {
+      url = "http://sysmic.org/dl/par/par-1.52-i18n.4.patch";
+      sha256 = "0alw44lf511jmr38jnh4j0mpp7vclgy0grkxzqf7q158vzdb6g23";
+    })
+  ];
+
+  buildPhase = ''make -f protoMakefile'';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp par $out/bin
+
+    mkdir -p $out/share/man/man1
+    cp  par.1 $out/share/man/man1
+  '';
+
+
+  meta = {
+    homepage = http://www.nicemice.net/par/;
+    description = "Paragraph reflow for email";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/tools/text/reckon/Gemfile b/pkgs/tools/text/reckon/Gemfile
new file mode 100644
index 00000000000..f708ddd9366
--- /dev/null
+++ b/pkgs/tools/text/reckon/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'reckon'
diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/tools/text/reckon/Gemfile.lock
new file mode 100644
index 00000000000..0ede7e2a256
--- /dev/null
+++ b/pkgs/tools/text/reckon/Gemfile.lock
@@ -0,0 +1,21 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    chronic (0.10.2)
+    fastercsv (1.5.5)
+    highline (1.7.8)
+    reckon (0.4.4)
+      chronic (>= 0.3.0)
+      fastercsv (>= 1.5.1)
+      highline (>= 1.5.2)
+      terminal-table (>= 1.4.2)
+    terminal-table (1.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  reckon
+
+BUNDLED WITH
+   1.12.5
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
new file mode 100644
index 00000000000..370fcf265d5
--- /dev/null
+++ b/pkgs/tools/text/reckon/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, bundlerEnv, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "reckon-${version}";
+  version = "0.4.4";
+
+  env = bundlerEnv {
+    name = "${name}-gems";
+
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/reckon $out/bin/reckon
+  '';
+
+  meta = with lib; {
+    description = "Flexibly import bank account CSV files into Ledger for command line accounting";
+    license = licenses.mit;
+    maintainers = "mckean.kylej@gmail.com";
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/tools/text/reckon/gemset.nix
new file mode 100644
index 00000000000..e1e4a43188d
--- /dev/null
+++ b/pkgs/tools/text/reckon/gemset.nix
@@ -0,0 +1,42 @@
+{
+  chronic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  fastercsv = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h";
+      type = "gem";
+    };
+    version = "1.5.5";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      type = "gem";
+    };
+    version = "1.7.8";
+  };
+  reckon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p6w8w7vpl8fq4yfggrxbv6ph76psg7l5b4q29a8zvfbzzx6a0xw";
+      type = "gem";
+    };
+    version = "0.4.4";
+  };
+  terminal-table = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hbmzfr17ji5ws5x5z3kypmb5irwwss7q7kkad0gs005ibqrxv0a";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index d9dcc3c0fbb..2e51e7d7f9e 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -39,6 +39,6 @@ in stdenv.mkDerivation rec {
     description = "A tool to serve ZIM files using HTTP";
     homepage = http://git.wikimedia.org/log/openzim;
     maintainers = with stdenv.lib.maintainers; [ robbinch ];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index f3ef746fedf..0e87ef5dacc 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "hevea-2.28";
+  name = "hevea-2.29";
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
-    sha256 = "14fns13wlnpiv9i05841kvi3cq4b9v2sw5x3ff6ziws28q701qnd";
+    sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6";
   };
 
   buildInputs = [ ocaml ];
diff --git a/pkgs/tools/typesetting/tex/texlive-new/bin.nix b/pkgs/tools/typesetting/tex/texlive-new/bin.nix
index b99edc2d062..26aebd56772 100644
--- a/pkgs/tools/typesetting/tex/texlive-new/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive-new/bin.nix
@@ -3,7 +3,7 @@
 , zlib, bzip2, ncurses, libpng, flex, bison, libX11, libICE, xproto
 , freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
 , xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
-, poppler, libpaper, graphite2, lesstif, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
+, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
 , xpdf, cairo, pixman, xorg, clisp
 , makeWrapper
 }:
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 9cabfe31a18..bb44fe044e8 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgs, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "${product}-${version}";
+  name = "atomicparsley-${version}";
   product = "AtomicParsley";
   version = "0.9.0";
 
@@ -10,12 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e";
   };
 
-  buildInputs = with pkgs; [ unzip ];
+  buildInputs = with pkgs; [ unzip ]
+    ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
   patches = [ ./casts.patch ];
   setSourceRoot = "sourceRoot=${product}-source-${version}";
   buildPhase = "bash build";
   installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
 
+  postPatch = ''
+    substituteInPlace build \
+      --replace 'g++' 'c++'
+    substituteInPlace AP_NSImage.mm \
+      --replace '_NSBitmapImageFileType' 'NSBitmapImageFileType'
+  '';
+
   meta = with stdenv.lib; {
     description = ''
       A lightweight command line program for reading, parsing and
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index a4b6f11654e..1dfe4567d8d 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -6,6 +6,7 @@ use File::Path;
 use File::Slurp;
 use Fcntl ':flock';
 use Getopt::Long qw(:config gnu_getopt);
+use Cwd 'abs_path';
 
 my $nsenter = "@utillinux@/bin/nsenter";
 my $su = "@su@";
@@ -18,13 +19,13 @@ umask 0022;
 sub showHelp {
     print <<EOF;
 Usage: nixos-container list
-       nixos-container create <container-name> [--system-path <path>] [--config <string>] [--ensure-unique-name] [--auto-start]
+       nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start]
        nixos-container destroy <container-name>
        nixos-container start <container-name>
        nixos-container stop <container-name>
-       nixos-container kill <container-name> [--signal <signal-specifier>]
+       nixos-container terminate <container-name>
        nixos-container status <container-name>
-       nixos-container update <container-name> [--config <string>]
+       nixos-container update <container-name> [--config <string>] [--config-file <path>]
        nixos-container login <container-name>
        nixos-container root-login <container-name>
        nixos-container run <container-name> -- args...
@@ -35,22 +36,30 @@ EOF
 }
 
 my $systemPath;
+my $nixosPath;
 my $ensureUniqueName = 0;
 my $autoStart = 0;
 my $extraConfig;
 my $signal;
+my $configFile;
 
 GetOptions(
     "help" => sub { showHelp() },
     "ensure-unique-name" => \$ensureUniqueName,
     "auto-start" => \$autoStart,
     "system-path=s" => \$systemPath,
+    "signal=s" => \$signal,
+    "nixos-path=s" => \$nixosPath,
     "config=s" => \$extraConfig,
-    "signal=s" => \$signal
+    "config-file=s" => \$configFile
     ) or exit 1;
 
 my $action = $ARGV[0] or die "$0: no action specified\n";
 
+if (defined $configFile and defined $extraConfig) {
+    die "--config and --config-file are mutually incompatible. " .
+        "Please define on or the other, but not both";
+}
 
 # Execute the selected action.
 
@@ -71,6 +80,17 @@ $containerName =~ /^[a-zA-Z0-9\-]+$/ or die "$0: invalid container name\n";
 sub writeNixOSConfig {
     my ($nixosConfigFile) = @_;
 
+    my $localExtraConfig = "";
+
+
+
+    if ($extraConfig) {
+        $localExtraConfig = $extraConfig
+    } elsif ($configFile) {
+        my $resolvedFile = abs_path($configFile);
+        $localExtraConfig = "imports = [ $resolvedFile ];"
+    }
+
     my $nixosConfig = <<EOF;
 { config, lib, pkgs, ... }:
 
@@ -79,7 +99,7 @@ with lib;
 { boot.isContainer = true;
   networking.hostName = mkDefault "$containerName";
   networking.useDHCP = false;
-  $extraConfig
+  $localExtraConfig
 }
 EOF
 
@@ -158,11 +178,12 @@ if ($action eq "create") {
     } else {
         mkpath("$root/etc/nixos", 0, 0755);
 
+        my $nixenvF = $nixosPath // "<nixpkgs/nixos>";
         my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
         writeNixOSConfig $nixosConfigFile;
 
         system("nix-env", "-p", "$profileDir/system",
-               "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
+               "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF",
                "--set", "-A", "system") == 0
             or die "$0: failed to build initial container configuration\n";
     }
@@ -189,12 +210,9 @@ sub isContainerRunning {
     return $status =~ /ActiveState=active/;
 }
 
-sub killContainer {
-    my @args = ();
-    push(@args, ("--signal", $signal)) if ($signal ne "");
-
-    system("machinectl", "kill", $containerName, @args) == 0
-        or die "$0: failed to kill container\n";
+sub terminateContainer {
+    system("machinectl", "terminate", $containerName) == 0
+        or die "$0: failed to terminate container\n";
 }
 
 sub stopContainer {
@@ -239,8 +257,7 @@ if ($action eq "destroy") {
     die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n"
         unless POSIX::access($confFile, &POSIX::W_OK);
 
-    $signal = "SIGKILL";
-    killContainer if (isContainerRunning);
+    terminateContainer if (isContainerRunning);
 
     safeRemoveTree($profileDir) if -e $profileDir;
     safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
@@ -257,8 +274,8 @@ elsif ($action eq "stop") {
     stopContainer;
 }
 
-elsif ($action eq "kill") {
-    killContainer;
+elsif ($action eq "terminate") {
+    terminateContainer;
 }
 
 elsif ($action eq "status") {
@@ -270,7 +287,10 @@ elsif ($action eq "update") {
 
     # FIXME: may want to be more careful about clobbering the existing
     # configuration.nix.
-    writeNixOSConfig $nixosConfigFile if (defined $extraConfig && $extraConfig ne "");
+    if ((defined $extraConfig && $extraConfig ne "") ||
+         (defined $configFile && $configFile ne "")) {
+        writeNixOSConfig $nixosConfigFile;
+    }
 
     system("nix-env", "-p", "$profileDir/system",
            "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcf06b8ee02..a3a2c310d6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -740,6 +740,8 @@ in
 
   dialog = callPackage ../development/tools/misc/dialog { };
 
+  dibbler = callPackage ../tools/networking/dibbler { };
+
   ding = callPackage ../applications/misc/ding {
     aspellDicts_de = aspellDicts.de;
     aspellDicts_en = aspellDicts.en;
@@ -3301,6 +3303,8 @@ in
 
   replace = callPackage ../tools/text/replace { };
 
+  reckon = callPackage ../tools/text/reckon { };
+
   reposurgeon = callPackage ../applications/version-management/reposurgeon { };
 
   reptyr = callPackage ../os-specific/linux/reptyr {};
@@ -4211,6 +4215,8 @@ in
 
   zimwriterfs = callPackage ../tools/text/zimwriterfs { };
 
+  par = callPackage ../tools/text/par { };
+
   zip = callPackage ../tools/archivers/zip { };
 
   zkfuse = callPackage ../tools/filesystems/zkfuse { };
@@ -5461,7 +5467,9 @@ in
   rust = rustStable;
   rustStable = callPackage ../development/compilers/rust {};
   rustBeta = lowPrio (callPackage ../development/compilers/rust/beta.nix {});
-  rustUnstable = lowPrio (callPackage ../development/compilers/rust/head.nix {});
+  rustUnstable = lowPrio (callPackage ../development/compilers/rust/head.nix {
+    rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
+  });
 
   cargo = rust.cargo;
   rustc = rust.rustc;
@@ -6737,6 +6745,8 @@ in
     target = crossSystem;
   });
 
+  gdb-multitarget = lowPrio (gdb.override { multitarget = true; });
+
   valgrind = callPackage ../development/tools/analysis/valgrind { };
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
@@ -7136,7 +7146,7 @@ in
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
   ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
   };
   # Aliases
   ffmpeg_0 = self.ffmpeg_0_10;
@@ -7344,6 +7354,10 @@ in
   glm = callPackage ../development/libraries/glm { };
   glm_0954 = callPackage ../development/libraries/glm/0954.nix { };
 
+  globalplatform = callPackage ../development/libraries/globalplatform { };
+  gppcscconnectionplugin =
+    callPackage ../development/libraries/globalplatform/gppcscconnectionplugin.nix { };
+
   glog = callPackage ../development/libraries/glog { };
 
   gloox = callPackage ../development/libraries/gloox { };
@@ -7464,6 +7478,8 @@ in
 
   gpgstats = callPackage ../tools/security/gpgstats { };
 
+  gpshell = callPackage ../development/tools/misc/gpshell { };
+
   grantlee = callPackage ../development/libraries/grantlee { };
 
   gsasl = callPackage ../development/libraries/gsasl { };
@@ -8132,6 +8148,7 @@ in
 
   libmsgpack = callPackage ../development/libraries/libmsgpack { };
   libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { };
+  libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { };
 
   libnatspec = callPackage ../development/libraries/libnatspec (
     stdenv.lib.optionalAttrs stdenv.isDarwin {
@@ -8166,7 +8183,9 @@ in
 
   librevisa = callPackage ../development/libraries/librevisa { };
 
-  libsamplerate = callPackage ../development/libraries/libsamplerate { };
+  libsamplerate = callPackage ../development/libraries/libsamplerate {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices;
+  };
 
   libsieve = callPackage ../development/libraries/libsieve { };
 
@@ -8255,7 +8274,9 @@ in
 
   libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
 
-  libmikmod = callPackage ../development/libraries/libmikmod { };
+  libmikmod = callPackage ../development/libraries/libmikmod {
+    inherit (darwin.apple_sdk.frameworks) CoreAudio;
+  };
 
   libmilter = callPackage ../development/libraries/libmilter { };
 
@@ -8647,6 +8668,7 @@ in
   mbedtls = callPackage ../development/libraries/mbedtls { };
 
   mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { };
+  mdds_0_12_1 = callPackage ../development/libraries/mdds/0.12.1.nix { };
   mdds = callPackage ../development/libraries/mdds { };
 
   mediastreamer = callPackage ../development/libraries/mediastreamer { };
@@ -8743,9 +8765,7 @@ in
     texinfo = texinfo4;
   };
 
-  mueval = callPackage ../development/tools/haskell/mueval {
-    haskellPackages = haskell.packages.lts;
-  };
+  mueval = callPackage ../development/tools/haskell/mueval { };
 
   muparser = callPackage ../development/libraries/muparser { };
 
@@ -8792,6 +8812,8 @@ in
     nix = pkgs.nixUnstable;
   };
 
+  nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
+
   nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
 
   non = callPackage ../applications/audio/non { };
@@ -9188,7 +9210,6 @@ in
 
   lambdabot = callPackage ../development/tools/haskell/lambdabot {
     haskell-lib = haskell.lib;
-    haskellPackages = haskell.packages.lts;
   };
 
   leksah = callPackage ../development/tools/haskell/leksah {
@@ -9604,10 +9625,7 @@ in
 
   wcslib = callPackage ../development/libraries/wcslib { };
 
-  webkitgtk = callPackage ../development/libraries/webkitgtk {
-    harfbuzz = harfbuzz-icu;
-    gst-plugins-base = gst_all_1.gst-plugins-base;
-  };
+  webkitgtk = webkitgtk212x;
 
   webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu;
@@ -9620,6 +9638,11 @@ in
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
+  webkitgtk210x = callPackage ../development/libraries/webkitgtk/2.10.nix {
+    harfbuzz = harfbuzz-icu;
+    gst-plugins-base = gst_all_1.gst-plugins-base;
+  };
+
   webkitgtk2 = webkitgtk24x.override {
     withGtk2 = true;
     enableIntrospection = false;
@@ -10397,7 +10420,7 @@ in
   };
 
   mysql = mariadb;
-  libmysql = mysql.lib;
+  libmysql = mysql.client; # `libmysql` is a slight misnomer ATM
 
   mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
 
@@ -11070,7 +11093,6 @@ in
   linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
-        kernelPatches.ecryptfs_fix_mmap_bug
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11709,8 +11731,6 @@ in
 
   udisks_glue = callPackage ../os-specific/linux/udisks-glue { };
 
-  uksmtools = callPackage ../os-specific/linux/uksmtools { };
-
   untie = callPackage ../os-specific/linux/untie { };
 
   upower = callPackage ../os-specific/linux/upower { };
@@ -12061,7 +12081,7 @@ in
   stix-otf = callPackage ../data/fonts/stix-otf { };
 
   inherit (callPackages ../data/fonts/gdouros { })
-    aegean textfonts symbola aegyptus akkadian anatolian maya unidings musica analecta;
+    symbola aegyptus akkadian anatolian maya unidings musica analecta;
 
   iana_etc = callPackage ../data/misc/iana-etc { };
 
@@ -12216,6 +12236,19 @@ in
 
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
+  # Oracle JDK is recommended upstream, but unfree and requires a manual
+  # download. OpenJDK is straightforward, but may suffer from compatibility
+  # problems e.g. https://code.google.com/p/android/issues/detail?id=174496.
+  # To use Oracle JDK add an override to ~/.nixpkgs/config.nix:
+  # {
+  #   packageOverrides = pkgs: {
+  #     android-studio = pkgs.android-studio.override {
+  #       jdk = pkgs.oraclejdk8;
+  #     };
+  #   };
+  # }
+  android-studio = callPackage ../applications/editors/android-studio { };
+
   antimony = qt5.callPackage ../applications/graphics/antimony {};
 
   antiword = callPackage ../applications/office/antiword {};
@@ -12947,6 +12980,8 @@ in
 
   fbreader = callPackage ../applications/misc/fbreader { };
 
+  fehlstart = callPackage ../applications/misc/fehlstart { };
+
   fetchmail = callPackage ../applications/misc/fetchmail { };
 
   flacon = callPackage ../applications/audio/flacon { };
@@ -13646,7 +13681,6 @@ in
     inherit (gnome) GConf ORBit2 gnome_vfs;
     inherit (gnome3) gsettings_desktop_schemas defaultIconTheme;
     zip = zip.override { enableNLS = false; };
-    #glm = glm_0954;
     bluez5 = bluez5_28;
     fontsConf = makeFontsConf {
       fontDirectories = [
@@ -13672,6 +13706,7 @@ in
         freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
       ];
     };
+    mdds = mdds_0_12_1;
     clucene_core = clucene_core_2;
     lcms = lcms2;
     harfbuzz = harfbuzz.override {
@@ -13923,6 +13958,7 @@ in
     youtubeSupport = config.mpv.youtubeSupport or true;
     cacaSupport = config.mpv.cacaSupport or true;
     vaapiSupport = config.mpv.vaapiSupport or false;
+    libva = libva-full;
   };
 
   mpvScripts = {
@@ -14238,6 +14274,8 @@ in
 
   purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { };
 
+  purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { };
+
   purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
 
   purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { };
@@ -14390,6 +14428,7 @@ in
 
   rawtherapee = callPackage ../applications/graphics/rawtherapee {
     fftw = fftwSinglePrec;
+    cmake = cmake-2_8; # problems after 3.4 -> 3.6.0
   };
 
   rcs = callPackage ../applications/version-management/rcs { };
@@ -14410,6 +14449,8 @@ in
 
   ricochet = qt55.callPackage ../applications/networking/instant-messengers/ricochet { };
 
+  ripser = callPackage ../applications/science/math/ripser { };
+
   rkt = callPackage ../applications/virtualization/rkt { };
 
   rofi = callPackage ../applications/misc/rofi { };
@@ -14946,6 +14987,7 @@ in
 
   neovim-qt = callPackage ../applications/editors/neovim/qt.nix {
     qt5 = qt55;
+    libmsgpack = libmsgpack_1_4;
   };
 
   neovim-pygui = pythonPackages.neovim_gui;
@@ -15566,6 +15608,10 @@ in
 
   factorio-headless = callPackage ../games/factorio { releaseType = "headless"; };
 
+  factorio-mods = callPackage ../games/factorio/mods.nix { };
+
+  factorio-utils = callPackage ../games/factorio/utils.nix { };
+
   fairymax = callPackage ../games/fairymax {};
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
@@ -15623,6 +15669,7 @@ in
 
   hedgewars = callPackage ../games/hedgewars {
     inherit (haskellPackages) ghcWithPackages;
+    ffmpeg = ffmpeg_2;
   };
 
   hexen = callPackage ../games/hexen { };
@@ -16303,6 +16350,8 @@ in
 
     konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };
 
+    kronometer = callPackage ../tools/misc/kronometer { };
+
     krita = callPackage ../applications/graphics/krita {
       vc = vc_0_7;
       openjpeg = openjpeg_1;
@@ -16469,7 +16518,7 @@ in
 
   openspecfun = callPackage ../development/libraries/science/math/openspecfun {};
 
-  LiE = callPackage ../applications/science/math/LiE { };
+  lie = callPackage ../applications/science/math/LiE { };
 
   magma = callPackage ../development/libraries/science/math/magma { };
 
@@ -16798,6 +16847,8 @@ in
 
   gap = callPackage ../applications/science/math/gap { };
 
+  geogebra = callPackage ../applications/science/math/geogebra { };
+
   maxima = callPackage ../applications/science/math/maxima { };
 
   wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 808a197ad3d..dbaa35cf7a6 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -48024,6 +48024,8 @@
   "timezone" = self.by-version."timezone"."1.0.4";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
+  by-spec."tinycolor"."0.0.x" =
+    self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = self.buildNodePackage {
     name = "tinycolor-0.0.1";
     version = "0.0.1";
@@ -52276,6 +52278,8 @@
   };
   by-spec."ws"."0.8.1" =
     self.by-version."ws"."0.8.1";
+  by-spec."ws"."0.8.x" =
+    self.by-version."ws"."0.8.1";
   by-version."ws"."0.8.1" = self.buildNodePackage {
     name = "ws-0.8.1";
     version = "0.8.1";
@@ -52341,6 +52345,29 @@
   };
   by-spec."ws"."^1.0.1" =
     self.by-version."ws"."1.1.0";
+  by-spec."wscat"."*" =
+    self.by-version."wscat"."1.0.1";
+  by-version."wscat"."1.0.1" = self.buildNodePackage {
+    name = "wscat-1.0.1";
+    version = "1.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/wscat/-/wscat-1.0.1.tgz";
+      name = "wscat-1.0.1.tgz";
+      sha1 = "542b47c1c27334c64ececef9c2db02faf6212964";
+    };
+    deps = {
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
+      "ws-0.8.1" = self.by-version."ws"."0.8.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "wscat" = self.by-version."wscat"."1.0.1";
   by-spec."wu"."*" =
     self.by-version."wu"."2.1.0";
   by-version."wu"."2.1.0" = self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index a8bd2e05ec0..9cb059ca136 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -180,6 +180,7 @@
 , "webdrvr"
 , "webpack"
 , "winston"
+, "wscat"
 , "wu"
 , "x509"
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 95a762df33e..8e4896b3fee 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5308,12 +5308,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  FileSlurper = buildPerlPackage {
-    name = "File-Slurper-0.008";
+  FileSlurper = buildPerlPackage rec {
+    name = "File-Slurper-0.009";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.008.tar.gz;
-      sha256 = "10f685140e2cebdd0381f24b010b028f9ca2574361a78f99f4dfe87af5d5d233";
+      url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz";
+      sha256 = "3eab340deff6ba5456e7d1156b9cfcc387e1243acfc156ff92b75b3f2e120b91";
     };
+    buildInputs = [ TestWarnings ];
     meta = {
       description = "A simple, sane and efficient module to slurp a file";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -7399,11 +7400,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogHandler = buildPerlPackage rec {
-    name = "Log-Handler-0.87";
+    name = "Log-Handler-0.88";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BL/BLOONIX/${name}.tar.gz";
-      sha256 = "aaf68894ddf51aeaec7e6e22069b5840994517a8937cc6ceaff4d73cee2cf3ed";
+      sha256 = "45bf540ab2138ed3ff93afc205b0516dc75755b86acdcc5e75c41347833c293d";
     };
+    buildInputs = [ ModuleBuild ];
     propagatedBuildInputs = [ ParamsValidate ];
     meta = {
       description = "Log messages to several outputs";
@@ -7938,6 +7940,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/R/RO/ROSCH/${name}.tar.gz";
       sha256 = "00wk9950i9q6qwp1vdq9xdddgk54lqd0bhcq2hnijh8xnmhvpmsc";
     };
+    outputs = [ "out" ];
     buildInputs = [ ProcWaitStat ];
   };
 
@@ -14116,6 +14119,7 @@ let self = _self // overrides; _self = with self; {
     preConfigure =
       ''
         substituteInPlace Makefile.PL --replace '"cpp"' '"gcc -E"'
+        substituteInPlace Makefile.PL --replace '_LASTENTRY\z' '_LASTENTRY\z|CURL_DID_MEMORY_FUNC_TYPEDEFS\z'
       '';
     doCheck = false; # performs network access
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e70212bc13..e63e0854021 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -825,7 +825,7 @@ in modules // {
     windowsSupport = true;
 
     propagatedBuildInputs = with self; [
-      paramiko jinja2 pyyaml httplib2 boto six
+      pycrypto paramiko jinja2 pyyaml httplib2 boto six
     ] ++ optional windowsSupport pywinrm;
 
     meta = {
@@ -858,7 +858,7 @@ in modules // {
     windowsSupport = true;
 
     propagatedBuildInputs = with self; [
-      paramiko jinja2 pyyaml httplib2 boto six readline
+      pycrypto paramiko jinja2 pyyaml httplib2 boto six readline
     ] ++ optional windowsSupport pywinrm;
 
     meta = with stdenv.lib; {
@@ -1214,6 +1214,27 @@ in modules // {
     };
   });
 
+  attrs = buildPythonPackage (rec {
+    pname = "attrs";
+    version = "16.0.0";
+    name = "attrs-16.0.0";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/a/attrs/${name}.tar.gz";
+      sha256 = "1g4asv3hbx5aqz7hjzq3q6ss2cpv1rdv66sp5d21cdyjajj2fs6y";
+    };
+
+    # Mac OS X needs clang for testing
+    buildInputs = with self; [ pytest hypothesis zope_interface
+    pympler coverage ]
+     ++ optionals (stdenv.isDarwin) [ pkgs.clang ];
+
+    meta = {
+      description = "Python attributes without boilerplate";
+      homepage = https://github.com/hynek/attrs;
+      license = licenses.mit;
+    };
+   });
+
   audioread = buildPythonPackage rec {
     name = "audioread-${version}";
     version = "2.1.1";
@@ -4004,11 +4025,12 @@ in modules // {
 
   cryptography = buildPythonPackage rec {
     # also bump cryptography_vectors
-    name = "cryptography-1.2.3";
+    name = "cryptography-${version}";
+    version = "1.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/cryptography/${name}.tar.gz";
-      sha256 = "0kj511z4g21fhcr649pyzpl0zzkkc7hsgxxjys6z8wwfvmvirccf";
+      sha256 = "0a6i4914ychryj7kqqmf970incynj5lzx57n3cbv5i4hxm09a55v";
     };
 
     buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
@@ -4024,11 +4046,12 @@ in modules // {
 
   cryptography_vectors = buildPythonPackage rec {
       # also bump cryptography
-    name = "cryptography_vectors-1.2.3";
+    name = "cryptography_vectors-${version}";
+    version = "1.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz";
-      sha256 = "0shawgpax79gvjrj0a313sll9gaqys7q1hxngn6j4k24lmz7bwki";
+      sha256 = "1sk6yhphk2k2vzshi0djxi0jsxd9a02259bs8gynfgf5y1g82a07";
     };
   };
 
@@ -5443,11 +5466,11 @@ in modules // {
 
   dill = buildPythonPackage rec {
     name = "dill-${version}";
-    version = "0.2.4";
+    version = "0.2.5";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/dill/${name}.tgz";
-      sha256 = "deca57da33ad2121ab1b9c4493bf8eb2b3a72b6426d4b9a3a853a073c68b97ca";
+      sha256 = "431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319";
     };
 
     propagatedBuildInputs = with self; [objgraph];
@@ -6497,7 +6520,13 @@ in modules // {
       sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc";
     };
 
+    # https://github.com/AGProjects/python-gnutls/issues/2
+    disabled = isPy3k;
+
     propagatedBuildInputs = with self; [ pkgs.gnutls ];
+    patchPhase = ''
+      substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls33.out}/lib"
+    '';
   };
 
   gitdb = buildPythonPackage rec {
@@ -7438,13 +7467,13 @@ in modules // {
 
   netcdf4 = buildPythonPackage rec {
     name = "netCDF4-${version}";
-    version = "1.2.1";
+    version = "1.2.4";
 
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-      sha256 = "0wzg73zyjjhns4209vrcvh71gs392d16ynz76x3pl1xg2by723iy";
+      sha256 = "0lakjix9dhc26f33f03c13ffwspqcrk5j3mnnjczwxbb23ppwwx6";
     };
 
     propagatedBuildInputs = with self ; [
@@ -8891,18 +8920,42 @@ in modules // {
     };
   };
 
-  django = self.django_1_9;
+  django = self.django_1_10;
 
   django_gis = self.django.override rec {
     patches = [
       (pkgs.substituteAll {
-        src = ../development/python-modules/django/1.7.7-gis-libs.template.patch;
+        src = ../development/python-modules/django/1.10-gis-libs.template.patch;
         geos = pkgs.geos;
         gdal = pkgs.gdal;
       })
     ];
   };
 
+  django_1_10 = buildPythonPackage rec {
+    name = "Django-${version}";
+    version = "1.10";
+    disabled = pythonOlder "2.7";
+
+    src = pkgs.fetchurl {
+      url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
+      sha256 = "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26";
+    };
+
+    # patch only $out/bin to avoid problems with starter templates (see #3134)
+    postFixup = ''
+      wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    '';
+
+    # too complicated to setup
+    doCheck = false;
+
+    meta = {
+      description = "A high-level Python Web framework";
+      homepage = https://www.djangoproject.com/;
+    };
+  };
+
   django_1_9 = buildPythonPackage rec {
     name = "Django-${version}";
     version = "1.9.5";
@@ -9090,26 +9143,46 @@ in modules // {
 
   django_compat = buildPythonPackage rec {
     name = "django-compat-${version}";
-    version = "1.0.8";
+    version = "1.0.13";
 
     # build process attempts to access a missing README.rst
     disabled = isPy35;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/django-compat/${name}.tar.gz";
-      sha256 = "195dgr55vzpw1fbjvbw2h35k9bfhvm5zchh2p7nzbq57xmwb3sra";
+      sha256 = "0s0z7cx0vv1kjsyzk24sg256hfnd09ssilc9rakhxrzr3firgx80";
     };
 
     buildInputs = with self; [ django_nose ];
     propagatedBuildInputs = with self; [ django six ];
 
     meta = {
-      description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, and 1.9";
+      description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9 and 1.10";
       homepage = https://github.com/arteria/django-compat;
       license = licenses.mit;
     };
   };
 
+  django_environ = buildPythonPackage rec {
+    name = "django-environ-${version}";
+    version = "0.4.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/d/django-environ/${name}.tar.gz";
+      sha256 = "0i32vsgk1xmwpi7i6f6v5hg653y9dl0fsz5qmv94skz6hwgm5kvh";
+    };
+
+    # The testsuite fails to modify the base environment
+    doCheck = false;
+    propagatedBuildInputs = with self ; [ django six ];
+
+    meta = {
+      description = "Utilize environment variables to configure your Django application";
+      homepage = https://github.com/joke2k/django-environ/;
+      license = licenses.mit;
+    };
+  };
+
   django_evolution = buildPythonPackage rec {
     name = "django_evolution-0.7.5";
     disabled = isPy3k;
@@ -9127,6 +9200,28 @@ in modules // {
     };
   };
 
+  django_guardian = buildPythonPackage rec {
+    name = "django-guardian-${version}";
+    version = "1.4.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/d/django-guardian/${name}.tar.gz";
+      sha256 = "1m7y3brk3697hr2cvkzl8dry4pp7wkmhvxmf8db1ardz1r9d8895";
+    };
+
+    buildInputs = with self ; [ pytestrunner pytestdjango django_environ mock sqlite3 ];
+    propagatedBuildInputs = with self ; [ django six ];
+
+    checkPhase = ''
+      ${python.interpreter} nix_run_setup.py test --addopts="--ignore build"
+    '';
+
+    meta = {
+      description = "Per object permissions for Django";
+      homepage = https://github.com/django-guardian/django-guardian;
+      licenses = [ licenses.mit licenses.bsd2 ];
+    };
+  };
 
   django_tagging = buildPythonPackage rec {
     name = "django-tagging-0.3.1";
@@ -9178,7 +9273,14 @@ in modules // {
       sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04";
     };
 
-    propagatedBuildInputs = with self; [ django django_compat ];
+    # TODO improve the that multi-override necessity (the fixpoint based python
+    # packages work can be the solution)
+    propagatedBuildInputs = with self; [ django_1_9 (django_compat.override {
+      buildInputs = with self; [ (django_nose.override {
+        propagatedBuildInputs = with self; [ django_1_9 nose ];
+      }) ];
+      propagatedBuildInputs = with self; [ django_1_9 six ];
+    }) ];
 
     meta = {
       description = "Allows superusers to hijack (=login as) and work on behalf of another user";
@@ -9189,11 +9291,11 @@ in modules // {
 
   django_nose = buildPythonPackage rec {
     name = "django-nose-${version}";
-    version = "1.4.3";
+    version = "1.4.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/django-nose/${name}.tar.gz";
-      sha256 = "0rl9ipa98smprlw56xqlhzhps28p84wg0640qlyn0rjyrpsdmf0r";
+      sha256 = "1fm47fkza2lk0xgc6qpi9vs78zg7q8cgl6mdan69sbycgy909ff0";
     };
 
     # vast dependency list
@@ -12130,6 +12232,22 @@ in modules // {
     };
   };
 
+  klein = buildPythonPackage rec {
+    name = "klein-15.3.1";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/k/klein/${name}.tar.gz";
+      sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
+    };
+
+    propagatedBuildInputs = with self; [ werkzeug twisted ];
+
+    meta = {
+      description = "Klein Web Micro-Framework";
+      homepage    = "https://github.com/twisted/klein";
+      license     = licenses.mit;
+    };
+   };
+
   kombu = buildPythonPackage rec {
     name = "kombu-${version}";
     version = "3.0.35";
@@ -13420,6 +13538,27 @@ in modules // {
     };
   };
 
+  multiprocess = buildPythonPackage rec {
+    name = "multiprocess-${version}";
+    version = "0.70.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/m/multiprocess/${name}.tgz";
+      sha256 = "73f8b9b7009860e3c3c8b9bdcad7e8366b130929775f89c114d4346a9cfcb31b";
+    };
+
+    propagatedBuildInputs = with self; [ dill ];
+
+    # Python-version dependent tests
+    doCheck = false;
+
+    meta = {
+      description = "Better multiprocessing and multithreading in python";
+      homepage = https://github.com/uqfoundation;
+      license = licenses.bsd3;
+    };
+  };
+
   munkres = buildPythonPackage rec {
     name = "munkres-1.0.6";
 
@@ -13669,6 +13808,31 @@ in modules // {
     };
   };
 
+  pympler = buildPythonPackage rec {
+    pname = "Pympler";
+    version = "0.4.3";
+    name = "${pname}-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/P/${pname}/${name}.tar.gz";
+      sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3";
+    };
+
+  # Remove test asizeof.flatsize(), broken and can be missed as
+  # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22
+   patchPhase = ''
+     substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize"
+     substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n,"
+     substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e"
+    '';
+
+    meta = {
+      description = "Tool to measure, monitor and analyze memory behavior";
+      homepage = http://pythonhosted.org/Pympler/;
+      license = licenses.asl20;
+    };
+  };
+
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
     version = "0.6.6";
@@ -14321,12 +14485,12 @@ in modules // {
   };
 
   notebook = buildPythonPackage rec {
-    version = "4.2.1";
+    version = "4.2.2";
     name = "notebook-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/notebook/${name}.tar.gz";
-      sha256 = "15z1j821iywjcjf6d8r338jm09l9qwk8z9gjplag56dvv8jfb7d4";
+      sha256 = "418ba230c9b2e7e739940cae9fb4625e10a63f038e9c95cf1a9b7a244256ba38";
     };
 
     LC_ALL = "en_US.UTF-8";
@@ -16449,14 +16613,15 @@ in modules // {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-1.15.1";
+    name = "paramiko-${version}";
+    version = "2.0.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/paramiko/${name}.tar.gz";
-      sha256 = "6ed97e2281bb48728692cdc621f6b86a65fdc1d46b178ce250cfec10b977a04c";
+      sha256 = "1p21s7psqj18k9a97nq26yas058i5ivzk7pi7y98l1rbl87zj6s1";
     };
 
-    propagatedBuildInputs = with self; [ pycrypto ecdsa ];
+    propagatedBuildInputs = with self; [ cryptography cryptography_vectors ];
 
     # https://github.com/paramiko/paramiko/issues/449
     doCheck = !(isPyPy || isPy33);
@@ -16504,8 +16669,27 @@ in modules // {
       license = with licenses; [ bsd3 ];
       homepage = http://github.com/dask/partd/;
     };
+  };
+
+  pathos = buildPythonPackage rec {
+    name = "pathos-${version}";
+    version = "0.2.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pathos/${name}.tgz";
+      sha256 = "e35418af733bf434da83746d46acca94375d6e306b3df330b2a1808db026a188";
+    };
 
+    propagatedBuildInputs = with self; [ dill pox ppft multiprocess ];
 
+    # Require network
+    doCheck = false;
+
+    meta = {
+      description = "Parallel graph management and execution in heterogeneous computing";
+      homepage = http://www.cacr.caltech.edu/~mmckerns/pathos.htm;
+      license = licenses.bsd3;
+    };
   };
 
   patsy = buildPythonPackage rec {
@@ -17127,12 +17311,12 @@ in modules // {
 
   pysftp = buildPythonPackage rec {
     name = "pysftp-${version}";
-    version = "0.2.8";
+    version = "0.2.9";
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pysftp/${name}.tar.gz";
-      sha256 = "1d69z8yngciksch1i8rivy1xl8f6g6sb7c3kk5cm3pf8304q6hhm";
+      sha256 = "0jl5qix5cxzrv4lb8rfpjkpcghbkacnxkb006ikn7mkl5s05mxgv";
     };
 
     propagatedBuildInputs = with self; [ paramiko ];
@@ -17371,7 +17555,39 @@ in modules // {
     };
   };
 
+  pox = buildPythonPackage rec {
+    name = "pox-${version}";
+    version = "0.2.2";
 
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pox/${name}.tgz";
+      sha256 = "22e97ac6d2918c754e65a9581dbe02e9d00ae4a54ca48d05118f87c1ea92aa19";
+    };
+
+    meta = {
+      description = "Utilities for filesystem exploration and automated builds";
+      license = licenses.bsd3;
+      homepage = http://www.cacr.caltech.edu/~mmckerns/pox.htm;
+    };
+  };
+
+  ppft = buildPythonPackage rec {
+    name = "ppft-${version}";
+    version = "1.6.4.6";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/ppft/${name}.tgz";
+      sha256 = "6f99c861822884cb00badbd5f364ee32b90a157084a6768040793988c6b92bff";
+    };
+
+    propagatedBuildInputs = with self; [ six ];
+
+    meta = {
+      description = "Distributed and parallel python";
+      homepage = https://github.com/uqfoundation;
+      license = licenses.bsd3;
+    };
+  };
 
   praw = buildPythonPackage rec {
     name = "praw-3.5.0";
@@ -18133,6 +18349,21 @@ in modules // {
     };
   });
 
+  pydispatcher = buildPythonPackage (rec {
+    version = "2.0.5";
+    disabled = isPy35;
+    name = "pydispatcher-${version}";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/P/PyDispatcher/PyDispatcher-${version}.tar.gz";
+      sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m";
+    };
+
+    meta = {
+      homepage = http://pydispatcher.sourceforge.net/;
+      description = "Signal-registration and routing infrastructure for use in multiple contexts";
+      license = licenses.bsd3;
+    };
+   });
 
   pydot = buildPythonPackage rec {
     name = "pydot-1.0.2";
@@ -21463,6 +21694,23 @@ in modules // {
     };
   };
 
+  sqlobject = buildPythonPackage rec {
+    version = "3.0.0";
+    name = "sqlobject-${version}";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/S/SQLObject/SQLObject-${version}.tar.gz";
+      sha256 = "15g3g7f4yiyplqf54px1dsnmrw3jb7xwx97z8qzgp9ijmm5vpr8r";
+    };
+
+    propagatedBuildInputs = with self; [ pydispatcher FormEncode ];
+
+    meta = {
+      description = "Object Relational Manager for providing an object interface to your database";
+      homepage = "http://www.sqlobject.org/";
+      license = licenses.lgpl21;
+    };
+  };
+
   pgpdump = self.buildPythonPackage rec {
     name = "pgpdump-1.5";
 
@@ -25764,7 +26012,7 @@ in modules // {
     postPatch = ''
       libusb=${pkgs.libusb1.out}/lib/libusb-1.0.so
       test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
-      sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py
+      sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py
     '';
 
     # No tests included
@@ -26198,6 +26446,11 @@ in modules // {
       sha256 = "030qkrsj4as9anr8xfpk5n41qzg7w4yyjasb4cqislvyl1l1dvvs";
     };
 
+    postPatch = ''
+      substituteInPlace requirements.txt \
+        --replace 'certifi==2015.11.20.1' 'certifi==2016.2.28'
+    '';
+
     propagatedBuildInputs = with self; [
       pyyaml lxml_3_5 grequests flaskbabel flask requests2
       gevent speaklater Babel pytz dateutil pygments_2_0
@@ -27707,14 +27960,14 @@ in modules // {
 
   ovh = buildPythonPackage rec {
     name = "ovh-${version}";
-    version = "0.3.5";
+    version = "0.4.5";
     doCheck = false; #test needs packages too explicit
     buildInputs = with self; [ d2to1 ];
     propagatedBuildInputs = with self; [ requests2 ];
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/o/ovh/ovh-${version}.tar.gz";
-      sha256 = "1y74lrdlgbb786mwas7ynphimfi00dgr67ncjq20kdf31jg5415n";
+      sha256 = "1wf2p1sbg34jpj97r3w5nx9pj6vp0mlprry3vw2xav3dv02qv2af";
     };
 
     meta = {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 6959bc2ffb0..ce093a1da22 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -49,6 +49,10 @@ let
               jobs.python3.x86_64-linux
               jobs.python3.i686-linux
               jobs.python3.x86_64-darwin
+              # Many developers use nix-repl
+              jobs.nix-repl.x86_64-linux
+              jobs.nix-repl.i686-linux
+              jobs.nix-repl.x86_64-darwin
               # Needed by travis-ci to test PRs
               jobs.nox.i686-linux
               jobs.nox.x86_64-linux
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 28a13adf4cf..4acf8e86786 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-07-26";
-  rev = "b4dbf6af6672b9f1c0f51cdf4e4aeb11664f3f69";
-  sha256 = "0hzf2yn5yv6r2h4azx4rsbpab73hg3hvk4n6hqa2jr927v1zd5bv";
+  version = "2016-08-10";
+  rev = "fe018be71eeed9c1dc441a16e6a0f32eb6a46bce";
+  sha256 = "0d8rvhndkz8sz7zn79lrk5vlkpljfilrk52cb2pr5rx83cm89vmi";
 
   src = fetchFromGitHub {
       inherit rev;
author	Robin Gloster <mail@glob.in>	2016-08-12 09:46:53 +0000
committer	Robin Gloster <mail@glob.in>	2016-08-12 09:46:53 +0000
commit	b7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch)
tree	c4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs
parent	bc025e83bd6c44df38851ef23da53359a0e62841 (diff)
parent	532b2222965377e77ed884c463ee2751fb51dba3 (diff)
download	nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2 nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst nixpkgs-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.zip