Merge branch 'master.upstream' into staging.post-15.06

2015-09-19 14:40:01 -07:00
parent 8b670fba26 a23b96c74d
commit 9f3c0d9967
95 changed files with 464061 additions and 6465 deletions
@@ -78,6 +78,26 @@ rec {
    listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set));


+  /* Filter an attribute set recursivelly by removing all attributes for
+     which the given predicate return false.
+
+     Example:
+       filterAttrsRecursive (n: v: v != null) { foo = { bar = null; }; }
+       => { foo = {}; }
+  */
+  filterAttrsRecursive = pred: set:
+    listToAttrs (
+      concatMap (name:
+        let v = set.${name}; in
+        if pred name v then [
+          (nameValuePair name (
+            if isAttrs v then filterAttrsRecursive pred v
+            else v
+          ))
+        ] else []
+      ) (attrNames set)
+    );
+
  /* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list:
     foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }]
     => { a = [ 2 3 ]; }
@@ -90,6 +90,7 @@
  emery = "Emery Hemingway <emery@vfemail.net>";
  epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
  ericbmerritt = "Eric Merritt <eric@afiniate.com>";
+  erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
  ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
  exlevan = "Alexey Levan <exlevan@gmail.com>";
  falsifian = "James Cook <james.cook@utoronto.ca>";
@@ -232,6 +232,7 @@
      namecoin = 208;
      dnschain = 209;
      #lxd = 210; # unused
+      kibana = 211;

      # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

@@ -442,6 +443,7 @@
      namecoin = 208;
      #dnschain = 209; #unused
      lxd = 210; # unused
+      #kibana = 211;

      # When adding a gid, make sure it doesn't match an existing
      # uid. Users and groups with the same name should have equal
@@ -365,6 +365,7 @@
  ./services/scheduling/fcron.nix
  ./services/scheduling/marathon.nix
  ./services/search/elasticsearch.nix
+  ./services/search/kibana.nix
  ./services/search/solr.nix
  ./services/security/clamav.nix
  ./services/security/fail2ban.nix
@@ -0,0 +1,168 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.kibana;
+
+  cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
+    (filterAttrsRecursive (n: v: v != null) ({
+      server = {
+        host = cfg.host;
+        port = cfg.port;
+        ssl = {
+          cert = cfg.cert;
+          key = cfg.key;
+        };
+      };
+
+      kibana = {
+        index = cfg.index;
+        defaultAppId = cfg.defaultAppId;
+      };
+
+      elasticsearch = {
+        url = cfg.elasticsearch.url;
+        username = cfg.elasticsearch.username;
+        password = cfg.elasticsearch.password;
+        ssl = {
+          cert = cfg.elasticsearch.cert;
+          key = cfg.elasticsearch.key;
+          ca = cfg.elasticsearch.ca;
+        };
+      };
+
+      logging = {
+        verbose = cfg.logLevel == "verbose";
+        quiet = cfg.logLevel == "quiet";
+        silent = cfg.logLevel == "silent";
+        dest = "stdout";
+      };
+    } // cfg.extraConf)
+  )));
+in {
+  options.services.kibana = {
+    enable = mkEnableOption "enable kibana service";
+
+    host = mkOption {
+      description = "Kibana listening host";
+      default = "127.0.0.1";
+      type = types.str;
+    };
+
+    port = mkOption {
+      description = "Kibana listening port";
+      default = 5601;
+      type = types.int;
+    };
+
+    cert = mkOption {
+      description = "Kibana ssl certificate.";
+      default = null;
+      type = types.nullOr types.path;
+    };
+
+    key = mkOption {
+      description = "Kibana ssl key.";
+      default = null;
+      type = types.nullOr types.path;
+    };
+
+    index = mkOption {
+      description = "Elasticsearch index to use for saving kibana config.";
+      default = ".kibana";
+      type = types.str;
+    };
+
+    defaultAppId = mkOption {
+      description = "Elasticsearch default application id.";
+      default = "discover";
+      type = types.str;
+    };
+
+    elasticsearch = {
+      url = mkOption {
+        description = "Elasticsearch url";
+        default = "http://localhost:9200";
+        type = types.str;
+      };
+
+      username = mkOption {
+        description = "Username for elasticsearch basic auth.";
+        default = null;
+        type = types.nullOr types.str;
+      };
+
+      password = mkOption {
+        description = "Password for elasticsearch basic auth.";
+        default = null;
+        type = types.nullOr types.str;
+      };
+
+      ca = mkOption {
+        description = "CA file to auth against elasticsearch.";
+        default = null;
+        type = types.nullOr types.path;
+      };
+
+      cert = mkOption {
+        description = "Certificate file to auth against elasticsearch.";
+        default = null;
+        type = types.nullOr types.path;
+      };
+
+      key = mkOption {
+        description = "Key file to auth against elasticsearch.";
+        default = null;
+        type = types.nullOr types.path;
+      };
+    };
+
+    logLevel = mkOption {
+      description = "Kibana log level";
+      default = "normal";
+      type = types.enum ["verbose" "normal" "silent" "quiet"];
+    };
+
+    package = mkOption {
+      description = "Kibana package to use";
+      default = pkgs.kibana;
+      type = types.package;
+    };
+
+    dataDir = mkOption {
+      description = "Kibana data directory";
+      default = "/var/lib/kibana";
+      type = types.path;
+    };
+
+    extraConf = mkOption {
+      description = "Kibana extra configuration";
+      default = {};
+      type = types.attrs;
+    };
+  };
+
+  config = mkIf (cfg.enable) {
+    systemd.services.kibana = {
+      description = "Kibana Service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" "elasticsearch.service" ];
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}";
+        User = "kibana";
+        WorkingDirectory = cfg.dataDir;
+      };
+    };
+
+    environment.systemPackages = [ cfg.package ];
+
+    users.extraUsers = singleton {
+      name = "kibana";
+      uid = config.ids.uids.kibana;
+      description = "Kibana service user";
+      home = cfg.dataDir;
+      createHome = true;
+    };
+  };
+}
@@ -0,0 +1,43 @@
+From e57f22a5089f194013534c9a9bbc42ee639297f1 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 19 Sep 2015 11:10:32 -0500
+Subject: [PATCH] unbundled qwt
+
+---
+ linssid-app/linssid-app.pro | 4 +---
+ linssid.pro                 | 4 +---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/linssid-app/linssid-app.pro b/linssid-app/linssid-app.pro
+index 26f61e7..7b80b60 100644
+--- a/linssid-app/linssid-app.pro
+++ b/linssid-app/linssid-app.pro
+@@ -19,13 +19,11 @@ QMAKE_CC = gcc
+ QMAKE_CXX = g++
+ DEFINES += 
+ INCLUDEPATH += /usr/include/qt5
+-# /usr/local/qwt-6.1.0/include
+-INCLUDEPATH += ../qwt-lib/src
+ # LIBS += /usr/lib/x86_64-linux-gnu/libboost_regex.a 
+ # LIBS += -lboost_regex
+ LIBS += -l:libboost_regex.a
+ # /usr/local/qwt-6.1.0/lib/libqwt.a
+-LIBS += ../qwt-lib/lib/libqwt.a
+LIBS += -lqwt
+ QMAKE_CXXFLAGS += -std=c++11
+ #
+ TARGET = linssid
+diff --git a/linssid.pro b/linssid.pro
+index 42dc277..26d1a2c 100644
+--- a/linssid.pro
+++ b/linssid.pro
+@@ -1,5 +1,3 @@
+ TEMPLATE = subdirs
+ CONFIG += ordered
+-SUBDIRS = qwt-lib \
+-          linssid-app
+-linssid-app.depends = qwt-lib
+SUBDIRS = linssid-app
+-- 
+2.5.2
+
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw }:
+{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw, qwt6 }:

 stdenv.mkDerivation rec {
  name = "linssid-${version}";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
    sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
  };

-  buildInputs = [ qt5 pkgconfig boost ];
+  buildInputs = [ qt5.base qt5.svg pkgconfig boost qwt6 ];
+
+  patches = [ ./0001-unbundled-qwt.patch ];

  postPatch = ''
    sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
@@ -20,6 +22,9 @@ stdenv.mkDerivation rec {

    sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp
    sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp
+
+    # Remove bundled qwt
+    rm -fr qwt-lib
  '';

  configurePhase = "qmake linssid.pro";
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, unzip, gcc48 }:
+
+stdenv.mkDerivation {
+  name = "perseus-4-beta";
+  version = "4-beta";
+  buildInputs = [unzip gcc48];
+
+  src = fetchurl {
+    url = "http://www.sas.upenn.edu/~vnanda/source/perseus_4_beta.zip";
+    sha256 = "09brijnqabhgfjlj5wny0bqm5dwqcfkp1x5wif6yzdmqh080jybj";
+  };
+
+  sourceRoot = ".";
+
+  buildPhase = ''
+    g++ Pers.cpp -O3 -o perseus
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp perseus $out/bin
+  '';
+
+  meta = {
+    description = "The Persistent Homology Software";
+    longDescription = ''
+      Persistent homology - or simply, persistence - is an algebraic
+      topological invariant of a filtered cell complex. Perseus
+      computes this invariant for a wide class of filtrations built
+      around datasets arising from point samples, images, distance
+      matrices and so forth.
+    '';
+    homepage = "www.sas.upenn.edu/~vnanda/perseus/index.html";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [erikryb];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
@@ -1,6 +1,6 @@
-/* moving all git tools into one attribute set because git is unlikely to be
- * referenced by other packages and you can get a fast overview.
-*/
+/* All git-relates tools live here, in a separate attribute set so that users
+ * can get a fast overview over what's available.
+ */
 args @ {pkgs}: with args; with pkgs;
 let
  inherit (pkgs) stdenv fetchgit fetchurl subversion;
@@ -46,7 +46,7 @@ rec {
    sendEmailSupport = !stdenv.isDarwin;
  };

-  inherit (pkgs.haskellPackages) git-annex;
+  git-annex = pkgs.haskellPackages.git-annex-with-assistant;
  gitAnnex = git-annex;

  qgit = import ./qgit {
@@ -1,23 +1,29 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, unzip}:

 let
-  makePackage = {language, region, description}: stdenv.mkDerivation rec {
-    version = "1.001R";
-    name = "source-han-sans-${language}-${version}";
+  makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec {
+    version = "1.004R";
+    name = "source-han-sans-${variant}-${version}";
+    revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa";
+
+    buildInputs = [ unzip ];

    src = fetchurl {
-      url = "https://github.com/adobe-fonts/source-han-sans/archive/${version}.tar.gz";
-      sha256 = "0cwz3d8jancl0a7vbjxhnh1vgwsjba62lahfjya9yrjkp1ndxlap";
+      url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip";
+      inherit sha256;
    };

+    setSourceRoot = ''
+      sourceRoot=$( echo SourceHanSans* )
+    '';
+
    installPhase = ''
      mkdir -p $out/share/fonts/opentype
-      cp $( find SubsetOTF/${region} -name '*.otf' ) $out/share/fonts/opentype
+      cp $( find . -name '*.otf' ) $out/share/fonts/opentype
    '';

    meta = {
-      inherit description;
-
+      description = "${language} subset of an open source Pan-CJK typeface";
      homepage = https://github.com/adobe-fonts/source-han-sans;
      license = stdenv.lib.licenses.asl20;
    };
@@ -25,23 +31,27 @@ let
 in
 {
  japanese = makePackage {
-    language = "japanese";
+    variant = "japanese";
+    language = "Japanese";
    region = "JP";
-    description = "Japanese subset of an open source Pan-CJK typeface";
+    sha256 = "0m1zprwqnqp3za42firg53hyzir6p0q73fl8mh5j4px3zgivlvfw";
  };
  korean = makePackage {
-    language = "korean";
+    variant = "korean";
+    language = "Korean";
    region = "KR";
-    description = "Korean subset of an open source Pan-CJK typeface";
+    sha256 = "1bz6n2sd842vgnqky0i7a3j3i2ixhzzkkbx1m8plk04r1z41bz9q";
  };
  simplified-chinese = makePackage {
-    language = "simplified-chinese";
+    variant = "simplified-chinese";
+    language = "Simplified Chinese";
    region = "CN";
-    description = "Simplified Chinese subset of an open source Pan-CJK typeface";
+    sha256 = "0ksafcwmnpj3yxkgn8qkqkpw10ivl0nj9n2lsi9c6fw3aa71s3ha";
  };
  traditional-chinese = makePackage {
-    language = "traditional-chinese";
+    variant = "traditional-chinese";
+    language = "Traditional Chinese";
    region = "TW";
-    description = "Traditional Chinese subset of an open source Pan-CJK typeface";
+    sha256 = "1l4zymd5n4nl9gmja707xq6bar88dxki2mwdixdfrkf544cidflj";
  };
 }
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
        md5 = "cb61be3be7254eae39684612c524740d";
      };

-    in [ dsfmt_src llvm.src ];
+    in [ dsfmt_src ];

  prePatch = ''
    copy_kill_hash(){
@@ -70,22 +70,18 @@ stdenv.mkDerivation rec {
    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
  '';

-  buildInputs =
-    [ libunwind readline utf8proc zlib
-      double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
-      openblas arpack suitesparse
-    ];
+  buildInputs = [
+    arpack double_conversion fftw fftwSinglePrec glpk gmp libunwind
+    llvm mpfr pcre openblas readline suitesparse utf8proc zlib
+  ];

-  nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
+  nativeBuildInputs = [ gfortran git m4 patchelf perl python2 which ];

  makeFlags =
    let
      arch = head (splitString "-" stdenv.system);
-      march =
-        { "x86_64-linux" = "x86-64";
-          "x86_64-darwin" = "x86-64";
-          "i686-linux" = "i686";
-        }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+      march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
+              or (throw "unsupported architecture: ${arch}");
    in [
      "ARCH=${arch}"
      "MARCH=${march}"
@@ -108,6 +104,7 @@ stdenv.mkDerivation rec {
      "USE_SYSTEM_GMP=1"
      "USE_SYSTEM_GRISU=1"
      "USE_SYSTEM_LIBUNWIND=1"
+      "USE_SYSTEM_LLVM=1"
      "USE_SYSTEM_MPFR=1"
      "USE_SYSTEM_PATCHELF=1"
      "USE_SYSTEM_PCRE=1"
@@ -143,6 +140,8 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  # Test fail on i686 (julia version 0.3.10)
+  doCheck = !stdenv.isi686;
  checkTarget = "testall";

  meta = {
@@ -150,6 +149,6 @@ stdenv.mkDerivation rec {
    homepage = "http://julialang.org/";
    license = stdenv.lib.licenses.mit;
    maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
  };
 }
@@ -12,6 +12,11 @@ in stdenv.mkDerivation rec {
  patches = [
    ./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries.
    ./no-rule-aarch64.patch          # http://llvm.org/bugs/show_bug.cgi?id=16625
+    # Patch needed for Julia, backports fixes from LLVM 3.5
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/JuliaLang/julia/3bdda3750efc4ebf8ce7eda8a0888ffef3851605/deps/llvm-3.3.patch";
+      sha256 = "0j6chyx4k8zr1qha5dks8lqlcraqrj4q1hwnk2kj3qi6cajsd8k3";
+    })
  ];

  buildInputs = [ perl groff cmake python libffi ];
@@ -8,8 +8,8 @@ self: super: {
  Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
  Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
  Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
-  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; });
-  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
+  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; });
+  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });

  # Link statically to avoid runtime dependency on GHC.
  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
@@ -20,28 +20,59 @@ self: super: {
  # Break infinite recursions.
  Dust-crypto = dontCheck super.Dust-crypto;
  hasql-postgres = dontCheck super.hasql-postgres;
+  hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_1_2 = super.hspec_2_1_2.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_1_3 = super.hspec_2_1_3.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_1_4 = super.hspec_2_1_4.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_1_5 = super.hspec_2_1_5.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_1_6 = super.hspec_2_1_6.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_1_7 = super.hspec_2_1_7.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec-expectations_0_6_1_1 = dontCheck super.hspec-expectations_0_6_1_1;
+  hspec-expectations_0_6_1 = dontCheck super.hspec-expectations_0_6_1;
+  hspec-expectations_0_7_1 = dontCheck super.hspec-expectations_0_7_1;
+  hspec-expectations = dontCheck super.hspec-expectations;
  hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; };
  HTTP = dontCheck super.HTTP;
+  mwc-random_0_13_2_2 = dontCheck super.mwc-random_0_13_2_2;
+  mwc-random_0_13_3_0 = dontCheck super.mwc-random_0_13_3_0;
  mwc-random = dontCheck super.mwc-random;
+  nanospec_0_2_0 = dontCheck super.nanospec_0_2_0;
  nanospec = dontCheck super.nanospec;
+  options_1_2_1 = dontCheck super.options_1_2_1;
+  options_1_2 = dontCheck super.options_1_2;
  options = dontCheck super.options;
  statistics = dontCheck super.statistics;
+  text_1_1_1_3 = dontCheck super.text_1_1_1_3;
+  text_1_2_0_3 = dontCheck super.text_1_2_0_3;
+  text_1_2_0_4 = dontCheck super.text_1_2_0_4;
+  text_1_2_0_6 = dontCheck super.text_1_2_0_6;
  text = dontCheck super.text;

  # The package doesn't compile with ruby 1.9, which is our default at the moment.
  hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };

-  # Doesn't compile with lua 5.2.
-  hslua = super.hslua.override { lua = pkgs.lua5_1; };
-
  # Use the default version of mysql to build this package (which is actually mariadb).
  mysql = super.mysql.override { mysql = pkgs.mysql.lib; };

  # Link the proper version.
  zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };

-  # These changes are required to support Darwin.
-  git-annex = (disableSharedExecutables super.git-annex).override {
+  # This package needs a little help compiling properly on Darwin. Furthermore,
+  # Stackage compiles git-annex without the Assistant, supposedly because not
+  # all required dependencies are part of Stackage. To comply with Stackage, we
+  # make 'git-annex-without-assistant' our default version, but offer another
+  # build which has the assistant to be used in the top-level.
+  git-annex_5_20150916 = (disableCabalFlag super.git-annex_5_20150916 "assistant").override {
+    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+    fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
+    hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
+  };
+  git-annex = (disableCabalFlag super.git-annex "assistant").override {
+    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+    fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
+    hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
+  };
+  git-annex-with-assistant = super.git-annex.override {
    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
    fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
    hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
@@ -65,33 +96,6 @@ self: super: {
  # https://github.com/phaazon/al/issues/1
  al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL";

-  # Depends on code distributed under a non-free license.
-  accelerate-cublas = dontDistribute super.accelerate-cublas;
-  accelerate-cuda = dontDistribute super.accelerate-cuda;
-  accelerate-cufft  = dontDistribute super.accelerate-cufft;
-  accelerate-examples = dontDistribute super.accelerate-examples;
-  accelerate-fft = dontDistribute super.accelerate-fft;
-  accelerate-fourier-benchmark = dontDistribute super.accelerate-fourier-benchmark;
-  AttoJson = markBroken super.AttoJson;
-  bindings-yices = dontDistribute super.bindings-yices;
-  cublas = dontDistribute super.cublas;
-  cufft = dontDistribute super.cufft;
-  gloss-accelerate = dontDistribute super.gloss-accelerate;
-  gloss-raster-accelerate = dontDistribute super.gloss-raster-accelerate;
-  GoogleTranslate = dontDistribute super.GoogleTranslate;
-  GoogleDirections = dontDistribute super.GoogleDirections;
-  libnvvm = dontDistribute super.libnvvm;
-  manatee-all = dontDistribute super.manatee-all;
-  manatee-ircclient = dontDistribute super.manatee-ircclient;
-  Obsidian = dontDistribute super.Obsidian;
-  patch-image = dontDistribute super.patch-image;
-  yices = dontDistribute super.yices;
-  yices-easy = dontDistribute super.yices-easy;
-  yices-painless = dontDistribute super.yices-painless;
-
-  # https://github.com/GaloisInc/RSA/issues/9
-  RSA = dontCheck super.RSA;
-
  # https://github.com/froozen/kademlia/issues/2
  kademlia = dontCheck super.kademlia;

@@ -116,17 +120,7 @@ self: super: {
  # https://github.com/haskell/time/issues/23
  time_1_5_0_1 = dontCheck super.time_1_5_0_1;

-  # Help libconfig find it's C language counterpart.
-  libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
-
-  hmatrix = overrideCabal super.hmatrix (drv: {
-    configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ];
-    extraLibraries = [ pkgs.openblasCompat ];
-    preConfigure = ''
-      sed -i hmatrix.cabal -e 's@/usr/lib/openblas/lib@${pkgs.openblasCompat}/lib@'
-    '';
-  });
-
+  # Switch levmar build to openblas.
  bindings-levmar = overrideCabal super.bindings-levmar (drv: {
    preConfigure = ''
      sed -i bindings-levmar.cabal \
@@ -156,6 +150,13 @@ self: super: {
  HDBC-odbc = dontHaddock super.HDBC-odbc;
  hoodle-core = dontHaddock super.hoodle-core;
  hsc3-db = dontHaddock super.hsc3-db;
+  hspec-discover_2_1_10 = dontHaddock super.hspec-discover_2_1_10;
+  hspec-discover_2_1_2 = dontHaddock super.hspec-discover_2_1_2;
+  hspec-discover_2_1_3 = dontHaddock super.hspec-discover_2_1_3;
+  hspec-discover_2_1_4 = dontHaddock super.hspec-discover_2_1_4;
+  hspec-discover_2_1_5 = dontHaddock super.hspec-discover_2_1_5;
+  hspec-discover_2_1_6 = dontHaddock super.hspec-discover_2_1_6;
+  hspec-discover_2_1_7 = dontHaddock super.hspec-discover_2_1_7;
  hspec-discover = dontHaddock super.hspec-discover;
  http-client-conduit = dontHaddock super.http-client-conduit;
  http-client-multipart = dontHaddock super.http-client-multipart;
@@ -170,7 +171,7 @@ self: super: {
  darcs = (overrideCabal super.darcs (drv: {
    doCheck = false;            # The test suite won't even start.
    postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
-  })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });
+  }));

  # https://github.com/massysett/rainbox/issues/1
  rainbox = dontCheck super.rainbox;
@@ -178,13 +179,6 @@ self: super: {
  # https://github.com/techtangents/ablist/issues/1
  ABList = dontCheck super.ABList;

-  # These packages have broken dependencies.
-  ASN1 = dontDistribute super.ASN1;                             # NewBinary
-  frame-markdown = dontDistribute super.frame-markdown;         # frame
-  hails-bin = dontDistribute super.hails-bin;                   # Hails
-  lss = markBrokenVersion "0.1.0.0" super.lss;                  # https://github.com/dbp/lss/issues/2
-  snaplet-lss = markBrokenVersion "0.1.0.0" super.snaplet-lss;  # https://github.com/dbp/lss/issues/2
-
  # https://github.com/haskell/vector/issues/47
  vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;

@@ -225,21 +219,6 @@ self: super: {
        '';
      });

-  # Does not compile: "fatal error: ieee-flpt.h: No such file or directory"
-  base_4_8_1_0 = markBroken super.base_4_8_1_0;
-
-  # Obsolete: https://github.com/massysett/prednote/issues/1.
-  prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test;
-
-  # Doesn't compile: "Setup: can't find include file ghc-gmp.h"
-  integer-gmp_1_0_0_0 = markBroken super.integer-gmp_1_0_0_0;
-
-  # Obsolete.
-  lushtags = markBrokenVersion "0.0.1" super.lushtags;
-
-  # https://github.com/haskell/bytestring/issues/41
-  bytestring_0_10_6_0 = dontCheck super.bytestring_0_10_6_0;
-
  # tests don't compile for some odd reason
  jwt = dontCheck super.jwt;

@@ -303,6 +282,7 @@ self: super: {
  pocket-dns = dontCheck super.pocket-dns;
  postgresql-simple = dontCheck super.postgresql-simple;
  postgrest = dontCheck super.postgrest;
+  setenv_0_1_1_1 = dontCheck super.setenv_0_1_1_1;
  snowball = dontCheck super.snowball;
  sophia = dontCheck super.sophia;
  test-sandbox = dontCheck super.test-sandbox;
@@ -313,8 +293,8 @@ self: super: {
  xmlgen = dontCheck super.xmlgen;

  # These packages try to access the network.
-  amqp = dontCheck super.amqp;
  amqp-conduit = dontCheck super.amqp-conduit;
+  amqp = dontCheck super.amqp;
  bitcoin-api = dontCheck super.bitcoin-api;
  bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
  bitx-bitcoin = dontCheck super.bitx-bitcoin;          # http://hydra.cryp.to/build/926187/log/raw
@@ -326,9 +306,38 @@ self: super: {
  hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
  hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
  holy-project = dontCheck super.holy-project;          # http://hydra.cryp.to/build/502002/nixlog/1/raw
+  holy-project_0_1_1_1 = dontCheck super.holy-project_0_1_1_1;
+  holy-project_0_2_0_0   = dontCheck super.holy-project_0_2_0_0  ;
  hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
+  http-client_0_4_11_1 = dontCheck super.http-client_0_4_11_1;
+  http-client_0_4_11_2 = dontCheck super.http-client_0_4_11_2;
+  http-client_0_4_11_3 = dontCheck super.http-client_0_4_11_3;
+  http-client_0_4_11 = dontCheck super.http-client_0_4_11;
+  http-client_0_4_12 = dontCheck super.http-client_0_4_12;
+  http-client_0_4_13 = dontCheck super.http-client_0_4_13;
+  http-client_0_4_15 = dontCheck super.http-client_0_4_15;
+  http-client_0_4_16 = dontCheck super.http-client_0_4_16;
+  http-client_0_4_18_1 = dontCheck super.http-client_0_4_18_1;
+  http-client_0_4_19 = dontCheck super.http-client_0_4_19;
+  http-client_0_4_20 = dontCheck super.http-client_0_4_20;
+  http-client_0_4_21 = dontCheck super.http-client_0_4_21;
+  http-client_0_4_22 = dontCheck super.http-client_0_4_22;
+  http-client_0_4_6_1 = dontCheck super.http-client_0_4_6_1;
+  http-client_0_4_6_2 = dontCheck super.http-client_0_4_6_2;
+  http-client_0_4_6 = dontCheck super.http-client_0_4_6;
+  http-client_0_4_7_1 = dontCheck super.http-client_0_4_7_1;
+  http-client_0_4_7 = dontCheck super.http-client_0_4_7;
+  http-client_0_4_8_1 = dontCheck super.http-client_0_4_8_1;
+  http-client_0_4_8 = dontCheck super.http-client_0_4_8;
+  http-client_0_4_9 = dontCheck super.http-client_0_4_9;
  http-client = dontCheck super.http-client;            # http://hydra.cryp.to/build/501430/nixlog/1/raw
+  http-conduit_2_1_5_1 = dontCheck super.http-conduit_2_1_5_1;
+  http-conduit_2_1_5 = dontCheck super.http-conduit_2_1_5;
+  http-conduit_2_1_7_1 = dontCheck super.http-conduit_2_1_7_1;
+  http-conduit_2_1_7_2 = dontCheck super.http-conduit_2_1_7_2;
  http-conduit = dontCheck super.http-conduit;          # http://hydra.cryp.to/build/501966/nixlog/1/raw
+  js-jquery_1_11_1 = dontCheck super.js-jquery_1_11_1;
+  js-jquery_1_11_2 = dontCheck super.js-jquery_1_11_2;
  js-jquery = dontCheck super.js-jquery;
  marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
  network-transport-tcp = dontCheck super.network-transport-tcp;
@@ -425,6 +434,9 @@ self: super: {
  hsexif = dontCheck super.hsexif;
  hspec-server = dontCheck super.hspec-server;
  HTF = dontCheck super.HTF;
+  HTF_0_12_2_3 = dontCheck super.HTF_0_12_2_3;
+  HTF_0_12_2_4 = dontCheck super.HTF_0_12_2_4;
+  HTF_0_13_0_0 = dontCheck super.HTF_0_13_0_0;
  htsn = dontCheck super.htsn;
  htsn-import = dontCheck super.htsn-import;
  http2 = dontCheck super.http2;
@@ -452,6 +464,9 @@ self: super: {
  optional = dontCheck super.optional;
  os-release = dontCheck super.os-release;
  pandoc-citeproc = dontCheck super.pandoc-citeproc;
+  pandoc-citeproc_0_6 = dontCheck super.pandoc-citeproc_0_6;
+  pandoc-citeproc_0_6_0_1 = dontCheck super.pandoc-citeproc_0_6_0_1;
+  pandoc-citeproc_0_7_3 = dontCheck super.pandoc-citeproc_0_7_3;
  persistent-redis = dontCheck super.persistent-redis;
  pipes-extra = dontCheck super.pipes-extra;
  pipes-websockets = dontCheck super.pipes-websockets;
@@ -470,6 +485,9 @@ self: super: {
  separated = dontCheck super.separated;
  shadowsocks = dontCheck super.shadowsocks;
  shake-language-c = dontCheck super.shake-language-c;
+  shake-language-c_0_6_3 = dontCheck super.shake-language-c_0_6_3;
+  shake-language-c_0_6_4 = dontCheck super.shake-language-c_0_6_4;
+  shake-language-c_0_8_0 = dontCheck super.shake-language-c_0_8_0;
  static-resources = dontCheck super.static-resources;
  strive = dontCheck super.strive;                      # fails its own hlint test with tons of warnings
  svndump = dontCheck super.svndump;
@@ -487,9 +505,6 @@ self: super: {
  webdriver = dontCheck super.webdriver;
  xsd = dontCheck super.xsd;

-  # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test
-  hspec-webdriver = markBroken super.hspec-webdriver;
-
  # Needs access to locale data, but looks for it in the wrong place.
  scholdoc-citeproc = dontCheck super.scholdoc-citeproc;

@@ -509,30 +524,12 @@ self: super: {
  # Help the test suite find system timezone data.
  tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; });

-  # Deprecated upstream and doesn't compile.
-  BASIC = dontDistribute super.BASIC;
-  bytestring-arbitrary = dontDistribute (addBuildTool super.bytestring-arbitrary self.llvm);
-  llvm = dontDistribute super.llvm;
-  llvm-base = markBroken super.llvm-base;
-  llvm-base-util = dontDistribute super.llvm-base-util;
-  llvm-extra = dontDistribute super.llvm-extra;
-  llvm-tf = dontDistribute super.llvm-tf;
-  objectid = dontDistribute super.objectid;
-  saltine-quickcheck = dontDistribute super.saltine-quickcheck;
-  stable-tree = dontDistribute super.stable-tree;
-  synthesizer-llvm = dontDistribute super.synthesizer-llvm;
-  optimal-blocks = dontDistribute super.optimal-blocks;
-  hs-blake2 = dontDistribute super.hs-blake2;
-
  # https://ghc.haskell.org/trac/ghc/ticket/9625
  vty = dontCheck super.vty;

  # https://github.com/vincenthz/hs-crypto-pubkey/issues/20
  crypto-pubkey = dontCheck super.crypto-pubkey;

-  # https://github.com/zouppen/stratum-tool/issues/14
-  stratum-tool = markBrokenVersion "0.0.4" super.stratum-tool;
-
  # https://github.com/Gabriel439/Haskell-Turtle-Library/issues/1
  turtle = dontCheck super.turtle;

@@ -545,15 +542,6 @@ self: super: {
  # https://github.com/cgaebel/stm-conduit/issues/33
  stm-conduit = dontCheck super.stm-conduit;

-  # The install target tries to run lots of commands as "root". WTF???
-  hannahci = markBroken super.hannahci;
-
-  # https://github.com/jkarni/th-alpha/issues/1
-  th-alpha = markBrokenVersion "0.2.0.0" super.th-alpha;
-
-  # https://github.com/haskell-hub/hub-src/issues/24
-  hub = markBrokenVersion "1.4.0" super.hub;
-
  # https://github.com/pixbi/duplo/issues/25
  duplo = dontCheck super.duplo;

@@ -573,9 +561,6 @@ self: super: {
  rematch = dontCheck super.rematch;            # https://github.com/tcrayford/rematch/issues/5
  rematch-text = dontCheck super.rematch-text;  # https://github.com/tcrayford/rematch/issues/6

-  # Upstream notified by e-mail.
-  MonadCompose = markBrokenVersion "0.2.0.0" super.MonadCompose;
-
  # no haddock since this is an umbrella package.
  cloud-haskell = dontHaddock super.cloud-haskell;

@@ -585,12 +570,6 @@ self: super: {
  # https://github.com/NixOS/nixpkgs/issues/6350
  paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });

-  # https://github.com/jwiegley/simple-conduit/issues/2
-  simple-conduit = markBroken super.simple-conduit;
-
-  # https://code.google.com/p/linux-music-player/issues/detail?id=1
-  mp = markBroken super.mp;
-
  # https://github.com/afcowie/http-streams/issues/80
  http-streams = dontCheck super.http-streams;

@@ -622,42 +601,15 @@ self: super: {
  apiary-session = dontCheck super.apiary-session;
  apiary-websockets = dontCheck super.apiary-websockets;

-  # https://github.com/mikeizbicki/hmm/issues/12
-  hmm = markBroken super.hmm;
-
  # https://github.com/alephcloud/hs-configuration-tools/issues/40
  configuration-tools = dontCheck super.configuration-tools;

-  # https://github.com/fumieval/karakuri/issues/1
-  karakuri = markBroken super.karakuri;
-
-  # Upstream notified by e-mail.
-  gearbox = markBroken super.gearbox;
-
-  # https://github.com/deech/fltkhs/issues/7
-  fltkhs = markBroken super.fltkhs;
-
-  # Build fails, but there seems to be no issue tracker available. :-(
-  hmidi = markBrokenVersion "0.2.1.0" super.hmidi;
-  padKONTROL = markBroken super.padKONTROL;
-  Bang = dontDistribute super.Bang;
-  launchpad-control = dontDistribute super.launchpad-control;
-
-  # Upstream provides no issue tracker and no contact details.
-  vivid = markBroken super.vivid;
-
  # Test suite wants to connect to $DISPLAY.
-  hsqml = dontCheck (super.hsqml.override { qt5 = pkgs.qt53; });
-
-  # https://github.com/lookunder/RedmineHs/issues/4
-  Redmine = markBroken super.Redmine;
+  hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa);

  # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
  unlambda = dontHyperlinkSource super.unlambda;

-  # https://github.com/megantti/rtorrent-rpc/issues/2
-  rtorrent-rpc = markBroken super.rtorrent-rpc;
-
  # https://github.com/PaulJohnson/geodetics/issues/1
  geodetics = dontCheck super.geodetics;

@@ -680,42 +632,12 @@ self: super: {
  # /homeless-shelter. Disabled.
  purescript = dontCheck super.purescript;

-  # Broken by GLUT update.
-  Monadius = markBroken super.Monadius;
-
-  # We don't have the groonga package these libraries bind to.
-  haroonga = markBroken super.haroonga;
-  haroonga-httpd = markBroken super.haroonga-httpd;
-
-  # Build is broken and no contact info available.
-  hopenpgp-tools = markBroken super.hopenpgp-tools;
-
-  # https://github.com/hunt-framework/hunt/issues/99
-  hunt-server = markBrokenVersion "0.3.0.2" super.hunt-server;
-
-  # https://github.com/bjpop/blip/issues/16
-  blip = markBroken super.blip;
-
  # https://github.com/tych0/xcffib/issues/37
  xcffib = dontCheck super.xcffib;

  # https://github.com/afcowie/locators/issues/1
  locators = dontCheck super.locators;

-  # https://github.com/scravy/hydrogen-syntax/issues/1
-  hydrogen-syntax = markBroken super.hydrogen-syntax;
-  hydrogen-cli = dontDistribute super.hydrogen-cli;
-
-  # https://github.com/meteficha/Hipmunk/issues/8
-  Hipmunk = markBroken super.Hipmunk;
-  HipmunkPlayground = dontDistribute super.HipmunkPlayground;
-  click-clack = dontDistribute super.click-clack;
-
-  # https://github.com/fumieval/audiovisual/issues/1
-  audiovisual = markBroken super.audiovisual;
-  call = dontDistribute super.call;
-  rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;
-
  # https://github.com/haskell/haddock/issues/378
  haddock-library = dontCheck super.haddock-library;

@@ -759,11 +681,6 @@ self: super: {
  hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
  distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {};

-  # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
-  HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
-  HGamer3D-Common = dontDistribute super.HGamer3D-Common;
-  HGamer3D-Data = markBroken super.HGamer3D-Data;
-
  # https://github.com/ndmitchell/shake/issues/206
  # https://github.com/ndmitchell/shake/issues/267
  shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });
@@ -771,11 +688,6 @@ self: super: {
  # https://github.com/nushio3/doctest-prop/issues/1
  doctest-prop = dontCheck super.doctest-prop;

-  # https://github.com/anton-k/temporal-music-notation/issues/1
-  temporal-music-notation = markBroken super.temporal-music-notation;
-  temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
-  temporal-music-notation-western = dontDistribute super.temporal-music-notation-western;
-
  # https://github.com/adamwalker/sdr/issues/1
  sdr = dontCheck super.sdr;

@@ -783,13 +695,9 @@ self: super: {
  aeson = dontCheck super.aeson;

  # Won't compile with recent versions of QuickCheck.
-  testpack = markBroken super.testpack;
  inilist = dontCheck super.inilist;
  MissingH = dontCheck super.MissingH;

-  # Obsolete for GHC versions after GHC 6.10.x.
-  utf8-prelude = markBroken super.utf8-prelude;
-
  # https://github.com/yaccz/saturnin/issues/3
  Saturnin = dontCheck super.Saturnin;

@@ -819,9 +727,6 @@ self: super: {
  inline-c-win32 = dontDistribute super.inline-c-win32;
  Southpaw = dontDistribute super.Southpaw;

-  # Doesn't work with recent versions of mtl.
-  cron-compat = markBroken super.cron-compat;
-
  # https://github.com/yesodweb/serversession/issues/1
  serversession = dontCheck super.serversession;

@@ -833,10 +738,6 @@ self: super: {
  # https://github.com/commercialhaskell/stack/issues/409
  stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });

-  # Missing dependency on some hid-usb library.
-  hid = markBroken super.hid;
-  msi-kb-backlit = dontDistribute super.msi-kb-backlit;
-
  # Hydra no longer allows building texlive packages.
  lhs2tex = dontDistribute super.lhs2tex;

@@ -856,18 +757,12 @@ self: super: {
  # https://github.com/edwinb/EpiVM/issues/14
  epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];

-  # Upstream has no issue tracker.
-  dpkg = markBroken super.dpkg;
-
  # https://github.com/ekmett/wl-pprint-terminfo/issues/7
  wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;

  # https://github.com/bos/pcap/issues/5
  pcap = addExtraLibrary super.pcap pkgs.libpcap;

-  # https://github.com/skogsbaer/hscurses/issues/24
-  hscurses = markBroken super.hscurses;
-
  # https://github.com/qnikst/imagemagick/issues/34
  imagemagick = dontCheck super.imagemagick;

@@ -877,9 +772,6 @@ self: super: {
  # https://github.com/k0ral/hbro-contrib/issues/1
  hbro-contrib = dontDistribute super.hbro-contrib;

-  # https://github.com/aka-bash0r/multi-cabal/issues/4
-  multi-cabal = markBroken super.multi-cabal;
-
  # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233.
  Elm = markBroken super.Elm;
  elm-build-lib = markBroken super.elm-build-lib;
@@ -956,12 +848,6 @@ self: super: {
  # https://github.com/bos/configurator/issues/22
  configurator = dontCheck super.configurator;

-  # https://github.com/thoughtpolice/hs-ed25519/issues/9
-  ed25519 = markBroken super.ed25519;
-  hackage-repo-tool = dontDistribute super.hackage-repo-tool;
-  hackage-security = dontDistribute super.hackage-security;
-  hackage-security-HTTP = dontDistribute super.hackage-security-HTTP;
-
  # The cabal files for these libraries do not list the required system dependencies.
  SDL-image = overrideCabal super.SDL-image (drv: {
    librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
@@ -982,11 +868,8 @@ self: super: {
    ];
  });

-  # https://github.com/chrisdone/freenect/pull/11
-  freenect = overrideCabal super.freenect (drv: {
-    libraryPkgconfigDepends = [ pkgs.freenect ];
-    prePatch = '' echo "  Pkgconfig-Depends: libfreenect" >> freenect.cabal '';
-  });
+  # Old versions don't detect this library reliably.
+  freenect = appendConfigureFlag super.freenect "--extra-include-dirs=${pkgs.freenect}/include/libfreenect --extra-lib-dirs=${pkgs.freenect}/lib";

  # https://github.com/ivanperez-keera/hcwiid/pull/4
  hcwiid = overrideCabal super.hcwiid (drv: {
@@ -1024,4 +907,30 @@ self: super: {
    });
  in g';

+  # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52
+  hpc-coveralls = disableSharedExecutables super.hpc-coveralls;
+  hpc-coveralls_0_9_0 = disableSharedExecutables super.hpc-coveralls_0_9_0;
+
+  # Test suite won't compile.
+  semigroupoids_5_0_0_3 = dontCheck super.semigroupoids_5_0_0_3;
+
+  # This is fixed in newer versions.
+  zip-archive_0_2_3_5 = addBuildTool super.zip-archive_0_2_3_5 pkgs.zip;
+
+  # https://github.com/fpco/stackage/issues/838
+  cryptonite = dontCheck super.cryptonite;
+  cryptonite_0_6   = dontCheck super.cryptonite_0_6  ;
+
+  # https://github.com/fpco/stackage/issues/843
+  hmatrix-gsl-stats_0_4_1 = overrideCabal super.hmatrix-gsl-stats_0_4_1 (drv: {
+    postUnpack = "rm */Setup.lhs";
+  });
+
+  # We cannot build this package w/o the C library from <http://www.phash.org/>.
+  phash = markBroken super.phash;
+
+  # https://github.com/yesodweb/serversession/issues/2
+  # https://github.com/haskell/cabal/issues/2661
+  serversession-backend-acid-state_1_0_1 = dontCheck super.serversession-backend-acid-state_1_0_1;
+
 }
@@ -61,19 +61,14 @@ self: super: {
    });
  };

-  idris =
-    let idris' = overrideCabal super.idris (drv: {
-      # "idris" binary cannot find Idris library otherwise while building.
-      # After installing it's completely fine though. Seems like Nix-specific
-      # issue so not reported.
-      preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
-      # https://github.com/idris-lang/Idris-dev/issues/2499
-      librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
-    });
-    in idris'.overrideScope (self: super: {
-      # https://github.com/idris-lang/Idris-dev/issues/2500
-      zlib = self.zlib_0_5_4_2;
-    });
+  idris = overrideCabal super.idris (drv: {
+    # "idris" binary cannot find Idris library otherwise while building.
+    # After installing it's completely fine though. Seems like Nix-specific
+    # issue so not reported.
+    preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
+    # https://github.com/idris-lang/Idris-dev/issues/2499
+    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
+  });

  Extra = appendPatch super.Extra (pkgs.fetchpatch {
    url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
@@ -180,22 +175,6 @@ self: super: {
            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
                                          self.webkitgtk3-javascriptcore ];

-  # https://github.com/cartazio/arithmoi/issues/1
-  arithmoi = markBroken super.arithmoi;
-  NTRU = dontDistribute super.NTRU;
-  arith-encode = dontDistribute super.arith-encode;
-  barchart = dontDistribute super.barchart;
-  constructible = dontDistribute super.constructible;
-  cyclotomic = dontDistribute super.cyclotomic;
-  diagrams = dontDistribute super.diagrams;
-  diagrams-contrib = dontDistribute super.diagrams-contrib;
-  enumeration = dontDistribute super.enumeration;
-  ghci-diagrams = dontDistribute super.ghci-diagrams;
-  ihaskell-diagrams = dontDistribute super.ihaskell-diagrams;
-  nimber = dontDistribute super.nimber;
-  pell = dontDistribute super.pell;
-  quadratic-irrational = dontDistribute super.quadratic-irrational;
-
  # https://github.com/lymar/hastache/issues/47
  hastache = dontCheck super.hastache;

@@ -214,37 +193,9 @@ self: super: {
  # https://github.com/HugoDaniel/RFC3339/issues/14
  timerep = dontCheck super.timerep;

-  # Upstream has no issue tracker.
-  llvm-base-types = markBroken super.llvm-base-types;
-  llvm-analysis = dontDistribute super.llvm-analysis;
-  llvm-data-interop = dontDistribute super.llvm-data-interop;
-  llvm-tools = dontDistribute super.llvm-tools;
-
-  # Upstream has no issue tracker.
-  MaybeT = markBroken super.MaybeT;
-  grammar-combinators = dontDistribute super.grammar-combinators;
-
  # Required to fix version 0.91.0.0.
  wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts");

-  # Upstream has no issue tracker.
-  Graphalyze = markBroken super.Graphalyze;
-  gbu = dontDistribute super.gbu;
-  SourceGraph = dontDistribute super.SourceGraph;
-
-  # Upstream has no issue tracker.
-  markBroken = super.protocol-buffers;
-  caffegraph = dontDistribute super.caffegraph;
-
-  # Deprecated: https://github.com/mikeizbicki/ConstraintKinds/issues/8
-  ConstraintKinds = markBroken super.ConstraintKinds;
-  HLearn-approximation = dontDistribute super.HLearn-approximation;
-  HLearn-distributions = dontDistribute super.HLearn-distributions;
-  HLearn-classification = dontDistribute super.HLearn-classification;
-
-  # Doesn't work with LLVM 3.5.
-  llvm-general = markBroken super.llvm-general;
-
  # Inexplicable haddock failure
  # https://github.com/gregwebs/aeson-applicative/issues/2
  aeson-applicative = dontHaddock super.aeson-applicative;
@@ -121,10 +121,6 @@ self: super: {
  # needs mtl-compat to build with mtl 2.1.x
  cgi = addBuildDepend super.cgi self.mtl-compat;

-  # Newer versions always trigger the non-deterministic library ID bug
-  # and are virtually impossible to compile on Hydra.
-  conduit = super.conduit_1_2_4_1;
-
  # https://github.com/magthe/sandi/issues/7
  sandi = overrideCabal super.sandi (drv: {
    postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
@@ -133,4 +129,13 @@ self: super: {
  # Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable.
  ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; };

+  # The network library is required in configurations that don't have network-uri.
+  hxt = addBuildDepend super.hxt self.network;
+  hxt_9_3_1_7 = addBuildDepend super.hxt_9_3_1_7 self.network;
+  hxt_9_3_1_10 = addBuildDepend super.hxt_9_3_1_10 self.network;
+  hxt_9_3_1_12 = addBuildDepend super.hxt_9_3_1_12 self.network;
+  xss-sanitize = addBuildDepend super.xss-sanitize self.network;
+  xss-sanitize_0_3_5_4 = addBuildDepend super.xss-sanitize_0_3_5_4 self.network;
+  xss-sanitize_0_3_5_5 = addBuildDepend super.xss-sanitize_0_3_5_5 self.network;
+
 }
@@ -1,4 +1,5 @@
 { pkgs, stdenv, ghc
+, compilerConfig ? (self: super: {})
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
 }:
@@ -77,4 +78,4 @@ let

 in

-  fix (extend (extend (extend haskellPackages commonConfiguration) packageSetConfig) overrides)
+  fix (extend (extend (extend (extend haskellPackages commonConfiguration) compilerConfig) packageSetConfig) overrides)
@@ -1,63 +0,0 @@
-From 35d5995a58c86a6addbf0aaf0d1be64d39182872 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:21:58 -0600
-Subject: [PATCH] dlopen-gtkstyle
-
---
- qtbase/src/widgets/styles/qgtk2painter.cpp |  2 +-
- qtbase/src/widgets/styles/qgtkstyle_p.cpp  | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp
-index 7b9bd97..075947a 100644
--- a/qtbase/src/widgets/styles/qgtk2painter.cpp
-+++ b/qtbase/src/widgets/styles/qgtk2painter.cpp
-@@ -104,7 +104,7 @@ static void initGtk()
-     static bool initialized = false;
-     if (!initialized) {
-         // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
-        QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
-+        QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
- 
-         QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
-         QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
-diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-index 2c64225..3343d32 100644
--- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-+++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-@@ -334,7 +334,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus)
- void QGtkStylePrivate::resolveGtk() const
- {
-     // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
-    QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
-+    QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
- 
-     gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
-     gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
-@@ -432,8 +432,8 @@ void QGtkStylePrivate::resolveGtk() const
-     pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
-     pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
- 
-    gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync");
-    gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init");
-+    gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync");
-+    gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init");
- }
- 
- /* \internal
-@@ -601,9 +601,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
- static bool resolveGConf()
- {
-     if (!QGtkStylePrivate::gconf_client_get_default) {
-        QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default");
-        QGtkStylePrivate::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string");
-        QGtkStylePrivate::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool");
-+        QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default");
-+        QGtkStylePrivate::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string");
-+        QGtkStylePrivate::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool");
-     }
-     return (QGtkStylePrivate::gconf_client_get_default !=0);
- }
-- 
-2.1.3
-
@@ -1,53 +0,0 @@
-From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:22:23 -0600
-Subject: [PATCH] dlopen-webkit-nsplugin
-
---
- qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp                  | 2 +-
- qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp                     | 2 +-
- .../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp       | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index 679480b..2c373cc 100644
--- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0)
-         }
-     }
- 
-    QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (library.load()) {
-         typedef void *(*gtk_init_check_ptr)(int*, char***);
-         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2f..363bde5 100644
--- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
-     // support gdk based plugins (like flash) that use a different X connection.
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
-diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff6..62a2197 100644
--- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- 
-    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
-- 
-2.1.3
-
@@ -1,25 +0,0 @@
-From a41c3e3a3a1ce4b373b1bbb98f3a835e9e8a0718 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:22:39 -0600
-Subject: [PATCH] glib-2.32
-
---
- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-index 1f6d25e..087c3fb 100644
--- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-+++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -81,7 +81,7 @@
- #include <pthread.h>
- #elif PLATFORM(GTK)
- #include <wtf/gtk/GOwnPtr.h>
-typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GCond GCond;
- #endif
- 
-- 
-2.1.3
-
@@ -1,39 +0,0 @@
-From 63af41c6eeca28c911c13b1a77afeaf860863c2d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:22:55 -0600
-Subject: [PATCH] dlopen-resolv
-
---
- qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +-
- qtbase/src/network/kernel/qhostinfo_unix.cpp  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp
-index 8c5a0eb..27ebf16 100644
--- a/qtbase/src/network/kernel/qdnslookup_unix.cpp
-+++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp
-@@ -87,7 +87,7 @@ static void resolveLibrary()
-     if (!lib.load())
- #endif
-     {
-        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc/lib/resolv"));
-         if (!lib.load())
-             return;
-     }
-diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
-index df8c8b1..613d0e0 100644
--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
-+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
-@@ -103,7 +103,7 @@ static void resolveLibrary()
-     if (!lib.load())
- #endif
-     {
-        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
-         if (!lib.load())
-             return;
-     }
-- 
-2.1.3
-
@@ -1,25 +0,0 @@
-From 6aaf6858bf817172a4c503158e1701c4837ee790 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:23:08 -0600
-Subject: [PATCH] dlopen-gl
-
---
- qtbase/src/plugins/platforms/xcb/qglxintegration.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-index 67235e0..2220a2e 100644
--- a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-+++ b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-@@ -434,7 +434,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) ()
-             {
-                 extern const QString qt_gl_library_name();
- //                QLibrary lib(qt_gl_library_name());
-                QLibrary lib(QLatin1String("GL"));
-+                QLibrary lib(QLatin1String("@openglDriver@/lib/libGL"));
-                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
-             }
-         }
-- 
-2.1.3
-
@@ -1,52 +0,0 @@
-From 775fd74351faaabd45f6751618b28e2b05812d05 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:23:22 -0600
-Subject: [PATCH] tzdir
-
---
- qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-index b4ea91e..a56a245 100644
--- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
- // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
- static QTzTimeZoneHash loadTzTimeZones()
- {
-    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+    QString path = qgetenv("TZDIR");
-+    path += "/zone.tab";
-+    if (!QFile::exists(path))
-+        path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-     if (!QFile::exists(path))
-         path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
- 
-@@ -559,12 +562,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
-         if (!tzif.open(QIODevice::ReadOnly))
-             return;
-     } else {
-        // Open named tz, try modern path first, if fails try legacy path
-        tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+        // Try TZDIR first
-+        QString zoneinfoDir = qgetenv("TZDIR");
-+        zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
-+        tzif.setFileName(zoneinfoDir);
-         if (!tzif.open(QIODevice::ReadOnly)) {
-            tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-            if (!tzif.open(QIODevice::ReadOnly))
-                return;
-+            // Open named tz, try modern path first, if fails try legacy path
-+            tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+            if (!tzif.open(QIODevice::ReadOnly)) {
-+                tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+                if (!tzif.open(QIODevice::ReadOnly))
-+                    return;
-+            }
-         }
-     }
- 
-- 
-2.1.3
-
@@ -1,25 +0,0 @@
-From 089db8835c80bf2b7dd91a97a5c6eb26636b6ab9 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:26:39 -0600
-Subject: [PATCH] dlopen-webkit-gtk
-
---
- qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de6521..0b25748 100644
--- a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
- 
- static bool initializeGtk()
- {
-    QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (!gtkLibrary.load())
-         return false;
-     typedef void* (*gtk_init_ptr)(void*, void*);
-- 
-2.1.3
-
@@ -1,31 +0,0 @@
-From 25d2922cce383fcaa4c138e0cc6c8d92328eeacb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:30:41 -0600
-Subject: [PATCH] dlopen-webkit-udev
-
---
- qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
-index 60ff317..da8ac69 100644
--- a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
-+++ b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
-     bool load()
-     {
-         m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
-        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1);
-         m_loaded = m_libUdev.load();
-         if (resolveMethods())
-             return true;
- 
-        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0);
-         m_loaded = m_libUdev.load();
-         return resolveMethods();
-     }
-- 
-2.1.3
-
@@ -1,28 +0,0 @@
-From 17c7257e54c00ea2121f2cf95fb2be5e5db6b4ad Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:31:03 -0600
-Subject: [PATCH] dlopen-serialport-udev
-
---
- qtserialport/src/serialport/qtudev_p.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qtserialport/src/serialport/qtudev_p.h b/qtserialport/src/serialport/qtudev_p.h
-index 09940ab..45460f9 100644
--- a/qtserialport/src/serialport/qtudev_p.h
-+++ b/qtserialport/src/serialport/qtudev_p.h
-@@ -119,9 +119,9 @@ inline void *resolveSymbol(QLibrary *udevLibrary, const char *symbolName)
- inline bool resolveSymbols(QLibrary *udevLibrary)
- {
-     if (!udevLibrary->isLoaded()) {
-        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1);
-         if (!udevLibrary->load()) {
-            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0);
-             if (!udevLibrary->load()) {
-                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
-                 return false;
-- 
-2.1.3
-
@@ -1,29 +0,0 @@
-From b56e3737ca97e3de664603976989da4419297eb3 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:33:51 -0600
-Subject: [PATCH] dlopen-libXcursor
-
---
- qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-index 6dbac90..4b23fc2 100644
--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -305,10 +305,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
- #ifdef XCB_USE_XLIB
-     static bool function_ptrs_not_initialized = true;
-     if (function_ptrs_not_initialized) {
-        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+        QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
-         bool xcursorFound = xcursorLib.load();
-         if (!xcursorFound) { // try without the version number
-            xcursorLib.setFileName(QLatin1String("Xcursor"));
-+            xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
-             xcursorFound = xcursorLib.load();
-         }
-         if (xcursorFound) {
-- 
-2.1.3
-
@@ -1,38 +0,0 @@
-From 99d458c93698b2d4f16ff164ed54237279ffbb64 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:35:21 -0600
-Subject: [PATCH] dlopen-openssl
-
---
- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 4e6200f..d9c3e7d 100644
--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -585,8 +585,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
-     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
-         return pair;
-@@ -597,8 +597,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
- #endif
- 
-     // second attempt: find the development files libssl.so and libcrypto.so
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.0 and libcrypto.so.0 found
-         return pair;
-- 
-2.1.3
-
@@ -1,25 +0,0 @@
-From eec8a79c6cc9e2c65fd43db48ca2347de3ae0c5e Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 1 Dec 2014 17:38:04 -0600
-Subject: [PATCH] dlopen-dbus
-
---
- qtbase/src/dbus/qdbus_symbols.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp
-index a7a1b67..661baf1 100644
--- a/qtbase/src/dbus/qdbus_symbols.cpp
-+++ b/qtbase/src/dbus/qdbus_symbols.cpp
-@@ -93,7 +93,7 @@ bool qdbus_loadLibDBus()
- 
-     static int majorversions[] = { 3, 2, -1 };
-     lib->unload();
-    lib->setFileName(QLatin1String("dbus-1"));
-+    lib->setFileName(QLatin1String("@dbus_libs@/lib/libdbus-1"));
-     for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) {
-         lib->setFileNameAndVersion(lib->fileName(), majorversions[i]);
-         if (lib->load() && lib->resolve("dbus_connection_open_private"))
-- 
-2.1.3
-
@@ -1,232 +0,0 @@
-From f8485382e319da57abea99797387ee9f6f94d32e Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 13 May 2015 12:42:07 -0500
-Subject: [PATCH] glib mutexlocker
-
---
- .../gstreamer/WebKitWebSourceGStreamer.cpp         | 48 +++++++++++-----------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-index 5625873..a6d961f 100644
--- a/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-+++ b/qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue*
- 
-     switch (propID) {
-     case PROP_IRADIO_MODE: {
-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-         priv->iradioMode = g_value_get_boolean(value);
-         break;
-     }
-@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
-     WebKitWebSrcPrivate* priv = src->priv;
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     switch (propID) {
-     case PROP_IRADIO_MODE:
-         g_value_set_boolean(value, priv->iradioMode);
-@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src)
- 
-     ASSERT(isMainThread());
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     bool seeking = priv->seekID;
- 
-@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src)
- 
-     ASSERT(isMainThread());
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     priv->startID = 0;
- 
-@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
-         return ret;
-     }
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     switch (transition) {
-     case GST_STATE_CHANGE_READY_TO_PAUSED:
-         GST_DEBUG_OBJECT(src, "READY->PAUSED");
-@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
-         gst_query_parse_duration(query, &format, NULL);
- 
-         GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-         if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
-             gst_query_set_duration(query, format, src->priv->size);
-             result = TRUE;
-@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
-         break;
-     }
-     case GST_QUERY_URI: {
-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-         gst_query_set_uri(query, src->priv->uri);
-         result = TRUE;
-         break;
-@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler)
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
-     gchar* ret;
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     ret = g_strdup(src->priv->uri);
-     return ret;
- }
-@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr
-         return FALSE;
-     }
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     g_free(priv->uri);
-     priv->uri = 0;
-@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler* handler)
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
-     gchar* ret;
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     ret = g_strdup(src->priv->uri);
-     return ret;
- }
-@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri)
-         return FALSE;
-     }
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     g_free(priv->uri);
-     priv->uri = 0;
-@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src)
- 
-     ASSERT(isMainThread());
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     // already stopped
-     if (!priv->needDataID)
-         return FALSE;
-@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData)
- 
-     GST_DEBUG_OBJECT(src, "Need more data: %u", length);
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     if (priv->needDataID || !priv->paused) {
-         return;
-     }
-@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
- 
-     ASSERT(isMainThread());
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     // already stopped
-     if (!priv->enoughDataID)
-         return FALSE;
-@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData)
- 
-     GST_DEBUG_OBJECT(src, "Have enough data");
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     if (priv->enoughDataID || priv->paused) {
-         return;
-     }
-@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src)
- 
-     ASSERT(isMainThread());
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     // already stopped
-     if (!priv->seekID)
-         return FALSE;
-@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
-     WebKitWebSrcPrivate* priv = src->priv;
- 
-     GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     if (offset == priv->offset && priv->requestedOffset == priv->offset)
-         return TRUE;
- 
-@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
- void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
- {
-     ASSERT(player);
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     src->priv->player = player;
-     s_cachedResourceLoader = player->cachedResourceLoader();
- }
-@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize
-     mapGstBuffer(buffer);
- #endif
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     priv->buffer = adoptGRef(buffer);
-     locker.unlock();
- 
-@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response)
- 
-     GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode());
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     // If we seeked we need 206 == PARTIAL_CONTENT
-     if (priv->requestedOffset && response.httpStatusCode() != 206) {
-@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char* data, int length)
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
-     WebKitWebSrcPrivate* priv = src->priv;
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length);
- 
-@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished()
- 
-     GST_DEBUG_OBJECT(src, "Have EOS");
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     if (!priv->seekID) {
-         locker.unlock();
-         gst_app_src_end_of_stream(priv->appsrc);
-@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*)
- 
-     GST_ERROR_OBJECT(src, "Request was blocked");
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     uri.set(g_strdup(src->priv->uri));
-     locker.unlock();
- 
-@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)
- 
-     GST_ERROR_OBJECT(src, "Cannot show URL");
- 
-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     uri.set(g_strdup(src->priv->uri));
-     locker.unlock();
- 
-- 
-2.3.6
-
@@ -1,15 +0,0 @@
-Ensure Qt knows where libGL is.
-
-Author: Bjørn Forsman <bjorn.forsman@gmail.com>
-diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf
--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf	2014-09-11 12:48:07.000000000 +0200
-+++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf	2015-08-23 13:03:30.617473019 +0200
-@@ -13,7 +13,7 @@
- QMAKE_INCDIR_X11        =
- QMAKE_LIBDIR_X11        =
- QMAKE_INCDIR_OPENGL     =
-QMAKE_LIBDIR_OPENGL     =
-+QMAKE_LIBDIR_OPENGL     = @mesa@/lib
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL        =
@@ -1,210 +0,0 @@
-{ stdenv, fetchurl, substituteAll, libXrender, libXext
-, libXfixes, freetype, fontconfig, zlib, libjpeg, libpng
-, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
-, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
-, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage
-, xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon
-, alsaLib, gstreamer, gst_plugins_base
-, libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor
-, flashplayerFix ? false
-, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
-, buildDocs ? false
-, buildExamples ? false
-, buildTests ? false
-, developerBuild ? false
-}:
-
-with stdenv.lib;
-
-let
-  v_maj = "5.3";
-  v_min = "2";
-  ver = "${v_maj}.${v_min}";
-in
-
-let system-x86_64 = elem stdenv.system platforms.x86_64; in
-
-stdenv.mkDerivation rec {
-  name = "qt-${ver}";
-
-  src = fetchurl {
-    url = "http://download.qt-project.org/official_releases/qt/"
-      + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz";
-    sha256 = "0b98n2jl62dyqxwn1gdj9xmk8wrrdxnazr65fdk5qw1hmlpgvly8";
-  };
-
-  # The version property must be kept because it will be included into the QtSDK package name
-  version = ver;
-
-  prePatch = ''
-    substituteInPlace configure --replace /bin/pwd pwd
-    substituteInPlace qtbase/configure --replace /bin/pwd pwd
-    substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-    substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace /usr/share/X11/locale ${libX11}/share/X11/locale \
-        --replace /usr/lib/X11/locale ${libX11}/share/X11/locale
-    sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
-  '';
-
-  patches =
-    optional gtkStyle
-      (substituteAll {
-        src = ./0001-dlopen-gtkstyle.patch;
-        # substituteAll ignores env vars starting with capital letter
-        gconf = GConf;
-        inherit gnome_vfs libgnomeui gtk;
-      })
-    ++ optional flashplayerFix
-      (substituteAll {
-        src = ./0002-dlopen-webkit-nsplugin.patch;
-        inherit gtk gdk_pixbuf;
-      })
-    ++ optional flashplayerFix
-      (substituteAll {
-        src = ./0007-dlopen-webkit-gtk.patch;
-        inherit gtk;
-      })
-    ++ [
-      ./0003-glib-2.32.patch
-      (substituteAll {
-        src = ./0004-dlopen-resolv.patch;
-        glibc = stdenv.cc.libc;
-      })
-      (substituteAll {
-        src = ./0005-dlopen-gl.patch;
-        openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
-      })
-      ./0006-tzdir.patch
-      (substituteAll { src = ./0008-dlopen-webkit-udev.patch; inherit udev; })
-      (substituteAll { src = ./0009-dlopen-serialport-udev.patch; inherit udev; })
-      (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; })
-      (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
-      (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
-      ./0013-qtwebkit-glib-2.44.patch
-    ] ++ optional mesaSupported
-      (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; });
-
-  preConfigure = ''
-    export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
-    export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
-    export configureFlags+=" -docdir $out/share/doc/qt5"
-  '';
-
-  prefixKey = "-prefix ";
-
-  # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
-  # TODO Remove obsolete and useless flags once the build will be totally mastered
-  configureFlags = ''
-    -verbose
-    -confirm-license
-    -opensource
-
-    -release
-    -shared
-    -c++11
-    ${optionalString developerBuild "-developer-build"}
-    -largefile
-    -accessibility
-    -rpath
-    -optimized-qmake
-    -strip
-    -reduce-relocations
-    -system-proxies
-
-    -gui
-    -widgets
-    -opengl desktop
-    -qml-debug
-    -nis
-    -iconv
-    -icu
-    -pch
-    -glib
-    -xcb
-    -qpa xcb
-    -${optionalString (cups == null) "no-"}cups
-    -${optionalString (!gtkStyle) "no-"}gtkstyle
-
-    -no-eglfs
-    -no-directfb
-    -no-linuxfb
-    -no-kms
-
-    ${optionalString (!system-x86_64) "-no-sse2"}
-    -no-sse3
-    -no-ssse3
-    -no-sse4.1
-    -no-sse4.2
-    -no-avx
-    -no-avx2
-    -no-mips_dsp
-    -no-mips_dspr2
-
-    -system-zlib
-    -system-libpng
-    -system-libjpeg
-    -system-xcb
-    -system-xkbcommon
-    -openssl-linked
-    -dbus-linked
-
-    -system-sqlite
-    -${if mysql != null then "plugin" else "no"}-sql-mysql
-    -${if postgresql != null then "plugin" else "no"}-sql-psql
-
-    -make libs
-    -make tools
-    -${optionalString (buildExamples == false) "no"}make examples
-    -${optionalString (buildTests == false) "no"}make tests
-  '';
-
-  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
-  # if dependency paths contain the string "pq", which can occur in the hash.
-  # To prevent these failures, we need to override PostgreSQL detection.
-  PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
-
-  propagatedBuildInputs = [
-    xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
-    fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
-    zlib libjpeg libpng libtiff sqlite icu
-    libwebp alsaLib gstreamer gst_plugins_base libpulseaudio
-    xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
-  ]
-  # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
-  # doesn't remain a runtime-dep if not used
-  ++ optionals mesaSupported [ mesa mesa_glu ]
-  ++ optional (cups != null) cups
-  ++ optional (mysql != null) mysql.lib
-  ++ optional (postgresql != null) postgresql
-  ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
-
-  buildInputs =
-    [ bison flex gperf ruby ]
-    ++ optional developerBuild gdb;
-
-  nativeBuildInputs = [ python perl pkgconfig ];
-
-  # freetype-2.5.4 changed signedness of some struct fields
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
-
-  postInstall =
-    ''
-      ${optionalString buildDocs ''
-        make docs && make install_docs
-      ''}
-
-      # Don't retain build-time dependencies like gdb and ruby.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-    '';
-
-  enableParallelBuilding = true; # often fails on Hydra, as well as qt4
-
-  meta = {
-    homepage = http://qt-project.org;
-    description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
-    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
-    platforms = platforms.linux;
-  };
-}
@@ -16,16 +16,15 @@ Qml2Imports = lib/qt5/qml
 Documentation = share/doc/qt5
 EOF

-for path in $paths; do
-    if [[ -d "$path/mkspecs" ]]; then
-        ${lndir}/bin/lndir -silent "$path/mkspecs" "$out/mkspecs"
+for pkg in $paths $qtbase; do
+    if [[ -d "$pkg/mkspecs" ]]; then
+        ${lndir}/bin/lndir -silent "$pkg/mkspecs" "$out/mkspecs"

        for dir in bin include lib share; do
-            if [[ -d "$path/$dir" ]]; then
-                ${lndir}/bin/lndir -silent "$path/$dir" "$out/$dir"
+            if [[ -d "$pkg/$dir" ]]; then
+                ${lndir}/bin/lndir -silent "$pkg/$dir" "$out/$dir"
            fi
        done
    fi
 done
-
 ''
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, qt4 }:
+{ stdenv, fetchurl, qt5 }:

 stdenv.mkDerivation rec {
-  name = "qwt-6.1.0";
+  name = "qwt-6.1.2";

  src = fetchurl {
    url = "mirror://sourceforge/qwt/${name}.tar.bz2";
-    sha256 = "00klw6jsn8z3dnhxg52pqg3hg5mw2sih8prwjxm1hzcivgqxkqx7";
+    sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b";
  };

-  propagatedBuildInputs = [ qt4 ];
+  propagatedBuildInputs = [ qt5.base qt5.svg qt5.tools ];

  postPatch = ''
    sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, conf ? null }:
+{ stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }:

 with stdenv.lib;

 stdenv.mkDerivation rec {
  name = "kibana-${version}";
-  version = "3.1.1";
+  version = "4.2.0";

  src = fetchurl {
-    url = "https://download.elasticsearch.org/kibana/kibana/${name}.tar.gz";
-    sha256 = "195x6zq9x16nlh2akvn6z0kp8qnba4vq90yrysiafgv8dmw34p5b";
+    url = "http://download.elastic.co/kibana/kibana-snapshot/kibana-4.2.0-snapshot-linux-x86.tar.gz";
+    sha256 = "01v35iwy8y6gpbl0v9gikvbx3zdxkrm60sxann76mkaq2al3pv0i";
  };

-  phases = ["unpackPhase" "installPhase"];
+  buildInputs = [ makeWrapper ];

  installPhase = ''
-    mkdir -p $out
-    mv * $out/
-    ${optionalString (conf != null) "cp ${conf} $out/config.js"}
+    mkdir -p $out/libexec/kibana $out/bin
+    mv * $out/libexec/kibana/
+    rm -r $out/libexec/kibana/node
+    makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
+      --prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin"
  '';

  meta = {
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool, unstableVersion ? false
+, pkgconfig, runCommand, which, libtool
 }:

 # nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.
@@ -5,7 +5,7 @@

 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
        ]);
 in
 stdenv.mkDerivation rec {
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ffmpeg, imagemagick, libzip, pkgconfig, qt53, SDL2 }:
+{ stdenv, fetchurl, cmake, ffmpeg, imagemagick, libzip, pkgconfig, qt5, SDL2 }:

 stdenv.mkDerivation rec {
  name = "mgba-0.3.0";
@@ -7,7 +7,10 @@ stdenv.mkDerivation rec {
    sha256 = "02zz6bdcwr1fx7i7dacff0s8mwp0pvabycp282qvhhx44x44q7fm";
  };

-  buildInputs = [ cmake ffmpeg imagemagick libzip pkgconfig qt53 SDL2 ];
+  buildInputs = [
+    cmake ffmpeg imagemagick libzip pkgconfig qt5.base qt5.multimedia
+    SDL2
+  ];

  enableParallelBuilding = true;

@@ -1,29 +1,13 @@
 { lib, pythonPackages, fetchgit, libxslt, docbook5_xsl, openssh }:

-let
-
-  # Use this until the patches are upstreamed.
-  # Warning: will be rebased at will
-  libcloud = lib.overrideDerivation pythonPackages.libcloud ( args: {
-    src = fetchgit {
-      url = https://github.com/Phreedom/libcloud.git;
-      rev = "784427f549829a00d551e3468184a708420ad1ec";
-      sha256 = "fd0e092b39fa1fde6a8847e6dc69855d30c2dad9e95ee0373297658ff53edf8a";
-    };
-
-    preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
-  });
-
-in
-
 pythonPackages.buildPythonPackage rec {
  name = "nixops-1.3pre-cefcd9ba";
  namePrefix = "";

  src = fetchgit {
    url = https://github.com/NixOS/nixops;
-    rev = "cefcd9bae9a4d3bac83f188460619d18972321a8";
-    sha256 = "1jwkbnfwics2j0m6mr75rz914vg0z46d2xv0z1717c1ac5rki0l2";
+    rev = "9a05ebc332701247fa99fbf6d1215d48e08f3edd";
+    sha256 = "17vxr51wpdd5dnasiaafga3a6ddhxyrwgr0yllczxj6bq0n5skp2";
  };

  buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ];
@@ -32,7 +16,7 @@ pythonPackages.buildPythonPackage rec {
    [ pythonPackages.prettytable
      pythonPackages.boto
      pythonPackages.hetzner
-      libcloud
+      pythonPackages.libcloud
      pythonPackages.sqlite3
    ];

@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, automake, autoconf, libtool, lzma, pkgconfig, zimlib, file, zlib }:
+
+stdenv.mkDerivation {
+  name = "zimwriterfs";
+  version = "20150710";
+
+  src = fetchgit {
+    url = https://gerrit.wikimedia.org/r/p/openzim.git;
+    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
+    sha256 = "0x0d3rx6zcc8k66nqkacmwdvslrz70h9bliqawzv90ribq3alb0q";
+  };
+
+  buildInputs = [ automake autoconf libtool lzma pkgconfig zimlib file zlib ];
+  setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
+  preConfigurePhases = [ "./autogen.sh" ];
+
+  meta = {
+    description = "A console tool to create ZIM files";
+    homepage = http://git.wikimedia.org/log/openzim;
+    maintainers = with stdenv.lib.maintainers; [ robbinch ];
+  };
+}
@@ -2015,7 +2015,6 @@ let
    libuv = libuvVersions.v1_6_1;
    libtool = darwin.cctools;
  };
-  nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
  nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
    libtool = darwin.cctools;
    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
@@ -3571,6 +3570,8 @@ let
  zinnia = callPackage ../tools/inputmethods/zinnia { };
  tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { };

+  zimwriterfs = callPackage ../tools/text/zimwriterfs { };
+
  zip = callPackage ../tools/archivers/zip { };

  zpaq = callPackage ../tools/archivers/zpaq { };
@@ -7868,14 +7869,6 @@ let
    developerBuild = true;
  });

-  qt53 = callPackage ../development/libraries/qt-5/5.3 {
-    mesa = mesa_noglu;
-    cups = if stdenv.isLinux then cups else null;
-    # GNOME dependencies are not used unless gtkStyle == true
-    inherit (gnome) libgnomeui GConf gnome_vfs;
-    bison = bison2; # error: too few arguments to function 'int yylex(...
-  };
-
  qt54 = recurseIntoAttrs (callPackage ../development/libraries/qt-5/5.4 {});

  qt5 = qt54;
@@ -7884,7 +7877,7 @@ let

  qt5Full = appendToName "full" (qtEnv {
    qtbase = qt5.base;
-    paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5);
+    paths = lib.filter lib.isDerivation (lib.attrValues qt5);
  });

  qtcreator = callPackage ../development/qtcreator {
@@ -11451,9 +11444,7 @@ let

  libquvi = callPackage ../applications/video/quvi/library.nix { };

-  linssid = callPackage ../applications/networking/linssid {
-    qt5 = qt53;
-  };
+  linssid = callPackage ../applications/networking/linssid { };

  mi2ly = callPackage ../applications/audio/mi2ly {};

@@ -12244,6 +12235,8 @@ let

  pencil = callPackage ../applications/graphics/pencil { };

+  perseus = callPackage ../applications/science/math/perseus {};  
+
  petrifoo = callPackage ../applications/audio/petrifoo {
    inherit (gnome) libgnomecanvas;
  };
@@ -64,43 +64,251 @@ rec {
    ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; };
    ghc6123 = callPackage ../development/haskell-modules {
      ghc = compiler.ghc6123;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
    };
    ghc704 = callPackage ../development/haskell-modules {
      ghc = compiler.ghc704;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
    };
    ghc722 = callPackage ../development/haskell-modules {
      ghc = compiler.ghc722;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
    };
    ghc742 = callPackage ../development/haskell-modules {
      ghc = compiler.ghc742;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
    };
    ghc763 = callPackage ../development/haskell-modules {
      ghc = compiler.ghc763;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
+    };
+    ghc783 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc783;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
    };
    ghc784 = callPackage ../development/haskell-modules {
      ghc = compiler.ghc784;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
    };
    ghc7102 = callPackage ../development/haskell-modules {
      ghc = compiler.ghc7102;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
    };
    ghcHEAD = callPackage ../development/haskell-modules {
      ghc = compiler.ghcHEAD;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
    };
    ghcNokinds = callPackage ../development/haskell-modules {
      ghc = compiler.ghcNokinds;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { };
    };
    ghcjs = callPackage ../development/haskell-modules {
      ghc = compiler.ghcjs;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+    };
+
+    lts-0_0 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.0.nix { };
+    };
+
+    lts-0_1 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.1.nix { };
+    };
+
+    lts-0_2 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.2.nix { };
+    };
+
+    lts-0_3 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.3.nix { };
+    };
+
+    lts-0_4 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.4.nix { };
+    };
+
+    lts-0_5 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.5.nix { };
+    };
+
+    lts-0_6 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.6.nix { };
+    };
+
+    lts-0_7 = packages.ghc783.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.7.nix { };
+    };
+
+    lts-1_0 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.0.nix { };
+    };
+
+    lts-1_1 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.1.nix { };
+    };
+
+    lts-1_2 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.2.nix { };
+    };
+
+    lts-1_4 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.4.nix { };
+    };
+
+    lts-1_5 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.5.nix { };
+    };
+
+    lts-1_7 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.7.nix { };
+    };
+
+    lts-1_8 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.8.nix { };
+    };
+
+    lts-1_9 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.9.nix { };
+    };
+
+    lts-1_10 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.10.nix { };
+    };
+
+    lts-1_11 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.11.nix { };
+    };
+
+    lts-1_12 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.12.nix { };
+    };
+
+    lts-1_13 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.13.nix { };
+    };
+
+    lts-1_14 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.14.nix { };
+    };
+
+    lts-1_15 =packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.15.nix { };
+    };
+
+    lts-2_0 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.0.nix { };
+    };
+
+    lts-2_1 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.1.nix { };
+    };
+
+    lts-2_2 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.2.nix { };
+    };
+
+    lts-2_3 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.3.nix { };
+    };
+
+    lts-2_4 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.4.nix { };
+    };
+
+    lts-2_5 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.5.nix { };
+    };
+
+    lts-2_6 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.6.nix { };
+    };
+
+    lts-2_7 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.7.nix { };
+    };
+
+    lts-2_8 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.8.nix { };
+    };
+
+    lts-2_9 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.9.nix { };
+    };
+
+    lts-2_10 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.10.nix { };
+    };
+
+    lts-2_11 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.11.nix { };
+    };
+
+    lts-2_12 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.12.nix { };
+    };
+
+    lts-2_13 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.13.nix { };
+    };
+
+    lts-2_14 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.14.nix { };
+    };
+
+    lts-2_15 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.15.nix { };
+    };
+
+    lts-2_16 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.16.nix { };
+    };
+
+    lts-2_17 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.17.nix { };
+    };
+
+    lts-2_18 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.18.nix { };
+    };
+
+    lts-2_19 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.19.nix { };
+    };
+
+    lts-2_20 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.20.nix { };
+    };
+
+    lts-2_21 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.21.nix { };
+    };
+
+    lts-2_22 = packages.ghc784.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.22.nix { };
+    };
+
+    lts-3_0 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.0.nix { };
+    };
+
+    lts-3_1 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.1.nix { };
+    };
+
+    lts-3_2 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.2.nix { };
+    };
+
+    lts-3_3 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.3.nix { };
+    };
+
+    lts-3_4 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.4.nix { };
+    };
+
+    lts-3_5 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.5.nix { };
    };

  };
@@ -10021,6 +10021,8 @@ let
    name = "pep8-${version}";
    version = "1.6.2";

+    disabled = isPy35; # Not yet supported
+
    src = pkgs.fetchurl {
      url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
      sha256 = "1zybkcdw1sx84dvkfss96nhykqg9bc0cdpwpl4k9wlxm61bf7dxq";
@@ -15084,12 +15086,12 @@ let
  };

  upass = buildPythonPackage rec {
-    version = "0.1.3";
+    version = "0.1.4";
    name = "upass-${version}";

    src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/u/upass/upass-${version}.tar.gz";
-      sha256 = "1gwp1b2xydc06pnj4a7kwadzs81fizqiyrq07l82dqjx4zkwn292";
+      url = "https://github.com/Kwpolska/upass/archive/v${version}.tar.gz";
+      sha256 = "0f2lyi7xhvb60pvzx82dpc13ksdj5k92ww09czclkdz8k0dxa7hb";
    };

    propagatedBuildInputs = with pythonPackages; [