Merge branch 'master' into staging

2016-01-29 10:19:48 +01:00
parent 2ecb6b4574 4f8f5732fc
commit de0af30716
312 changed files with 14247 additions and 2595 deletions
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2015 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2003-2016 Eelco Dolstra and the Nixpkgs/NixOS contributors
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -489,7 +489,6 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
    sha256 = "1bhw5hkz6chrnrih0ymjbmn69hyfriza2lr550xyvpdrnbzr4gk2"; <co xml:id='ex-dockerTools-pullImage-4' />
    indexUrl = "https://index.docker.io"; <co xml:id='ex-dockerTools-pullImage-5' />
    registryUrl = "https://registry-1.docker.io";
    registryVersion = "v1";
  }
  </programlisting>
@@ -534,8 +533,8 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
   <callout arearefs='ex-dockerTools-pullImage-5'>
    <para>
-     In the above example the default values are shown for the variables <varname>indexUrl</varname>,
+     In the above example the default values are shown for the variables
-     <varname>registryUrl</varname> and <varname>registryVersion</varname>.
+     <varname>indexUrl</varname> and <varname>registryVersion</varname>.
     Hence by default the Docker.io registry is used to pull the images.
    </para>
   </callout>
@@ -1,4 +1,4 @@
-{ pkgs, options, version, revision }:
+{ pkgs, options, version, revision, extraSources ? [] }:
 with pkgs;
 with pkgs.lib;
@@ -17,19 +17,27 @@ let
  # Clean up declaration sites to not refer to the NixOS source tree.
  optionsList' = flip map optionsList (opt: opt // {
-    declarations = map (fn: stripPrefix fn) opt.declarations;
+    declarations = map (fn: stripAnyPrefixes fn) opt.declarations;
  }
  // optionalAttrs (opt ? example) { example = substFunction opt.example; }
  // optionalAttrs (opt ? default) { default = substFunction opt.default; }
  // optionalAttrs (opt ? type) { type = substFunction opt.type; });
-  prefix = toString ../../..;
+  # We need to strip references to /nix/store/* from options,
  # including any `extraSources` if some modules came from elsewhere,
  # or else the build will fail.
  #
  # E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
  # you'd need to include `extraSources = [ "#{pkgs.customModules}" ]`
  herePrefix = toString ../../..;
  prefixesToStrip = [ herePrefix ] ++ extraSources;
-  stripPrefix = fn:
+  stripAnyPrefixes = fn:
-    if substring 0 (stringLength prefix) fn == prefix then
+    flip (flip fold fn) prefixesToStrip (fn: prefix:
-      substring (stringLength prefix + 1) 1000 fn
+      if substring 0 (stringLength prefix) fn == prefix then
-    else
+        substring (stringLength prefix + 1) 1000 fn
-      fn;
+      else
        fn);
  # Convert the list of options into an XML file.
  optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList');
@@ -221,10 +221,7 @@ in
        fi
      '';
-    environment.interactiveShellInit = optionalString config.services.xserver.enable
+    environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
      ''
        export SSH_ASKPASS=${askPassword}
      '';
    programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
@@ -165,7 +165,7 @@ in
        script = "exec venus-planet ${configFile}";
        serviceConfig.User = "${cfg.user}";
        serviceConfig.Group = "${cfg.group}";
-        environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+        environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
        startAt = cfg.dates;
      };
@@ -93,9 +93,11 @@ in {
  config = mkIf (cfg.enable == "lock" || cfg.enable) {
    systemd.services.audit = {
-      description = "pseudo-service representing the kernel audit state";
+      description = "Kernel Auditing";
      wantedBy = [ "basic.target" ];
      unitConfig.ConditionVirtualization = "!container";
      path = [ pkgs.audit ];
      serviceConfig = {
@@ -4,7 +4,7 @@ with lib;
 let
-  caBundle = pkgs.runCommand "ca-bundle.crt"
+  caCertificates = pkgs.runCommand "ca-certificates.crt"
    { files =
        config.security.pki.certificateFiles ++
        [ (builtins.toFile "extra.crt" (concatStringsSep "\n" config.security.pki.certificates)) ];
@@ -26,7 +26,7 @@ in
      description = ''
        A list of files containing trusted root certificates in PEM
        format. These are concatenated to form
-        <filename>/etc/ssl/certs/ca-bundle.crt</filename>, which is
+        <filename>/etc/ssl/certs/ca-certificates.crt</filename>, which is
        used by many programs that use OpenSSL, such as
        <command>curl</command> and <command>git</command>.
      '';
@@ -56,13 +56,13 @@ in
    security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ];
    # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.
-    environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;
+    environment.etc."ssl/certs/ca-certificates.crt".source = caCertificates;
    # Old NixOS compatibility.
-    environment.etc."ssl/certs/ca-bundle.crt".source = caBundle;
+    environment.etc."ssl/certs/ca-bundle.crt".source = caCertificates;
    # CentOS/Fedora compatibility.
-    environment.etc."pki/tls/certs/ca-bundle.crt".source = caBundle;
+    environment.etc."pki/tls/certs/ca-bundle.crt".source = caCertificates;
    environment.sessionVariables =
      { SSL_CERT_FILE          = "/etc/ssl/certs/ca-certificates.crt";
@@ -364,7 +364,7 @@ in
          ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
        environment = cfg.envVars
-          // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; }
+          // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
          // config.networking.proxy.envVars;
        serviceConfig =
@@ -183,7 +183,7 @@ in {
        Restart = "always";
        RestartSec = 2;
      };
-      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ];
    };
@@ -127,7 +127,7 @@ in
      wantedBy = [ "multi-user.target" ];
      after = [ "network.target" ];
-      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
      serviceConfig = {
        # Uncomment this if too many problems occur:
        # Type = "forking";
@@ -21,7 +21,7 @@ options = {
 };
 config = mkIf cfg.enable {
  environment.systemPackages = with pkgs.pythonPackages; [
-    gateone pkgs.openssh pkgs.procps pkgs.coreutils ];
+    gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert];
  users.extraUsers.gateone = {
    description = "GateOne privilege separation user";
@@ -49,8 +49,6 @@ config = mkIf cfg.enable {
      User = "gateone";
      Group = "gateone";
      WorkingDirectory = cfg.settingsDir;
      PermissionsStartOnly = true;
    };
    wantedBy = [ "multi-user.target" ];
@@ -31,6 +31,9 @@ let
    [General]
    HaltCommand=${pkgs.systemd}/bin/systemctl poweroff
    RebootCommand=${pkgs.systemd}/bin/systemctl reboot
    ${optionalString cfg.autoNumlock ''
    Numlock=on
    ''}
    [Theme]
    Current=${cfg.theme}
@@ -110,6 +113,14 @@ in
        '';
      };
      autoNumlock = mkOption {
        type = types.bool;
        default = false;
        description = ''
          Enable numlock at login.
        '';
      };
      setupScript = mkOption {
        type = types.str;
        default = "";
@@ -19,6 +19,9 @@ with lib;
    # Shut up warnings about not having a boot loader.
    system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
    # Not supported in systemd-nspawn containers.
    security.audit.enable = false;
  };
 }
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, eyeD3
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbis-tools, id3v2, eyeD3
 , lame, flac, eject, mkcue
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
@@ -50,7 +50,7 @@ in
         --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
      wrapProgram "$out/bin/abcde" --prefix PATH ":" \
-        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
+        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
      wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
        "${wget}/bin"
@@ -2,10 +2,6 @@
 let
  version = "1.2.5";
  rev = "v${version}";
  sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
  reaperFork = {
    src = fetchFromGitHub {
      sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc";
@@ -30,11 +26,13 @@ let
    };
  };
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
  name = "dfasma-${version}";
  version = "1.2.5";
  src = fetchFromGitHub {
-    inherit sha256 rev;
+    sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
    rev = "v${version}";
    repo = "dfasma";
    owner = "gillesdegottex";
  };
@@ -60,7 +58,6 @@ in stdenv.mkDerivation {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "Analyse and compare audio files in time and frequency";
    longDescription = ''
      DFasma is free open-source software to compare audio files by time and
@@ -7,9 +7,9 @@ assert alsaSupport -> alsaLib != null;
 assert jackSupport -> libjack2 != null;
 assert portaudioSupport -> portaudio != null;
-let version = "1.0.8"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "fmit-${version}";
  version = "1.0.8";
  src = fetchFromGitHub {
    sha256 = "04s7xcgmi5g58lirr48vf203n1jwdxf981x1p6ysbax24qwhs2kd";
@@ -37,7 +37,6 @@ stdenv.mkDerivation {
  enableParallelBuilding = true;
  meta = with stdenv.lib; {
    inherit version;
    description = "Free Musical Instrument Tuner";
    longDescription = ''
      FMIT is a graphical utility for tuning musical instruments, with error
@@ -1,8 +1,9 @@
 {stdenv, fetchurl, id3lib, groff, zlib}:
 let version = "0.1.12"; in
 stdenv.mkDerivation rec {
  name = "id3v2-${version}";
  version = "0.1.12";
  src = fetchurl {
    url = "mirror://sourceforge/id3v2/${name}.tar.gz";
    sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1";
@@ -19,7 +20,6 @@ stdenv.mkDerivation rec {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "A command line editor for id3v2 tags";
    homepage = http://id3v2.sourceforge.net/;
    license = licenses.gpl2Plus;
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libav, libkeyfinder }:
 let version = "2015-09-13"; in
 stdenv.mkDerivation rec {
  name = "keyfinder-cli-${version}";
  version = "2015-09-13";
  src = fetchFromGitHub {
    repo = "keyfinder-cli";
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;
  meta = with stdenv.lib; {
    inherit version;
    inherit (src.meta) homepage;
    description = "Musical key detection for digital audio (command-line tool)";
    longDescription = ''
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }:
-let version = "2.1"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "keyfinder-${version}";
  version = "2.1";
  src = fetchFromGitHub {
    sha256 = "0j9k90ll4cr8j8dywb6zf1bs9vijlx7m4zsh6w9hxwrr7ymz89hn";
@@ -11,24 +11,6 @@ stdenv.mkDerivation {
    owner = "ibsh";
  };
  meta = with stdenv.lib; {
    inherit version;
    description = "Musical key detection for digital audio (graphical UI)";
    longDescription = ''
      KeyFinder is an open source key detection tool, for DJs interested in
      harmonic and tonal mixing. Designed primarily for electronic and dance
      music, it is highly configurable and can be applied to many genres. It
      supports a huge range of codecs thanks to LibAV, and writes to metadata
      tags using TagLib. It's intended to be very focused: no library
      management, no track suggestions, no media player. Just a fast,
      efficient workflow tool.
    '';
    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ nckx ];
  };
  buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ];
  postPatch = ''
@@ -43,4 +25,21 @@ stdenv.mkDerivation {
  '';
  enableParallelBuilding = true;
  meta = with stdenv.lib; {
    description = "Musical key detection for digital audio (graphical UI)";
    longDescription = ''
      KeyFinder is an open source key detection tool, for DJs interested in
      harmonic and tonal mixing. Designed primarily for electronic and dance
      music, it is highly configurable and can be applied to many genres. It
      supports a huge range of codecs thanks to LibAV, and writes to metadata
      tags using TagLib. It's intended to be very focused: no library
      management, no track suggestions, no media player. Just a fast,
      efficient workflow tool.
    '';
    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ nckx ];
  };
 }
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk, libjack2, ladspaH
 , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
-, vorbisTools }:
+, vorbis-tools }:
 stdenv.mkDerivation  rec {
  name = "mhwaveedit-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation  rec {
  postInstall = ''
    wrapProgram $out/bin/mhwaveedit \
      --prefix PATH : ${lame}/bin/ \
-      --prefix PATH : ${vorbisTools}/bin/
+      --prefix PATH : ${vorbis-tools}/bin/
  '';
  meta = with stdenv.lib; {
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
    description = "A CD ripper aiming for accuracy over speed";
    maintainers = with maintainers; [ rycee jgeerds ];
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
  };
 }
@@ -2,16 +2,17 @@
 , gst_all_1, wrapGAppsHook }:
 pythonPackages.buildPythonPackage rec {
-  name = "pithos-${version}";
+  pname = "pithos";
-  version = "1.1.1";
+  version = "1.1.2";
  name = "${pname}-${version}";
  namePrefix = "";
  src = fetchFromGitHub {
-    owner = "pithos";
+    owner = pname;
-    repo  = "pithos";
+    repo  = pname;
    rev = version;
-    sha256 = "0373z7g1wd3g1xl8m4ipx5n2ka67a2wcn387nyk8yvgdikm14jm3";
+    sha256 = "0zk9clfawsnwmgjbk7y5d526ksxd1pkh09ln6sb06v4ygaiifcxp";
  };
  postPatch = ''
@@ -212,6 +212,45 @@ rec {
    };
  };
  cup = buildEclipsePluginBase rec {
    name = "cup-${version}";
    version = "1.0.0.201412081321";
    srcFeature = fetchurl {
      url = "http://www2.in.tum.de/projects/cup/eclipse/features/CupEclipsePluginFeature_${version}.jar";
      sha256 = "353513445f77ed144687bafc20ab85dc31f2f95ffdc47f102ab773ab0b7afb8b";
    };
    srcPlugin1 = fetchurl {
      url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version}.jar";
      sha256 = "082b5ed8730ad065efaac6ea2812dae15669ae74a49778911125b171bea41187";
    };
    srcPlugin2 = fetchurl {
      url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar";
      sha256 = "6b67937fa11944b0330173a9d8564a19eccd705e76b96291d80077a1d7344939";
    };
    srcs = [ srcFeature srcPlugin1 srcPlugin2 ];
    phases = [ "installPhase" ];
    installPhase = ''
      dropinDir="$out/eclipse/dropins/${name}"
      mkdir -p $dropinDir/features
      unzip ${srcFeature} -d $dropinDir/features/
      mkdir -p $dropinDir/plugins
      cp -v ${srcPlugin1} ${srcPlugin2} $dropinDir/plugins/
    '';
    meta = with stdenv.lib; {
      homepage = http://www2.cs.tum.edu/projects/cup/eclipse.php;
      description = "IDE for developing CUP based parsers";
      platforms = platforms.all;
      maintainers = [ maintainers.romildo ];
    };
  };
  eclemma = buildEclipseUpdateSite rec {
    name = "eclemma-${version}";
    version = "2.3.2.201409141915";
@@ -317,11 +356,11 @@ rec {
  scala = buildEclipseUpdateSite rec {
    name = "scala-${version}";
-    version = "4.1.1.20151201";
+    version = "4.3.0.201512011535";
    src = fetchzip {
      url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
-      sha256 = "19iqaha9c5n5hkyn83xj8znkvshm4823d65zigbj97fz8gzrr0la";
+      sha256 = "1j0qw4frkvvmyl64wdbznglgjjr9sfg8wb9npar0x7qv1hj4hw3x";
    };
    meta = with stdenv.lib; {
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, emacs, texinfo
-, mpg321, vorbisTools, taglib, mp3info, alsaUtils }:
+, mpg321, vorbis-tools, taglib, mp3info, alsaUtils }:
 # XXX: EMMS also supports Xine, MPlayer, Jack, etc.
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
    sed -i "emms-player-mpg321-remote.el" \
        -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
    sed -i "emms-player-simple.el" \
-        -e 's|"ogg123"|"${vorbisTools}/bin/ogg123"|g'
+        -e 's|"ogg123"|"${vorbis-tools}/bin/ogg123"|g'
    sed -i "emms-info-ogginfo.el" \
-        -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbisTools}/bin/ogginfo"|g'
+        -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbis-tools}/bin/ogginfo"|g'
    sed -i "emms-info-libtag.el" \
        -e "s|\"emms-print-metadata\"|\"$out/bin/emms-print-metadata\"|g"
    sed -i "emms-volume-amixer.el" \
@@ -15,11 +15,10 @@ with stdenv.lib;
 let
  version = "0.1.1";
  # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
-  neovimLibvterm = let version = "2015-11-06"; in stdenv.mkDerivation {
+  neovimLibvterm = stdenv.mkDerivation rec {
    name = "neovim-libvterm-${version}";
    version = "2015-11-06";
    src = fetchFromGitHub {
      sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9";
@@ -59,8 +58,9 @@ let
    ignoreCollisions = true;
  };
-  neovim = stdenv.mkDerivation {
+  neovim = stdenv.mkDerivation rec {
    name = "neovim-${version}";
    version = "0.1.1";
    src = fetchFromGitHub {
      sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60";
@@ -145,8 +145,11 @@ let
  };
 in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation {
-  name = "neovim-${version}-configured";
+  name = "neovim-${neovim.version}-configured";
  inherit (neovim) version;
  nativeBuildInputs = [ makeWrapper ];
  buildCommand = ''
    mkdir -p $out/bin
    for item in ${neovim}/bin/*; do
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }:
-let version = "7.1"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "apitrace-${version}";
  version = "7.1";
  src = fetchFromGitHub {
    sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a";
@@ -20,7 +20,6 @@ stdenv.mkDerivation {
  '';
  meta = with stdenv.lib; {
    inherit version;
    homepage = https://apitrace.github.io;
    description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
    license = licenses.mit;
@@ -13,7 +13,7 @@
 }:
 stdenv.mkDerivation {
-  inherit src;
+  inherit src version;
  name = "sane-backends-${version}";
@@ -56,8 +56,6 @@ stdenv.mkDerivation {
  '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
  meta = with stdenv.lib; {
    inherit version;
    description = "SANE (Scanner Access Now Easy) backends";
    longDescription = ''
      Collection of open-source SANE backends (device drivers).
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
 , libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }:
 let version = "3.19.4"; in
 stdenv.mkDerivation rec {
  name = "simple-scan-${version}";
  version = "3.19.4";
  src = fetchurl {
    sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83";
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
  doCheck = true;
  meta = with stdenv.lib; {
    inherit version;
    description = "Simple scanning utility";
    longDescription = ''
      A really easy way to scan both documents and photos. You can crop out the
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeDesktopItem, unzip, jre }:
 let version = "0.2"; in
 stdenv.mkDerivation rec {
  name = "swingsane-${version}";
  version = "0.2";
  src = fetchurl {
    sha256 = "15pgqgyw46yd2i367ax9940pfyvinyw2m8apmwhrn0ix5nywa7ni";
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "Java GUI for SANE scanner servers (saned)";
    longDescription = ''
      SwingSane is a powerful, cross platform, open source Java front-end for
@@ -2,11 +2,11 @@
 let
  getmodel = name: sha256: {
    inherit name;
    src = fetchurl {
      url = "http://www.tmbdev.net/ocropy/${name}";
      inherit sha256;
    };
    inherit name;
  };
  models = [
@@ -16,10 +16,10 @@ let
      "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b")
  ];
  version = "20150316";
 in
-pythonPackages.buildPythonPackage {
+pythonPackages.buildPythonPackage rec {
  name = "ocropus-${version}";
  version = "20150316";
  src = fetchFromGitHub {
    sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g";
@@ -49,7 +49,6 @@ pythonPackages.buildPythonPackage {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "Open source document analysis and OCR system";
    license = licenses.asl20;
    homepage = https://github.com/tmbdev/ocropy/;
@@ -7,13 +7,14 @@
 }:
 let
  version = "1.11";
  mkFlag = flag: name: if flag
    then "--enable-${name}"
    else "--disable-${name}";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  name = "redshift-${version}";
  version = "1.11";
  src = fetchurl {
    sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh";
    url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
@@ -51,7 +52,6 @@ stdenv.mkDerivation {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "Gradually change screen color temperature";
    longDescription = ''
      The color temperature is set according to the position of the
@@ -4,185 +4,185 @@
 # ruby generate_sources.rb > sources.nix
 {
-  version = "43.0.4";
+  version = "44.0";
  sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "88e62cbc7a46a4bdc9822a7155a7a92fd856472323fe93c2c6684262b8e71056"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "c0c65ced611dcc7b788aff7f0e32cd1823467c06dc99ced2e0aca0539ce545a2"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "e0eb56995f078a72c0bcf8a38a68e3087ca6c229181d0ca75052d2b784acd6f3"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "87068d8072d0312af90524c7470c874d33e23c2b3e94be3fe9d934998330e898"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "826a7c46b08813698c6fc6cfa3faf8d8fb3c6bfa2d9126d2668f91f34fa5874a"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "7c8f08471fe561a345175c350c6414e72721baeb41a3ff47a429f5b79c33c82c"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "74efde0018f1c0a0d8afab8a069c7dc2ace12a9c2e8ccc5021601aa472581ea1"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "4768a53842d40e81a2e357ba58da56b0a81d2224878b6ab2ffad0bfc50c20ec1"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "bd7c8cd1473fa7b15905fc2a9aa5595a7ffe4e6a53a4c832dfbe3393236a2706"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "cdb921661a6b20738f38ab2d0fb285aa81a323401f360f77b9ae6d9e8642210d"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "73e97be9965dea6416d88b7edb609ed1c7cecbb48c363370dec68854ebcc2b05"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "cff97655831940b84bfa5f73dfa3dc48de084ae6503e7a5824c3e57e373f0ff0"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "30fbc1adfda1487093ed3ca3571bc4c02132b8fd65a67c937e10d5a53fffe2c5"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "9f6322577809b557f325168953170706af6d29a29b5347886f928b5f495799b8"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "5c7b899f37cd894b79c74e95c03e131e8809fd147316d21ac5d9e0165840bdbb"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "d5a1a956d7f9afe5867e2dbeaea4ba2a94e743d291062d18232d20ace29d2c94"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "2dc43867cd934830c79050e2080570e86fe63ab9ce80252599a7ac29ef21408a"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "750c5cddd2d436993a4630f0ebf31e9d0ac679cc23a84298071a682e7a8a8de1"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "73c6712729087bbebc335e631505dca89fbfc9eedf6fcec220f66f50e013f938"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "5b5a2376daef30eae3ff1a94213937381148ade79783546b1f38687c9fc4489e"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "3b76e984e74737f0bd22e10c017bbfc3ff9346a9bf83ec09d959cdc0c5b4c36c"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "99b5bc2c709a923a43debfe746c70c3613c206424c88d553f7593c200053a8b6"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "2b9b732d19498b78c72d8f0bcf0852c7d209c3a3e0c891fbef6be753e39bc9a3"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "2fd75ff22d3b75f03c6a9ab005e369373f999ef4c38ea49438ab2adaa8e9a2c2"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "8889cf66294a788b59754a4331c6fe4ceccf5d4efedb402d144f27384e491b46"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "0781239c9c8f237d66ce0c8d9f39136e0eb71365f6ca8b695014648060c18c38"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "cca620118720374edf45b8dba81ffa5086f640bb1c10b67cfe6286aa2afc3a6f"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "9fd6f6047ec3c4103c4aa761882053d4e00e018a1509fa1fbede1757394aa3fe"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "33543ed7c2f68457573729fa95fb306a3c509d8ecda937d5d638d6d158979ced"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "098e932b708ebc71a2aa7fe86ced4835dbc6725f8714904b25e7ebd1ca7b7d69"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "58c567f2b6657f533bcc20d39f29715a503a0a9d59e05ccf9b4f3f3ba64280ca"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "d9284a84e7e55ad6d73e7d599c5b6824774d7a9e6f7484064fd2985e5634d102"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "5b87663b5887a8eeceee3c0e54c99c66ca673bbf78b434cdcac659891c1f3333"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "02879ea328d1536781f2f9765db51bcb9fa05d0a0b7ad426fd659156c293f347"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "ebcf93c8b5ae952f244426988defbfe0638cf81a8dc4c372613be08f9e0d8f45"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "70f55197d8ff67d52f090bd58dcc106fcc08492fe6989494eee3aa3cd1c3552a"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "30af81108a6f9ea31a623666ebfb68d99ec256e27cc8d18921bfe2780753ba4c"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "227873ac53fdac5f27b569a5b6a1f3d45caa4e3c822610a5f294a3abdbc2c0fd"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "082ddb0fce87e1399dc95cb94fcc71ebe334f7e611497c0b0bb8186edf46e8e5"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "0a46de9bfc19fba878104ae2865a092fba7a9eea62a64a31c0decc9fc021b3af"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "3e8af6555a65ee403b8fdd3a78842ec4f7c16fb3c590f77d9ddd76e9631d564c"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "2cc4d364852fc987e97f169de9039992d4ecb848125eae38c09bced34aae8653"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "78bf008a03318c1d58788433a07b71b63bd52cd2befcc68f8c6320d5ff5dc387"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "6a722ed42f251e3433d46d9b56ca06f7bc1cf0854de782da10285db6ee4a1bfd"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "77ff1b40b9cc81b1c6bc63d74e68687ad92f5eb0cee265cd5d9528c38a36bd12"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "14b75dc8278a946d705210306b50a85795f70d83d0527d2c77a60b13662e89e3"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "a4784a6b2d356f633deefefbc237f5aa662334765a334f968d60afc0aa76ccab"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "73e62d2869fb450b4597ec3d65ae3c36ef78984462a158dbf565bbac539b1fa5"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "5fc7d9cbd892c83f40e0cda6b8e6b4e993948530bef355457015a6976ce097f6"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "01e02d4a0e140d962e27e4f1a4ec24837c0646e9373f3ce2eb8337437c274ecf"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "4fc83306fca0a6458e66fa082eb8afe6d07ecbf5a3b309d3906ca16f00fc5d31"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "59fef5429b639a52ee113e855a18080870a2f905212dd0e4aefdd838d040133d"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "c72b7f343e62f479dd2fc37f22af3c462890a886727a2b5a1f140992e3069c92"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "62f96267e91fb9a8df1c436adb78945f32eb14bccc57e706104ae0547b723682"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "81d44ab8e493816180ce46d86a0b061ddada85b820c21b91d18f62b3fdfa455e"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "0be231034e076e162b5568a5247da47ca2038011928f89c729fe9a7e139dd922"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "c2fb062c3fce0c4c174bcf3987108176d9cbe8da19a06b5db46e0b6d65b244ec"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "15c8a066fe101a5b9151c96611e2390008ac54a9a1909b9430ed6f440c856920"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "81afcae57081c20a7a1e03c28a4d8dd26b3c89608591b7a7171be91bd24789d6"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "40400da9851782418a12b224b74c3b5c8c112912bb98dc8f368972cc898ea155"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "bf5f4bdb6fbaea7d0de662921d5e6096d413f799fd3ca1876d42146f14667e5d"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "b9b8d3d4c5160eb1676f6c4531123ec28dc0ca6b51e7dcf20716611f93f1c975"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "cc4057fb04da6db0d2ba315fe9ff015a0e0fc1542843adb4a65621936f849d98"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "6e00d5e5c7e50aa24468b802bd53377d8962b146fed8a8588dd5c8db4162da93"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "10468470db91eccc1234b34fc4f933b909df68284f9cee8125fbdb5c5802a45a"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "760c9d95fe6941847dfd53b254cd662a83f4c9f2d66f84a96b4dd1d3127adbb8"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "34e29284e753686f00e4019902b75aa071d0eb87bafec8c31cc4029989ec210f"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "e168e7e7e11aabe54f773c960d4c9b9920e15e4ccadef9f728e2016f0240555f"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "f5b2e2c7fdbd0f91e0ce581dfcbbb253d627a4aac45a914eab763de6b2fb6750"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "e5c6372f3fd732fddfaa31ed3ddc81cf803386d7842e103fddd0685739ea63c7"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "7366de80f3717f62768055613bb6767a39716808e394d623cff18e649b1a5a02"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "73da0a0c66c18dddf5de7b7dda677cb9cef1e0b3c8cff5e22f48bf743ece8116"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "1a69cb59bd213323ddf5576f2f060def74735b50576c5048f030170a8e4a54d1"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "509b8233c403b629803fb0d67a29f2d6f649627d4b91c592121acd3e2ff62282"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "89c431dc58a91ff9c7b31b9a5f988aabd7265a23697e870cd746320c0dde9760"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "6089971aa6e19e2cbcb49724e2eea7922d9408936aa8e2d396b8f1966ea81eec"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "cb6c72d842895714a7ce5f0acc7e2de721befd8605ce567811f5e626f9349a50"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "451f1a7caea7553fc18e440c2716e1954e7d7ba66f5fbe15cc6954224a36444e"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "8b33af54b8e00acba75446a5921ebf41e570f66cf86d38bf46b9238d2b2b57ef"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "d02f4b813cc16b4293f9441bdbdef56acd0a7a510d9edcce223d04270e65f2e4"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "17685f4d47efa9ca8a2ca220960d7819e11c728516d4c0f67f789f5dc29e9606"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "663b7a6300fa46c4e62e7542135ab2632117496a5b0365276ec5ac94183a1d55"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "702f8da239eadcbf92cc8e286716836ec889a64276a92e51ee26cc5338e4398e"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d50895a71408e74d8b5b1965be279011214c50eba56e0046f360f216326f1135"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "be03a282b7da67899c988f89423594b91e017ce5f4569d55ea23f6ba28f59414"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "84a5fa00271f90356bbfedb1fdbcc033489d1759fef53c4dda92bd285633ae3d"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "0ba5a1868386c715ea1f48393b035305d4bef67ed1838b7bfacf5bff8b36716f"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "49e55275df9e902bc234fa59b4b614a084d76dc2c256ce6218fa96663cabe2dd"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "790462e745744b05a5fc27d9518f02e88f678bc1f95140dad970abdff0ec7aaf"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "dfe926680b0bc5852db920ba8b3e4febecf1ead33d9865568ac69e9494337072"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "ab1ff49b84beb7a5a02a70cbaba9d3110cdd76653486799038fd05936b9db499"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "83c8480482dd154519d26e43a3f79d32c82f149d81a1c6e8ef98e9511ecbf35a"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "d6be5d333050ca0d1ecd78082b9daf7955a068915af6ef2694b3f6d60595cd94"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "a27703068ff3be53e8944c750bde0316414f51ee4c10569018d121db7ec1b705"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "6ea5dd2bd55bd0211ce67f398b24a37f26b012250b8e7b1b4a9d5ef619e19051"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "981462cf59716c17fc0630d0cf12b03e7cc96d72c2d8d33109c1db633895f18a"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "1b16ed83eed980b0ea8b99e989bab1882b6d2a497fd643f109f0610425c693d8"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "16b2efda57842f29c6f4432cd51296d5e9a709d30f2310e885c786fc68a96e65"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3aad55c9d10012c5b22154e8562a034e30ce6ef0b579047649a43afd0645d6e2"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "7b6c8a2bbae8e72ec820df741b8f4a2e162c4b628db8e669a5e85dc190db6c51"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "f22705f5dee51be7bdced48c6c8f48780529f22a566d9d8784a10c2fe8427b92"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ad18bc224500c834a159d91fa568461cbf131edd1b044ae8c97e887b2151e112"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "8dc4c8854169db3c22c09b723002852c452cdcf8d0bde94b089af9fcf0ae0f28"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "84c414c64bff02d8e82a4ca4c01e1b4dfae21991ee9a6850203ccbe15469cfe8"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "7bd24886bc72db5479c1aa2c8a48359858c1e87e8444a5cc8f0ef3e141744806"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "142db7f0bb92976345aace30d9ba53ab4ba98a47332c3f7ae7372d9d80300781"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c69a6be864d1c865013b00a1b8fb748da96be2ddc65cb178eeca6e165aa1ccff"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "337de34606e018ec5b600d559d928e35c79fb28800c9b5ad28e2defe259f9b58"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "a52775fe1038fbef208d760c4069187943387b0717076b32a54647d9e319890b"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "51cecc939011135842bb51c41cfda0fb4ae53c5180e49bd66a810c243b1d68be"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "56c2e14770c2c6d40213f159715a3c269bf3b6c5985ddb4851b6f50f2ca93a39"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "cfe309df7412f68abf487c1f9065e6b9d4b4f384254576c8d1098878012e5b53"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "648fbeb1dc15d76685d80afdad2b6a797eb25f30b27bb405e11725ccc53ef164"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "1540b0f0c1d867c87d1e109b4e9ad417be51306c324a03e07706d7e215f7ae4f"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "400f9cd73854034edd7b392367a7961638c921e78885064bdbc567ed3c508d38"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "e7c0e4e61d17164a648ae51bcff92d99f76055a1a6a29dfec6ea12a0359f1285"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "727e0d1d692be4f472f1172d8901d94d58e201ab9c2e30b80684564b3ecaf325"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "c2c88bf65329b168fde8fe02613eb89069d85da8b2a3114ac647158b8a345055"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "476f207657fb9a5c3bc89493b06900b4fe46a06aca7854e4f37bbe8c8d98c064"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "9d10a2f8a0e889a6ebe99bc486cf56cc44535b6f67ce3667ac61e87430a24eea"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "2de4b2b0f02918c8ff538db66272196479ad95cf8e239ccf9e1a244d5553456e"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "21ba5e79f5fbe3c3a8a8a71f8fe9a4280f8e47d4c58070443bbf53305c906175"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "3c04ec5ebd27b815a215ff815dcc86ec05f81a5a0d606e60ed14135b76679fe2"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "99d8d2e81e2a8f495d5568d7a9cbbfbcdc8a0e1d67fa297adf8a021988948a80"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "07b19ce6be53c16c6f299a2640a3a597475644fef63edf702242e245001b1eb0"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "3e1812cd98e04fcf575783eafdef2c89739c51e6648f4cd7ba7bed44fbe5f960"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "d0a4e2d3b155c0fd5fa12162dd73d6077be30a9cdd3ccdf5566748a7af4fe2c6"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "cbe37600da8bfdabe683473dbb4f2ccc96beda89a9ca15810432a8fce65a591f"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "f5e9e4222bfc1c34d58befaccf501d741cdcf3ee9bfda034ea8600a906c9a912"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "ecf982266072b4a15a06b939d4f0cc22c3653982404974baa51871af0e411ab5"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "d48f0673a768b6265119a3097061ae437711a81fbf7f665b8fec079f0516b1ca"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "345b7f038e454e6efd513e923ad2aa0a45d76d846539563bbfc79293ec84a6ec"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "67eb797623354f037b49745c9ef7ddfa3a0cfce03f984add560a33ab2955fc97"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "e71b05083a122ef20b5d75481129fa2e3d1e2ac608cea2c5baf7b300a5fbe5df"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "6bcba534539f9b5f42397c82e2c1a6affa6eec473c09e6d71c5315f9acef35b0"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "1897112ce462b341abba4c2b1664fbf39b5072a11ea6fb61c66cbfb3336358f0"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "fe4b44c9b50abc001bb4bcf6e046a9b18f30a42170b4662daf5d35c17089f4ad"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5557347f19ab6d7c90a34bf8a9729d39eb65a02a021040091cc1863e08fb72c9"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "8238342ac06af2d4e0b7ef8ea26d1960af996ac7d401f0e11b3b666ebafe0df8"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "c77b86d5512f8343674248b9b4d31165975f0eeea002313311339ae45d9effe3"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9f59d32123141d624b9fa16f885ff9e1cc989628e33074bb2a546d9c54be07eb"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "7a68d7de10abf095fd9240807a6a553b60ba75f3d8edc56afcf5ad1832a05eaf"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "29785a5a2cc09750c8ea391ca6b2d8812e5a68185807d76ec295c3ca86c21da9"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f935b317c5aadd60553f497ceae2cc663dec3729b2fc8e48e6a98d1eb91fe263"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "bd4dcb330e8733c3443e763a2fcd49085b5027ec032ee6f641ac1211534fdb6a"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "21bbca4e12b3fa230b879f190d279ba9314090454e0263b65e77dbf8f99dcbf3"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "5508260caa85a450a2496a7e261aebff847301d4f981bd0caf0208aa65c0bc10"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "027630690ecff7ad56f6e992ef243d2a734dac1a3e6365bb22c56a571f938fcb"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "7e6df6be5937c01d8bbf65cd6d107fba76f1c59794f7e2ed81ac9db1384abe34"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "6973787b5136491ef28bb2e10976d49c3717a866ec6fe357a995dbf3179a751c"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b5370fd005569fa1544099fb4629ea344f81b43fc10188dbb3cbc5926b5df53a"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "0ca57d72bf11ddf74eb79904be607c479c01f31f11fc0ff567a9ad7beef8067d"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "5256e889efd097decc2b55f4d928c9847f6e9499b25947de068d357db4d70c59"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "6f422fdcf2fd514e132b33fa079631a6bd4b12deab17a3463b1f3f1ce3f2f535"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "2b51d50b49965c766081d35b1a426e1c3a858038bb88807522a7dcbc8c97b815"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "19cc20d1bd838ebfb8518b8076800cc3255376e4928cf2f37be86258307f1104"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "b71d83c274d82f63ab175978bd661e047ad73586249f6e24d33d17c1e9ba4ec6"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "f8eb56fea0e73c247fc767541bc97cc3556e4db75ad446e01b0978a5c0b11d3f"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "4c3dd5066a9b5ca04ab222af8d7009419fe34d0bc41bf5f78e6370d6e975c4e5"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "8ee0ae75d179bfec9e081777e9a34fdae72d8d55ade73983fdac433649b596ac"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "33f3591e2d75bcc539cc57e68e865183b307a8eb8153c0b48bacc0bc62ea48f4"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "bb64fc5285bca12542669ef83bfc465bf593154f9bca2548510f525bde5a55f3"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "25eef40150db99b56dc46deaf78525951d8ae838886427838c9d78bab41c6b7e"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "52bb0b68a5f282e65d077166a3a0716fe6c9368ab88f6d5e2a8669515bcc000a"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "d83ab7b48cd7fc4637fbb4c19edd0974db121186289b04da01414fbdc78ad7e9"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "f36e7b656e5898191801d6e04f3ebef9f9f7080c011dd695ddccfe12c3cb2f6b"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "8a1d3055aedc504cf0f34e41931464752148dd1859c807f689978fb80504a5ab"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "9c553d5312363980364c6a9a6591fe5e0229668ff1de3a78943af18235098eee"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "d9dfc43216b0c6281a311edc6c0fed79344cbb4f4cfdcf153f3ba37a4221199b"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "e58662111147e836ac404cf7fc9d9e52ac141b204004c813c6b8d180a378af57"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "2ec46b326249e0049de0a110896672191edf0837d4f224ff3b0f88a21edf1a22"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5aa7dcce6e48dfcb7b8b4f9f48b4bdd496bd606d901896fd37f2a2cd6b4a06bf"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "6c7cecaf0865bd80eceefe2541b5cbdbdc457a367b66a3cb7f8f3d73cf3118f4"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "d352b7d67ebbd5e45f972a804cccbb769f6a79700506297c0808d2f9b0f5ca8d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "d33903cda04f3be9e147dd69c55a58fa76f1bfc0abdb8346c641b76c5f20aacf"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "0f7e5cf8306e1fa9b8ab56cdb39b5ca1fe2ff1a3f4ded38e5982bbd842438dde"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "a7006e239fc119c1af332e1fdcd3ed42aed59deb6e22a092c9d3ed5c7eafa11e"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "bf057113e03190fbfc6947f24a0fb432f53991f02e56d2b5e8270002cd742d4d"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "89b0def0f9d9177fa0c0f1f7630d52bf3d6380ab27c475019fc6b1dddeca32b6"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "aa0fdba0a703f06ab5a6b667448316f9de9729c20602fecaf872d14e43a0b822"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "15fd16ebb3c82755a1ff70a172658c3928ad495194b975de8270b0dadf8fd10b"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "eb8fc36302a63113e9891f8153aeffc1da4f990f1473d9d779f28df6658bada0"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "7cfe30a94db8722d0cf3c5f68f636c76e7e98c8f34f67f95724c80499c89ec64"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "6f2262e13a649499a0783922a3f2d85a71727ef37629a529f084590828746bca"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "0a066fed6ed9ca4a1514166c8b1ac5e097b5d32522dc39bee3a644f241f7448a"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "312f1af8601c24417672383063085f1c588d9301a09ddeef15b8c54e130547ff"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "4fbef4c8c25690e3c23f3fcd27196714c691c9ea023d81b82763867a7547deab"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "ed3165767c2a14329869930d2b618a5a795d3c3d34e06cbae0d1694ccdfb0c97"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "451b17760fd2f3b99cda0f1711fc3e74320ef0e86b41ea89205c00395b1ac46a"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "7555b6f4aac9bcc270fcd5204d15a3cb7b84cdd845f66cea2fbb843315100107"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "e12206fd4993e75ecd3398130758cb1cc4f103c5792a9b59956766d975840653"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "b6c2799434bceda271a004769372dfe416584953be5950fe7125920e4e428737"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "ef954070ef7f3eafb9727ee848627145dfc884fc46445374d5b618d344359432"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "e8606fc60aaf6ba91a2616dc991d268e8099eb8d5d3eb3c19fdeace93c6453a7"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "6795c8d63e2cbad65d347bb07503725f85ef464767020df605bdc5dfbdd4cf60"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "5da4d4c307d661868ff7076e2fc1d929e9d3b9816be25adeba02bd4f9a56f15b"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "752594014a72770d33784a99782b24bebaadeb83bda57880f3d0bdb94c2ef56e"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "f77db4c679c687bd33ed125419666226989ef5da88c2a4c8a81aea0ece602e25"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "a5b26f9f5b9194592e4749770e85cfe35d308ce5cffceea00e9aea5a90a5ef95"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "3af207c5e2b6bf089739056f2be6e585529c87d5f142e7100fee55728faaf785"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "57c6072b4dd026daa11b7877fc05ff8aea383eb1d0a8cd1798bd26246f013145"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "d48c3f0952d354b9c6539d9e333a8e9c359006a25f1ca6a0895f7e3344504f70"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "fe5a4aae238d74a26614014547294226b49155a7c7fe5fe8a4d2955ee9bfc457"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "5bc3f65a205a78b110293df5a94a9bde27a491d61b1f9e340a7fe983c1ee1b3f"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "53b5a81b33115e6892dc6d98a275d675a576eb721290af271262314f33a8a5d3"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "50efbbad9ea231a9281a00dc702d9c6103bfd09b712b45b6809d78a176714897"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "7a73aea8c228b3491c12735240fbdb8715d8236e89b8634f8b8eae435a6b33f2"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "001f41e86fcf93fd6a714e5ee0450fe8424bbb3ff40cebad29cb233cb0667bca"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "7060ad8b0e78eaebcb6ef7b4976866ddbcca8123daca4ebd7e0ace9792c55a00"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "11539b78bc650b19be2d25af10242a61ee043b47a15000f2e07e50df00875e2e"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "b3858ed759dc5c3bf383bff0620d28e939e2a906b266bf9ad28409c45835da82"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "a4f0b466c5d544f0abecec8861e1d24132755fff54091a49370414ba27c9cc7f"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "efda293d3583806b80695c0f102151574623180a192826e66e90c34599e13444"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "eede4d95ac6c7f55b312aaadce690016732bb143f3926c1d1533f64efd7306e8"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "235138d5b83242a50e194c09d687edfad8a4f912d8434c749dec15a271a38d8e"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "6900bfd4af3146881cc045eed187b88a58ea0fe3e0ed6acbff034f68f43b5935"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "0fccd7402f84ef47bc14cd91da4c9aecfceda90588293e47c3473ba5849e8ba2"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "4cdf1ced9a687daa34235ae82aa439d69e517d5c31b8f61e12615f361440a54a"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "de27a346f47ad06ade89b4da1809b7ab8aff10e491352b88185d4fab1aaa5613"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "873f75d77adc9c142f64523c199799f7e9b0460ae0252c514fc1caa5ac5dcdb0"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "e4daced301792d86a7d5bb194da1ff4b9fb1ab7e8583ff3810ed5dca2c57c2c2"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "65af6b876aeda23827c57d5886cc67665fe2c3fe93cfc2cc5b614400828b6eb7"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "e6f6b914d0b8e1a349087c893cd91807e6d8159f4f8db27c2c89b8304a21aca8"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "1b2f6ef94bb5a1ea999af797e2aa8ff267b4a9945fd0e8afc6c9df12273ce60d"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "f61a475f0646b6935abf6ca4b07d88a65e782ad6a5fbd17ab2c7cbc0e386f9b0"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "65fec172ddfce096f367338c8b95b32fb2415655e900f8dc628b8ac660270e48"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "091597ef122a51e27e69aa02d84c0de37b3bcc4aab38326a160d8836f82d9235"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "238a78c2bb240609fd0c777399d3307ef659b95cf4e88ae85700321030000eb7"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "336f74b4f6f0fc0ca24af1b287bb049ba37aedd760c60b71560c32aa21d902a4"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "e591486c66c9b7175b1ab180e9646976a413338dca225eb50d7db457f95afe98"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "7026aaee3d615fd5401881728fce02d69a74dd08bcf4ad32cdbde6e48e9750fa"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "f8d04696d02b0af221b8642d4780d79a76be68c07096c7f9c5915a9db6d5f768"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "412212198a4bfb35964baa84d55bdec89a30ad47be0e54c7be64e3bbaa8166f9"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "19dd334052bd9c98ec9afe7b8e5141728b25d2278b7b946921b031aaedd01b2d"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "50c0c3f6931e6a1a498d075847dec4796db804d296b0bcb7254576d910c88f51"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "a307739cb6de6f80258c28797125f78fe7746d0edd3182e3716f312f1b0915f8"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "f457de6b5e6692cdac57f9cc8b5bace0f3c678cb40848963f91dad36aa53e7cb"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "c86343db611dbca1b8fac25ea1e9364b30fcd6c31d5c856f699bacf6e4128c3c"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "9a88a56a56d5448e6ffdcc2aa15b70bc6300750dae11c25047036873bd0f1bf7"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "b25fd422e6b3b1535fbb8839d04a77dec22dfcc0abf14062f5465c0a5aa5c99c"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "1254482bd8d0c2fef0a728415e0053b1e68951c1a4de32ea38e3a8435ef8be11"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "e437939df4de54d415224db8fbf6ce9e8ae21fc0402052a72612085c73faa493"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "6daecbd8ab6eaeab01139037a950e5e48766f20290bd13daa9f2177a0bed7a37"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "5d9051de7a1bdc68018511d38e29658f00c0db113438a3ec84e68fa99b89f760"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "ae92dcc94f43a80e335b9dcbc82a1831ede646e173eb1a6b76a3a5c076f70598"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "04d0bdd6235a9321d1a5467c48240cbdb790485b580c1b818b048817fae22f49"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "813d1965cd6b15e8bd1b40f77e787086ff38dfbafbfdb6ef3d958543ec566d9e"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "30afe02bd7090929841edc88eadcd745435f64189782d95477568b3b41cb107c"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "bfe3bd48305674bc3e7f9edc318585e605e31e59bf55c1095ba08f82f1e92fe6"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "83b01feb621cb9c7c64edb125c19aa0765bc2d16b2c20551be12690f835539da"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "d9f6062d09d4c505656e4f1c3fe098b896beffb9ee299ba5d544a91d97288d8c"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "c5af070524b828313a5e819f4c446cdc7a72f6bffd62e734bb8752438e5d28ef"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "9c5b3343070f2f986aa13cd6f03a184643cfa5a0214fe2d3696cfd5f81efa4cb"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "527c9c2dd61a318c5b6ca5e9b26ee9b81b71ae8d7c23cdab6efee1bb5caaa685"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "bb128791f7f9dc18b282aec0892987b2d315103bd56d646b22113f74e379db0f"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6f3d800c347a70c5ed7a8838365599c7401e4805037f5e980865794d395b416a"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "2a5e0a25d654015bec541cca26491312746552b052a6ff1e93daa7e83d5c5539"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "e5f9ba3ebe3d641b3dd948ec51dd25671327a35e5ee87b274079a8a3ce7a26b1"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "97f524aa830ebbbe80396db69b798463c1bb973a57edb3bf04350cf343b9f345"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "53fea5b84051fea6c247fe2baf9f9d3c87b3f78d4655fc8509068fd60ff3c942"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "f4e38e9124fc916766c1b7d3b1eb5612e5358d5ff7cb60127f6c9ef00360ca2f"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "dc8d60a3f94da475fea5c1c748c52072f69d4642ea2c3b305e92c56fb3b09324"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "415b0f6e0c9ca0c9a415d96c821ab72c15b5d2863109c6411d1d35f3835fc92a"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "c06eb60b39cef2564e248e3d9dd711b863e46cc6d45803002c641a1335927bdc"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "d001a0047d2ef866ae2ad7675b3e45a7055ceaf84e031a24c72b239b42fdd98e"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "95cbcf68c03ed83590b6e257003282d710c8dd366fd75bd218880735731ed7d2"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "cbea32c4b8989fc5f0bf948ab5d80ab715fac7fcc179dee169ac9d725ab2b43a"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "9f59a86501cbb9d8813fbf5812646e87d400f136f2cca5d791dd5ac0bc4964c9"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "ea9073faecd9cb850dae9c69a85368f9ad8ec9e00c9aba988205aedfc2e63bd3"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "690772121588229f34e9a9d5e6042c56a3fdb9fdcafea53f45a12997cd1d1e53"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "c3c57dcc4a5790b36668b8e255674945e61ee9d6ef69704f39d499ad57510a79"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "fce60e0a3787a2362bdab4d566766c22a4b4f777d1dde7552e195eefc8fe98b1"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "854692a0be4be1b34e958c34a7318dd818e310439d01ee552910a067cf6f6624"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "35a4981bc819fa7cba9e2f73ebb28eafd68b464eacc9da4e3e651882ae8b84bd"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0143d2dc4cf2979f8744dd282f937f9e8084393e4c7836219eb182618062d1cc"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "eb4f25e99cc681a6113f9de016a6993e46575caba84f5cba6195c88379e4e661"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "81f96f818ce68ee25fe1ed7b1c831ed95d26a3fb034bac836707bf93ffaa140a"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "cef140f0b0c4da31235147871679d009f05aeec3e1b138e56bd6acabf79cb666"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "3824d40ecbebc2df46f865e0375119c9fe5dd1dd5a0f4c193de984134ee6e7c7"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "e6aba016e9909cc43a9ab285ed8cbfc15dadf2cf7bba9c78ba340512dd9bbcc5"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "218b36a99038e08dde7677bc8e89f1b74b5456da2f5e5e1a081eea7ab19bb7e5"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "d159bd682f8db01fea12e25bc0d4c24ef2ffffca07b3c5d64223ae75d6f77d23"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "2007623afeacb1b11ed4e93dafad6f47d1365ff8505282c858168ef95d31b724"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "e82f1ad5461e25c25a8c6db480a733e95b81578ec280e93a52b00b650211a0ac"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "708780c7f96b0f48f177780fe48c4613b3548eb5b08ba37d1471781de2fe5653"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "fc2e1166c4d9614bcf9c8ccd01aa157bc229cccbdcd2854bbc52302465d24d75"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "589e950adc3258ad2064233ecfc5e385d301096e0fc08b3a5cc9eebc0454ac6e"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "c08fcc4457bad70ff5861168364306753df7f03d7817a52dda8c6aad74bde389"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "eec26f6c23c5e58913387264ad9cd52d5571ad95b1047490530c2c7cecee4584"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "78f60d4ba047d323ec2a36e2f8a775d86bb2c00bb671009105f5fe368419366f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "3c71e67434e42be6ef9970c948030c58198cb941ee39d50845afc2a96c85abe0"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "d9c84c673378721c0bc45e767176b879858ba0feacdeeca503e600567569ad33"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "558f5ab75ade19ac57fc939c4314233004fbafb2232e9d4bdc6ee938cf0d0e2c"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "1bbddd4c07cffc083997d3b43034438eccf8647bd9b078cbca86f63c50c588ae"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "d8a19e75930a0e902b261b6a4872f47daa16baa736fcf4b6e86ba3e947a05fb2"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "f8278a40b25bd24a951855b633218c8d0884fec7468291d947890f2e98310acb"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "c69f8782bdfddc06e4fcce994ce8bf79031c47fd60132fbdab42083d7645fbac"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "18e9f99de5847e996ab66202e8718d9844f26ffef771a236ae16ee68098853fa"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "ed1da31169d61b4eb6f3f7858dfd5ab7bb436a9c3ae66882d00a19929d48ded0"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "bbc818432701696fd140e914943d076e4d11741180a04ea27f4be75ec3558d1c"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "e1e4b663f699ed623ccf4d91966d1d0b6f17aa831a14b86316898590b559790f"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "e1d8c54d8b1149f98adb1b46c4973e01fa76bb132f0df9b0f090c4ead0ec4676"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "5c51bfb471b8870aa04d3e66bb1cc465a7e3d7f36badb91bb0cdd56789ba9657"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "a57f3971825a40c8dfce2d987384292f1ad3ebe6a96ff762bc38e69c6ce2889f"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "7523bdbc44826267f710d1758c3d64fc5b2711ea26559e8eee8d803174a5f801"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "b452ab04c4bae6079bbdc293bc6c41882dac30ec1b1483340e49d072ecf2ced4"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "929bca0a3d2eb67d02c1af5df073fca04db1e70ec95cae622f87c70c5138559c"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "b8aaff5e70e7690481a5c22fb2da97ce63de67246217fb106441173573aeb4d9"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "464da5be343009f180d829cc88e01cc7eaef953195f4b3396156a019fd17a36e"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "135f60c2012e63622d1a75cab6fd5f686fee71138b1f1f01e367fac0b3b583c8"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "f84234ba1c6c0eaaf9b73d40546e482dd024bad6bc1aa9b0f19351af064abacf"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "ce464a8ec58fe19e037a26a1b94e346ad314eacbe94232f4b136e0fc7b3919ac"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "c1c25d2226f47102969272777fa985694430e227a6e58c1a3fc3da479ed6a69f"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "937bb415ca95996207c371d111a888f68a24d690db8c31b8c1df530b2b7b30a7"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "10ae8036fc64d7bd0226ec9b8e9614b5bb24d995d0701d23b471f65767de81cf"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0ee83de9b3bb77a6e3d1120194700b720d441ee116f9728823c5a78f59d28a10"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "ca3fb46ad1d80fb9d37bc0b3844b8d3972640772edba1ab6485eaf10d257654f"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "fb908dcbc4fa42c6472e4cb5bd9d8ae7c845bbf9965498091b32f7d1669ede24"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "f8d229cb8257262adac057831f7080f431e356eb4ffdd512e8ea8b6ba8e6d702"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "5c8f1c1c09ff2eccf6becf9136f9da3517fabbb0192f157676962fd3bfd31bb8"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "78d326fc7baed0aee612b542fda5333a83d2874c20a396a4cea0ae4d4c9b45e3"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "5478af8e757d8282993afacd10fc78bc7a207fbdc50705d2d8a665aa98e5f910"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "fc827807c3793c15fa7650614da558773fd884d5aabf8e181c8822e4109a6832"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "719945b8d7a945e556137cc3bdc4a8d7ddf5693e4ac49a3884f912ec471da1f5"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "37681476c04f02dd5fe3e815da3c6569cfedf1d1627826122c934caab8bca74c"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "4f0dfccef932beec90f7de951bb2d454bedc192b376caf25c3ba89ecdb5de9df"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "d63640093f26d53257b5f1b6ea3c8b620498a21cd7ad1144bb3b5d85d63967ac"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "e14a4cdff4cc89f85043efbf56a82211f1040bc5b369c2113866efb639969017"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "a37e2833f4ad4e9c13d4da88f22f8a9cf7ad77b238f2d00f914a27f276ba99da"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "aa5bc43997a6669b1c8da7b04a12c7a16ce8b1fedae8b0bb1a317c83176e88c5"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "869fc9c719a7a619e15b98007f60b3f92dd8f7c46fd27e4fc864a8b829e13da0"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "3a0a5883b4e4442985fa8e24a80d0849ac450a20d278858e1b3847974cc212f2"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "c832506a00c22cbc2589814642340bbb1067fd31e414db4f426a8a451991083e"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "3ea926ea98fd3506cdcccc32266fd8910f7c6b563818d58fa9708872712daad9"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "9597216b353369221867741de9f9fcd030adccf1d9ffe2b127c7b858b51e04f4"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "c1d596a00831ed30446f8a6f9e7b455329a402939d5c7318616ad182e9564aa5"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "d67274f1e39b479674b4909b0e072dff712db0146577f4ea36736ac0d94e3dae"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "d17a26657562ee017388c878867ff43a1d1d86f80c86a18fcf63268b477bd889"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "95477afad170df8efcedb493e5ffa9366f1abc8d451860b899457c8a296afbe0"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "7115c30ae7c0528f54aa8629402ddcfc54687e3a439d7a96c18f15e903e283c8"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "d453f7cb7f1fd662d1a1fecc701880a3d45c223d842d91061ab5f815333b8680"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "37fe2af25d7068569770573e605f3d325e41169b3b0a82ca4ff007a0636b155b"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "f19bf0b83a4389aa4bb1e1f7d434be12c266c0575b13cabed541a4ac38c2d810"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "5bb2b8a27065b9a71a06dbec136a1774e43fbe27a30a03092f718042d58ec26c"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "4d1c8c365511b195da7e18c10cda8f6599d840598e4623bffb445a67a42590cf"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "fa44efebbc0f1174ad10f540668447ddf6bd26a2c918694dd11e63e4d6f36b9c"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "607a62d71718fb2ba89c2a3b75acc13fde048f5d05a692783da955af344a16d1"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "2c179d4613b0b7456d900f9b6c02a1041c39d4cf98a0ca0ea2ea97d1d7546199"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "635a980f48bd8c0f93ff2666ad7f761e80a255fb54647704e2514c6ba7b9bf60"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "e3c06fbffb4b2c135d31499d1a3490d23baedbed5125b46a4153ad9d60ea2fa8"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3eb083c8de026db0727b4fd206fc9045981c5672af7ebf6e0653ee28f5aa8bc0"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3402f491b016e791c9f40f8ac5df5f7017dd6dd71d872020a27eae3634e4fb52"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "515749c690b64a7d047df00291aed071dc90e5582e9ab0e4bc560635ef7d888a"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c77d79a6b1602c9f8c6538be18c974b8557af3ad3898910e1bccfe0a54993207"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "256316348c9d5cf525f0b2f2c09db968714135e21677d122b6bca6e87471a9f3"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "651e4a28750ea9376636293b934cf646b0e6981825a9801fe8bf47785114e34d"; }
  ];
 }
@@ -1,4 +1,5 @@
 { stdenv
 , lib
 , fetchurl
 , zlib
 , alsaLib
@@ -54,6 +55,7 @@ let
      else             "_linux.i386"
    else throw "Flash Player is not supported on this platform";
  is-i686 = (stdenv.system == "i686-linux");
 in
 stdenv.mkDerivation rec {
  name = "flashplayer-${version}";
@@ -67,19 +69,47 @@ stdenv.mkDerivation rec {
  buildInputs = [ unzip ];
  postUnpack = ''
-    cd */*${arch}
+    pushd $sourceRoot
-    tar -xvzf *${suffix}.tar.gz
+    tar -xvzf *${arch}/*${suffix}.tar.gz
    ${ lib.optionalString is-i686 ''
       tar -xvzf */*_sa.*.tar.gz
       tar -xvzf */*_sa_debug.*.tar.gz
    ''}
    popd
  '';
-  sourceRoot = ".";
+  sourceRoot = "fp_${version}_archive";
  dontStrip = true;
  dontPatchELF = true;
  outputs = [ "out" ] ++ lib.optionals is-i686 ["sa" "saDbg" ];
  installPhase = ''
    mkdir -p $out/lib/mozilla/plugins
    cp -pv libflashplayer.so $out/lib/mozilla/plugins
    patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
    ${ lib.optionalString is-i686 ''
       mkdir -p $sa/bin
       cp flashplayer $sa/bin/
       patchelf \
         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
         --set-rpath "$rpath" \
         $sa/bin/flashplayer
       mkdir -p $saDbg/bin
       cp flashplayerdebugger $saDbg/bin/
       patchelf \
         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
         --set-rpath "$rpath" \
         $saDbg/bin/flashplayerdebugger
    ''}
  '';
  passthru = {
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pythonPackages }:
 let version = "2.21"; in
 pythonPackages.buildPythonPackage rec {
  name = "rawdog-${version}";
  version = "2.21";
  src = fetchurl {
    url = "http://offog.org/files/${name}.tar.gz";
@@ -14,7 +14,6 @@ pythonPackages.buildPythonPackage rec {
  namePrefix = "";
  meta = with stdenv.lib; {
    inherit version;
    homepage = "http://offog.org/code/rawdog/";
    description = "RSS Aggregator Without Delusions Of Grandeur";
    license = licenses.gpl2;
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 let version = "2.1"; in
 stdenv.mkDerivation rec {
  name = "rsstail-${version}";
  version = "2.1";
  src = fetchFromGitHub {
    sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
  doCheck = true;
  meta = with stdenv.lib; {
    inherit version;
    description = "Monitor RSS feeds for new entries";
    longDescription = ''
      RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
@@ -1,22 +1,14 @@
 { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
 let version = "4.0.5.0"; in
 stdenv.mkDerivation rec {
  name = "x2goclient-${version}";
  version = "4.0.5.0";
  src = fetchurl {
    url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
    sha256 = "18a2pszh0nq2ir64a1ah1mlzddn4qcd12b339bv30n0y1ir92bi4";
  };
  meta = with stdenv.lib; {
    description = "Graphical NoMachine NX3 remote desktop client";
    homepage = http://x2go.org/;
    license = licenses.gpl2;
    platforms = platforms.linux;
    maintainers = with maintainers; [ nckx ];
  };
  buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
  nativeBuildInputs = [ makeWrapper ];
@@ -35,4 +27,12 @@ stdenv.mkDerivation rec {
  postInstall = ''
    wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin";
  '';
  meta = with stdenv.lib; {
    description = "Graphical NoMachine NX3 remote desktop client";
    homepage = http://x2go.org/;
    license = licenses.gpl2;
    platforms = platforms.linux;
    maintainers = with maintainers; [ nckx ];
  };
 }
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, gd, ncurses }:
 let version = "1.15"; in
 stdenv.mkDerivation rec {
  name = "vnstat-${version}";
  version = "1.15";
  src = fetchurl {
    sha256 = "0fdw3nbrfm4acv48r0934ls6ld5lwkff3gyym2c72qlbm9dlp0f3";
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "Console-based network statistics utility for Linux";
    longDescription = ''
      vnStat is a console-based network traffic monitor for Linux and BSD that
@@ -6,7 +6,7 @@
 {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
 let
-  version = "8.5rc1";
+  version = "8.5";
  coq-version = "8.5";
  buildIde = lablgtk != null;
  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
  inherit ocaml camlp5;
  src = fetchurl {
-    url = https://coq.inria.fr/distrib/V8.5rc1/files/coq-8.5rc1.tar.gz;
+    url = https://coq.inria.fr/distrib/V8.5/files/coq-8.5.tar.gz;
-    sha256 = "0n8mb7di9iwg8dgy1xmivf2ajx8kqkrj9mafc32vicn2lbg16q2r";
+    sha256 = "0gdfm6k5q1f8sz1xr9ijdkkvwqsb7v8prj21gmwv0z0yp6w2zac9";
  };
  buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
@@ -45,6 +45,8 @@ rec {
  git-annex = pkgs.haskellPackages.git-annex-with-assistant;
  gitAnnex = git-annex;
  git-annex-remote-b2 = pkgs.goPackages.git-annex-remote-b2;
  qgit = import ./qgit {
    inherit fetchurl stdenv;
    inherit (xorg) libXext libX11;
@@ -2,9 +2,9 @@
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
 , pythonPackages }:
-let version = "3.2015-09-08"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "git-bz-${version}";
  version = "3.2015-09-08";
  src = fetchgit {
    sha256 = "19d9c81d4eeabe87079d8f60e4cfa7303f776f5a7c9874642cf2bd188851d029";
@@ -12,7 +12,6 @@ stdenv.mkDerivation {
    url = "git://git.fishsoup.net/git-bz";
  };
  nativeBuildInputs = [
    asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto
  ];
@@ -32,7 +31,6 @@ stdenv.mkDerivation {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "Bugzilla integration for git";
    longDescription = ''
      git-bz is a tool for integrating the Git command line with the
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, docutils, python }:
 let version = "0.9.0"; in
 stdenv.mkDerivation rec {
  name = "git-hub-${version}";
  version = "0.9.0";
  src = fetchFromGitHub {
    sha256 = "0c4kq4a906lr8nzway7qh0560n2ydvidh9rlffh44902rd48kp0h";
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
  '';
  meta = with stdenv.lib; {
    inherit version;
    inherit (src.meta) homepage;
    description = "Git command line interface to GitHub";
    longDescription = ''
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "gitflow-${version}";
+  pname = "gitflow";
-  version = "1.8.0";
+  version = "1.9.1";
  name = "${pname}-${version}";
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/petervanderdoes/gitflow/archive/${version}.tar.gz";
+    owner = "petervanderdoes";
-    sha256 = "1vxdawx4sinl19g59ifmrdalmr2dl5pkgawyj9z0s5mcildi6fc2";
+    repo = pname;
    rev = version;
    sha256 = "0ad2421r3iq4xrdy46f4rrqbm8r3xphqcsdj3gqy8fnlrmxw5dfw";
  };
  preBuild = ''
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4 }:
 let version = "3.5.6"; in
 stdenv.mkDerivation rec {
  name = "clipgrab-${version}";
  version = "3.5.6";
  src = fetchurl {
    sha256 = "0wm6hqaq6ydbvvd0fqkfydxd5h7gf4di7lvq63xgxl4z40jqc25n";
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "Video downloader for YouTube and other sites";
    longDescription = ''
      ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe,
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbisTools }:
+{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
 let
  wrapper = writeScript "dvd-slideshow.sh" ''
      #!/bin/bash
      # wrapper script for dvd-slideshow programs
-      export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbisTools}/bin:$PATH
+      export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbis-tools}/bin:$PATH
      dir=`dirname "$0"`
      exe=`basename "$0"`
@@ -2,9 +2,9 @@
 # "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
-let version = "2.4"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "minitube-${version}";
  version = "2.4";
  src = fetchFromGitHub {
    sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5";
@@ -13,20 +13,6 @@ stdenv.mkDerivation {
    owner = "flaviotordini";
  };
  meta = with stdenv.lib; {
    inherit version;
    description = "Stand-alone YouTube video player";
    longDescription = ''
      Watch YouTube videos in a new way: you type a keyword, Minitube gives
      you an endless video stream. Minitube is not about cloning the YouTube
      website, it aims to create a new TV-like experience.
    '';
    homepage = http://flavio.tordini.org/minitube;
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ nckx ];
  };
  buildInputs = [ phonon phonon_backend_vlc qt4 ];
  nativeBuildInputs = [ makeWrapper ];
@@ -40,4 +26,17 @@ stdenv.mkDerivation {
    wrapProgram $out/bin/minitube \
      --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins"
  '';
  meta = with stdenv.lib; {
    description = "Stand-alone YouTube video player";
    longDescription = ''
      Watch YouTube videos in a new way: you type a keyword, Minitube gives
      you an endless video stream. Minitube is not about cloning the YouTube
      website, it aims to create a new TV-like experience.
    '';
    homepage = http://flavio.tordini.org/minitube;
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ nckx ];
  };
 }
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
  name = "simplescreenrecorder-${version}";
-  version = "0.3.3";
+  version = "0.3.6";
  src = fetchurl {
    url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
-    sha256 = "09mcmvqbzq2blv404pklv6fc8ci3a9090p42rdsgmlr775bdyxfb";
+    sha256 = "1d89ncspjd8c4mckf0nb6y3hrxpv4rjpbj868pznhvfmdgr5nvql";
  };
  buildInputs = [
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qtscript }:
 stdenv.mkDerivation rec {
-  name = "smplayer-15.11.0";
+  name = "smplayer-16.1.0";
  src = fetchurl {
    url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "1h8r5xjaq7p78raw1v29gsrcv221lzl8m2i2qls3khc65kx032cn";
+    sha256 = "1jfqpmbbjrs9lna44dp10zblj7b0cras9sb0nczycpkcsdi9np6j";
  };
  patches = [ ./basegui.cpp.patch ];
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qtscript, qtwebkit }:
 stdenv.mkDerivation rec {
-  version = "15.11.0";
+  version = "16.1.0";
  name = "smtube-${version}";
  src = fetchurl {
    url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "13pkd0462ygsdlmym6y2cfivihmi175y41jq5hjyh926cgfg7pny";
+    sha256 = "1yjn7gj5pfw8835gfazk29mhcvfh1dhfjqmbqln1ajxr89imjj4r";
  };
  makeFlags = [
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
-let version = "2.0"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "remotebox-${version}";
  version = "2.0";
  src = fetchurl {
    url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
@@ -26,7 +26,6 @@ stdenv.mkDerivation {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "VirtualBox client with remote management";
    homepage = http://remotebox.knobgoblin.org.uk/;
    license = licenses.gpl2Plus;
@@ -1,136 +0,0 @@
 { pkgs }:
 let inherit (pkgs) bash coreutils findutils nix wget;
    inherit (pkgs) callPackage fetchurl runCommand stdenv substituteAll writeText;
 in
 /* autonix is a collection of tools to automate packaging large collections
 * of software, particularly KDE. It consists of three components:
 *   1. a script (manifest) to download and hash the packages
 *   2. a dependency scanner (autonix-deps) written in Haskell that examines
 *      the package sources and tries to guess their dependencies
 *   3. a library of Nix routines (generateCollection) to generate Nix
 *      expressions from the output of the previous steps.
 */
 let inherit (stdenv) lib; in
 let
  resolveDeps = scope: deps:
    let resolve = dep:
          let res = scope."${dep}" or [];
          in if lib.isList res then res else [res];
    in lib.concatMap resolve deps;
 in rec {
  /* Download the packages into the Nix store, compute their hashes,
   * and generate a package manifest in ./manifest.nix.
   */
  manifest =
    let
      script =
        substituteAll
          {
            src = ./manifest.sh;
            inherit bash coreutils findutils nix wget;
          };
    in
      runCommand "autonix-manifest" {}
        ''
          cp ${script} $out
          chmod +x $out
        '';
  mkPackage = callPackage: defaultOverride: name: pkg: let drv =
    { mkDerivation, fetchurl, scope }:
    mkDerivation (defaultOverride {
      inherit (pkg) name;
      src = fetchurl pkg.src;
      buildInputs = resolveDeps scope pkg.buildInputs;
      nativeBuildInputs = resolveDeps scope pkg.nativeBuildInputs;
      propagatedBuildInputs = resolveDeps scope pkg.propagatedBuildInputs;
      propagatedNativeBuildInputs =
        resolveDeps scope pkg.propagatedNativeBuildInputs;
      propagatedUserEnvPkgs = resolveDeps scope pkg.propagatedUserEnvPkgs;
      enableParallelBuilding = true;
    });
  in callPackage drv {};
  renameDeps = renames: lib.mapAttrs (name: pkg:
    let breakCycles = lib.filter (dep: dep != name);
        rename = dep: renames."${dep}" or dep;
    in pkg // {
      buildInputs = breakCycles (map rename pkg.buildInputs);
      nativeBuildInputs = breakCycles (map rename pkg.nativeBuildInputs);
      propagatedBuildInputs = breakCycles (map rename pkg.propagatedBuildInputs);
      propagatedNativeBuildInputs =
        breakCycles (map rename pkg.propagatedNativeBuildInputs);
      propagatedUserEnvPkgs = breakCycles (map rename pkg.propagatedUserEnvPkgs);
    });
  propagateDeps = propagated: lib.mapAttrs (name: pkg:
    let isPropagated = dep: lib.elem dep propagated;
        isNotPropagated = dep: !(isPropagated dep);
    in pkg // {
      buildInputs = lib.filter isNotPropagated pkg.buildInputs;
      nativeBuildInputs = lib.filter isNotPropagated pkg.nativeBuildInputs;
      propagatedBuildInputs =
        pkg.propagatedBuildInputs
        ++ lib.filter isPropagated pkg.buildInputs;
      propagatedNativeBuildInputs =
        pkg.propagatedNativeBuildInputs
        ++ lib.filter isPropagated pkg.nativeBuildInputs;
    });
  nativeDeps = native: lib.mapAttrs (name: pkg:
    let isNative = dep: lib.elem dep native;
        isNotNative = dep: !(isNative dep);
    in pkg // {
      buildInputs = lib.filter isNotNative pkg.buildInputs;
      nativeBuildInputs =
        pkg.nativeBuildInputs
        ++ lib.filter isNative pkg.buildInputs;
      propagatedBuildInputs = lib.filter isNotNative pkg.propagatedBuildInputs;
      propagatedNativeBuildInputs =
        pkg.propagatedNativeBuildInputs
        ++ lib.filter isNative pkg.propagatedBuildInputs;
    });
  userEnvDeps = user: lib.mapAttrs (name: pkg:
    let allDeps = with pkg; lib.concatLists [
          buildInputs
          nativeBuildInputs
          propagatedBuildInputs
          propagatedNativeBuildInputs
        ];
    in assert (lib.isList allDeps); pkg // {
      propagatedUserEnvPkgs = lib.filter (dep: lib.elem dep user) allDeps;
    });
  overrideDerivation = pkg: f: pkg.override (super: super // {
    mkDerivation = drv: super.mkDerivation (drv // f drv);
  });
  extendDerivation = pkg: attrs:
    let mergeAttrBy = lib.mergeAttrBy // {
          propagatedNativeBuildInputs = a: b: a ++ b;
          NIX_CFLAGS_COMPILE = a: b: "${a} ${b}";
          cmakeFlags = a: b: a ++ b;
        };
        mergeAttrsByFunc = sets:
          let merged = lib.foldl lib.mergeAttrByFunc { inherit mergeAttrBy; } sets;
          in builtins.removeAttrs merged ["mergeAttrBy"];
    in overrideDerivation pkg (drv: mergeAttrsByFunc [ drv attrs ]);
  overrideScope = pkg: fnOrSet: pkg.override (super: super // {
    scope = if builtins.isFunction fnOrSet
              then super.scope // fnOrSet super.scope
            else super.scope // fnOrSet;
  });
 }
@@ -1,44 +0,0 @@
 #!@bash@/bin/bash
@coreutils@/bin/mkdir tmp; cd tmp
@wget@/bin/wget -nH -r -c --no-parent $*
 cat >../manifest.json <<EOF
 [
 EOF
 workdir=$(pwd)
 sep=""
@findutils@/bin/find . | while read path; do
    if [[ -f "${path}" ]]; then
        [[ -n "${sep}" ]] && echo "$sep" >>../manifest.json
        url="${path:2}"
        # Sanitize file name
        filename=$(@coreutils@/bin/basename "${path}" | tr '@' '_')
        nameversion="${filename%.tar.*}"
        name="${nameversion%-*}"
        dirname=$(@coreutils@/bin/dirname "${path}")
        mv "${workdir}/${path}" "${workdir}/${dirname}/${filename}"
        # Prefetch and hash source file
        sha256=$(@nix@/bin/nix-prefetch-url "file://${workdir}/${dirname}/${filename}")
        store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$filename")
        cat >>../manifest.json <<EOF
  {
    "name": "${nameversion}",
    "store": "${store}",
    "src": {
      "url": "${url}",
      "sha256": "${sha256}",
      "name": "${filename}"
    }
  }
 EOF
        sep=","
    fi
 done
 echo "]" >>../manifest.json
 cd ..
@@ -169,7 +169,7 @@ while (scalar(keys %postponed) > 0) {
    my @pkgDirs = keys %postponed;
    %postponed = ();
    foreach my $pkgDir (sort @pkgDirs) {
-        addPkg($pkgDir, 2, $priorityCounter++);
+        addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++);
    }
 }
@@ -24,9 +24,11 @@ SAFEDELS["container_config"] = SAFEDELS["config"]
 def makedet(j, safedels):
    for k,v in safedels.items():
        if k not in j:
            continue
        if type(v) == dict:
            makedet(j[k], v)
-        elif k in j and j[k] == v:
+        elif j[k] == v:
            del j[k]
 def main():
@@ -8,13 +8,14 @@
 { imageName, imageTag ? "latest", imageId ? null
 , sha256, name ? "${imageName}-${imageTag}"
 , indexUrl ? "https://index.docker.io"
 , registryUrl ? "https://registry-1.docker.io"
 , registryVersion ? "v1"
 , curlOpts ? "" }:
 assert registryVersion == "v1";
 let layer = stdenv.mkDerivation {
  inherit name imageName imageTag imageId
-          indexUrl registryUrl registryVersion curlOpts;
+          indexUrl registryVersion curlOpts;
  builder = ./pull.sh;
  detjson = ./detjson.py;
@@ -34,10 +35,6 @@ let layer = stdenv.mkDerivation {
    # This variable allows the user to pass additional options to curl
    "NIX_CURL_FLAGS"
    # This variable allows overriding the timeout for connecting to
    # the hashed mirrors.
    "NIX_CONNECT_TIMEOUT"
  ];
  # Doing the download on a remote machine just duplicates network
@@ -6,17 +6,20 @@ source $stdenv/setup
 # servers to need them during redirects, and work on SSL without a
 # certificate (this isn't a security problem because we check the
 # cryptographic hash of the output anyway).
-curl="curl \
+curl=$(command -v curl)
- --location --max-redirs 20 \
+curl() {
- --retry 3 \
+  [[ -n ${token:-} ]] && set -- -H "Authorization: Token $token" "$@"
- --fail \
+  $curl \
- --disable-epsv \
+    --location --max-redirs 20 \
- --cookie-jar cookies \
+    --retry 3 \
- --insecure \
+    --fail \
- $curlOpts \
+    --disable-epsv \
- $NIX_CURL_FLAGS"
+    --cookie-jar cookies \
-
+    --insecure \
-baseUrl="$registryUrl/$registryVersion"
+    $curlOpts \
    $NIX_CURL_FLAGS \
    "$@"
 }
 fetchLayer() {
    local url="$1"
@@ -26,7 +29,7 @@ fetchLayer() {
    # if we get error code 18, resume partial download
    while [ $curlexit -eq 18 ]; do
        # keep this inside an if statement, since on failure it doesn't abort the script
-        if $curl -H "Authorization: Token $token" "$url" --output "$dest"; then
+        if curl -C - "$url" --output "$dest"; then
            return 0
        else
            curlexit=$?;
@@ -36,17 +39,25 @@ fetchLayer() {
    return $curlexit
 }
-token="$($curl -o /dev/null -D- -H 'X-Docker-Token: true' "$indexUrl/$registryVersion/repositories/$imageName/images" | grep X-Docker-Token | tr -d '\r' | cut -d ' ' -f 2)"
+headers=$(curl -o /dev/null -D- -H 'X-Docker-Token: true' \
          "$indexUrl/$registryVersion/repositories/$imageName/images")
-if [ -z "$token" ]; then
+header() {
-    echo "error: registry returned no token"
+  grep $1 <<< "$headers" | tr -d '\r' | cut -d ' ' -f 2
-    exit 1
+}
 # this only takes the first endpoint, more may be provided
 # https://docs.docker.com/v1.6/reference/api/docker-io_api/
 if ! registryUrl=$(header X-Docker-Endpoints); then
  echo "error: index returned no endpoint"
  exit 1
 fi
 baseUrl="https://$registryUrl/$registryVersion"
-# token="${token//\"/\\\"}"
+token="$(header X-Docker-Token || true)";
 if [ -z "$imageId" ]; then
-    imageId="$($curl -H "Authorization: Token $token" "$baseUrl/repositories/$imageName/tags/$imageTag")"
+    imageId="$(curl "$baseUrl/repositories/$imageName/tags/$imageTag")"
    imageId="${imageId//\"/}"
    if [ -z "$imageId" ]; then
        echo "error: no image ID found for ${imageName}:${imageTag}"
@@ -62,7 +73,7 @@ jshon -n object \
  -n object -s "$imageId" -i "$imageTag" \
  -i "$imageName" > $out/repositories
-$curl -H "Authorization: Token $token" "$baseUrl/images/$imageId/ancestry" -o ancestry.json
+curl "$baseUrl/images/$imageId/ancestry" -o ancestry.json
 layerIds=$(jshon -a -u < ancestry.json)
 for layerId in $layerIds; do
@@ -70,6 +81,6 @@ for layerId in $layerIds; do
    mkdir "$out/$layerId"
    echo '1.0' > "$out/$layerId/VERSION"
-    $curl -H "Authorization: Token $token" "$baseUrl/images/$layerId/json" | python $detjson > "$out/$layerId/json"
+    curl "$baseUrl/images/$layerId/json" | python $detjson > "$out/$layerId/json"
    fetchLayer "$baseUrl/images/$layerId/layer" "$out/$layerId/layer.tar"
 done
@@ -66,7 +66,7 @@ stdenv.mkDerivation (
              KEEPBUILDDIR="$out/`basename $TMPDIR`"
              header "Copying build directory to $KEEPBUILDDIR"
              mkdir -p $KEEPBUILDDIR
-              cp -R $TMPDIR/* $KEEPBUILDDIR
+              cp -R "$TMPDIR/"* $KEEPBUILDDIR
              stopNest
          fi
      fi
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 let version = "4.04"; in
 stdenv.mkDerivation rec {
  name = "man-pages-${version}";
  version = "4.04";
  src = fetchurl {
    url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
  makeFlags = [ "MANDIR=$(out)/share/man" ];
  meta = with stdenv.lib; {
    inherit version;
    description = "Linux development manual pages";
    homepage = http://www.kernel.org/doc/man-pages/;
    repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, unzip }:
-let version = "2.019"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "hack-font-${version}";
  version = "2.019";
  src = let
    version_ = with stdenv.lib;
@@ -22,7 +22,6 @@ stdenv.mkDerivation {
  '';
  meta = with stdenv.lib; {
    inherit version;
    description = "A typeface designed for source code";
    longDescription = ''
      Hack is hand groomed and optically balanced to be a workhorse face for
@@ -5,13 +5,10 @@ let
    inherit name sha256;
    url = "https://geolite.maxmind.com/download/geoip/database/${src}";
  };
  # Annoyingly, these files are updated without a change in URL. This means that
  # builds will start failing every month or so, until the hashes are updated.
  version = "2016-01-18";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  name = "geolite-legacy-${version}";
  version = "2016-01-25";
  srcGeoIP = fetchDB
    "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -27,13 +24,12 @@ stdenv.mkDerivation {
    "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
  srcGeoIPASNum = fetchDB
    "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "00x6d11l8jxc1dj7p1kwmr3x1zwxwbv7xqbxj17j30s4qjmkb2i1";
+    "1n7zlmnaxvjljyih9yi9hns530by21h42j2kcszbcyvn7rd9rnyw";
  srcGeoIPASNumv6 = fetchDB
    "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0r84ji86q4f6maw3scx9i054nzhjg4kb26r6fp1jdbiqjp8mhkyw";
+    "1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56";
  meta = with stdenv.lib; {
    inherit version;
    description = "GeoLite Legacy IP geolocation databases";
    homepage = https://geolite.maxmind.com/download/geoip;
    license = licenses.cc-by-sa-30;
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, intltool }:
 let version = "0.8"; in
 stdenv.mkDerivation rec {
  name = "sound-theme-freedesktop-${version}";
  version = "0.8";
  src = fetchurl {
    sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ intltool ];
  meta = with stdenv.lib; {
    inherit version;
    description = "Freedesktop reference sound theme";
    homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec;
    # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS:
@@ -1,8 +1,8 @@
 { stdenv, fetchgit }:
-let version = "2015-12-14"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "wireless-regdb-${version}";
  version = "2015-12-14";
  src = fetchgit {
    sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm";
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
  ];
  meta = with stdenv.lib; {
    inherit version;
    description = "Wireless regulatory database for CRDA";
    homepage = http://wireless.kernel.org/en/developers/Regulatory/;
    license = licenses.isc;
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 fetchurl: {
-  name = "gnome-calculator-3.18.2";
+  name = "gnome-calculator-3.18.3";
  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.2.tar.xz;
+    url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.3.tar.xz;
-    sha256 = "c86c5857409ce1d01896904e97ccf0a1a880f3dcf428a524e5c0fec27b274d64";
+    sha256 = "c376a4a14a3f7946b799b8458ac4cf2694735fc7c20e90cfda29e209439e32ff";
  };
 }
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 fetchurl: {
-  name = "nautilus-3.18.4";
+  name = "nautilus-3.18.5";
  src = fetchurl {
-    url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.4.tar.xz;
+    url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.5.tar.xz;
-    sha256 = "4ff2c78dba352b4666bb30e0c80ed786eed09199fd624f00810fce4d987fcd26";
+    sha256 = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15";
  };
 }
@@ -2,12 +2,12 @@
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:
 stdenv.mkDerivation rec {
-  version = "${gnome3.version}.2";
+  version = "${gnome3.version}.3";
  name = "gpaste-${version}";
  src = fetchurl {
    url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "0w9d0vbqhvc78vqlsyaywmrpzibr7137398azpfh416bm6vh6d3h";
+    sha256 = "1fyrdgsn4m3fh8450qcic243sl7llfs44cdbspwpn5zb4h2hk8rj";
  };
  buildInputs = [ intltool autoreconfHook pkgconfig vala glib
@@ -16,6 +16,7 @@ plasmaPackage {
  propagatedBuildInputs = [
    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
  ];
  propagatedUserEnvPkgs = [ bluez-qt ];
  postInstall = ''
    wrapQtProgram "$out/bin/bluedevil-wizard"
    wrapQtProgram "$out/bin/bluedevil-sendfile"
@@ -4,7 +4,7 @@
 set -x
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.5.3/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.5.4/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 mkdir tmp; cd tmp
@@ -3,307 +3,307 @@
 {
  bluedevil = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/bluedevil-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/bluedevil-5.5.4.tar.xz";
-      sha256 = "079bj1s86w9xycijs7imfwkhbg6k8sw22dh6p52q0kzsbz4sh7mk";
+      sha256 = "1r20dlsg83d3lrnbdb92cpd7h0s2fmh0vjv3xi5z6rf741463p14";
-      name = "bluedevil-5.5.3.tar.xz";
+      name = "bluedevil-5.5.4.tar.xz";
    };
  };
  breeze = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/breeze-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/breeze-5.5.4.tar.xz";
-      sha256 = "1kaw4mv86lw0igqhbl7v60k11s9az2cj14rs6yqrl96k2ki3931x";
+      sha256 = "0chlp5z5zz19rh9k4ffjr92hn07dmavfcwx0wwffy8qhiw6qw7w3";
-      name = "breeze-5.5.3.tar.xz";
+      name = "breeze-5.5.4.tar.xz";
    };
  };
  breeze-gtk = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/breeze-gtk-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/breeze-gtk-5.5.4.tar.xz";
-      sha256 = "0ph3n77s37rklcjmh5g9rj047hmiym6h4dn27zxmfnfybr52zfjv";
+      sha256 = "1r6ihmpgha1s4hvgr4jliqvbraw06fnaa4sjrhzqbx9dh00y5d8v";
-      name = "breeze-gtk-5.5.3.tar.xz";
+      name = "breeze-gtk-5.5.4.tar.xz";
    };
  };
  discover = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/discover-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/discover-5.5.4.tar.xz";
-      sha256 = "0qhhgnjpwdir3y6i3z4cvfvgigbrmsblwkxhsafg015ralklgcnd";
+      sha256 = "0d5s8b9f5az40ajviijc67rz5l2345wlrqacjm4pdi8fqvxivb1v";
-      name = "discover-5.5.3.tar.xz";
+      name = "discover-5.5.4.tar.xz";
    };
  };
  kde-cli-tools = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kde-cli-tools-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kde-cli-tools-5.5.4.tar.xz";
-      sha256 = "0aw936amj3jigi3n8ldhlihmp4v9m7mbjbxlhp8s7643963f3n3w";
+      sha256 = "1w9l8lh05k6xjdz0nccfygp76lp3wf3xa6pizmgv27wq21pw4wxy";
-      name = "kde-cli-tools-5.5.3.tar.xz";
+      name = "kde-cli-tools-5.5.4.tar.xz";
    };
  };
  kdecoration = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kdecoration-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kdecoration-5.5.4.tar.xz";
-      sha256 = "1lhzbk9bwn7biilqbk7n8dd453a7580n50571lyxxr6b7kfs6ikv";
+      sha256 = "1ghgvg0lfjjlgl3a9ryw1y8aqihdwrkr7qjph4v3p9brlpqm5326";
-      name = "kdecoration-5.5.3.tar.xz";
+      name = "kdecoration-5.5.4.tar.xz";
    };
  };
  kde-gtk-config = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kde-gtk-config-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kde-gtk-config-5.5.4.tar.xz";
-      sha256 = "0dk2gda8qc1mg8fra3lgb4mizl5q2bx8zx5j2w3r8gqrw2g6vk5v";
+      sha256 = "062jgc2sqd93yz5n1z4n7h50k7zsiayi3z901y2rq0x62nndff1m";
-      name = "kde-gtk-config-5.5.3.tar.xz";
+      name = "kde-gtk-config-5.5.4.tar.xz";
    };
  };
  kdeplasma-addons = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kdeplasma-addons-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kdeplasma-addons-5.5.4.tar.xz";
-      sha256 = "0i2j5m51dlbrh54ndspk9zl4ggwpfampsbdjs6kzwisxa4ksyz1s";
+      sha256 = "0yrrjkh632q3ns068j7avaf2rkn2n54sf594jyl30q5fxc22mhq1";
-      name = "kdeplasma-addons-5.5.3.tar.xz";
+      name = "kdeplasma-addons-5.5.4.tar.xz";
    };
  };
  kgamma5 = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kgamma5-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kgamma5-5.5.4.tar.xz";
-      sha256 = "0pm41wfihayp980z4zb5jdsh7qvyd93bql36jzicv8mmj2z7p3g4";
+      sha256 = "0w63m1sxq2fa0wabyyry4prbzc2c54adc56hfhkh84rflccfbnc2";
-      name = "kgamma5-5.5.3.tar.xz";
+      name = "kgamma5-5.5.4.tar.xz";
    };
  };
  khelpcenter = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/khelpcenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/khelpcenter-5.5.4.tar.xz";
-      sha256 = "0gazbv5z1145zv0d7zrm41byqs9blis2x6ij2yha7h8i0vf748rc";
+      sha256 = "01kw97p1xz2gghghykkv953bvypcyd080fxknjrzn4v9gl5mrjv0";
-      name = "khelpcenter-5.5.3.tar.xz";
+      name = "khelpcenter-5.5.4.tar.xz";
    };
  };
  khotkeys = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/khotkeys-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/khotkeys-5.5.4.tar.xz";
-      sha256 = "0mmszjnwcza30b5npd6ddkj88g4zy3nhnpw7bdghz053cn1lb1m0";
+      sha256 = "1jlpzqrww2n9zf5cwlvpyvxcz0wv0cyln1xjhm49ayl5iin3m9yn";
-      name = "khotkeys-5.5.3.tar.xz";
+      name = "khotkeys-5.5.4.tar.xz";
    };
  };
  kinfocenter = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kinfocenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kinfocenter-5.5.4.tar.xz";
-      sha256 = "1c5bbvkfmdizkmd4n0mqbg6mpixkxvmahprsrlczh4fyd12j1r00";
+      sha256 = "10qhq76ha1mahpmgrj4kw660zf92k7ys3mz2dkiid7ib6gsimir4";
-      name = "kinfocenter-5.5.3.tar.xz";
+      name = "kinfocenter-5.5.4.tar.xz";
    };
  };
  kmenuedit = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kmenuedit-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kmenuedit-5.5.4.tar.xz";
-      sha256 = "1vihqqc431na4b29hliflcv61lhw1r43l0m4bficcy0l6xkmiyxz";
+      sha256 = "0scsr3isf4d0hlk85pk0snn6j5cwm7qlqnl6iqs0df32g8ysirs6";
-      name = "kmenuedit-5.5.3.tar.xz";
+      name = "kmenuedit-5.5.4.tar.xz";
    };
  };
  kscreen = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kscreen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kscreen-5.5.4.tar.xz";
-      sha256 = "12r4k9ihlx62wgra7aw3pj5gjscg3jw1akkjrw9dkjy1vbpdxmpg";
+      sha256 = "0ax67gqfjw59jk3wh3sflk3q10xqrjwf2qmvx6jky6q2x4kdixvv";
-      name = "kscreen-5.5.3.tar.xz";
+      name = "kscreen-5.5.4.tar.xz";
    };
  };
  kscreenlocker = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kscreenlocker-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kscreenlocker-5.5.4.tar.xz";
-      sha256 = "1crgnq6hwi7hy1yx2brs8hln57ib889ifz5ba72v9j4wk0439p49";
+      sha256 = "18r53f5vri8xaj53zskadnxqxs60akxmwkq54xnb4lvg5cks9hrr";
-      name = "kscreenlocker-5.5.3.tar.xz";
+      name = "kscreenlocker-5.5.4.tar.xz";
    };
  };
  ksshaskpass = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/ksshaskpass-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/ksshaskpass-5.5.4.tar.xz";
-      sha256 = "14xlvbb411vc3rfkdfcyx7jdgdnaf9gwy6xd6bivvdlj9hq2nikb";
+      sha256 = "0hlgf7896qksivmf79ks0xcqndjvmmq13ywrkc0l43pcj50ydhj2";
-      name = "ksshaskpass-5.5.3.tar.xz";
+      name = "ksshaskpass-5.5.4.tar.xz";
    };
  };
  ksysguard = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/ksysguard-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/ksysguard-5.5.4.tar.xz";
-      sha256 = "1y5x3n1rqncnzvs7j1icb4k3i2254l5mvvw6rrr6ymd1mvl8h1hx";
+      sha256 = "1hbq8ppz9ijkk032aldrxyfwk1yrpjchfy6w6mg836bi8f69i1kc";
-      name = "ksysguard-5.5.3.tar.xz";
+      name = "ksysguard-5.5.4.tar.xz";
    };
  };
  kwallet-pam = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwallet-pam-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwallet-pam-5.5.4.tar.xz";
-      sha256 = "0nlzrvdzf339pjcvm359brf0dmlx983gamjr75wm4277hhxwmphd";
+      sha256 = "0cj9iq7ba24lccgj3h4fpa97bcm3lw3yz43hfhldiwdkzl1pydhl";
-      name = "kwallet-pam-5.5.3.tar.xz";
+      name = "kwallet-pam-5.5.4.tar.xz";
    };
  };
  kwayland = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwayland-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwayland-5.5.4.tar.xz";
-      sha256 = "0jmv4zphy2fb1pnkxcgsy1qcd926llqgqcdqn0kiwlxaznll0lnz";
+      sha256 = "1cprg187h8pny86910m08pzyvknbcqa9x3xbqh7flrpw0rvrg5wp";
-      name = "kwayland-5.5.3.tar.xz";
+      name = "kwayland-5.5.4.tar.xz";
    };
  };
  kwayland-integration = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwayland-integration-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwayland-integration-5.5.4.tar.xz";
-      sha256 = "1yyp8vq6b544gbphpfcdayn1n0g4i3lyb5n1pnxb71nvv2j5ji95";
+      sha256 = "07vv7gjqgmgn766p6nifn2i835rdhs6kvp24a5fqnh8ad24m8fjy";
-      name = "kwayland-integration-5.5.3.tar.xz";
+      name = "kwayland-integration-5.5.4.tar.xz";
    };
  };
  kwin = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwin-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwin-5.5.4.tar.xz";
-      sha256 = "1hjgxm8l25vdc7zfv6kivgdwhbjvjfia7lqdsv8r4rf110f4an70";
+      sha256 = "1015a0d3yi5b4isfkrl3w3mdslh0r1xyhvy9z8liz3wnxgrajwj8";
-      name = "kwin-5.5.3.tar.xz";
+      name = "kwin-5.5.4.tar.xz";
    };
  };
  kwrited = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwrited-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwrited-5.5.4.tar.xz";
-      sha256 = "1bggps8icam3ngkzxz6hkf8r5slz4x25wd1c47651y8prvqdagx9";
+      sha256 = "01d8q3hj5frhmafsavgvyz2nlbd4ma4fsx12dhjyxqsgxdvvgffh";
-      name = "kwrited-5.5.3.tar.xz";
+      name = "kwrited-5.5.4.tar.xz";
    };
  };
  libkscreen = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/libkscreen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/libkscreen-5.5.4.tar.xz";
-      sha256 = "04gm7sqpij0mnivrhx7n2y0y1dpsffsvbn5l5l754q5bis6f182y";
+      sha256 = "15q7x844x8cz15b3mkh4lwygvrx66s0fl706b221p3my54n63ymf";
-      name = "libkscreen-5.5.3.tar.xz";
+      name = "libkscreen-5.5.4.tar.xz";
    };
  };
  libksysguard = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/libksysguard-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/libksysguard-5.5.4.tar.xz";
-      sha256 = "1p35agppwplfz396irdprsjgqjqpin4vbcigzylxflbvp7yp5sgl";
+      sha256 = "1irrb3im0gr8yhkp570bqipbqz8igpxr2k4kxb2c04111npkqmw1";
-      name = "libksysguard-5.5.3.tar.xz";
+      name = "libksysguard-5.5.4.tar.xz";
    };
  };
  milou = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/milou-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/milou-5.5.4.tar.xz";
-      sha256 = "0sddp3x8hm5d300bxn2m6j0vvy49kw8hidqmc7yim5gvimipzn92";
+      sha256 = "0dc8jbk0yihqv5jxd4i12rmvfyyp63b6hx9q22qjrj5gkda1cddl";
-      name = "milou-5.5.3.tar.xz";
+      name = "milou-5.5.4.tar.xz";
    };
  };
  oxygen = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/oxygen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/oxygen-5.5.4.tar.xz";
-      sha256 = "1rynv9scc4pm682imjc8w8czcf4yryzkwvsviyl86iqx1v14jydn";
+      sha256 = "10fjwk1aznpkrnal961kfwpjjil2iy2n0x96h26bh91l4insix1v";
-      name = "oxygen-5.5.3.tar.xz";
+      name = "oxygen-5.5.4.tar.xz";
    };
  };
  plasma-desktop = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-desktop-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-desktop-5.5.4.tar.xz";
-      sha256 = "1w5bphy231722ly2f8ybpgdck0sbrlibjjxvkby2r2pynzsgbr0m";
+      sha256 = "0lkjgbqinxy40w6z01akpihljqpm7bachmxqmcp6fjnzawql2xqd";
-      name = "plasma-desktop-5.5.3.tar.xz";
+      name = "plasma-desktop-5.5.4.tar.xz";
    };
  };
  plasma-mediacenter = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-mediacenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-mediacenter-5.5.4.tar.xz";
-      sha256 = "15sisk0pyggrirfkvbq2qcy17m1jgxn43vznfnbzp8dp9yrz0wbv";
+      sha256 = "1rn7qffd11dljx1il7cw74wbqf4lwmmlcv19yxj08fdrp5ylqr8a";
-      name = "plasma-mediacenter-5.5.3.tar.xz";
+      name = "plasma-mediacenter-5.5.4.tar.xz";
    };
  };
  plasma-nm = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-nm-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-nm-5.5.4.tar.xz";
-      sha256 = "1ijqx0aphdhk5zffy4mnc1lbkkzdhj0qng0v4978kkxxjdq7g26q";
+      sha256 = "0bjfcsavrqx4i4c0ynfmdna7fnmabm8970h3dnx7ihwsqgjf5q31";
-      name = "plasma-nm-5.5.3.tar.xz";
+      name = "plasma-nm-5.5.4.tar.xz";
    };
  };
  plasma-pa = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-pa-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-pa-5.5.4.tar.xz";
-      sha256 = "0hpdf9vhsys0jbv8fya2dqdnig8bvbnaxp01x0zwa59lxb6b3czf";
+      sha256 = "0d1cdixgxa2vsgv47hinh5nsbf2bln3ppdlrnzz9vglian0z7879";
-      name = "plasma-pa-5.5.3.tar.xz";
+      name = "plasma-pa-5.5.4.tar.xz";
    };
  };
  plasma-sdk = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-sdk-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-sdk-5.5.4.tar.xz";
-      sha256 = "0cqg8a3gmmifgicca7fg559didqmr7hgpfybw7j8rlibsh8wdlk5";
+      sha256 = "0fdx4f8z00276s1p1v1bkbrhy59jswk2dj8kcj96r2rk3xzcg0ax";
-      name = "plasma-sdk-5.5.3.tar.xz";
+      name = "plasma-sdk-5.5.4.tar.xz";
    };
  };
  plasma-workspace = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-workspace-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-5.5.4.tar.xz";
-      sha256 = "0wpsmw1rbidr8fc4zcfp84h05gs6cfxcl6cn0azb8lc2zh3v4ja9";
+      sha256 = "0zh96qq0nl1c6bni7vnciba548f3cjacsi06n2rv05356j1fp87h";
-      name = "plasma-workspace-5.5.3.tar.xz";
+      name = "plasma-workspace-5.5.4.tar.xz";
    };
  };
  plasma-workspace-wallpapers = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-workspace-wallpapers-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-wallpapers-5.5.4.tar.xz";
-      sha256 = "1i1gysw489spvpbfr654yncf8yjpg29aggk21ykmmmyc2qpz1jxp";
+      sha256 = "0p111f95di11k4v19c1mg694c71825najmi8dzj2qrif5sb2vvsn";
-      name = "plasma-workspace-wallpapers-5.5.3.tar.xz";
+      name = "plasma-workspace-wallpapers-5.5.4.tar.xz";
    };
  };
  polkit-kde-agent = {
-    version = "1-5.5.3";
+    version = "1-5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/polkit-kde-agent-1-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/polkit-kde-agent-1-5.5.4.tar.xz";
-      sha256 = "1hh3i0chc817bvxaydb2ak1wq65wzrqyj7dl3q1wl4l7a4yyh8ab";
+      sha256 = "116sj9s45n3qcgfsdz5hh6a73b0hldgcnxbpvi4320xpny316vh2";
-      name = "polkit-kde-agent-1-5.5.3.tar.xz";
+      name = "polkit-kde-agent-1-5.5.4.tar.xz";
    };
  };
  powerdevil = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/powerdevil-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/powerdevil-5.5.4.tar.xz";
-      sha256 = "0ilx44rhy0z8c0kv439nypr5rrs7wk30a1hnhdzssqbhc4d43kzy";
+      sha256 = "0i0i55g72yb9z8agv1yyrx98l3s0fs5wn51kz571vqqrw6m3wn7l";
-      name = "powerdevil-5.5.3.tar.xz";
+      name = "powerdevil-5.5.4.tar.xz";
    };
  };
  sddm-kcm = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/sddm-kcm-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/sddm-kcm-5.5.4.tar.xz";
-      sha256 = "0gijb75bzqih7h4m6r6kqg16p5l7rj4nb1cc959gqqkkqxghgfd0";
+      sha256 = "04vh4f2hg5584acb5ywf1i8z6lvz0fcs7zh085bm7pkx5l60l59b";
-      name = "sddm-kcm-5.5.3.tar.xz";
+      name = "sddm-kcm-5.5.4.tar.xz";
    };
  };
  systemsettings = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/systemsettings-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/systemsettings-5.5.4.tar.xz";
-      sha256 = "1wcbgs10shhgip1dxz80wxpgxifrcal863h6ygzpqwj9jb53dj7x";
+      sha256 = "1i7ljxsnwf2kwd05kzxirbyaxj3w5kyr0jq9j0iy3jlz97p4jkpv";
-      name = "systemsettings-5.5.3.tar.xz";
+      name = "systemsettings-5.5.4.tar.xz";
    };
  };
  user-manager = {
-    version = "5.5.3";
+    version = "5.5.4";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/user-manager-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/user-manager-5.5.4.tar.xz";
-      sha256 = "1v421xfy089m6kj7x5175lvvsaqjk9y9zr7s33jsnhg8zd1hwwcm";
+      sha256 = "17lki4y77rq1n100p74q4n6sm3l5dxvv996wf4w1j2n2aiw89p4j";
-      name = "user-manager-5.5.3.tar.xz";
+      name = "user-manager-5.5.4.tar.xz";
    };
  };
 }
@@ -4,14 +4,14 @@
 stdenv.mkDerivation rec {
  name    = "compcert-${version}";
-  version = "2.5";
+  version = "2.6";
  src = fetchurl {
    url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n";
+    sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1";
  };
-  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]);
+  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
  enableParallelBuilding = true;
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert }:
+{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc }:
 let
  llvm     = callPackage ./llvm.nix { };
@@ -14,10 +14,12 @@ stdenv.mkDerivation rec {
  buildInputs =
    [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib
-    ];
+    ]
    ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
  propagatedBuildInputs = [glib];
-  NIX_LDFLAGS = "-lgcc_s" ;
+  NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;
  # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
  dontDisableStatic = true;
@@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://mono-project.com/;
    description = "Cross platform, open source .NET development framework";
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; darwin ++ linux;
    maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz ];
    license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
  };
@@ -1,33 +1,15 @@
 { stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
 , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
-let version = "4.10.2.2614"; in
+stdenv.mkDerivation rec {
 stdenv.mkDerivation {
  name = "squeak-${version}";
  version = "4.10.2.2614";
  src = fetchurl {
    sha256 = "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix";
    url = "http://squeakvm.org/unix/release/Squeak-${version}-src.tar.gz";
  };
  meta = with stdenv.lib; {
    inherit version;
    description = "Smalltalk programming language and environment";
    longDescription = ''
      Squeak is a full-featured implementation of the Smalltalk programming
      language and environment based on (and largely compatible with) the
      original Smalltalk-80 system. Squeak has very powerful 2- and 3-D
      graphics, sound, video, MIDI, animation and other multimedia
      capabilities. It also includes a customisable framework for creating
      dynamic HTTP servers and interactively extensible Web sites.
    '';
    homepage = http://squeakvm.org/;
    downloadPage = http://squeakvm.org/unix/index.html;
    license = with licenses; [ asl20 mit ];
    platforms = platforms.linux;
    maintainers = with maintainers; [ nckx ];
  };
  buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
    pango libpulseaudio which ];
  nativeBuildInputs = [ cmake pkgconfig ];
@@ -44,4 +26,21 @@ stdenv.mkDerivation {
  '';
  enableParallelBuilding = true;
  meta = with stdenv.lib; {
    description = "Smalltalk programming language and environment";
    longDescription = ''
      Squeak is a full-featured implementation of the Smalltalk programming
      language and environment based on (and largely compatible with) the
      original Smalltalk-80 system. Squeak has very powerful 2- and 3-D
      graphics, sound, video, MIDI, animation and other multimedia
      capabilities. It also includes a customisable framework for creating
      dynamic HTTP servers and interactively extensible Web sites.
    '';
    homepage = http://squeakvm.org/;
    downloadPage = http://squeakvm.org/unix/index.html;
    license = with licenses; [ asl20 mit ];
    platforms = platforms.linux;
    maintainers = with maintainers; [ nckx ];
  };
 }
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
  name = "urweb-${version}";
-  version = "20151018";
+  version = "20151220";
  src = fetchurl {
    url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "08p52p5m1xl2gzdchnayky44mm2b0x8hv0f00iviyyv1gnx3lpy0";
+    sha256 = "155maalm4l1ni7az3yqs0lrgl5f2xr3pz4118ag1hnk82qldd4s5";
  };
  buildInputs = [ openssl mlton mysql postgresql sqlite ];
@@ -5,14 +5,14 @@ with import ./lib.nix { inherit pkgs; };
 self: super: {
  # Some packages need a non-core version of Cabal.
-  Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
+  Cabal_1_18_1_7 = dontCheck super.Cabal_1_18_1_7;
-  Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
+  Cabal_1_20_0_4 = dontCheck super.Cabal_1_20_0_4;
  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; });
-  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });
+  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_7; });
  # Link statically to avoid runtime dependency on GHC.
-  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
  # Apply NixOS-specific patches.
  ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
@@ -41,7 +41,7 @@ self: super: {
  unix = null;
  # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_0_0;
+  binary = self.binary_0_8_0_1;
  deepseq = self.deepseq_1_3_0_1;
  haskeline = self.haskeline_0_7_2_1;
  hoopl = self.hoopl_3_10_2_0;
@@ -53,7 +53,7 @@ self: super: {
  deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
  # Newer versions don't compile.
-  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
  # We have no working cabal-install at the moment.
  cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
@@ -63,7 +63,7 @@ self: super: {
  hashable = dontCheck super.hashable;
  # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_7; };
  # Haddock chokes on the prologue from the cabal file.
  ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -83,12 +83,13 @@ self: super: {
  vector = self.vector_0_10_9_3;
  # These packages need more recent versions of core libraries to compile.
-  happy = addBuildTools super.happy [self.Cabal_1_18_1_6 self.containers_0_4_2_1];
+  happy = addBuildTools super.happy [self.Cabal_1_18_1_7 self.containers_0_4_2_1];
-  network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_6;
+  network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_7;
-  stm = addBuildTool super.stm self.Cabal_1_18_1_6;
+  stm = addBuildTool super.stm self.Cabal_1_18_1_7;
  split = super.split_0_1_4_3;
  # Needs hashable on pre 7.10.x compilers.
  nats_1 = addBuildDepend super.nats_1 self.hashable;
  nats = addBuildDepend super.nats self.hashable;
  # Needs void on pre 7.10.x compilers.
@@ -47,12 +47,12 @@ self: super: {
  hashable = dontCheck super.hashable;
  # Newer versions don't compile.
-  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
  cabal-install = self.cabal-install_1_18_1_0;
  # https://github.com/peti/jailbreak-cabal/issues/9
  jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
+    Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
  };
  # Haddock chokes on the prologue from the cabal file.
@@ -68,6 +68,7 @@ self: super: {
  doctest = dontHaddock super.doctest;
  # Needs hashable on pre 7.10.x compilers.
  nats_1 = addBuildDepend super.nats_1 self.hashable;
  nats = addBuildDepend super.nats self.hashable;
  # Newer versions require bytestring >=0.10.
@@ -42,10 +42,10 @@ self: super: {
  xhtml = self.xhtml_3000_2_1;
  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_0; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_1; process = self.process_1_2_3_0; };
  # Newer versions don't compile.
-  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
  cabal-install = self.cabal-install_1_18_1_0;
  # https://github.com/tibbe/hashable/issues/85
@@ -53,7 +53,7 @@ self: super: {
  # https://github.com/peti/jailbreak-cabal/issues/9
  jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
+    Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
  };
  # Haddock chokes on the prologue from the cabal file.
@@ -69,6 +69,7 @@ self: super: {
  doctest = dontHaddock super.doctest;
  # Needs hashable on pre 7.10.x compilers.
  nats_1 = addBuildDepend super.nats_1 self.hashable;
  nats = addBuildDepend super.nats self.hashable;
  # Newer versions require bytestring >=0.10.
@@ -41,16 +41,16 @@ self: super: {
  xhtml = self.xhtml_3000_2_1;
  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
  # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
  # https://github.com/tibbe/hashable/issues/85
  hashable = dontCheck super.hashable;
  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
  # Haddock chokes on the prologue from the cabal file.
  ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -74,6 +74,7 @@ self: super: {
  control-monad-free = super.control-monad-free_0_5_3;
  # Needs hashable on pre 7.10.x compilers.
  nats_1 = addBuildDepend super.nats_1 self.hashable;
  nats = addBuildDepend super.nats self.hashable;
  # Test suite won't compile.
@@ -40,16 +40,16 @@ self: super: {
  xhtml = self.xhtml_3000_2_1;
  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
  # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
  # https://github.com/tibbe/hashable/issues/85
  hashable = dontCheck super.hashable;
  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
  # Haddock chokes on the prologue from the cabal file.
  ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -77,6 +77,7 @@ self: super: {
  control-monad-free = super.control-monad-free_0_5_3;
  # Needs hashable on pre 7.10.x compilers.
  nats_1 = addBuildDepend super.nats_1 self.hashable;
  nats = addBuildDepend super.nats self.hashable;
  # https://github.com/magthe/sandi/issues/7
@@ -38,7 +38,7 @@ self: super: {
  xhtml = null;
  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
  # mtl 2.2.x needs the latest transformers.
  mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; };
@@ -112,6 +112,7 @@ self: super: {
                                          self.webkitgtk3-javascriptcore ];
  # Needs hashable on pre 7.10.x compilers.
  nats_1 = addBuildDepend super.nats_1 self.hashable;
  nats = addBuildDepend super.nats self.hashable;
  # needs mtl-compat to build with mtl 2.1.x
@@ -35,12 +35,7 @@ self: super: {
  xhtml = null;
  # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal.override {
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
    Cabal = null;
    mkDerivation = drv: self.mkDerivation (drv // {
      preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
    });
  };
  # Older versions of QuickCheck don't support our version of Template Haskell.
  QuickCheck = self.QuickCheck_2_8_2;
@@ -51,7 +46,7 @@ self: super: {
  # https://github.com/hspec/HUnit/issues/7
  HUnit = dontCheck super.HUnit;
-  # Older versions don't support our version of base.
+  # https://github.com/hspec/hspec/issues/253
-  async = self.async_2_1_0;
+  hspec-core = dontCheck super.hspec-core;
 }
@@ -33,23 +33,8 @@ self: super: {
  unix = null;
  xhtml = null;
-  # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
+  # jailbreak-cabal can use the native Cabal library.
-  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
    version = "1.23.0.0";
    src = pkgs.fetchFromGitHub {
      owner = "haskell";
      repo = "cabal";
      rev = "fe7b8784ac0a5848974066bdab76ce376ba67277";
      sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s";
    };
    jailbreak = false;
    doHaddock = false;
    postUnpack = "sourceRoot+=/Cabal";
  });
  jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: {
    executableHaskellDepends = [ self.Cabal_1_23_0_0 ];
    preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
  });
  # haddock: No input file(s).
  nats = dontHaddock super.nats;
@@ -14,10 +14,6 @@ self: super: {
  inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy gtk2hs-buildtools;
  # Many packages fail with:
  #   haddock: internal error: expectJust getPackageDetails
  mkDerivation = drv: super.mkDerivation (drv // { doHaddock = false; });
  # This is the list of packages that are built into a booted ghcjs installation
  # It can be generated with the command:
  # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'"
@@ -192,6 +192,7 @@ dont-distribute-packages:
  AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -288,6 +289,7 @@ dont-distribute-packages:
  aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  atom-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  atomic-primops-foreign:                       [ x86_64-darwin ]
  atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -372,6 +374,7 @@ dont-distribute-packages:
  binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  binary-indexed-tree:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  binary-search:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  binary-strict:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  binding-gtk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -399,6 +402,7 @@ dont-distribute-packages:
  bindings-librrd:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  bindings-libstemmer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  bindings-libv4l2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  bindings-libzip:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  bindings-linux-videodev2:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  bindings-lxc:                                 [ x86_64-darwin ]
  bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -421,6 +425,7 @@ dont-distribute-packages:
  BiobaseTrainingData:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  BiobaseTurner:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -455,6 +460,7 @@ dont-distribute-packages:
  blip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  bloodhound:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  bloxorz:                                      [ x86_64-darwin ]
  blubber:                                      [ x86_64-darwin ]
  Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -463,6 +469,7 @@ dont-distribute-packages:
  board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  boolsimplifier:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -695,6 +702,7 @@ dont-distribute-packages:
  const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  constructible:                                [ i686-linux ]
  constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  consumers:                                    [ x86_64-darwin ]
@@ -1079,6 +1087,7 @@ dont-distribute-packages:
  feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  feed-cli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  feed-collect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  feed-translator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  feldspar-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  feldspar-language:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1129,6 +1138,7 @@ dont-distribute-packages:
  flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  fluidsynth:                                   [ x86_64-darwin ]
  FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1183,6 +1193,7 @@ dont-distribute-packages:
  frpnow-gloss:                                 [ x86_64-darwin ]
  fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  FTGL-bytestring:                              [ x86_64-darwin ]
  FTGL:                                         [ x86_64-darwin ]
@@ -1199,6 +1210,7 @@ dont-distribute-packages:
  funion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  funsat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  fuzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  fuzzytime:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  fwgl-glfw:                                    [ x86_64-darwin ]
  gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1247,7 +1259,6 @@ dont-distribute-packages:
  ghc-exactprint:                               [ x86_64-darwin ]
  ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  ghc-imported-from:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  ghc-parmake:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1472,6 +1483,7 @@ dont-distribute-packages:
  happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  harchive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  hardware-edsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  HaRe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1743,6 +1755,7 @@ dont-distribute-packages:
  hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  HLogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  hly:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  HMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  hmatrix-banded:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2039,6 +2052,7 @@ dont-distribute-packages:
  INblobs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  inch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  incremental-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  incremental-sat-solver:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  index-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2284,6 +2298,7 @@ dont-distribute-packages:
  libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  life:                                         [ x86_64-darwin ]
  lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  lighttpd-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2359,6 +2374,7 @@ dont-distribute-packages:
  lord:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  loris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  lscabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2519,6 +2535,7 @@ dont-distribute-packages:
  monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  monoid-subclasses:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  monte-carlo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  moo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  morfette:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2618,6 +2635,7 @@ dont-distribute-packages:
  newt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  newtype-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  nibblestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  nikepub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  nimber:                                       [ i686-linux ]
@@ -2704,9 +2722,11 @@ dont-distribute-packages:
  OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  opml-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  OrchestrateDB:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  orchestrate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  orchid-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  orchid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  order-maintenance:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2790,6 +2810,7 @@ dont-distribute-packages:
  phybin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  pianola:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  picoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  piki:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2821,6 +2842,7 @@ dont-distribute-packages:
  polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  polh-lexicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  Pollutocracy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  polynom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  polyseq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  polysoup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2906,6 +2928,7 @@ dont-distribute-packages:
  pugs-hsregex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  pugs-HsSyck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  Pugs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  PUH-Project:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  pulse-simple:                                 [ x86_64-darwin ]
  punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3055,6 +3078,7 @@ dont-distribute-packages:
  rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  rezoom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  rfc3339:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  rhythm-game-tutorial:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  riemann:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  riot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3136,6 +3160,7 @@ dont-distribute-packages:
  scaleimage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  scalp-webhooks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  scan-vector-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  scc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  scholdoc-citeproc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3202,6 +3227,7 @@ dont-distribute-packages:
  ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  set-cover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  sexp-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3480,6 +3506,7 @@ dont-distribute-packages:
  tensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  termbox-bindings:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3528,6 +3555,7 @@ dont-distribute-packages:
  timeplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  time-qq:                                      [ i686-linux ]
  time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  timerep:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  timestamp-subprocess-lines:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3625,6 +3653,7 @@ dont-distribute-packages:
  udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  udev:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  ui-command:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  UISF:                                         [ x86_64-darwin ]
  UMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3745,6 +3774,7 @@ dont-distribute-packages:
  wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  webapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  webapp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  WebBits-multiplate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3828,6 +3858,7 @@ dont-distribute-packages:
  xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  xlsx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1576,6 +1577,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3680,6 +3682,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4601,6 +4610,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4798,6 +4808,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4966,6 +4977,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5050,6 +5062,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5578,6 +5591,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5935,6 +5949,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6103,6 +6118,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6489,6 +6505,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7762,6 +7779,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7957,6 +7975,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1576,6 +1577,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3680,6 +3682,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4601,6 +4610,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4798,6 +4808,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4966,6 +4977,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5050,6 +5062,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5578,6 +5591,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5935,6 +5949,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6103,6 +6118,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6489,6 +6505,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7762,6 +7779,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7957,6 +7975,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1576,6 +1577,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3680,6 +3682,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4601,6 +4610,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4798,6 +4808,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4966,6 +4977,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5050,6 +5062,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5578,6 +5591,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5935,6 +5949,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6103,6 +6118,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6489,6 +6505,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7762,6 +7779,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7957,6 +7975,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1576,6 +1577,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3680,6 +3682,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4601,6 +4610,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4798,6 +4808,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4966,6 +4977,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5050,6 +5062,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5578,6 +5591,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5935,6 +5949,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6103,6 +6118,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6489,6 +6505,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7762,6 +7779,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7957,6 +7975,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1576,6 +1577,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3679,6 +3681,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4598,6 +4607,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4795,6 +4805,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4963,6 +4974,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5047,6 +5059,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5575,6 +5588,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5932,6 +5946,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6100,6 +6115,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6486,6 +6502,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7758,6 +7775,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7953,6 +7971,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1576,6 +1577,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3679,6 +3681,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4598,6 +4607,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4795,6 +4805,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4963,6 +4974,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5047,6 +5059,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5575,6 +5588,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5932,6 +5946,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6100,6 +6115,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6486,6 +6502,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7758,6 +7775,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7953,6 +7971,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1428,6 +1429,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1574,6 +1576,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3677,6 +3680,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4595,6 +4605,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4792,6 +4803,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4960,6 +4972,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5044,6 +5057,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5572,6 +5586,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5929,6 +5944,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6096,6 +6112,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6482,6 +6499,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7753,6 +7771,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7948,6 +7967,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1428,6 +1429,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1574,6 +1576,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3677,6 +3680,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4595,6 +4605,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4792,6 +4803,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4960,6 +4972,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5044,6 +5057,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = dontDistribute super."json-autotype";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5572,6 +5586,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5929,6 +5944,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6096,6 +6112,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6482,6 +6499,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7753,6 +7771,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7948,6 +7967,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1424,6 +1425,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1570,6 +1572,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3666,6 +3669,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4583,6 +4593,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4780,6 +4791,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4948,6 +4960,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5032,6 +5045,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5560,6 +5574,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5917,6 +5932,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6084,6 +6100,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6470,6 +6487,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7739,6 +7757,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7934,6 +7953,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1424,6 +1425,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1570,6 +1572,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3663,6 +3666,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4577,6 +4587,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4774,6 +4785,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4942,6 +4954,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5026,6 +5039,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5554,6 +5568,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5910,6 +5925,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6077,6 +6093,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6463,6 +6480,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7730,6 +7748,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7925,6 +7944,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_3";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -1423,6 +1424,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1571,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3654,6 +3657,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4566,6 +4576,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4758,6 +4769,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4926,6 +4938,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5010,6 +5023,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5537,6 +5551,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5892,6 +5907,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6058,6 +6074,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6443,6 +6460,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7707,6 +7725,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7900,6 +7919,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_3";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -1423,6 +1424,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1571,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3653,6 +3656,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4565,6 +4575,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4756,6 +4767,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4923,6 +4935,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5007,6 +5020,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5533,6 +5547,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5888,6 +5903,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6054,6 +6070,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6439,6 +6456,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7703,6 +7721,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7896,6 +7915,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_3";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -1423,6 +1424,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1571,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3653,6 +3656,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4564,6 +4574,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4755,6 +4766,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4922,6 +4934,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5006,6 +5019,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5532,6 +5546,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5887,6 +5902,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6053,6 +6069,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6438,6 +6455,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7702,6 +7720,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7895,6 +7914,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_3";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -1423,6 +1424,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1571,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3653,6 +3656,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4563,6 +4573,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4754,6 +4765,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4921,6 +4933,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5005,6 +5018,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5531,6 +5545,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5886,6 +5901,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6052,6 +6068,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6437,6 +6454,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7701,6 +7719,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7893,6 +7912,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_3";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -1422,6 +1423,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1567,6 +1569,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3650,6 +3653,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4559,6 +4569,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4750,6 +4761,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4917,6 +4929,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5001,6 +5014,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5526,6 +5540,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5880,6 +5895,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6046,6 +6062,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6431,6 +6448,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7694,6 +7712,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7886,6 +7905,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_3";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -1421,6 +1422,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1566,6 +1568,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3646,6 +3649,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4555,6 +4565,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4746,6 +4757,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4913,6 +4925,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -4997,6 +5010,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5522,6 +5536,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5874,6 +5889,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6040,6 +6056,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6425,6 +6442,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -6691,7 +6709,6 @@ self: super: {
  "quick-generator" = dontDistribute super."quick-generator";
  "quick-schema" = dontDistribute super."quick-schema";
  "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1";
  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
  "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7686,6 +7703,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringtable-atom" = dontDistribute super."stringtable-atom";
@@ -7877,6 +7895,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_2";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -1424,6 +1425,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1570,6 +1572,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3660,6 +3663,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4574,6 +4584,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4771,6 +4782,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4939,6 +4951,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5023,6 +5036,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5551,6 +5565,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5907,6 +5922,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6074,6 +6090,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6459,6 +6476,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7724,6 +7742,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7919,6 +7938,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -172,6 +172,7 @@ self: super: {
  "Cartesian" = dontDistribute super."Cartesian";
  "Cascade" = dontDistribute super."Cascade";
  "Catana" = dontDistribute super."Catana";
  "ChannelT" = dontDistribute super."ChannelT";
  "Chart" = doDistribute super."Chart_1_3_3";
  "Chart-cairo" = dontDistribute super."Chart-cairo";
  "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -1423,6 +1424,7 @@ self: super: {
  "astrds" = dontDistribute super."astrds";
  "astview" = dontDistribute super."astview";
  "astview-utils" = dontDistribute super."astview-utils";
  "async" = doDistribute super."async_2_0_2";
  "async-dejafu" = dontDistribute super."async-dejafu";
  "async-extras" = dontDistribute super."async-extras";
  "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1571,7 @@ self: super: {
  "bdd" = dontDistribute super."bdd";
  "bdelta" = dontDistribute super."bdelta";
  "bdo" = dontDistribute super."bdo";
  "beam" = dontDistribute super."beam";
  "beamable" = dontDistribute super."beamable";
  "beautifHOL" = dontDistribute super."beautifHOL";
  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3658,6 +3661,13 @@ self: super: {
  "googleplus" = dontDistribute super."googleplus";
  "googlepolyline" = dontDistribute super."googlepolyline";
  "gopherbot" = dontDistribute super."gopherbot";
  "gore-and-ash" = dontDistribute super."gore-and-ash";
  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
  "gpah" = dontDistribute super."gpah";
  "gpcsets" = dontDistribute super."gpcsets";
  "gpolyline" = dontDistribute super."gpolyline";
@@ -4571,6 +4581,7 @@ self: super: {
  "hspec-experimental" = dontDistribute super."hspec-experimental";
  "hspec-jenkins" = dontDistribute super."hspec-jenkins";
  "hspec-laws" = dontDistribute super."hspec-laws";
  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
  "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
  "hspec-server" = dontDistribute super."hspec-server";
@@ -4768,6 +4779,7 @@ self: super: {
  "hyphenate" = dontDistribute super."hyphenate";
  "hyphenation" = doDistribute super."hyphenation_0_4_1";
  "hypher" = dontDistribute super."hypher";
  "hzaif" = dontDistribute super."hzaif";
  "hzk" = dontDistribute super."hzk";
  "hzulip" = dontDistribute super."hzulip";
  "i18n" = dontDistribute super."i18n";
@@ -4936,6 +4948,7 @@ self: super: {
  "irc-fun-client" = dontDistribute super."irc-fun-client";
  "irc-fun-color" = dontDistribute super."irc-fun-color";
  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
  "irc-fun-types" = dontDistribute super."irc-fun-types";
  "ircbot" = dontDistribute super."ircbot";
  "ircbouncer" = dontDistribute super."ircbouncer";
  "ireal" = dontDistribute super."ireal";
@@ -5020,6 +5033,7 @@ self: super: {
  "jsmw" = dontDistribute super."jsmw";
  "json" = dontDistribute super."json";
  "json-assertions" = dontDistribute super."json-assertions";
  "json-ast" = dontDistribute super."json-ast";
  "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
  "json-b" = dontDistribute super."json-b";
  "json-builder" = dontDistribute super."json-builder";
@@ -5548,6 +5562,7 @@ self: super: {
  "mangopay" = dontDistribute super."mangopay";
  "manifold-random" = dontDistribute super."manifold-random";
  "manifolds" = dontDistribute super."manifolds";
  "mappy" = dontDistribute super."mappy";
  "marionetta" = dontDistribute super."marionetta";
  "markdown" = doDistribute super."markdown_0_1_13_1";
  "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5903,6 +5918,7 @@ self: super: {
  "names" = dontDistribute super."names";
  "names-th" = dontDistribute super."names-th";
  "nano-cryptr" = dontDistribute super."nano-cryptr";
  "nano-erl" = dontDistribute super."nano-erl";
  "nano-hmac" = dontDistribute super."nano-hmac";
  "nano-md5" = dontDistribute super."nano-md5";
  "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6070,6 +6086,7 @@ self: super: {
  "null-canvas" = dontDistribute super."null-canvas";
  "nullary" = dontDistribute super."nullary";
  "number" = dontDistribute super."number";
  "number-length" = dontDistribute super."number-length";
  "numbering" = dontDistribute super."numbering";
  "numerals" = dontDistribute super."numerals";
  "numerals-base" = dontDistribute super."numerals-base";
@@ -6455,6 +6472,7 @@ self: super: {
  "pkggraph" = dontDistribute super."pkggraph";
  "pktree" = dontDistribute super."pktree";
  "plailude" = dontDistribute super."plailude";
  "plan-b" = dontDistribute super."plan-b";
  "planar-graph" = dontDistribute super."planar-graph";
  "plat" = dontDistribute super."plat";
  "playlists" = dontDistribute super."playlists";
@@ -7720,6 +7738,7 @@ self: super: {
  "string-qq" = dontDistribute super."string-qq";
  "string-quote" = dontDistribute super."string-quote";
  "string-similarity" = dontDistribute super."string-similarity";
  "string-typelits" = dontDistribute super."string-typelits";
  "stringlike" = dontDistribute super."stringlike";
  "strings" = dontDistribute super."strings";
  "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
@@ -7914,6 +7933,7 @@ self: super: {
  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
  "temporary" = doDistribute super."temporary_1_2_0_3";
  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
  "tempus" = dontDistribute super."tempus";
  "tempus-fugit" = dontDistribute super."tempus-fugit";
--- a/Show More
+++ b/Show More