Merge remote-tracking branch 'upstream/master' into staging

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,8 +4,8 @@
 ###### Things done
 
 - [ ] Tested using sandboxing
-  ([nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS,
+  ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,
-    or option `build-use-chroot` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file)
+    or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file)
     on non-NixOS)
 - Built on platform(s)
    - [ ] NixOS

.version

@@ -1 +1 @@
-16.09
+17.03

doc/languages-frameworks/python.md

@@ -481,7 +481,7 @@ and the aliases
 #### `buildPythonPackage` function
 
 The `buildPythonPackage` function is implemented in
-`pkgs/development/python-modules/generic/default.nix`
+`pkgs/development/interpreters/python/build-python-package.nix`
 
 and can be used as:
 
@@ -536,6 +536,7 @@ All parameters from `mkDerivation` function are still supported.
 * `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
 * `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`.
 * `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
+* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
 
 #### `buildPythonApplication` function
 

doc/old/update-upstream-data.txt

@@ -1,14 +0,0 @@
-Semi-automatic source information updating using "update-upstream-data.sh" script and "src-{,info-}for-*.nix"
-
-1. Recognizing when a pre-existing package uses this mechanism.
-
-Packages using this automatical update mechanism have src-info-for-default.nix and src-for-default.nix next to default.nix. src-info-for-default.nix describes getting the freshest source from upstream web site; src-for-default.nix is a generated file with the current data about used source. Both files define a simple attrSet. 
-
-src-info-for-default.nix (for a file grabbed via http) contains at least downloadPage attribute - it is the page we need to look at to find out the latest version. It also contains baseName that is used for automatical generation of package name containing version. It can contain extra data for trickier cases.
-
-src-for-default.nix will contain advertisedUrl (raw URL chosen on the site; its change prompts regeneration of source data), url for fetchurl, hash, version retrieved from the download URL and suggested package name.
-
-2. Updating a package
-
-nixpkgs/pkgs/build-support/upstream-updater directory contains some scripts. The worker script is called update-upstream-data.sh. This script requires main expression name (e.g. default.nix). It can optionally accpet a second parameter, URL which will be used instead of getting one by parsing the downloadPage (version extraction, mirror URL creation etc. will still be run). After running the script, check src-for-default.nix (or replace default.nix with expression name, if there are seceral expressions in the directory) for new version information.
-

doc/stdenv.xml

@@ -557,8 +557,8 @@ script) if it exists.</para>
 
   <varlistentry>
     <term><varname>configureFlags</varname></term>
-    <listitem><para>Additional arguments passed to the configure
+    <listitem><para>A list of strings passed as additional arguments to the
-    script.</para></listitem>
+    configure script.</para></listitem>
   </varlistentry>
 
   <varlistentry>
@@ -658,7 +658,7 @@ nothing.</para>
 
   <varlistentry>
     <term><varname>makeFlags</varname></term>
-    <listitem><para>Additional flags passed to
+    <listitem><para>A list of strings passed as additional flags to
     <command>make</command>.  These flags are also used by the default
     install and check phase.  For setting make flags specific to the
     build phase, use <varname>buildFlags</varname> (see
@@ -685,7 +685,7 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
 
   <varlistentry>
     <term><varname>buildFlags</varname> / <varname>buildFlagsArray</varname></term>
-    <listitem><para>Additional flags passed to
+    <listitem><para>A list of strings passed as additional flags to
     <command>make</command>.  Like <varname>makeFlags</varname> and
     <varname>makeFlagsArray</varname>, but only used by the build
     phase.</para></listitem>
@@ -753,7 +753,7 @@ doCheck = true;</programlisting>
 
   <varlistentry>
     <term><varname>checkFlags</varname> / <varname>checkFlagsArray</varname></term>
-    <listitem><para>Additional flags passed to
+    <listitem><para>A list of strings passed as additional flags to
     <command>make</command>.  Like <varname>makeFlags</varname> and
     <varname>makeFlagsArray</varname>, but only used by the check
     phase.</para></listitem>
@@ -808,7 +808,7 @@ installTargets = "install-bin install-doc";</programlisting>
 
   <varlistentry>
     <term><varname>installFlags</varname> / <varname>installFlagsArray</varname></term>
-    <listitem><para>Additional flags passed to
+    <listitem><para>A list of strings passed as additional flags to
     <command>make</command>.  Like <varname>makeFlags</varname> and
     <varname>makeFlagsArray</varname>, but only used by the install
     phase.</para></listitem>

nixos/doc/manual/release-notes/release-notes.xml

@@ -9,6 +9,7 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
+<xi:include href="rl-1703.xml" />
 <xi:include href="rl-1609.xml" />
 <xi:include href="rl-1603.xml" />
 <xi:include href="rl-1509.xml" />

nixos/doc/manual/release-notes/rl-1609.xml

@@ -57,6 +57,14 @@ following incompatible changes:</para>
     behavior of Redis 3.2</para>
   </listitem>
 
+  <listitem>
+    <para>/var/setuid-wrappers/
+      <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now a symlink so
+      it can be atomically updated</link>
+      and it's not mounted as tmpfs anymore since setuid binaries are located on /run/ as tmpfs.
+    </para>
+  </listitem>
+
   <listitem>
     <para>Gitlab's maintainence script gitlab-runner was removed and split up into the more clearer
       gitlab-run and gitlab-rake scripts because gitlab-runner is a component of Gitlab CI.</para>

nixos/doc/manual/release-notes/rl-1703.xml

@@ -0,0 +1,46 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-17.03">
+
+<title>Release 17.03 (“XXX”, 2017/03/??)</title>
+
+<para>In addition to numerous new and upgraded packages, this release
+has the following highlights: </para>
+
+<itemizedlist>
+  <listitem>
+    <para></para>
+  </listitem>
+</itemizedlist>
+
+<para>The following new services were added since the last release:</para>
+
+<itemizedlist>
+  <listitem>
+    <para></para>
+  </listitem>
+</itemizedlist>
+
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:</para>
+
+<itemizedlist>
+  <listitem>
+    <para></para>
+  </listitem>
+</itemizedlist>
+
+
+<para>Other notable improvements:</para>
+
+<itemizedlist>
+  <listitem>
+    <para></para>
+  </listitem>
+</itemizedlist>
+
+
+</section>

nixos/modules/config/swap.nix

@@ -54,6 +54,10 @@ let
           WARNING: Don't try to hibernate when you have at least one swap partition with
           this option enabled! We have no way to set the partition into which hibernation image
           is saved, so if your image ends up on an encrypted one you would lose it!
+
+          WARNING #2: Do not use /dev/disk/by-uuid/… or /dev/disk/by-label/… as your swap device
+          when using randomEncryption as the UUIDs and labels will get erased on every boot when
+          the partition is encrypted. Best to use /dev/disk/by-partuuid/…
         '';
       };
 
@@ -72,7 +76,7 @@ let
     config = rec {
       device = mkIf options.label.isDefined
         "/dev/disk/by-label/${config.label}";
-      deviceName = escapeSystemdPath config.device;
+      deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device);
       realDevice = if config.randomEncryption then "/dev/mapper/${deviceName}" else config.device;
     };
 
@@ -121,6 +125,8 @@ in
 
         createSwapDevice = sw:
           assert sw.device != "";
+          assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-uuid"  sw.device);
+          assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-label" sw.device);
           let realDevice' = escapeSystemdPath sw.realDevice;
           in nameValuePair "mkswap-${sw.deviceName}"
           { description = "Initialisation of swap device ${sw.device}";

nixos/modules/installer/tools/nixos-install.sh

@@ -92,14 +92,12 @@ fi
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
 mkdir -m 01777 -p $mountPoint/tmp
 mkdir -m 0755 -p $mountPoint/tmp/root
-mkdir -m 0755 -p $mountPoint/var/setuid-wrappers
 mkdir -m 0700 -p $mountPoint/root
 mount --rbind /dev $mountPoint/dev
 mount --rbind /proc $mountPoint/proc
 mount --rbind /sys $mountPoint/sys
 mount --rbind / $mountPoint/tmp/root
 mount -t tmpfs -o "mode=0755" none $mountPoint/run
-mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers
 rm -rf $mountPoint/var/run
 ln -s /run $mountPoint/var/run
 for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done

nixos/modules/security/hidepid.nix

@@ -20,6 +20,6 @@ with lib;
   config = mkIf config.security.hideProcessInformation {
     users.groups.proc.gid = config.ids.gids.proc;
 
-    fileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ];
+    boot.specialFileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ];
   };
 }

nixos/modules/security/setuid-wrappers.nix

@@ -12,7 +12,7 @@ let
     installPhase = ''
       mkdir -p $out/bin
       cp ${./setuid-wrapper.c} setuid-wrapper.c
-      gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" \
+      gcc -Wall -O2 -DWRAPPER_DIR=\"/run/setuid-wrapper-dirs\" \
           setuid-wrapper.c -o $out/bin/setuid-wrapper
     '';
   };
@@ -102,11 +102,11 @@ in
                 source=/nix/var/nix/profiles/default/bin/${program}
             fi
 
-            cp ${setuidWrapper}/bin/setuid-wrapper ${wrapperDir}/${program}
+            cp ${setuidWrapper}/bin/setuid-wrapper $wrapperDir/${program}
-            echo -n "$source" > ${wrapperDir}/${program}.real
+            echo -n "$source" > $wrapperDir/${program}.real
-            chmod 0000 ${wrapperDir}/${program} # to prevent races
+            chmod 0000 $wrapperDir/${program} # to prevent races
-            chown ${owner}.${group} ${wrapperDir}/${program}
+            chown ${owner}.${group} $wrapperDir/${program}
-            chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${wrapperDir}/${program}
+            chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program}
           '';
 
       in stringAfter [ "users" ]
@@ -115,9 +115,29 @@ in
           # programs to be wrapped.
           SETUID_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
-          rm -f ${wrapperDir}/* # */
+          mkdir -p /run/setuid-wrapper-dirs
+          wrapperDir=$(mktemp --directory --tmpdir=/run/setuid-wrapper-dirs setuid-wrappers.XXXXXXXXXX)
 
           ${concatMapStrings makeSetuidWrapper setuidPrograms}
+
+          if [ -L ${wrapperDir} ]; then
+            # Atomically replace the symlink
+            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
+            old=$(readlink ${wrapperDir})
+            ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp
+            mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir}
+            rm --force --recursive $old
+          elif [ -d ${wrapperDir} ]; then
+            # Compatibility with old state, just remove the folder and symlink
+            rm -f ${wrapperDir}/*
+            # if it happens to be a tmpfs
+            umount ${wrapperDir} || true
+            rm -d ${wrapperDir}
+            ln -d --symbolic $wrapperDir ${wrapperDir}
+          else
+            # For initial setup
+            ln --symbolic $wrapperDir ${wrapperDir}
+          fi
         '';
 
   };

nixos/modules/services/databases/postgresql.nix

@@ -11,12 +11,14 @@ let
     if cfg.extraPlugins == [] then pg
     else pkgs.buildEnv {
       name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}";
-      paths = [ pg ] ++ cfg.extraPlugins;
+      paths = [ pg pg.lib ] ++ cfg.extraPlugins;
+      buildInputs = [ pkgs.makeWrapper ];
       postBuild =
         ''
           mkdir -p $out/bin
           rm $out/bin/{pg_config,postgres,pg_ctl}
           cp --target-directory=$out/bin ${pg}/bin/{postgres,pg_config,pg_ctl}
+          wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib
         '';
     };
 

nixos/modules/services/desktops/accountsservice.nix

@@ -35,6 +35,14 @@ with lib;
     services.dbus.packages = [ pkgs.accountsservice ];
 
     systemd.packages = [ pkgs.accountsservice ];
+
+    systemd.services.accounts-daemon= {
+
+      wantedBy = [ "graphical.target" ];
+
+    } // (mkIf (!config.users.mutableUsers) {
+      environment.NIXOS_USERS_PURE = "true";
+    });
   };
 
 }

nixos/modules/services/misc/gitit.nix

@@ -663,7 +663,7 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = with pkgs; [ curl ]
-             ++ optional cfg.pdfExport texLiveFull
+             ++ optional cfg.pdfExport texlive.combined.scheme-basic
 	     ++ optional (cfg.repositoryType == "darcs") darcs
 	     ++ optional (cfg.repositoryType == "mercurial") mercurial
 	     ++ optional (cfg.repositoryType == "git") git;

nixos/modules/services/networking/mjpg-streamer.nix

@@ -59,8 +59,12 @@ in {
       description = "mjpg-streamer webcam streamer";
       wantedBy = [ "multi-user.target" ];
 
-      serviceConfig.User = cfg.user;
+      serviceConfig = {
-      serviceConfig.Group = cfg.group;
+        User = cfg.user;
+        Group = cfg.group;
+        Restart = "on-failure";
+        RestartSec = 1;
+      };
 
       script = ''
         IPLUGIN="${cfg.inputPlugin}"

nixos/modules/services/networking/unbound.nix

@@ -43,11 +43,7 @@ in
   options = {
     services.unbound = {
 
-      enable = mkOption {
+      enable = mkEnableOption "Unbound domain name server";
-        default = false;
-        type = types.bool;
-        description = "Whether to enable the Unbound domain name server.";
-      };
 
       allowedAccess = mkOption {
         default = [ "127.0.0.0/24" ];

nixos/modules/services/networking/zerotierone.nix

@@ -7,11 +7,19 @@ let
 in
 {
   options.services.zerotierone.enable = mkEnableOption "ZeroTierOne";
+  options.services.zerotierone.package = mkOption {
+    default = pkgs.zerotierone;
+    defaultText = "pkgs.zerotierone";
+    type = types.package;
+    description = ''
+      ZeroTier One package to use.
+    '';
+  };
 
   config = mkIf cfg.enable {
     systemd.services.zerotierone = {
       description = "ZeroTierOne";
-      path = [ pkgs.zerotierone ];
+      path = [ cfg.package ];
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart =
@@ -21,7 +29,7 @@ in
         chown -R root:root /var/lib/zerotier-one
         '';
       serviceConfig = {
-        ExecStart = "${pkgs.zerotierone}/bin/zerotier-one";
+        ExecStart = "${cfg.package}/bin/zerotier-one";
         Restart = "always";
         KillMode = "process";
       };
@@ -30,6 +38,6 @@ in
     # ZeroTier does not issue DHCP leases, but some strangers might...
     networking.dhcpcd.denyInterfaces = [ "zt0" ];
 
-    environment.systemPackages = [ pkgs.zerotierone ];
+    environment.systemPackages = [ cfg.package ];
   };
 }

nixos/modules/system/boot/loader/grub/grub.nix

@@ -425,13 +425,20 @@ in
         { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; }
       ];
 
-      system.build.installBootLoader = pkgs.writeScript "install-grub.sh" (''
+      system.build.installBootLoader =
+        let
+          install-grub-pl = pkgs.substituteAll {
+            src = ./install-grub.pl;
+            inherit (pkgs) utillinux;
+            btrfsprogs = pkgs.btrfs-progs;
+          };
+        in pkgs.writeScript "install-grub.sh" (''
         #!${pkgs.stdenv.shell}
         set -e
         export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
         ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
       '' + flip concatMapStrings cfg.mirroredBoots (args: ''
-        ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} $@
+        ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@
       ''));
 
       system.build.grub = grub;

nixos/modules/system/boot/loader/grub/install-grub.pl

@@ -12,8 +12,10 @@ require List::Compare;
 use POSIX;
 use Cwd;
 
+# system.build.toplevel path
 my $defaultConfig = $ARGV[1] or die;
 
+# Grub config XML generated by grubConfig function in grub.nix
 my $dom = XML::LibXML->load_xml(location => $ARGV[0]);
 
 sub get { my ($name) = @_; return $dom->findvalue("/expr/attrs/attr[\@name = '$name']/*/\@value"); }
@@ -97,6 +99,8 @@ sub PathInMount {
     }
     return 1;
 }
+
+# Figure out what filesystem is used for the directory with init/initrd/kernel files
 sub GetFs {
     my ($dir) = @_;
     my $bestFs = Fs->new(device => "", type => "", mount => "");
@@ -136,7 +140,10 @@ my $driveid = 1;
 sub GrubFs {
     my ($dir) = @_;
     my $fs = GetFs($dir);
-    my $path = "/" . substr($dir, length($fs->mount));
+    my $path = substr($dir, length($fs->mount));
+    if (substr($path, 0, 1) ne "/") {
+      $path = "/$path";
+    }
     my $search = "";
 
     if ($grubVersion > 1) {
@@ -169,7 +176,7 @@ sub GrubFs {
                 $search = $types{$fsIdentifier} . ' ';
 
                 # Based on the type pull in the identifier from the system
-                my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}");
+                my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}");
                 if ($status != 0) {
                     die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}";
                 }
@@ -182,7 +189,7 @@ sub GrubFs {
 
             # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
             if ($fs->type eq 'btrfs') {
-                my ($status, @id_info) = runCommand("btrfs subvol show @{[$fs->mount]}");
+                my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs subvol show @{[$fs->mount]}");
                 if ($status != 0) {
                     die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
                 }
@@ -190,7 +197,7 @@ sub GrubFs {
                 if ($#ids > 0) {
                     die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
                 } elsif ($#ids == 0) {
-                    my ($status, @path_info) = runCommand("btrfs subvol list @{[$fs->mount]}");
+                    my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs subvol list @{[$fs->mount]}");
                     if ($status != 0) {
                         die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n";
                     }

nixos/modules/system/boot/stage-2-init.sh

@@ -141,13 +141,6 @@ if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then
     cat /etc/resolv.conf | resolvconf -m 1000 -a host
 fi
 
-
-# Create /var/setuid-wrappers as a tmpfs.
-rm -rf /var/setuid-wrappers
-mkdir -m 0755 -p /var/setuid-wrappers
-mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers
-
-
 # Log the script output to /dev/kmsg or /run/log/stage-2-init.log.
 # Only at this point are all the necessary prerequisites ready for these commands.
 exec {logOutFd}>&1 {logErrFd}>&2

nixos/modules/system/boot/systemd-unit-options.nix

@@ -309,7 +309,7 @@ in rec {
     };
 
     startAt = mkOption {
-      type = types.str;
+      type = with types; either str (listOf str);
       default = "";
       example = "Sun 14:00:00";
       description = ''

nixos/modules/tasks/filesystems.nix

@@ -20,7 +20,7 @@ let
 
   specialFSTypes = [ "proc" "sysfs" "tmpfs" "devtmpfs" "devpts" ];
 
-  fileSystemOpts = { name, config, ... }: {
+  coreFileSystemOpts = { name, config, ... }: {
 
     options = {
 
@@ -37,13 +37,6 @@ let
         description = "Location of the device.";
       };
 
-      label = mkOption {
-        default = null;
-        example = "root-partition";
-        type = types.nullOr types.str;
-        description = "Label of the device (if any).";
-      };
-
       fsType = mkOption {
         default = "auto";
         example = "ext3";
@@ -55,12 +48,28 @@ let
         default = [ "defaults" ];
         example = [ "data=journal" ];
         description = "Options used to mount the file system.";
-      } // (if versionAtLeast lib.nixpkgsVersion "16.09" then {
         type = types.listOf types.str;
-      } else {
+      };
-        type = types.either types.commas (types.listOf types.str);
+
-        apply = x: if isList x then x else lib.strings.splitString "," (builtins.trace "warning: passing a comma-separated string for filesystem options is deprecated; use a list of strings instead. This will become a hard error in 16.09." x);
+    };
-      });
+
+    config = {
+      mountPoint = mkDefault name;
+      device = mkIf (elem config.fsType specialFSTypes) (mkDefault config.fsType);
+    };
+
+  };
+
+  fileSystemOpts = { config, ... }: {
+
+    options = {
+
+      label = mkOption {
+        default = null;
+        example = "root-partition";
+        type = types.nullOr types.str;
+        description = "Label of the device (if any).";
+      };
 
       autoFormat = mkOption {
         default = false;
@@ -99,22 +108,9 @@ let
         description = "Disable running fsck on this filesystem.";
       };
 
-      early = mkOption {
-        default = false;
-        type = types.bool;
-        internal = true;
-        description = ''
-	  Mount this filesystem very early during boot. At the moment of
-	  mounting no disks are exposed, so this option is primarily for
-          special file systems.
-        '';
-      };
-
     };
 
     config = {
-      mountPoint = mkDefault name;
-      device = mkIf (elem config.fsType specialFSTypes) (mkDefault config.fsType);
       options = mkIf config.autoResize [ "x-nixos.autoresize" ];
 
       # -F needed to allow bare block device without partitions
@@ -151,7 +147,7 @@ in
           "/bigdisk".label = "bigdisk";
         }
       '';
-      type = types.loaOf (types.submodule fileSystemOpts);
+      type = types.loaOf (types.submodule [coreFileSystemOpts fileSystemOpts]);
       description = ''
         The file systems to be mounted.  It must include an entry for
         the root directory (<literal>mountPoint = "/"</literal>).  Each
@@ -183,6 +179,15 @@ in
       description = "Names of supported filesystem types.";
     };
 
+    boot.specialFileSystems = mkOption {
+      default = {};
+      type = types.loaOf (types.submodule coreFileSystemOpts);
+      internal = true;
+      description = ''
+        Special filesystems that are mounted very early during boot.
+      '';
+    };
+
   };
 
 
@@ -196,14 +201,11 @@ in
       { assertion = ! (fileSystems' ? "cycle");
         message = "The ‘fileSystems’ option can't be topologically sorted: mountpoint dependency path ${ls " -> " fileSystems'.cycle} loops to ${ls ", " fileSystems'.loops}";
       }
-      { assertion = all (x: !x.early || (x.label == null && !x.autoFormat && !x.autoResize)) fileSystems;
-        message = "Early filesystems don't support mounting by label, auto formatting and resizing";
-      }
     ];
 
     # Export for use in other modules
     system.build.fileSystems = fileSystems;
-    system.build.earlyMountScript = makeSpecialMounts (filter (fs: fs.early) fileSystems);
+    system.build.earlyMountScript = makeSpecialMounts (toposort fsBefore (attrValues config.boot.specialFileSystems)).result;
 
     boot.supportedFilesystems = map (fs: fs.fsType) fileSystems;
 
@@ -234,7 +236,7 @@ in
             + " " + (if skipCheck fs then "0" else
                      if fs.mountPoint == "/" then "1" else "2")
             + "\n"
-        ) (filter (fs: !fs.early) fileSystems)}
+        ) fileSystems}
 
         # Swap devices.
         ${flip concatMapStrings config.swapDevices (sw:
@@ -282,7 +284,7 @@ in
       in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems));
 
     # Sync mount options with systemd's src/core/mount-setup.c: mount_table.
-    fileSystems = mapAttrs (n: fs: fs // { early = true; }) {
+    boot.specialFileSystems = {
       "/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; };
       "/sys" = { fsType = "sysfs"; options = [ "nosuid" "noexec" "nodev" ]; };
       "/run" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; };

nixos/modules/virtualisation/brightbox-image.nix

@@ -20,7 +20,7 @@ in
 
           postVM =
             ''
-              PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
+              PATH=$PATH:${lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
               pushd $out
               ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2
               rm $diskImageBase

nixos/modules/virtualisation/grow-partition.nix

@@ -4,6 +4,8 @@
 
 { config, lib, pkgs, ... }:
 
+with lib;
+
 {
 
   options = {

nixos/modules/virtualisation/virtualbox-host.nix

@@ -5,7 +5,7 @@ with lib;
 let
   cfg = config.virtualisation.virtualbox.host;
   virtualbox = config.boot.kernelPackages.virtualbox.override {
-    inherit (cfg) enableHardening;
+    inherit (cfg) enableHardening headless;
   };
 
 in
@@ -47,6 +47,15 @@ in
         </para></important>
       '';
     };
+
+    headless = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Use VirtualBox installation without GUI and Qt dependency. Useful to enable on servers
+        and when virtual machines are controlled only via SSH.
+      '';
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [{

nixos/tests/postgis.nix

@@ -0,0 +1,30 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "postgis";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lsix ];
+  };
+
+  nodes = {
+    master =
+      { pkgs, config, ... }:
+
+      {
+        services.postgresql = let mypg = pkgs.postgresql95; in {
+            enable = true;
+            package = mypg;
+            extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_2_1 ];
+            initialScript =  pkgs.writeText "postgresql-init.sql"
+          ''
+          CREATE ROLE postgres WITH superuser login createdb;
+          '';
+          };
+      };
+  };
+
+  testScript = ''
+    startAll;
+    $master->waitForUnit("postgresql");
+    $master->sleep(10); # Hopefully this is long enough!!
+    $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'");
+  '';
+})

nixos/tests/virtualbox.nix

@@ -314,6 +314,9 @@ let
 
     test2.vmFlags = hostonlyVMFlags;
     test2.vmScript = dhcpScript;
+
+    headless.virtualisation.virtualbox.headless = true;
+    headless.services.xserver.enable = false;
   };
 
   mkVBoxTest = name: testScript: makeTest {
@@ -402,6 +405,14 @@ in mapAttrs mkVBoxTest {
     shutdownVM_simple;
   '';
 
+  headless = ''
+    createVM_headless;
+    $machine->succeed(ru("VBoxHeadless --startvm headless & disown %1"));
+    waitForStartup_headless;
+    waitForVMBoot_headless;
+    shutdownVM_headless;
+  '';
+
   host-usb-permissions = ''
     my $userUSB = removeUUIDs vbm("list usbhost");
     print STDERR $userUSB;

pkgs/applications/audio/ncmpcpp/default.nix

@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     homepage    = http://ncmpcpp.rybczak.net/;
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ lovek323 mornfall koral ];
-    platforms   = platforms.all;
+    platforms   = platforms.linux;
   };
 }

pkgs/applications/audio/spotify/default.nix

@@ -5,7 +5,8 @@
 assert stdenv.system == "x86_64-linux";
 
 let
-  version = "1.0.36.120.g536a862f-20";
+  # Please update the stable branch!
+  version = "1.0.37.152.gc83ea995-42";
 
   deps = [
     alsaLib
@@ -50,7 +51,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "03r4hz4x4f3zmp6dsv1n72y5q01d7mfqvaaxqvd587a5561gahf0";
+      sha256 = "00hd5q3cn9dzgphkpswd5y06k9phiqhhmb3frwdkcnb1d4pnp9cx";
     };
 
   buildInputs = [ dpkg makeWrapper ];

pkgs/applications/editors/emacs-modes/elpa-generated.nix

@@ -28,10 +28,10 @@
     ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
     elpaBuild {
         pname = "ada-mode";
-        version = "5.1.9";
+        version = "5.2.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ada-mode-5.1.9.tar";
+          url = "https://elpa.gnu.org/packages/ada-mode-5.2.0.tar";
-          sha256 = "04hwy9py22c4vpbk24idbyavjdjpm1akvnfigdzx35zljdrvk3l7";
+          sha256 = "1j4f94bmykz5j6kyyg5x81k0yjai609c1qzs8sig8v267hydkpqr";
         };
         packageRequires = [ cl-lib emacs wisi ];
         meta = {
@@ -471,10 +471,10 @@
     debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
     elpaBuild {
         pname = "debbugs";
-        version = "0.9.7";
+        version = "0.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.9.7.tar";
+          url = "https://elpa.gnu.org/packages/debbugs-0.10.tar";
-          sha256 = "07w73if4lmh23ih2v3p0197f781002dywd5fzdbmr4hcqvvi97qq";
+          sha256 = "0vrsa70h6ipsq01qr9qzlaw1704xqviby321ri6w69wkwlcjkpin";
         };
         packageRequires = [ cl-lib soap-client ];
         meta = {
@@ -523,6 +523,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    diffview = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "diffview";
+        version = "1.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/diffview-1.0.el";
+          sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/diffview.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "dismal";
@@ -605,10 +618,10 @@
       }) {};
     el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "el-search";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-0.2.1.el";
+          url = "https://elpa.gnu.org/packages/el-search-0.2.2.tar";
-          sha256 = "1ralag6a4752mqbsz92prd1f75380q5f7j4k3ajhv66krhd1w0k6";
+          sha256 = "07b4jk143vi3sydg03mg12gy1rs21q0qvs7p303irwz4pv8bfwqj";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -698,10 +711,10 @@
       }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.6";
+        version = "0.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.6.tar";
+          url = "https://elpa.gnu.org/packages/exwm-0.10.tar";
-          sha256 = "0fxkhpc87wd7crzwwj9r5r3s07pznsphk4hi8jinx91641szi1px";
+          sha256 = "1c8558dxy7a2m61a0bc0p5vrdw3nw03zq9s8wxgmdvlklyzbqa22";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -846,6 +859,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "hyperbole";
+        version = "6.0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/hyperbole-6.0.2.tar";
+          sha256 = "0nyihi7j2061jpdzl4mf4pki840hkfpwj0m2sqz0nqxd689ckwpg";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/hyperbole.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ioccur = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "ioccur";
         version = "2.4";
@@ -980,10 +1006,10 @@
       }) {};
     lmc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "lmc";
-        version = "1.3";
+        version = "1.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/lmc-1.3.el";
+          url = "https://elpa.gnu.org/packages/lmc-1.4.el";
-          sha256 = "0s5dkksgfbfbhc770z1n7d4jrkpcb8z1935abgrw80icxgsrc01p";
+          sha256 = "0fm4sclx9gg0d0615smz105x320sk45y4ivpjk3nbc67c5l0sh2h";
         };
         packageRequires = [];
         meta = {
@@ -1202,14 +1228,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    nhexl-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    nhexl-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
         pname = "nhexl-mode";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nhexl-mode-0.1.el";
+          url = "https://elpa.gnu.org/packages/nhexl-mode-0.2.el";
-          sha256 = "0h4kl5d8rj9aw4xxrmv4a9fdcqvkk74ia7bq8jgmjp11pwpzww9j";
+          sha256 = "0qrzpkxxdwi2b3136yj5agvaxwr9g2c58kpmjmjpfhpc6yyyx5x0";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
           license = lib.licenses.free;
@@ -1309,10 +1336,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160725";
+        version = "20160829";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20160725.tar";
+          url = "https://elpa.gnu.org/packages/org-20160829.tar";
-          sha256 = "05ky7hlsjqlml14ss9hcj2756clvsi1f26gv7a01d923m3drkqjc";
+          sha256 = "1p0bxbzjzxmhsg1m4a3mlsphh7gcv6b97mfgkl22lfy0ia0g1fzv";
         };
         packageRequires = [];
         meta = {
@@ -1375,10 +1402,10 @@
       }) {};
     poker = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "poker";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/poker-0.1.el";
+          url = "https://elpa.gnu.org/packages/poker-0.2.el";
-          sha256 = "0gbm59m6bs0766r7v8dy9gdif1pb89xj1h8h76bh78hr65yh7gg0";
+          sha256 = "0sikspimvnzvwhyivi1gvr0630zz2pr3q2fwagl57iv06jas9f00";
         };
         packageRequires = [];
         meta = {
@@ -1439,6 +1466,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }:
+    elpaBuild {
+        pname = "realgud";
+        version = "1.4.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/realgud-1.4.3.tar";
+          sha256 = "07yfah8kmr60rhrj8y8gs7l85hsbylv26crw3qbqh67ka4ykpj01";
+        };
+        packageRequires = [
+          cl-lib
+          emacs
+          load-relative
+          loc-changes
+          test-simple
+        ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     register-list = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "register-list";
         version = "0.1";
@@ -1571,14 +1618,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    sml-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
         pname = "sml-mode";
         version = "6.7";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/sml-mode-6.7.el";
           sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/sml-mode.html";
           license = lib.licenses.free;
@@ -1639,10 +1687,10 @@
       }) {};
     stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "stream";
-        version = "2.2.0";
+        version = "2.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/stream-2.2.0.el";
+          url = "https://elpa.gnu.org/packages/stream-2.2.1.el";
-          sha256 = "0i6vwih61a0z0q05v9wyp9nj5h68snlb9n52nmrv1k0hhzsjmlrs";
+          sha256 = "1d91ddak5whb7kln216vhcsl707h5kirc6aqbkw82skhpg4c3ap1";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1690,14 +1738,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    temp-buffer-browse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
         pname = "temp-buffer-browse";
-        version = "1.4";
+        version = "1.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.4.el";
+          url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.el";
-          sha256 = "055z7hm8b2s8z1kd6hahjz0crz9qx8k9qb5pwdwdxcsh2j70pmcw";
+          sha256 = "1drfvqxc6g4vfijmx787b1ygq7x2s5wq26l45qnz4wdrqqmcqx3c";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
           license = lib.licenses.free;
@@ -1759,10 +1808,10 @@
       }) {};
     transcribe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "transcribe";
-        version = "1.5.0";
+        version = "1.5.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/transcribe-1.5.0.el";
+          url = "https://elpa.gnu.org/packages/transcribe-1.5.2.el";
-          sha256 = "0capyagpzmrf26jgqng5kvsxz30pf2iq55drnws73w9jywkq45mf";
+          sha256 = "08m1n6adab46bfywm47gygswf10vnxcfh16yjxglvcsg4prkn2vh";
         };
         packageRequires = [];
         meta = {
@@ -1931,10 +1980,10 @@
     wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "wisi";
-        version = "1.1.2";
+        version = "1.1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wisi-1.1.2.tar";
+          url = "https://elpa.gnu.org/packages/wisi-1.1.3.tar";
-          sha256 = "04gryfpgbviviwbnvv3sh280pzasr59cp5xz1s0yf0n4d3rv2df3";
+          sha256 = "1vhligxyg73gvr68767pjgiqxah00a920h6i37kip8xmhlkgp9ak";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1971,10 +2020,10 @@
     xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "xelb";
-        version = "0.9";
+        version = "0.11";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xelb-0.9.tar";
+          url = "https://elpa.gnu.org/packages/xelb-0.11.tar";
-          sha256 = "19gv08wxs2s337y1wv2i19a0vk8w6733l9mryn334yy2m5031vxh";
+          sha256 = "12qgbv30dizp7kadq9kg7nfyg5qfbfy14s833zg95fqqa87qg90j";
         };
         packageRequires = [ cl-generic emacs ];
         meta = {

pkgs/applications/editors/nano/default.nix

@@ -12,10 +12,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.6.3";
+  version = "2.7.0";
   src = fetchurl {
-    url = "https://nano-editor.org/dist/v2.6/${name}.tar.gz";
+    url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "00ym3zws1vdds726drgr5wj14mjn18d96ghn6vjci0915zhm8h2g";
+    sha256 = "08cmnca3s377z74yjw1afz59l2h9s40wsa9wxw5y4x5f2jaz6spq";
   };
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];
@@ -26,15 +26,6 @@ stdenv.mkDerivation rec {
     ${optionalString enableTiny "--enable-tiny"}
   '';
 
-  patchFlags = [ "-p0" ];
-
-  patches = optional stdenv.isDarwin
-    (fetchurl {
-      name = "darwin.patch";
-      url = "https://trac.macports.org/browser/trunk/dports/editors/nano/files/patch-src-winio.c.diff?rev=151356&format=txt";
-      sha256 = "184q33irz9px2svwr2qx70zvfby5zlwlhv4k607yzsy90fq2jpdd";
-    });
-
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/text.c --replace "__time_t" "time_t"
   '';

pkgs/applications/graphics/gimp/2.8.nix

@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     description = "The GNU Image Manipulation Program";
     homepage = http://www.gimp.org/;
     license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/graphics/hugin/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
   postInstall = ''
     for p in $out/bin/*; do

pkgs/applications/graphics/krita/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     openjpeg opencolorio vc poppler_qt5 curl ilmbase
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${ilmbase}/include/OpenEXR" ];
+  NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
 
   enableParallelBuilding = true;
 

pkgs/applications/graphics/luminance-hdr/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl";
   })];
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
   buildInputs =
     [

pkgs/applications/graphics/openimageio/default.nix

@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0cr0z81a41bg193dx9crcq1mns7mmzz7qys4lrbm18cmdbwkk88x";
   };
 
+  outputs = [ "bin" "out" "dev" "doc" ];
+
   buildInputs = [
     boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr
     unzip
@@ -21,10 +23,15 @@ stdenv.mkDerivation rec {
   ];
 
   preBuild = ''
-    makeFlags="ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0
+    makeFlags="ILMBASE_HOME=${ilmbase.dev} OPENEXR_HOME=${openexr.dev} USE_PYTHON=0
       INSTALLDIR=$out dist_dir="
   '';
 
+  postInstall = ''
+    mkdir -p $bin
+    mv $out/bin $bin/
+  '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

pkgs/applications/graphics/qtpfsgui/default.nix

@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   preConfigure = ''
-    export CPATH="${ilmbase}/include/OpenEXR:$CPATH"
+    export CPATH="${ilmbase.dev}/include/OpenEXR:$CPATH"
   '';
 
   qmakeFlags = [
     "EXIV2PATH=${exiv2.dev}/include/exiv2"
-    "OPENEXRDIR=${openexr}/include/OpenEXR"
+    "OPENEXRDIR=${openexr.dev}/include/OpenEXR"
     "FFTW3DIR=${fftwSinglePrec.dev}/include"
     "LIBTIFFDIR=${libtiff.dev}/include"
   ];

pkgs/applications/misc/blender/default.nix

@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
     ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON";
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
 
   enableParallelBuilding = true;
 

pkgs/applications/misc/curaengine/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 let
-  version = "15.04";
+  version = "15.04.6";
 in
 stdenv.mkDerivation {
   name = "curaengine-${version}";
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
-    sha256 = "0rgrsyi7951fsv3lzprlzrg55jf6pbdjfql85dylwmg9nc4y8xym";
+    sha256 = "1cd4dikzvqyj5g80rqwymvh4nwm76vsf78clb37kj6q0fig3qbjg";
   };
 
   postPatch = ''

pkgs/applications/misc/emem/default.nix

@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.27";
+  version = "0.2.28";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0zmh152dfgsq2yj14wb3504pyibq4r671q5yz6yy28ihym7qr0fd";
+    sha256 = "1hapvvkkwnvg32awx4nj84s2ascpci6x02wf4rckyd1ykbxp2b8m";
   };
 
   buildInputs = [ ];

pkgs/applications/misc/octoprint/plugins.nix

@@ -12,13 +12,13 @@ let
 
     m33-fio = buildPlugin rec {
       name = "M33-Fio-${version}";
-      version = "1.5";
+      version = "1.7";
 
       src = fetchFromGitHub {
         owner = "donovan6000";
         repo = "M33-Fio";
         rev = "V${version}";
-        sha256 = "0ss8ic9l5srb5wj2mj0qafam0z4d6zv0cixhxgghh03fp0lvwjyq";
+        sha256 = "14sqvgrpf3zvgycjj7f3m7m2flx06zq4h0yhq4g18av0zbsrv7yp";
       };
 
       patches = [

pkgs/applications/misc/sdcv/default.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     description = "Console version of StarDict program";
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 
   src = fetchurl {

pkgs/applications/networking/cluster/marathon/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "35a80401383f6551c45c676beed30b3c1af6d3ad027f44735c208abe8eaca93d";
+    sha256 = "1c1ml3blhhc10mky5pqxhpndbz6nk7qgcfbzwdqj9kqfzmwlsfbb";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];

pkgs/applications/networking/cluster/mesos/default.nix

@@ -10,7 +10,7 @@ let
   soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
 
 in stdenv.mkDerivation rec {
-  version = "0.28.0";
+  version = "0.28.2";
   name = "mesos-${version}";
 
   enableParallelBuilding = true;
@@ -18,12 +18,17 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/mesos/${version}/${name}.tar.gz";
-    sha256 = "05dnj6r5pspizna0fk7yayn38a4w9hlcswgg8l9qmb35m6nq6hby";
+    sha256 = "0wh4h11w5qvqa66fiz0qbm9q48d3jz48mw6mm22bcy9q9wmzrxcn";
   };
 
   patches = [
     # https://reviews.apache.org/r/36610/
     ./rb36610.patch
+
+    # https://issues.apache.org/jira/browse/MESOS-6013
+    ./rb51324.patch
+    ./rb51325.patch
+
     ./maven_repo.patch
   ];
 

pkgs/applications/networking/cluster/mesos/rb51324.patch

@@ -0,0 +1,72 @@
+diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp
+index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44cf882d27 100644
+--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp
++++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp
+@@ -18,6 +18,8 @@
+ #else
+ #include <dirent.h>
+ #endif // __WINDOWS__
++
++#include <errno.h>
+ #include <stdlib.h>
+ 
+ #include <list>
+@@ -26,8 +28,6 @@
+ #include <stout/error.hpp>
+ #include <stout/try.hpp>
+ 
+-#include <stout/os/direntsize.hpp>
+-
+ 
+ namespace os {
+ 
+@@ -36,36 +36,32 @@ inline Try<std::list<std::string>> ls(const std::string& directory)
+   DIR* dir = opendir(directory.c_str());
+ 
+   if (dir == NULL) {
+-    // Preserve `opendir` error.
+     return ErrnoError("Failed to opendir '" + directory + "'");
+   }
+ 
+-  dirent* temp = (dirent*) malloc(os::dirent_size(dir));
+-
+-  if (temp == NULL) {
+-    // Preserve `malloc` error.
+-    ErrnoError error("Failed to allocate directory entries");
+-    closedir(dir);
+-    return error;
+-  }
+-
+   std::list<std::string> result;
+   struct dirent* entry;
+-  int error;
+ 
+-  while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != NULL) {
++  // Zero `errno` before starting to call `readdir`. This is necessary
++  // to allow us to determine when `readdir` returns an error.
++  errno = 0;
++
++  while ((entry = readdir(dir)) != NULL) {
+     if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
+       continue;
+     }
+     result.push_back(entry->d_name);
+   }
+ 
+-  free(temp);
+-  closedir(dir);
++  if (errno != 0) {
++    // Preserve `readdir` error.
++    Error error = ErrnoError("Failed to read directory");
++    closedir(dir);
++    return error;
++  }
+ 
+-  if (error != 0) {
+-    // Preserve `readdir_r` error.
+-    return ErrnoError("Failed to read directories");
++  if (closedir(dir) == -1) {
++    return ErrnoError("Failed to close directory");
+   }
+ 
+   return result;

pkgs/applications/networking/cluster/mesos/rb51325.patch

@@ -0,0 +1,156 @@
+diff -Naur a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am
+--- a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am	2016-09-02 15:20:04.834457344 +0200
++++ b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am	2016-09-02 15:21:00.190983981 +0200
+@@ -62,7 +62,6 @@
+   stout/os/chroot.hpp			\
+   stout/os/close.hpp			\
+   stout/os/constants.hpp		\
+-  stout/os/direntsize.hpp		\
+   stout/os/environment.hpp		\
+   stout/os/exists.hpp			\
+   stout/os/fcntl.hpp			\
+@@ -101,7 +100,6 @@
+   stout/os/posix/bootid.hpp		\
+   stout/os/posix/chown.hpp		\
+   stout/os/posix/chroot.hpp		\
+-  stout/os/posix/direntsize.hpp		\
+   stout/os/posix/exists.hpp		\
+   stout/os/posix/fcntl.hpp		\
+   stout/os/posix/fork.hpp		\
+@@ -118,7 +116,6 @@
+   stout/os/raw/environment.hpp		\
+   stout/os/windows/bootid.hpp		\
+   stout/os/windows/chroot.hpp		\
+-  stout/os/windows/direntsize.hpp	\
+   stout/os/windows/exists.hpp		\
+   stout/os/windows/fcntl.hpp		\
+   stout/os/windows/fork.hpp		\
+diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp
+deleted file mode 100644
+index 819f99a89862491e99873bdedc603317b91266b0..0000000000000000000000000000000000000000
+--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp
++++ /dev/null
+@@ -1,26 +0,0 @@
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-//  http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-#ifndef __STOUT_OS_DIRENTSIZE_HPP__
+-#define __STOUT_OS_DIRENTSIZE_HPP__
+-
+-
+-// For readability, we minimize the number of #ifdef blocks in the code by
+-// splitting platform specifc system calls into separate directories.
+-#ifdef __WINDOWS__
+-#include <stout/os/windows/direntsize.hpp>
+-#else
+-#include <stout/os/posix/direntsize.hpp>
+-#endif // __WINDOWS__
+-
+-
+-#endif // __STOUT_OS_DIRENTSIZE_HPP__
+diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp
+deleted file mode 100644
+index 9d8f72eb607a288e77f92b39b91542ff5eb2fa21..0000000000000000000000000000000000000000
+--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp
++++ /dev/null
+@@ -1,42 +0,0 @@
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-//  http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-#ifndef __STOUT_OS_POSIX_DIRENTSIZE_HPP__
+-#define __STOUT_OS_POSIX_DIRENTSIZE_HPP__
+-
+-#include <dirent.h>
+-#include <unistd.h>
+-
+-
+-namespace os {
+-
+-inline size_t dirent_size(DIR* dir)
+-{
+-  // Calculate the size for a "directory entry".
+-  long name_max = fpathconf(dirfd(dir), _PC_NAME_MAX);
+-
+-  // If we don't get a valid size, check NAME_MAX, but fall back on
+-  // 255 in the worst case ... Danger, Will Robinson!
+-  if (name_max == -1) {
+-    name_max = (NAME_MAX > 255) ? NAME_MAX : 255;
+-  }
+-
+-  size_t name_end = (size_t) offsetof(dirent, d_name) + name_max + 1;
+-
+-  size_t size = (name_end > sizeof(dirent) ? name_end : sizeof(dirent));
+-
+-  return size;
+-}
+-
+-} // namespace os {
+-
+-#endif // __STOUT_OS_POSIX_DIRENTSIZE_HPP__
+diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp
+deleted file mode 100644
+index 7c8c7a06f478b3a80341a874494cff21f71fc397..0000000000000000000000000000000000000000
+--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp
++++ /dev/null
+@@ -1,43 +0,0 @@
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-//  http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-#ifndef __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__
+-#define __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__
+-
+-#include <stout/internal/windows/dirent.hpp>
+-
+-#include <stout/windows.hpp>
+-
+-
+-namespace os {
+-
+-inline size_t dirent_size(DIR* dir)
+-{
+-  // NOTE: Size calculation logic here is much simpler than on POSIX because
+-  // our implementation of `dirent` is constant-sized. In particular, on POSIX,
+-  // we usually have to calculate the maximum name size for a path before we
+-  // can alloc a correctly-size `dirent`, but on Windows, `dirent.d_name` is
+-  // always `MAX_PATH` bytes in size.
+-  //
+-  // This follows closely from the Windows standard API data structures for
+-  // manipulating and querying directories. For example, the structures
+-  // `WIN32_FIND_DATA`[1] (which in many ways is the Windows equivalent of
+-  // `dirent`) has a field `cFileName` (which is much like `d_name`) that is
+-  // also `MAX_PATH` in size.
+-  //
+-  // [1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa365740(v=vs.85).aspx
+-  return sizeof(dirent);
+-}
+-
+-} // namespace os {
+-
+-#endif // __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__

pkgs/applications/networking/feedreaders/newsbeuter/default.nix

@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     description = "An open-source RSS/Atom feed reader for text terminals";
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.unix;
+    platforms   = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/networking/feedreaders/newsbeuter/dev.nix

@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     description = "An open-source RSS/Atom feed reader for text terminals";
     maintainers = with maintainers; [ lovek323 ];
     license     = licenses.mit;
-    platforms   = platforms.unix;
+    platforms   = platforms.linux;
   };
 }

pkgs/applications/networking/irc/communi/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libcommuni qtbase ];
 
-  enableParallelBuild = true;
+  enableParallelBuilding = true;
 
   preConfigure = ''
     export QMAKEFEATURES=${libcommuni}/features

pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix

@@ -4,123 +4,123 @@
 # ruby generate_sources.rb 45.1.1 > sources.nix
 
 {
-  version = "45.2.0";
+  version = "45.3.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha512 = "fa7457cf48ca68f559b14b79acefe90f8d449e7dd7a32a97f728ef33b26e3f513064bf733eed77b12237902491852a66fce690b1cf1de049e2f09d27416d8786"; }
+    { locale = "ar"; arch = "linux-i686"; sha512 = "a2d1728cec3775a3a012ada32a8934fa1a94ff0af315e395e765c94873593c4e2ddb1ec5acee33a83f2970137087ff1fd6ba23b0bbea3780e4f67a3b46146911"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha512 = "6b2bc528ef7401a5ca6d6c5e68eaf68386a706925a3087ed16b4a2560a449ccba52c8dacae39d9a761323cc46f934ca2ea3c07bc5ef49df07eff9760a8a0ed15"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha512 = "d29362ecf4abe3cb7224058ffb421feafe5ddb277ad8cae407907c0939028e7e03079ec3b6a691cf260ea29908be7df4377dbc626704da622548056f45b6e9d7"; }
-    { locale = "ast"; arch = "linux-i686"; sha512 = "2917644f88a775441634a8b2dc214e29a34eb0cc7ad88c423a5cc02f7603cf321392c7fc3c7ce97231835fd39d1d8e264d8a9fb084651ec722719d5110d83cbb"; }
+    { locale = "ast"; arch = "linux-i686"; sha512 = "51fb3626875acbf78f0d2337feee07aeaca24dec59042a2b6374afb205dce099df477ab3384e0e9c545fe68ac13af921a8d3a1c4c93f721d7831f3aca15e4783"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha512 = "d047bc41a3ee0a444c8e4870a986c0068a67deff043bf96a9ae6338247461f2b51ecf02348c4a5b5e2ae4f68f7bd665c64582f0afc45bd480588cc82cdebc1e5"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha512 = "660376e67491f11d484ff112b8b8d1dc9187a7bb7f7ff1e8665d3693e5eee9737bff8f23f69f4d71b2d3f3be0ad4d816febb4894bb17ac911e19ef18411fc667"; }
-    { locale = "be"; arch = "linux-i686"; sha512 = "830fce5b2361acef206876a43af60963ddd720ad4c49c30936b0231c94096c5f43fb9479679c0260846a28a315f359ee2cdcb66e1f2bce0d222f1495b1cf1f58"; }
+    { locale = "be"; arch = "linux-i686"; sha512 = "be5fed683ee9b325f135e65fc6f641d81b7294f3d13f411b36b4e73d68a8b8592d0c93fa6ad55fc9aa8a281a5d2069f3f8dcf029038d867f3b87baf8e4a93411"; }
-    { locale = "be"; arch = "linux-x86_64"; sha512 = "8ec67cd108abb51b86fb8cc528a6bd43628847e47e2a7e5ffe3bc971b6c89aa0c7cbce2ce0738a7316a54c4ab376502187ddf5be9d74db31985187b7e6ae3038"; }
+    { locale = "be"; arch = "linux-x86_64"; sha512 = "4b92f1999478d9a97737b31f34ca78bcbf6d657297b0ef791327c73d89a1737a29df9eaca47aed3e0f1ddf0d4925ba6c0a51584ca8009237ea98fec9007e69b9"; }
-    { locale = "bg"; arch = "linux-i686"; sha512 = "d18965ad8f1456d688811e972b09e293cedaa98832b4d5898d62a80dc9cb4799d898a14ad968fc2f05c3e6dcf3fc480d21d1d8de63a4ea9c10b8081b28c321fa"; }
+    { locale = "bg"; arch = "linux-i686"; sha512 = "76d2450774254052ee216644f53025ffd4a928932955d856e16141a95b557fc327b17f01d4c47ff3b7f8a8c267a6a78511c126980554bf64f5fa5c06eba758fe"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha512 = "a7dcbe29dc4b28b3273693bec60f9ed66d1eb81899a049f7181271e84763f13817f97e07a9696ce803d151b382f3339f3b0d2b1bdfc5bc687c3f6198627e2fd3"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha512 = "53f2463e8838e6dc53fd1212745f401dbbffec484036745114f04e90e2270421efb0e579724023f1a153e2fbf5afb9e31b383b9d0a8e74ec15cdd17aff04b58c"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha512 = "3919ffd44cb501f5c8d273651e3bef27203270ae269e8682f2c749a32eb6a622a8106179cb9a493f7e62f255da62381ab497e2a590f84bd207a1bbabc039827d"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha512 = "c798161824be7fd3253308b3157c0dfb5dbec085f2b530fa4a7cd8992b8e602031c0c8f6959449a3a7f988f10b00b1f99f331b017c8d38358a017e54c2ff5166"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "8e4d026bf30a0fc69eb2c7982b3866a4745f506f5365677540e050cba81a569df1b367c42b9bcaf58ae20243a82a9e7d006c476a83ecc29b4b77f042f8aad5d1"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "8f8fafa9a79696a81e2e4a7e033edec1e37c44fc6b4a5a20cea0853f88ac978fa536109a81f5fe7baf574af6e1778975b8df5e0a47a0c6cb8161dd19f3e2c067"; }
-    { locale = "br"; arch = "linux-i686"; sha512 = "cd00e42cce4a5efd18ba5b9a784dc93282c200a43796b826cc05eb4858d44775df827dafcda0c6468d17ea5f7f930590db1546b544fc19ad52d9d5e1cf7c522d"; }
+    { locale = "br"; arch = "linux-i686"; sha512 = "9007da613fd8930e669da228197d5be59d53a26f94453523ae468a0b4172adb4509e5ae1677ca21421031238910d19f45323fb09ef52ac95205f1fa3a1d8ce46"; }
-    { locale = "br"; arch = "linux-x86_64"; sha512 = "be84c92859014a055606588fd7e9c8d8c13fed8ca253ccaed560a2b457305b487cb2664df8af7416220349a85a4db15f7420674ab46c1ba8f8cdec03f0002d83"; }
+    { locale = "br"; arch = "linux-x86_64"; sha512 = "57cead8865a052981729f55f85f402329dd4151cf3f89ad5c6cc1a83a068a9ba1e309db521ecde1cf90a3737b04a7d992087a68b93506ce0ab4a7ea26253b761"; }
-    { locale = "ca"; arch = "linux-i686"; sha512 = "2e678aec4efde29b659f1e4de071f7b5cf2fc56b28b362bfc7fc2a3ba8ceaaa53a3452cb9c2a565ea5bf83304be87fa18dd246d2207e5ba6f5ad16a0f008ffe7"; }
+    { locale = "ca"; arch = "linux-i686"; sha512 = "5401395d2e57ada9b62fd1d8a90006e60884a38086fe74bc720109d1fd8d989292bcb2781c1b30f19fbfcb867bf157bf33c3948463ab1e0fd8ddbfbc790b492d"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha512 = "7bebca69abdf5510793e376693d82e626fbce49d01fc66d28bc53ad51ab70fd9432266e2cc1b0d83359fb2bfdd075daa181c66618f6094996355f6cc0920b239"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha512 = "1d69ddc33643c7227d80cbb61087a73ff46c79e1531479531201b4e49a53400fc576f445306dad20b318f189e8b739179390f9ca7fd340e2d2cac46650569da6"; }
-    { locale = "cs"; arch = "linux-i686"; sha512 = "2f8d5faaa0952ad37e3777a2d15e2a1ac7aed1ed275faf909e479f56e4ee2e9f385aedf6b08cdb3abd9e0830949b6b6b1048e19ac489d0d0e881595b31816068"; }
+    { locale = "cs"; arch = "linux-i686"; sha512 = "25a9c864e60aced998c1599786a9cb3db92c02b9d855c7500fd466cd92f4bc8ff6fc7c5cb37c52b3dbba990ae4ce0eee1854f4f3459b4c2ce50e4e4ccd3ff445"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha512 = "01e807c22d90e07503b92e3821ddf91b509763d9c7b2ebc5e21ec9788333086de25508979422446a2e0469be611f890db682757ddebf15e549bb8714f40877d4"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha512 = "0b1b72a4f43192afa03fcf17e234fa6d09ab20cccadc0a58682b37c96a576c31d2e5022d3d778992c188b826816d7d36e56fbf4055a0be2213e45062a162939d"; }
-    { locale = "cy"; arch = "linux-i686"; sha512 = "e87718bbd286e1e2fcef8e114aa27b81a1917b37cba996c59ddc30d5300bf53a4e3662d3770f70362850d41e564887ba510f605412e57d8e6510f02e5a4d54d8"; }
+    { locale = "cy"; arch = "linux-i686"; sha512 = "b69312902ede9687c804a068f9fcf70c0c3c68786d92c72a5b38ed38e9773382223e5d09a2067632b02ae9e2f224c85e0c95de9ada535e0b8e37ce5f6aa86006"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha512 = "f3287f4cec54f6814a678dfd9875952d5109716cd15d097ad5589fb2bbf75aabf2496cff6d320929c825b1a1e61d50f060b9d9fd7f7011078620995570dbe88a"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha512 = "bd03a664a14c2b7271db1ae66f65fada02eb995da9d8466f345d25b40bbd7f836e48e9e8f19276f7109e5e42effc3be70d0c20705d386620319c6e2c920027c4"; }
-    { locale = "da"; arch = "linux-i686"; sha512 = "6cc8e7c2c3aec96dc9639a8663915db2e86437b8b9a598570946b2dc63c9d261a257dcba3359762668683a67cf39d5448e0203eeeeb4da41f6d5df51c955da3d"; }
+    { locale = "da"; arch = "linux-i686"; sha512 = "2fce874759494b51d9f9081f26985834527984cec849f1f07ebd0f3b7523bdeb7a39cae6d17f021e82972f392ae7cc33d6b81606f81afc7bc35a75698889905d"; }
-    { locale = "da"; arch = "linux-x86_64"; sha512 = "bcba101b8438ff5a61ecb76f1328174aaaf7dccf5031a836cfcd8e597db8d0b120623e15a8c8231373732b6796015ed9fe212797bf0f664055d3be3755bf38d5"; }
+    { locale = "da"; arch = "linux-x86_64"; sha512 = "c7fd6b68f50c2ea4abb2d72dfb804db0e5ff3a8dd932f36fb7e9f194f4a12469bf64785ba18ad6f989b5456e6a0387c17fcf421075341998dce315f658b70058"; }
-    { locale = "de"; arch = "linux-i686"; sha512 = "fffa1b9a61ef75ac077bf03f85abbb5a40131a9a35a49835ac40b424870b773a42f8fb534ba5757da7c0bf6781efe39dbe2942ddd436860efe5799170952dbed"; }
+    { locale = "de"; arch = "linux-i686"; sha512 = "8661fd16bcb94fba14156ea0d569364b495dd470359491b482f6e9c957a6ffd1c9b3a60728d6a0755a1789d6c3029952bead677df38d3f7e972469cd877d96a2"; }
-    { locale = "de"; arch = "linux-x86_64"; sha512 = "db88539be38c0a62d9c56b5295af2bb67d342996c85e788a17fe2a74e974a8d196765343ca005207b8b1ebb8f76421640dc7cdf36c51e23a4bc03edfbdbfe73c"; }
+    { locale = "de"; arch = "linux-x86_64"; sha512 = "c98b8afbd38e3ea31196a2dfdd3e8a13639aed9a3052a25dbcf851139a75167481b67c94542be310c5a2fd8850c8396ff2fbb57ac14b0158c87b6e30562d1eb6"; }
-    { locale = "dsb"; arch = "linux-i686"; sha512 = "2191707e5c796eb5ef210798c3519004f5cfcc9be0f56a22c03eef52a34f04f011e556894dc932467c142c8ec876105cab628c947ded0e11d7a63733db83bdac"; }
+    { locale = "dsb"; arch = "linux-i686"; sha512 = "2e5f781f0ea57f4cc129693d5085d17047ecdde3273a97b83717e793bef2693ddd543078c667635e2603e5a4867fdee60cecf0fe47170f84d31456c72f4753a1"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha512 = "07a9bb323db8f626ff0614dd8cfbbb1f0c8d922aac4c7ce21770b79c40e79ca09c798903998d44c236cfaa76daaaa94814bff697d34aafa417533078405cef1f"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha512 = "fcaad0f6ea4f9610bbfb5efd414005ab1b62d13799e2f0ff0188c0e262910c881f0e7ca838c6d18df0bc629eb26e4dc34e48635fb64029f484c0fe3aec12cef0"; }
-    { locale = "el"; arch = "linux-i686"; sha512 = "4325888c1b2585d7f2bf9c999407dba260783570816b0edfadd90bdebe6d6db637f9aa9589f2b5824ab6e833c4527fa760e177ed866ce302fce85d9b9daa2608"; }
+    { locale = "el"; arch = "linux-i686"; sha512 = "d71b2805881cf5b7f0c06e398289907f224bbb58ffe676c32587f98cdfa6d80b1a8497bf4d1d515a4b1ba8472f5250dc7df178a0fd47baf51746409c18157d69"; }
-    { locale = "el"; arch = "linux-x86_64"; sha512 = "bbb2971ba5c3ebda94312f740c54ef0b4b4b4f2311d4a017e272260945a9f063eb4d341857919da4107f2207f3265df9439aea78d636d9c357fd79a11239fd9e"; }
+    { locale = "el"; arch = "linux-x86_64"; sha512 = "89309f36b503f1be5a23f24def962a7ed6604369fc1e3a254deaf3fca6b020837813e7b3a5896320620301eb14025c604121c4b6727f1362d6783da6256be039"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha512 = "507f8f79718698b9599d52e7b5a4a9157c05ae1642622eff1b3547861532ece9727b3d56f67a20ca38df0f32375beec65ec3c7b1ba929799ddc057b4b95d1b8d"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha512 = "233fb74c88ff43fc5520fef6fc052019551405ed43e786448c9b7921fb620b81b8b1569dbd3c57b7e8a0aa34043b29fa388100ab0ad66545bb84675de43d4b9b"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "bbaceccac3ad841259058c738ef2baef780e96177b3b6a635fbc8a18de53137ec6831729b9f98bcb6b4442fe58b5dd71f526a9f0f3b86231a41bb0a48ea4c930"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "70dddef3561b53d359ed59205dd77d661f6842a7ac4a62d79f2f2576a7d2b9a8735ae7e48759b669bade841dd7329857d4c273fd6e202f1ae22201b7d461def3"; }
-    { locale = "en-US"; arch = "linux-i686"; sha512 = "28b5d2699a65792457414d178bb3bc4d73abf911860ecbcf75bbcfae91b24a056fd67d6aa4d50e4b3003ef84c63750050e16e74c92b690fe9b24347de3ad54a7"; }
+    { locale = "en-US"; arch = "linux-i686"; sha512 = "bf1f75d614dc0e401981b81d84911f2e13a1c8fc668b8a7c531963162ac293f72d6252aceb4447c97c57cc3b632452de6475f294f82090751141c3f8f681b868"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha512 = "08034ab8d833f7a2e63a7e40a56dfc78a2dd762e73d1a4b8fd0dd70ad23da5d525771846f47c8e7798517d1f85fef9bc2a8437af3d6ba71d7402a9f6a93d5679"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha512 = "5b7ba243783d5bd3eb1acc6cad872b5f2885cf289d33274932ceee2159295c84230f692a1338fc4c4c3e1947436917251ed54a6995922b4777bdee7e5303ec29"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha512 = "3f08fc47b03cf095bcfc0af78064fd7179006a4b3240292fbd109b2a4c58c55719328eed631a67ca7a3f0f68ac8d2fcc577596bf532ad95442fba728270ef28a"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha512 = "9fddac56cc41a0b83c794ad7b7744573a6039c736d785a46666fb5c40360aae0397d129e523a7ac8b7e9b07295b56741e96e8cea770533c7c3611c209f9ae5ad"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cfe7e9f8dd67fb52462f840048115e54e5f789a34b63c5d7ec592ccc3a2b25220a66fb7499a50f32539d61205fc46199c0167ad5a75ea46123b96070329a236d"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "f7d7a051bc7411d2811aa5672da7aff51ee96065eb26e47e9eda721c0e125a529353a6290195cc257f36e44dbca6d81dff1342478a52b0d700f7def335135440"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha512 = "d2c4cc32d2ae7bfdde1870686675f644f4eb3f2bd0870fa72986f5cef2cc3c45b8070b6df3196e67275bc67c1ece63706f1fcae3b89d80fea8db5c34b9f4b638"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha512 = "b0b32a37d13b76899037c7d34e2444cb45d54166516c6f6f141ae4713e5cca36827c0c02f4d9614a1c7eb5d9d859087586dda3e311d221f19091414557f9b713"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "6f4d295638ab8d16e1ec1db176d9a60946ee76cacb21c7e10018c2b908e5dad0527705d37b7050d11587244e922fa9e218482fcef40c3beab06c07db3dd8ccfb"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "918affe04e2dbf1f8d2f65a8a16cb30d575631d323eeb5cd29e76f2b30d003337e35792e57f78ca6bf8abd253f005296b44b71ecd4c48d055456b8820a2b8551"; }
-    { locale = "et"; arch = "linux-i686"; sha512 = "e352de0fb13570e5fd39bae39ea7dfab746529e8617beb8cca51c0a6183614722f62f93e91065c74fbe24e0cd91c03428d76c6e70369a60a64957ebebd1052d7"; }
+    { locale = "et"; arch = "linux-i686"; sha512 = "7a2aaa9e81fa166ad66ef6a275ea1e1b1f333946e73bd22c7954b78641949a870e8c4ff38f763ef22bbf25cf81ad0138e5d4b154b1d2cb90126ef53e56b6e676"; }
-    { locale = "et"; arch = "linux-x86_64"; sha512 = "583be1a8c7f1e2aac3242371ca8f34710510c6750b95f933e1574f9ba0e2a6ad733de4c9cc503909a063250d969aaaee6a53a69aae0c502274f5b0d43fc33b43"; }
+    { locale = "et"; arch = "linux-x86_64"; sha512 = "cfb751a0d94cbc3e130abe78dceb81117750b16c9665860a083a71554ce96e9102fa3c8b084c7acf07c9e10a8fe30e54e5964a214486c2bd16d93678a4b6948d"; }
-    { locale = "eu"; arch = "linux-i686"; sha512 = "9de8f87c48c65535c7b073ad90d9c1ad3b7f4932124529ffc1ece36175e5a139d4660efc4a850bd0034d885afc7d7889f137b10fb5972377a4ec97d6858c932f"; }
+    { locale = "eu"; arch = "linux-i686"; sha512 = "c99dd3738739f06963cf3e31d72831d8861c898ac512b0563f0d9ab21e671fed55c0e16e07ff87e058873095204a81f1756d77453e792bcc522c81d6ac26638c"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha512 = "101beb0a0dc8f33a78583f9b15036815b030429d471ba0c8852dde7a2e2c91bb6436c8dd36f39e4eab1ecdb38cec08c7ab88f4649b5d25a246657d358984f7c2"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha512 = "4726d30ed22d79edca4d3a6082ecf40cb107b28aeebcc1ed21faca951cd955fca524d4c16f4e9ac71fd57651c2392d79c5adcafea9a7dadbe84dc3e3511f47f4"; }
-    { locale = "fi"; arch = "linux-i686"; sha512 = "9670d209fabc23fed2dadb873335e3964b7107b67fbfda39e53fa28ff1d91fd617f73d041cd9d4d0b9dfbdc9e619f69ce05199f7afd383a4fd6717b9f912dee9"; }
+    { locale = "fi"; arch = "linux-i686"; sha512 = "3fe4ae74f046a0fcf95570ff7cd00abfa63567153bbabd036ecd8cccf1aab075b19e43642e247c741165d3990f1690d4c7f4b3eb16aaa34188d1bd17c202e06d"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha512 = "3c2b135437a80047ec04e9995d119b32e948d105677bde0efe505272a0768d860e8b68dbe487bb81c38f9eee94a7bcc23c976a3dd614300056ec578bb5dbe7a1"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha512 = "5e76a85eb66d62c2fcd42d0274e43c052131bd2a8d54bce256e417782d1b97985cc9a917fba18ab1118e72fd3bacb94abdf5620c1be9a7225f6c9b62f1eb0e02"; }
-    { locale = "fr"; arch = "linux-i686"; sha512 = "d14822f3ef67082a77488ee3f7b6e3294a01f12e48cf037fb2b41ab9c5e4af01f1b0a76b29673c9196f2caa16dade84183d69a6bbf1dd618e7742f9e1d903477"; }
+    { locale = "fr"; arch = "linux-i686"; sha512 = "216e084442018d1e5925d4deb14c11bda248d5015696b22167693f2534dd98049dd385bc3061348085113487b93cfea675cb7ea528ca4385022b33860b39633a"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha512 = "e1fdb863309bcdf382c3533b15ff1c3e4e9ee6f4c0ea097790c432d302b4a0712d00b1f0851dbc4c4e9c3758f941eddffd82dd1d3912dc76afc20e05083b82ad"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha512 = "6fbb2935899d94b3f56b27c131e2574f6735fba4147430a1dd5cd8728db29b90fd1416bc3661b1a3a927f496e9d716ae165ed8c65951184c2b1e07c962f876df"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha512 = "3881348184cdbac93b452e9f5c9ebbf14c542dff68cb500c82204dec42c3433e3b356f2d332c1fb5a4f6649e8bd5b03564bbd1f75bb25c2d946c72ba955c4b63"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha512 = "f752dbe8d2e90c0b5e60faa0b34280050463ea1bdda0749c9d46a46f08339e5952eacf70f0765144677362c9dad51c24a3bdffeb89e309563e472484f436993f"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3182f39c26085bc882cb1a391c63f2ce58a8ffcffce4ae1ca9293a08e572d888691cb2968d93caee77576bc7568a0ad67f0ccb6815dfffadc9f8f798343c92b2"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "302d8bf3941e0dff52918202f7f885dcb14ae9504baf52686a5c9201a644d469c57925181074ac0789d437d9bd8bfa965ae2ccbd54f51dbe2bc352b29d4a1e9c"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha512 = "a653b578be20b8127de26e7c8ac90adc04024cd108e078b5a5e2e7634d834d76f9227341e52ab8b72fdc5f8c11787405eabc19403922c854f0d0fc7e9fcb0774"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha512 = "be52801d6995cd377d451a640e319c2b812d83d62cbb2c3bf7063a18f03838f9b758add09875aa9e4e973b3ce3ac285f6f3486a7495590acf5672ccb900e5528"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "28dcbcefd11807482becc961244f58520498e0f9540f28c1e74d18f499cf5a209d51599783b8551ee937f228b406bd0605adef4146e29dccd8ccf2e5ef155a2c"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "a475b35c3fbd9fee3e4fd1475b9d3138d58df296744660dd8cc1932f121bbe9b1a2324c6452a4159b5c97a3846f38e92b9214a512d739a897cffeb40805cc0c7"; }
-    { locale = "gd"; arch = "linux-i686"; sha512 = "2b39ed0b1533cce97f4c4e5663ffef0fc88611334cceeaee0687ccc87e8c4b0f58afd9d826e7e9b66634b51249b776820cf03fc841e739ff3504eadc02597dd5"; }
+    { locale = "gd"; arch = "linux-i686"; sha512 = "88e209d87e38dd950b1248351d6b0518f63dd27423d2f30df1b177740dda4fb3568e19361b066ddd758fe071a7f2c747f8ff9307d6745b9d68002bb34be5dc77"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha512 = "525f632482577a3dcc2668495ad8c127bb8bc06412ef01ccf0188c1dbf735e73460cbabac439fc3dd80cf70519c45a439897ef91a1b32208d527e0b6487044f2"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha512 = "a56c26c2393323a8ec9190a89b3c1a4a27de9086222791e6cc84de0f640e2700274b92ffda0a21aa1de39684443108499122a12fbf5ceec3df69301132cf3463"; }
-    { locale = "gl"; arch = "linux-i686"; sha512 = "232bbd56d92ce7648ba57a061d8154b38bc6068dbde32b9ef17199d3a8bb28e1b0b384859d99c526fa96fbb35405520675ab3b45adc90caf125ac813bc77b5bd"; }
+    { locale = "gl"; arch = "linux-i686"; sha512 = "bc180ce7132641596151a1b6516b6ab9aa6070c542fbe90be7e440580c8f7a488348ba238922e33c8aea10505814604d5f5568d03978bcc75db536a31f66c4ce"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha512 = "5758ab0d5a6733395ba62601735193073fcee47ba7c3ab24d7031ce87447fb9018264bf3df1ab715ea786beb63a9d479e57217d56477d987021aa482c7b116a5"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha512 = "92bba67974146f832d91c6d023b60a7d4dd3f0391f4df9744379035bbf6fe2ca43d8eb81e05184658da34d5519b310f06fe4429287874ba618d3720931ef89a6"; }
-    { locale = "he"; arch = "linux-i686"; sha512 = "dc7cd600a93276995634303cff80d77724b56f0b7ff2fdfe8fe7da23d57d5f4f3d0e0169508c02c9ac57092da58d9ac9e3646f951ca4cb1fd398c70196fc6405"; }
+    { locale = "he"; arch = "linux-i686"; sha512 = "37da8123306823963ac02c9756d5ce3e76207ee0a1652fdad42cf2c8467062f1369c8f6640625fdc049e2c024d6ed71cb3c9c669d18e1d737246d510102d1d89"; }
-    { locale = "he"; arch = "linux-x86_64"; sha512 = "bdb385f4df861b1109169e1819860d46e8edf4d58588d4cdce609387117adeafe35e8bb17a0a2e43bcf12b1bb2244f089f3a1669cd69bb507434da202a1c7e15"; }
+    { locale = "he"; arch = "linux-x86_64"; sha512 = "62bb1f1735c13ac7adef4ce922eff64aba486bb2274691b8c3df12c4d87c30660dd2054e6fa314f56a690a0a8bf3533237d0d4bce89f83cc7a955e8de3f9fc43"; }
-    { locale = "hr"; arch = "linux-i686"; sha512 = "e7dc17107f762128bac6f0e173ceaec6a9e910dc84d486a0c9447365f1df07fcc1379dd2f05416aa904637836deac5a924f704396ab2af149676a6b1d075c52f"; }
+    { locale = "hr"; arch = "linux-i686"; sha512 = "b36128139442da20bdda63bf325a12e6f7467fe8f1baf8a56a3b0c55c8cce45f8c5a629b25a97b12c86e10fc12cddc2edd9aeea651bb9026427c6486270d80a2"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha512 = "74600954b56b03d4f2bcc71b32f6c8a19be483af16a7cd2b841fabea6eb042ded21afb1c196aa9bea97c81aae1732d7153e8419f97f439b44570ae53e53f88ea"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha512 = "ec3c826ed484ced10b417320d50f3c0c9b955b71eb656b2469c7a3268d712579901cba904a789f5f6a2fab6d7707401ff1ea0e112a575091c4196d7bd178387d"; }
-    { locale = "hsb"; arch = "linux-i686"; sha512 = "d42d5b10480100a38d2fe275be060423593f54f9aa6cda13fdac96fca9a36590dd9bb8d1638cca935faedbd09bf2435c0a2858ae9c2ce653af7b2dd183f46f29"; }
+    { locale = "hsb"; arch = "linux-i686"; sha512 = "274b913c0a5c293b45c622c360380560c62b19772c0d5616d46040b6330cc5c330177084f743f2edc2624c88bcafda748fcd3beae606adf7eafbc4711845517e"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha512 = "c41c5b57d7c170c54cd0817dbe21be8ba9e94b99fe28d7478ceb6545c6bf64a215d9ed6c66f99f116f43bb7b442ba6765613c15d14648ff64be3c0c5d7a6c763"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha512 = "5af289d7d57645959c0b1f1437239e8ed989720c586b6dff7734bd675258f6876b467b2e4a29686ac0f703685e41204b702df758ea25410271ecad9d9beee203"; }
-    { locale = "hu"; arch = "linux-i686"; sha512 = "d2ee002d390bf44ecdadba86ece0d77bdb4ea96a69a79dac4064a4c3f3244c9aeed95df4a1101535fb02225e0305e1d7e97389d4419574ad98d9484237aaff84"; }
+    { locale = "hu"; arch = "linux-i686"; sha512 = "fff9201e818d17b8ed453d272c5095625edac664555fc028efa9f08d23ad151d5aa22e3ddd9ee0eae9d0dfdfac27ca882107f12aa023741bcbd20be61e11c457"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha512 = "aca465875d8f3cb5815dd2de0546b7a822b55090c78f049d6d3a885f29c90fcbc437f0b7184e8249bb9c8dcc1ca4f146f1cf0067a751590df2d8c5fe4aeeea5d"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha512 = "cbe561fbd504b14c59e5db745dcbf83edbb5bf1813f86888419d0dc5cab43bc700f96782c36d1bc8c8732311758209faee5d9755e872e626c0a6012e5be6e441"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha512 = "567cba4a91dcc944e1922a429c8b328fc3b2843105056cef938a97c2ba73806f0fee2471b6fe6898856230c54ae0cb6110ebb249eaf9363a0beb35ed2aa0daba"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha512 = "954e697b2400b93fc575c7336a613d3d63702e80a12617a9c86b08e294bf4dad54c2cae4669525e88ecb55a0c029bab028105659a12656f03ce2ba0f0a7e71b1"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "34bf0a6638822fd1ea6c1a51e01d0d2f370202c61bb5a728abbeb2c1335c9130f3a4fbb7c26f9cb8025849aefde09eaf58567c7aedfd7d854d7313baeb8fd698"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "9e27956960fb2154e8c4b895123ceb0cbc8538f3f4563e2888db2d056605de0612a629c66f3db9a9acc3db7032ef39b553a9791a11489e89b6485c00f0e1b903"; }
-    { locale = "id"; arch = "linux-i686"; sha512 = "9dd1e0ba44787921fe8fce39f430575334e61948cbbd2e31923c67779c795dc0fc64cc0e46d62e3fa749a3d6cac12c3cb54c3f9e62e02930c1f4fd9a17fa50b2"; }
+    { locale = "id"; arch = "linux-i686"; sha512 = "bdedb03a25ec664c0443fa4e1e0d5dfa84ac5644e2a5dcefc67a714b71c2d18d9a38962e7ca2661f4d0d4d518d3e4eab51fb499efc32825a0446387cd22ed34e"; }
-    { locale = "id"; arch = "linux-x86_64"; sha512 = "78385b8276c5a9449d34a0233b40280437dacfc04a9d5d8291ae8603ee5b89337c5b53d4da80f41ca8c7153719654d6506027179c4a79575fd555d9dc8740d4f"; }
+    { locale = "id"; arch = "linux-x86_64"; sha512 = "2c18f2b919a64f540e5a1e59a430d1c710959711757e06fb38a12b67f0ff139ddde822ef7cdf5836a32d3bf904e56fb56e9d8d97f9d49cf35b67650be54e131c"; }
-    { locale = "is"; arch = "linux-i686"; sha512 = "02bc577e3d696735a280079fef84361d556a04c5d3f11f5af93f9ec5220ed729f237eb67120739192dfeedcb4570480bc40da9c413ca2b7f9023a5742cbb2e4a"; }
+    { locale = "is"; arch = "linux-i686"; sha512 = "73e866f713fc38ab7e56b97c985db69d49bdea2007c84e2ba54638f07433fc37a1a65a1189dd2b847394811e57ba8c767e20756686ec7fc86dcc3248168b110d"; }
-    { locale = "is"; arch = "linux-x86_64"; sha512 = "5de6270e4dd79f402163fdd724fa0987563c1f474c54b555e84ebd94cdb865bd890de21e3dc44ace9dc2bcc70fb182b78752840b6860a6f0494fbfadf4f705c6"; }
+    { locale = "is"; arch = "linux-x86_64"; sha512 = "031c069a6c6dd79f21594dcd64801c9f11bf4e41ba8efd3b17020fdebae585ea746910c0186a5dcfb5a073ff33807d8324932e5ef3c2e04b5d35e24a714f2cd2"; }
-    { locale = "it"; arch = "linux-i686"; sha512 = "d81131a4322b0a069f3f914d394f8400b0d532aad4f1a0316288ed00df184798c5c61484cbb50a134e7b681a2f150bd04416147734f0d73731811349e537a2d3"; }
+    { locale = "it"; arch = "linux-i686"; sha512 = "86bf4650fabfb9716d228e8449792b620a0692e3f5c6af19398cb37b1079cdf79f42795e16cd13c6ed261c1a81b7b3a23ba305299d03bcf1d716ee0ccade903d"; }
-    { locale = "it"; arch = "linux-x86_64"; sha512 = "7c9ce8e652dc994ee1155e4d1d3375ad093d8f684c422157a5c450edc3701151a1ca8036dda5f79781860ea1e138960266a7df77c16770418f4cb8327e2a2767"; }
+    { locale = "it"; arch = "linux-x86_64"; sha512 = "5225af86242544e4fdc176fa68463c9ab03e4066ae57266f112aec179f7085b7621df7e46e34302bc3e3e30dc713eb45af568b86bfb1a4fa6b01f50fe677b5b2"; }
-    { locale = "ja"; arch = "linux-i686"; sha512 = "6b96e8bba64fb004021838e41a36f13469eb48cb03659bceb12b897dd09fdc44f32d279e71e97b146a77fc0433cd85eb38449bf666355692a25f39eddc2775b8"; }
+    { locale = "ja"; arch = "linux-i686"; sha512 = "401e4c7b9831f2a3342764b6a2de732c89fe5687ff1e611c4ba1b630f22936c0343b3ef5ec444925ccc68c8ad45cd98d67ca502c32094adb567bfa64481e82c0"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha512 = "90c7f76fecc1c9eafbbd7f2f935a006266372d4192c2382c447b52a7993b650b6bb769d1f2f067540f038588b862a82ab4f1dc3b8a7c2a484fedaee55c82889e"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha512 = "7962eaef19bc5bdcf5f3aa9dad6df110ffed9b247d13dd61f3c4c170e4c854985d061847b84058bac35c16391821bdbbf5ed05120687cfc75c4baeba2de6f5ee"; }
-    { locale = "ko"; arch = "linux-i686"; sha512 = "c2e509fd91664c9ae9d12ad4eebbc875b96c3b7124b88373fbbfb8ef3ec45b3525e8e9c6a295680c583b55564ee26855f2d607a661bfce9d9f57acdc4b90a3cb"; }
+    { locale = "ko"; arch = "linux-i686"; sha512 = "d09e2083db577b308a65d1600bf15cbc6cae7b5137c66782d922a28588803a58348f87df5b9cb2cf9ca00713d542d441c5947475b551c8d5d929dc6293c00a48"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha512 = "b5fb1e955dde624bdf52a58d5ffadf99cc7fb0a0e757d236c553675aca14fbc942d420a63c91f64e584486fda3e0ecc39c62dbba6b3a62910d01447d7cafd4fc"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha512 = "b8689c851b176ec82b73566bffecff54c0e6c85efcae7deb9dd542360fd7a0f8a6f8e53c193060dc36a98203ad7024a0c1d408ac2348f59fd9f3cbd591a17e5e"; }
-    { locale = "lt"; arch = "linux-i686"; sha512 = "a24deedd6a2ed118cbdb9fc66c17aeb5756d8bf3586a096164c0c1841e1bd7a4b6179cacff3f058bbc9bef40186acf3833a5b2e75aeca8ee525302953fd7ea58"; }
+    { locale = "lt"; arch = "linux-i686"; sha512 = "8d5bd77d3d5d1b6168b65458bbb4f2409c447cfb6d019fcf7f8d81b3d4d486203533d3acb8a59257e664296636ee5b192b237ebf070b37a729926ff11bd81090"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha512 = "f4e0a5ec95a30f04a8ee84dd1f4f8bf7427255d382c0fc6a35f63a935edf54380dcd73bca5329ea01147e89c4d3faf30582412618e93a543643ee5922e9044b9"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha512 = "7314e8138a913c7610227cbbf71d535f85bf008e09610d742d996be391ff4be0e9dd4daed8fa3ccf1e1556e5c66982e3f2cea0d34d76d78588fe9926420af75f"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha512 = "c10d7ce6f66d716c550f27ba793cd6239d98ef7fb1dc75605288f426bb2fb65357af95134c4c2241f0438ac90995f666a488a3a61e7696318180496bc29cc94f"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha512 = "6b1cbcd9888b400ebcb4eccd416e12d09f29431a4afa3b890b05721d1c4108c35549c2f70800ca386f3b21c66b42be3d00a730d4fd2a4ba9c62069c92ab726f7"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "a722d43addca22cfc791da37de60d5ab96e18d66fbb0d8b4b3de9f08202b01bec8c5b8300404df19689d154249d80b0f84a6e09335f607c74a7ee65f64daecee"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "27f278b9f54b563f0aa907448eba04b4f84c9ab33eadb4737a662058e904e68baa481625c0303764ac7416cf5cad7bcf94a651db981fbcf94ab8e93625555415"; }
-    { locale = "nl"; arch = "linux-i686"; sha512 = "030da83ad81fcb1ce7188d8957fc0ea216372aa4e1fd6fd7d173ef5e329d95d8cd61d1ec9db3e28887d2f949056172644b0590e05815478abb42427d0ad5c06b"; }
+    { locale = "nl"; arch = "linux-i686"; sha512 = "d932296e6cc61c634ab09a66328335e0c6049e9d6ca660a862dce3cbe8cc0900fb3bdc0956b82c9f70f18f5c68c1f37acacdd7a3b8a697acd24df1197683aea3"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha512 = "6ea70e3fedc1cf1ea6f75ce9be7c8a7a6245e167f65baaabcdfd3194e70ca5474766e9ccd0d8180270b84c78697793a9af5b82a8f7a773c46b1af0a025382a99"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha512 = "010e833b541b1a9ef20d10a1678b7b25cf2a9268cfc6b6f0f1c1e5b1803bfdc4cd214b9e3a86132f1335531f107773dfe01f9f4dcd996262dc2c3ece491b36a4"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha512 = "354bb0c0447c8e7a54e8e8218f659f4810a6e2848f85c482cf289fe77518fce9c33bd817019bf089f254f71b141d65061c2a690190000c968badd939feaacec0"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha512 = "b2ed20a973248031fb63b5652f6eea2c572c1fc2d8dc780db4cfa6a0450ccc211effc1d79ac67718b444f0247f8659d134586a0abe829df4090f65b1cdb59d93"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "fa2484614a067461d8cc3c1fab8675f65b17fc6419c0fe1a8f15e98e8ffffea7297391ec8ec50ec8d2fe1cac4b348afe0b82f2db55584c46cbe2d62daf3a8e4b"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "5924aaeeb828464552b0de572ce24cbb94558aa30d599cb518d7dae74e6974d7da9ac5035c5bb2195fe826a8197907c29f02f5f0e83e36c84bb023b208fb56c7"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha512 = "045fa66125cc3c4fc4650bf4e5ea12aae1b26f2cc4191d6b464f41e5305f015611463b311f3bb55264d07b48edbbff606cb58f73d91b22b3bfaaf5de0b830121"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha512 = "6ac911f182c6c9b7e2617118efb76285136f0320d99f49401e5732841ffd846770bdd7ec98a200922536cfbd855debd037bdbe279b0f43e644d6e107afd73e68"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "696dad47dde2f2494f0410fb698b52ca87112e2c29310aea585b703f4633e404f533d37e6bbe09939aa6f575f426d0a4f2605ca5b95fccafc033569bfe258872"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e16db609e60e4c79336e31d267af552124b2d2b62fac0066e0a84a6e48f082a46699010a9f2540df30ff5c1d4f8d481c4cfc4caea4acc68f50ab83f996105209"; }
-    { locale = "pl"; arch = "linux-i686"; sha512 = "1848c4c819fa0aebeeec75ac43f3bcf3fa332ba08b79c8296a17aadc7d0434d2b634280541c8d71a68390e3a892a88dd49a0ab4b25c3a2b4b5e7321132801ee9"; }
+    { locale = "pl"; arch = "linux-i686"; sha512 = "90217da5f30de60aef9da734355d6b5e0a93526e0d8f91db6c21405e2666df12d1ae37acb94638966b1bff6e3de3713c5243b683e4d321b916125ef89af42c15"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha512 = "e9e0b937a165fd90e0639a01001c9b4ada645c9a1201b64ae6cbc1bbf885b5d0b89e195ca5732aaae66360dfc4f188ac8f1643bf12bdbfa029a348aa29a0f79a"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha512 = "b77b19d6c413a92ae3c0da43f989725b3d74fd9d7c1f343711ea73d5a10e4310f005a2d728fa708fcad3b281c5694964ab91966df00b2667a7a8ef616c3a86eb"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha512 = "4a69c26598d48d25d048288b6d1785dc8e4d89078eca3d300497a93d44639a8eaca0c32c1988abd831d33e0c32788e8ca6d07fdec9cd4ba7f451a23afbddc525"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha512 = "d4ce84451941a9382d4fa6225b697e2bea2f72dcf76c72b779bd1e3d955803d7ad3bcbed47e9a7dafde72cd20bfa1e8616b691d275e1e390b2af415e0ea9610c"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "72d387d49ae5f4dd6406f63fd5c0003f99865079c9d63d7d3deaf15268437dba592642ee8bc759df85fb679da094078c1bdf9808de05bf5e35ac870a62b960e2"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c3585047b7b5611e5925f873e3a996142e9b73b5f5389729f3b609f3554030d39a988183f15aa2a5d07036fecc147cdd0abc02b13601a0e02e794c40cada5b40"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha512 = "b3ff7eecd345f789bc4798e94402fe7cf7a0cbf27b03f3d8f92274f39764cfd38bd1e4ad5745f3d177645f2c5bea6cb4aa2f1110c90d524bc6b89916c00b2eb2"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha512 = "e28dce49f6660bea1f56f2515ae539701cc160956318305464ea6b8cf1cf6be21fa8b97b30b234eec9f7e5bc3987ed939b5eca50174ab148a988706f00a2ef0f"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "684849e41f77410c290688582488243fed9594c02ebdd85812a2c63e0cc410b470c14533d09184a83df43555b9ff1d775ed0f1ddbe24bb6890848ccce4e041f6"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "81a225e7d4f56b0c231d690b4da3f819a1549e8f5194cd6dd2da23d7909c24d9f5f9262e6bec5eee8701ce510980426c7d2612149c4c88da68f910cb7b046d1e"; }
-    { locale = "rm"; arch = "linux-i686"; sha512 = "02c4171d05c1f070cde474ad60edd7aded613ec1fd7bf51391fe4718554eed435282c44bf891703c356f5bfc0dd08093ef5bc7c979174d5b7fdab1529dde9dbe"; }
+    { locale = "rm"; arch = "linux-i686"; sha512 = "c4c724f0be3d6a1ada175ec87f840b177ab2a074d5ec858a49732ca7b5289a7d3b1e09b9d0e5c195e1e7565175cdef35e5b6e6e1a3344d7e307f9901e0ca1e6f"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha512 = "9ea31a30e8b5624c03c1627a6e2e1895a3ede5d35e1b9da0b16d6571c13af0e34cfcbe17f396638c8946b1f96037e9c833b3ed58ad46a9e0bf38ffc0e1dc8bba"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha512 = "8e55f3b680a7b7d4299e59360413a339a99569af8c3a890cb95437c76dfd903f5fc60b6abfb3820e4dbd7d637015ebf8600f351f858022b535709879c9b0608a"; }
-    { locale = "ro"; arch = "linux-i686"; sha512 = "dc5b581971333067b25317b702a2e9f58484ae66f640ecda0f9d7c8323fbf8c9fb6ca47fb59c94494e641787f7e9b95c6a4cf3037bf2fc974cc394160359910e"; }
+    { locale = "ro"; arch = "linux-i686"; sha512 = "cf91019d92850db3954690a403c13948f53d79574d874aa10effeac92d759d1b5e62cad9184f58c29b6e478903a4c6f4e27cc3e7e2457605332e361da5ab3ab4"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha512 = "92ef0d86e46d8c80685e9bcd16331447e310147b87cdb45bf80ab2992b4ea11626cf5fbf860ee807d2d8d4e6c7c4fdd352de4c498a57c6951f66ebf72bd60aeb"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha512 = "ed1106a9855752c951f232de0946665914051dda0e9ded0052b4ef10b7f8d19ce3994165eabeb8b2a1f04009fb7909a48c79c484451335ee24541ab3eee52f4c"; }
-    { locale = "ru"; arch = "linux-i686"; sha512 = "511f96bd7713ea798904216d466f362115922c1566d7214115df7665d9e152b9866bb66608f5426080251f55391ac92eb8ec8a0e76d9471563a0bd84fc8c4431"; }
+    { locale = "ru"; arch = "linux-i686"; sha512 = "e3175d29cee4f253f7adf4f1d9b9826840e434d11d0c3f10fd9163f904ca315764b4943fb9d2c8a2324aedaac26047e95b6cf87c3218bc5b941e0b9a07e2b49f"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha512 = "57f6669ae5706a4673bb15b1eb06d89807a9a1a0fb59493b2380778efd8dd3f014d1e0a354c16e71207bf0121a561720caa1a71a846237044889916374b6a5d6"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha512 = "62c15a60e2d600068273695f00e4d37416cd7c1804bbc814a3e0b7c0de2a3f23a03b4d6fa5666f25971b7726bd0cde1fccb40cde1e95522704c14252d52384dd"; }
-    { locale = "si"; arch = "linux-i686"; sha512 = "9eb41ae08570098f2cd9d099cec9d2a21490f5bbd7a5a9a422ae9c83b72fb50af2768ed7c33d0d174c3bd09b365107b1e726a57db8fd6bcf52dcc7430f8d22fe"; }
+    { locale = "si"; arch = "linux-i686"; sha512 = "a94106b78937fa105eb254044f5ba808edb17b7b0f9b2b56ad918a48566ed43e181b652f4b4feb37d81ed749a5ecd9bd6997cfe6fd1cd7fc001567d9a888f582"; }
-    { locale = "si"; arch = "linux-x86_64"; sha512 = "03291a8e69b3b6ebb69e25627ed77fed3e7a008ae77f869b262983fb9334e61748a1028f6dd4e1aabf513b7f6cbaefef83c237107d88c1b177c31f34fff54e3f"; }
+    { locale = "si"; arch = "linux-x86_64"; sha512 = "974c8349b19e34e9262a98b44c691354061a8f802c8ce47609251023eb91a97096cc107fbd653e9ef9536deb81259cead57b5bcebadb602af8fe51b7e1224fc6"; }
-    { locale = "sk"; arch = "linux-i686"; sha512 = "0152a947109f5257ec17889453cf650d1dcdd40825208053e65b70e8281579fce307d1f38e6d682d7a8d2f3da377c91ca1e249bc1d507c768d2f08292e5e6b90"; }
+    { locale = "sk"; arch = "linux-i686"; sha512 = "63fea9c688a89717b5626e407abf82e650916ede2f01189a54d33e4af366474b39383c2d64bde4bfdfdde3bfe767afb8677b1638b3b327c8a387d0dc00b1318e"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha512 = "d2fdb7585af8a1507362b44b9383acc611668cc4aeb912d98424a49543cefb9a58f95aaa77c1b36a1082fd1334f60df939900e1673e32d3af764ca5ce746d144"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha512 = "96684db63e28088ca0d1f6c3bc30b3075ee2f135900359060add36a34d539132655ec403847acd4d7823bf80d6fb5f7ce7a0c618031b64f6af725a8b3c4c5a22"; }
-    { locale = "sl"; arch = "linux-i686"; sha512 = "c2cedc7a07a27f439e5833ca9a1214d0e75b2154ff879fa39b06ab6baa05d13feac227b51d1126d70ef907942db1dcaf1e7c987128f752d0dc1d147266cf520f"; }
+    { locale = "sl"; arch = "linux-i686"; sha512 = "6279d3656f2b0a71e7082fd728bd2b551b16838263d7f83a32eebbb28e6d69df11be3f25db259a464428529ddf389f221048f445f0a0f34de1c263aca6fc48ae"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha512 = "07aa88c7d281e247e9c30f9ae3b8329132d4a145e8a8b0f88b544995d39f58d196fb6ce6a5604954129222a848ce49aa07a0bf6f1ab3a4b1fd29e61f51c7664f"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha512 = "c69e0ae0d72229c59ca0fa68789c1bdab1ceff5159906ccb27766b854b677328cb1c305d5568c058b93c4e512fd5b7f7626531c5a6f1655519f0c07ecc02308f"; }
-    { locale = "sq"; arch = "linux-i686"; sha512 = "e2afd03139f475ae68206cc1f35780261abd7646babd7f05c255acbcdbb712f11ea0b7b68887d0fc05e8bcded3a166cea490c86b2936be7d400c919efbb221cd"; }
+    { locale = "sq"; arch = "linux-i686"; sha512 = "d63f84b4e5d8b9728e354487b243c3de604c571af39e43a7552cebdf28139271a8acab85bd1dfc6506e1231bb1ed49dc127f3b0400c9fdaeba2bf6c3ea78829d"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha512 = "7b91f7c6cdeda2735dbe7befcdec777a6d22c1aa278d4a1caa8cb15441841b4edb7599e8d4d4fbc1d198cc6178625ad4a29455e7195ab563e9bd3ac4faa1104c"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha512 = "df10b39b6cc461c2418d8b297fed5f7ce34e31a0892737b99076b11095602f250b7018af109555a0ce7959695e00c56835786a9ca10573bfca07d1f21af7dedb"; }
-    { locale = "sr"; arch = "linux-i686"; sha512 = "6b92ea68fde0ede23bdd7998a81d9924e35b8cb77cc396636fb91495cafe039c32efa272f8c3693fa4ec582eb04bc0db6d22991e3056d22188e0eb8c64bf352b"; }
+    { locale = "sr"; arch = "linux-i686"; sha512 = "57f710812a1f26212ad0cbc4a3506424d36d0560f5d7d17f8e01d7ed4836fb7a385753b17388b30074cd00985ce7edd7882cb5c326b89840cc816f0b5f1c19cd"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha512 = "3ca3f049f677f9283d9af660d2989f5c05ed418bb904e7695e456f73d9615da106e0f0db2c3a371109c77fd7348eef5a94d8061b3a0ad508d193e1234839f954"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha512 = "88a92d428e32b7c3f63fc898c1c3a448ef3b78afde1334d86dc4e68819f05cb8cba9816e875aaf36f52f1f04c42f9833d690c43dc5eedff3743416a76d33f38d"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha512 = "95bbcfaade0c12d87c8b591e3d9d6205e1056741e9eb526cc505687e2ee43fbdb96ff0b411c63b58c6fdd57260180a94d343155163518843a843f5f3b086b25b"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha512 = "f86b0d7fd4f5875dee70ec00efe7f4c99a59d34e877b21288c89f9d5c83d04b31eeafe7dadc01ee5bd91a76363dace2da86e5bc219909fa06d47c5351931efc4"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "15d0bfb22e6f0d3425737dd05dedc5af7e1f98744fb0d943cd88ad6125083bc86bbfb700d71839a090f9b54642cc1b0ebb8fbd205d46316f83cab75bd5442ec9"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8994b908589746e5d8dc980b5dd06294988399be8e1ced10c6d4b3a6da440f69d6de7f101b9f96723fe55afdc21a7336c141058aa7fc70d283533e5fdd096b85"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha512 = "89b3a7997d3cc3a8372ee49df3dee21e535403d08a2aa742a1416c1e7c41c63fa56fe50fe133f588f3a34db180c4505f05034e99e078c0b19e1eef6f48e3d7fb"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha512 = "852a0132af6ed9d0c3da36025e0183b9c5bfc4a34af7870373989602059f05f6f5f779439c68ce577e6821295c2aa45135a2b90624b941c736089c391364e566"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "00c20fc4c27005e13cda53c5332bf874267e4bda6894480e599557e5e90a334b648a47ce28fff6353060d9a6fb4e547e632e2deb1513175023c1bf6d453a9583"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "bf8332314c43a8f2709be4440e9eace27ce4ca097d0db7a25de99ac6447606fda297bdccd5d7bf865a964f5276f04371a022134c22962fa5743cc90f4e1a627e"; }
-    { locale = "tr"; arch = "linux-i686"; sha512 = "1b791b57b9d8c3da228293c83fa02fc1a24a0b6b8a6efaecbfef42962f2390fb448d2fb08e5a812df8efcf135f9cecb98cba3b2b174e59b43575236ba5fb2f76"; }
+    { locale = "tr"; arch = "linux-i686"; sha512 = "e46e71d28a9bf4eefe453ad3841bfdbc261594e2b29322bc2e5cc072957674e1121c246d3be3fb56c84f64692d048f6792be526dd600dc85d5b2d7f5d2aaeab4"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha512 = "7040da3720ce3b0dad6e2863b48e025c32206c8a0d6cdae4e4fb13b7b6754796e9e1b83a09280303a83c97ddaf391c10a56aa8edfe1e7eca60534a6e1d4006d3"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha512 = "1c5d2d1f01129aa4456c166120ab21dd021e92bcd9ba9f4c1d2911699f856516bd9c9a5ae356397d117ae376fc5a44eb3b3880a2fe7e4f61a3b5bc581544f2b1"; }
-    { locale = "uk"; arch = "linux-i686"; sha512 = "54412cf33dab4be4553d267cad386d47ca38726e8643de10b8509828ba6c25f2c35e151165d3d999c22724ba57028b740f9b5e5f9a05aa773779759ffe6ced78"; }
+    { locale = "uk"; arch = "linux-i686"; sha512 = "7b3acee5c624600f908ec6ff7e664d2414a3fc48208bd54baf0cf209f66460e560137a52445805ccfb410913f2ab8ecee30f4a702fbe0c8bf758bf89411d06fe"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha512 = "3725c3c9c7ee8140b2c9ae3ad928e933afbfaab60ec27b8f1a8c56a87553c0123031d50d27c794407b6971b347b8f379c1c92ddff00db960bb635fb0cd945ebf"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha512 = "3b90f1a04c8922889182b81c88a071de2ff54f3524110739878e80738513216ba133ab973219eef822d7c1f605c1d2fa1b32fdbee2451e4c6427a27f9d25599a"; }
-    { locale = "vi"; arch = "linux-i686"; sha512 = "92edb5e4789d1e1a63d5f69f99a06ae474d85949771c07ef572ce5ae66a125d5c04ea207b51fcb4ee2d1f00052f53ee8415d109cb06e53c55e9436f37e375d3f"; }
+    { locale = "vi"; arch = "linux-i686"; sha512 = "bd37a54a586e91b29c668a2995fc37ec5b2e6d0bab5af640575981aff2be91e97181f5f89e0c4720979fac38b19530c056562a2c4a07c3b9868b347ea5f7f831"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha512 = "e786670f4033857873e5238118b23a86638b190db51d70ac55662718126621580bffd705803638bf71556caa397f3420efaa08e83e06abb4c2e2dbdd22f111af"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha512 = "a571cfd9e0e43e9ebf5d29969a9af08c16c3fb44abad302207ee17018b105cb7079a0e3da02433264cddfc2da7922296c41f4d5ee76d722b07211c9cb78c8caa"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha512 = "9af79559703b8734df11c2773ccd7f77a88d9dc5ebf2df1bac14fdef4ad0f45c840102e5bb86f6172ad6e7d225af8a1723d4de84b877fb2574fd1a729213ea08"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha512 = "6560d28c15ec9e46787d8eaa1fd9b20630828f15b2ebea98591e25123e5c51a90e12889ac2474467f9d1e3e41b88ae3cacc75ebb67391af0abbe18aaffa29a48"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "4d63dc15450d9297d4f161c72eded27d6176bc755f657012821cd9d9e989597c296f985e12af39d7a1b37dd5cf442fdbf9d2e1f7e6f11ba841ed87ea279d813b"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "0ad5965f5028c7d0642cdbb140caabab24536e9bb386b6b14c59af52758e667a6217c7251445c462d3c283c72215a449545f06a1d176ad178a17ed51640715c3"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha512 = "7bca2ef8b1e597346c0450870fcd0058fac18b3f3607c6280774db97d594e98928bf291ee22146d70f2de40437e38088b9a8af71b0b076b9bbf2049067bfc448"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha512 = "a44dc60451845e27560ba41ff5a37446f955076e0da8cbf8ed9ffe06c217dee8847f57c6a58913581ccd4d4039b0f2b570b660882e68bd0e9050371cd1220022"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "64ee5cf56a48159c1a2aee2c8dc9118ce9187c5c68a9a1393e2c28a35786fd42042b13d48d30ececf1893973ccab92c0a8b23cbaec340a5150cc1a994236c6cc"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "17cbdb81577522510f7538d843755f09465700f558d164e6e292070859c9e298165e16c57e5c6db109be6b570666986fd506b60ce6b8ea6f983070c36c5b28c4"; }
   ];
 }

pkgs/applications/networking/mailreaders/thunderbird/default.nix

@@ -13,7 +13,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "45.2.0"; in
+let version = "45.3.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
-    sha256 = "1h1p14zswrg71qvzshwvw03mhicwwkfg29hvnj56cf41nb5qj8xx";
+    sha512 = "1226b35535d68b9c088ab8692f61120c99951e1ecbae4739ced711665a3237d248202831831f00536c724e2f6359db4601fa5c90f2793433eab4bd9dab0c1165";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx

pkgs/applications/science/biology/neuron/default.nix

@@ -1,24 +1,56 @@
 { stdenv 
 , fetchurl 
 , pkgconfig
+, automake
+, autoconf
+, libtool
 , ncurses
+, readline
+, which
+, python ? null 
 , mpi ? null
 }:
 
 stdenv.mkDerivation rec {
-  name = "neuron-7.4";
+  name = "neuron-${version}";
-  buildInputs = [ stdenv pkgconfig ncurses mpi ];
+  version = "7.4";
+  
+  nativeBuildInputs = [ which pkgconfig automake autoconf libtool ];
+  buildInputs = [ ncurses readline python mpi  ];
 
   src = fetchurl {
-    url = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.4/nrn-7.4.tar.gz";
+    url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz";
     sha256 = "1rid8cmv5mca0vqkgwahm0prkwkbdvchgw2bdwvx4adkn8bbl0ql";
   };
 
+  patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]);
 
   enableParallelBuilding = true;
 
-  configureFlags = [ "--without-x"
+  ## neuron install by default everything under prefix/${host_arch}/*
-		     "${if mpi != null then "--with-mpi" else "--without-mpi"}" ];
+  ## override this to support nix standard file hierarchy 
+  ## without issues: install everything under prefix/
+  preConfigure = ''
+    ./build.sh
+    export prefix="''${prefix} --exec-prefix=''${out}" 
+  '';
+
+  configureFlags = with stdenv.lib;
+                    [ "--without-x" "--with-readline=${readline}" ]
+                    ++  optionals (python != null)  [ "--with-nrnpython=${python.interpreter}" ]
+                    ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] 
+                        else ["--without-mpi"]);
+                        
+                        
+  postInstall = stdenv.lib.optionals (python != null) [ ''
+    ## standardise python neuron install dir if any
+    if [[ -d $out/lib/python ]]; then
+        mkdir -p ''${out}/${python.sitePackages}
+        mv ''${out}/lib/python/*  ''${out}/${python.sitePackages}/
+    fi
+  ''];
+  
+  propagatedBuildInputs = [ readline ncurses which libtool ];  
 
   meta = with stdenv.lib; {
     description = "Simulation environment for empirically-based simulations of neurons and networks of neurons";

pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch

@@ -0,0 +1,21 @@
+--- nrn-7.4/src/mac/Makefile.am	2015-11-12 21:42:45.000000000 +0100
++++ nrn-7.4.new/src/mac/Makefile.am	2016-08-24 17:43:39.000000000 +0200
+@@ -15,18 +15,8 @@
+ host_cpu = @host_cpu@
+ 
+ if MAC_DARWIN
+-carbon = @enable_carbon@
+ bin_SCRIPTS = $(launch_scripts)
+ install: install-am
+-if UniversalMacBinary
+-	$(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
+-	$(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
+-	lipo aouti386 aoutppc -create -output a.out
+-else
+-	gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon
+-
+-endif
+-	carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)"
+ 	for i in $(S) ; do \
+ 		sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \
+ 		mv temp $(DESTDIR)$(bindir)/$$i; \

pkgs/applications/science/logic/prover9/default.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation {
       for first-order and equational logic. Prover9 is a successor of
       the Otter Prover. This is the LADR command-line version.
     '';
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [];
   };
 }

pkgs/applications/science/math/yacas/default.nix

@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
       homepage = http://yacas.sourceforge.net/;
       license = stdenv.lib.licenses.gpl2Plus;
       maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; all;
+      platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/version-management/peru/default.nix

@@ -1,24 +1,21 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ stdenv, fetchurl, python3Packages }:
 
 let 
-  version = "0.2.3"; 
+  pythonPackages = python3Packages;
-in
+in pythonPackages.buildPythonApplication rec {
-
-python3Packages.buildPythonApplication rec {
-  
-  # Do not prefix name with python specific version identifier.
-  namePrefix = "";
 
   name = "peru-${version}";
+  version = "1.0.1";
 
-  src = fetchFromGitHub {
+  src = fetchurl {
-    owner = "buildinspace";
+    url = "mirror://pypi/p/peru/${name}.tar.gz";
-    repo = "peru";
+    sha256 = "d51771d4aa7e16119e46c39efd71b0a1a898607bf3fb7735fc688a64fc59cbf1";
-    rev = "${version}";
-    sha256 = "04bnaly50qmzkj0shdag94n8vr3ggarlqdny5zdb8nh31fqgln8b";
   };
 
-  pythonPath = with python3Packages; [ pyyaml docopt ];
+  propagatedBuildInputs = with pythonPackages; [ pyyaml docopt ];
+
+  # No tests in archive
+  doCheck = false;
 
   meta = {
     homepage = https://github.com/buildinspace/peru;

pkgs/applications/version-management/rcs/default.nix

@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ eelco ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/video/gpac/default.nix

@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl21;
 
     maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/virtualization/qemu/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
+{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib
-, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
+, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex
-, libaio, gnutls, nettle
+, bison, lzo, snappy, libaio, gnutls, nettle
 , makeWrapper
 , attr, libcap, libcap_ng
 , CoreServices, Cocoa, rez, setfile
@@ -15,7 +15,7 @@
 
 with stdenv.lib;
 let
-  version = "2.6.0";
+  version = "2.6.1";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
-    sha256 = "1v1lhhd6m59hqgmiz100g779rjq70pik5v4b3g936ci73djlmb69";
+    sha256 = "1l88iqk0swqccrnjwczgl9arqsvy77bis862zxajy7z3dqdzshj9";
   };
 
   buildInputs =
@@ -45,7 +45,24 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [ ./no-etc-install.patch ];
+  patches = [
+    ./no-etc-install.patch
+    (fetchpatch {
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fff39a7ad09da07ef490de05c92c91f22f8002f2";
+      name = "9pfs-forbid-illegal-path-names.patch";
+      sha256 = "081j85p6m7s1cfh3aq1i2av2fsiarlri9gs939s0wvc6pdyb4b70";
+    })
+    (fetchpatch {
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=805b5d98c649d26fc44d2d7755a97f18e62b438a";
+      name = "9pfs-forbid-.-and-..-in-file-names.patch";
+      sha256 = "0km6knll492dx745gx37bi6dhmz08cmjiyf479ajkykp0aljii24";
+    })
+    (fetchpatch {
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=56f101ecce0eafd09e2daf1c4eeb1377d6959261";
+      name = "9pfs-directory-traversal-CVE-2016-7116.patch";
+      sha256 = "06pr070qj19w5mjxr36bcqxmgpiczncigqsbwfc8ncjhm1h7dmry";
+    })
+  ];
 
   configureFlags =
     [ "--smbd=smbd" # use `smbd' from $PATH

pkgs/applications/virtualization/virtualbox/default.nix

@@ -1,5 +1,6 @@
 { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
 , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
+, libXrandr
 , which, alsaLib, curl, libvpx, gawk, nettools, dbus
 , xorriso, makeself, perl, pkgconfig, nukeReferences
 , javaBindings ? false, jdk ? null
@@ -7,6 +8,7 @@
 , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
 , pulseSupport ? false, libpulseaudio ? null
 , enableHardening ? false
+, headless ? false
 }:
 
 with stdenv.lib;
@@ -67,12 +69,14 @@ in stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
+    [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
       libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl
       pkgconfig which libXmu nukeReferences ]
     ++ optional javaBindings jdk
     ++ optional pythonBindings python
-    ++ optional pulseSupport libpulseaudio;
+    ++ optional pulseSupport libpulseaudio
+    ++ optionals (headless) [ libXrandr libpng ]
+    ++ optionals (!headless) [ qt4 SDL ];
 
   hardeningDisable = [ "fortify" "pic" "stackprotector" ];
 
@@ -129,7 +133,9 @@ in stdenv.mkDerivation {
     ''}
     LOCAL_CONFIG
 
-    ./configure --with-qt4-dir=${qt4} \
+    ./configure \
+      ${optionalString headless "--build-headless"} \
+      ${optionalString (!headless) "--with-qt4-dir=${qt4}"} \
       ${optionalString (!javaBindings) "--disable-java"} \
       ${optionalString (!pythonBindings) "--disable-python"} \
       ${optionalString (!pulseSupport) "--disable-pulse"} \
@@ -180,6 +186,7 @@ in stdenv.mkDerivation {
       EXTHELPER
     ''}
 
+    ${optionalString (!headless) ''
       # Create and fix desktop item
       mkdir -p $out/share/applications
       sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop
@@ -190,6 +197,7 @@ in stdenv.mkDerivation {
         mkdir -p $out/share/icons/hicolor/$size/apps
         ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps
       done
+    ''}
 
     # Get rid of a reference to linux.dev.
     nuke-refs $out/lib/modules/*/misc/*.ko

pkgs/build-support/builder-defs/builder-defs.nix

@@ -1,607 +0,0 @@
-args @ {stringsWithDeps, lib, stdenv, writeScript, fetchurl, fetchmtn, fetchgit, ...}: with args; with stringsWithDeps; with lib;
-let inherit (builtins) head tail trace; in
-(rec
-{
-        inherit writeScript;
-
-        src = attrByPath ["src"] "" args;
-
-        addSbinPath = attrByPath ["addSbinPath"] false args;
-
-        forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"];
-        forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL"
-          "README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++
-          (optional (attrByPath ["forceCopyDoc"] true args) "doc");
-
-        hasSuffixHack = a: b: hasSuffix (a+(substring 0 0 b)) ((substring 0 0 a)+b);
-
-        archiveType = s:
-                (if hasSuffixHack ".tar" s then "tar"
-                else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
-                else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) ||
-			(hasSuffixHack ".tbz" s) then "tbz2"
-                else if hasSuffixHack ".tar.Z" s then "tZ"
-                else if hasSuffixHack ".tar.lzma" s then "tar.lzma"
-                else if hasSuffixHack ".tar.xz" s then "tar.xz"
-                else if hasSuffixHack ".rar" s then "rar"
-                else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
-                else if hasSuffixHack "-cvs-export" s then "cvs-dir"
-                else if hasSuffixHack "-git-export" s then "git-dir"
-                else if hasSuffixHack ".nar.bz2" s then "narbz2"
-                else if hasSuffixHack ".rpm" s then "rpm"
-
-                # Mostly for manually specified directories..
-                else if hasSuffixHack "/" s then "dir"
-
-                # Last block - for single files!! It should be always after .tar.*
-                else if hasSuffixHack ".bz2" s then "plain-bz2"
-                else if hasSuffixHack ".gz" s then "plain-gz"
-
-		# For bootstrap calls
-		else if (s ==("" + (substring 0 0 s))) then "empty"
-
-                else (abort "unknown archive type : ${s}"));
-
-        # changing this ? see [1]
-        defAddToSearchPath = fullDepEntry ("
-                addToSearchPathWithCustomDelimiter() {
-                        local delimiter=\$1
-                        local varName=\$2
-                        local needDir=\$3
-                        local addDir=\${4:-\$needDir}
-                        local prefix=\$5
-                        if [ -d \$prefix\$needDir ]; then
-                                if [ -z \${!varName} ]; then
-                                        eval export \${varName}=\${prefix}\$addDir
-                                else
-                                        eval export \${varName}=\${!varName}\${delimiter}\${prefix}\$addDir
-                                fi
-                        fi
-                }
-
-                addToSearchPath()
-                {
-                        addToSearchPathWithCustomDelimiter \"\${PATH_DELIMITER}\" \"\$@\"
-                }
-        ") ["defNest"];
-
-        # changing this ? see [1]
-        defNest = noDepEntry ("
-                nestingLevel=0
-
-                startNest() {
-                        nestingLevel=\$((\$nestingLevel + 1))
-                                echo -en \"\\e[\$1p\"
-                }
-
-                stopNest() {
-                        nestingLevel=\$((\$nestingLevel - 1))
-                                echo -en \"\\e[q\"
-                }
-
-                header() {
-                        startNest \"\$2\"
-                                echo \"\$1\"
-                }
-
-                # Make sure that even when we exit abnormally, the original nesting
-                # level is properly restored.
-                closeNest() {
-                        while test \$nestingLevel -gt 0; do
-                                stopNest
-                                        done
-                }
-
-                trap \"closeNest\" EXIT
-        ");
-
-
-        # changing this ? see [1]
-        minInit = fullDepEntry ("
-                ${stdenv.preHook}
-                
-                set -e
-                NIX_CC=${stdenv.cc}
-                export SHELL=${stdenv.shell}
-                PATH_DELIMITER=':'
-                
-                # Set up the initial path.
-                PATH=
-                for i in \$NIX_CC ${toString stdenv.initialPath}; do
-                    PATH=\$PATH\${PATH:+\"\${PATH_DELIMITER}\"}\$i/bin
-                done
-
-                export TZ=UTC
-
-                prefix=${if args ? prefix then (toString args.prefix) else "\$out"}
-
-                ") ["defNest" "defAddToSearchPath"];
-                
-        # if you change this rewrite using '' instead of "" to get rid of indentation in builder scripts
-        addInputs = fullDepEntry ("
-                # Recursively find all build inputs.
-                findInputs()
-                {
-                    local pkg=\$1
-
-                    case \$pkgs in
-                        *\\ \$pkg\\ *)
-                            return 0
-                            ;;
-                    esac
-                    
-                    pkgs=\"\$pkgs \$pkg \"
-
-                        echo \$pkg
-                    if test -f \$pkg/nix-support/setup-hook; then
-                        source \$pkg/nix-support/setup-hook
-                    fi
-                }
-
-                pkgs=\"\"
-                for i in \$NIX_CC ${toString realBuildInputs}; do
-                    findInputs \$i
-                done
-
-
-                # Set the relevant environment variables to point to the build inputs
-                # found above.
-                addToEnv()
-                {
-                    local pkg=\$1
-                "+
-                (if !((args ? ignoreFailedInputs) && (args.ignoreFailedInputs == 1)) then "
-                    if [ -e \$1/nix-support/failed ]; then
-                        echo \"failed input \$1\" >&2
-                        fail
-                    fi
-                " else "")
-                +(if addSbinPath then "
-                    if test -d \$1/sbin; then
-                        export _PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$1/sbin
-                    fi
-                " else "")
-                +"
-                    if test -d \$1/bin; then
-                        export _PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$1/bin
-                    fi
-
-                    for i in \"\${envHooks[@]}\"; do
-                        \$i \$pkg
-                    done
-                }
-
-                for i in \$pkgs; do
-                    addToEnv \$i
-                done
-
-
-                # Add the output as an rpath.
-                if test \"\$NIX_NO_SELF_RPATH\" != \"1\"; then
-                    export NIX_LDFLAGS=\"-rpath \$out/lib \$NIX_LDFLAGS\"
-                fi
-
-                PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH
-        ") ["minInit"];
-        
-        # changing this ? see [1]
-        defEnsureDir = fullDepEntry ("
-                # Ensure that the given directories exists.
-                ensureDir() {
-                    local dir
-                    for dir in \"\$@\"; do
-                        if ! test -x \"\$dir\"; then mkdir -p \"\$dir\"; fi
-                    done
-                }
-        ") ["minInit"];
-
-        # changing this ? see [1]
-        toSrcDir = s : fullDepEntry ((if (archiveType s) == "tar" then "
-                tar xvf '${s}'
-                cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\"
-        " else if (archiveType s) == "tgz" then "
-                tar xvzf '${s}'
-                cd \"\$(tar tzf '${s}' | head -1 | sed -e 's@/.*@@' )\"
-        " else if (archiveType s) == "tbz2" then "
-                tar xvjf '${s}'
-                cd \"\$(tar tjf '${s}' | head -1 | sed -e 's@/.*@@' )\"
-        " else if (archiveType s) == "tZ" then "
-                uncompress < '${s}' | tar x
-                cd \"\$(uncompress < '${s}' | tar t | head -1 | sed -e 's@/.*@@' )\"
-        " else if (archiveType s) == "tar.lzma" then "
-                unlzma -d -c <'${s}' | tar xv
-                cd \"\$(unlzma -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\"
-        " else if (archiveType s) == "tar.xz" then "
-                xz -d -c <'${s}' | tar xv
-                cd \"\$(xz -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\"
-        " else if (archiveType s) == "rar" then "
-                unrar x '${s}'
-                cd \"$(unrar lb '${s}' | tail -1 | sed -e 's@/.*@@' )\"
-        " else if (archiveType s) == "zip" then "
-                unzip '${s}'
-                cd \"$( unzip -lqq '${s}' | tail -1 | 
-                        sed -e 's@^\\(\\s\\+[-0-9:]\\+\\)\\{3,3\\}\\s\\+\\([^/]\\+\\)/.*@\\2@' )\"
-        " else if (archiveType s) == "cvs-dir" then "
-                cp -r '${s}' .
-                cd \$(basename ${s})
-                chmod u+rwX -R .
-        " else if (archiveType s) == "git-dir" then "
-                cp -r '${s}' .
-                cd \$(basename ${s})
-                chmod u+rwX -R .
-        " else if (archiveType s) == "dir" then "
-                cp -r '${s}' .
-                cd \$(basename ${s})
-                chmod u+rwX -R .
-        " else if (archiveType s) == "narbz2" then "
-                bzip2 <${s} | nix-store --restore \$PWD/\$(basename ${s} .nar.bz2)
-                cd \$(basename ${s} .nar.bz2)
-        " else if (archiveType s) == "rpm" then ''
-                rpm2cpio ${s} > ${s}.cpio
-                cpio -iv < ${s}.cpio
-		test -f *.tar.* && tar -xvf *.tar.*
-		test -d */ && cd */
-        '' else if (archiveType s) == "plain-bz2" then "
-                mkdir \$PWD/\$(basename ${s} .bz2)
-                NAME=\$(basename ${s} .bz2)
-                bzip2 -d <${s} > \$PWD/\$(basename ${s} .bz2)/\${NAME#*-}
-                cd \$(basename ${s} .bz2)
-        " else if (archiveType s) == "plain-gz" then "
-                mkdir \$PWD/\$(basename ${s} .gz)
-                NAME=\$(basename ${s} .gz)
-                gzip -d <${s} > \$PWD/\$(basename ${s} .gz)/\${NAME#*-}
-                cd \$(basename ${s} .gz)
-        " else if (archiveType s) == "empty" then "
-	        echo No source to unpack - doing nothing ..
-        " else (abort "unknown archive type : ${s}"))+
-                # goSrcDir is typically something like "cd mysubdir" .. but can be anything else 
-                (if args ? goSrcDir then args.goSrcDir else "")
-        ) ["minInit"];
-
-        configureCommand = attrByPath ["configureCommand"] "./configure" args;
-
-        # changing this ? see [1]
-        doConfigure = fullDepEntry ("
-                ${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags}
-        ") ["minInit" "addInputs" "doUnpack"];
-
-        # changing this ? see [1]
-	doIntltool = fullDepEntry ("
-		mkdir -p config
-		intltoolize --copy --force
-	") ["minInit" "addInputs" "doUnpack"];
-
-        # changing this ? see [1]
-        doAutotools = fullDepEntry ("
-                mkdir -p config
-                libtoolize --copy --force
-                aclocal --force
-                #Some packages do not need this
-                autoheader || true; 
-                automake --add-missing --copy
-                autoconf
-        ")["minInit" "addInputs" "doUnpack"];
-
-        # changing this ? see [1]
-        doAutogen = fullDepEntry (''
-                ./autogen.sh
-        '')["minInit" "addInputs" "doUnpack"];
-
-        # changing this ? see [1]
-        doMake = fullDepEntry ("        
-                make ${toString makeFlags}
-        ") ["minInit" "addInputs" "doUnpack"];
-
-        doUnpack = toSrcDir (toString src);
-
-        # changing this ? see [1]
-        installPythonPackage = fullDepEntry ("
-                python setup.py install --prefix=\"\$prefix\" 
-                ") ["minInit" "addInputs" "doUnpack"];
-
-        doPythonConfigure = fullDepEntry ('' 
-          pythonVersion=$(toPythonPath "$prefix")
-          pythonVersion=''${pythonVersion#*/lib/python}
-          pythonVersion=''${pythonVersion%%/site-packages}
-          ${if args ? extraPythonConfigureCommand then 
-            args.extraPythonConfigureCommand 
-          else ""}
-          python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags}
-        '') ["minInit" "addInputs" "doUnpack"]; 
-
-        # changing this ? see [1]
-        doMakeInstall = fullDepEntry ("
-                make ${toString (attrByPath ["makeFlags"] "" args)} "+
-                        "${toString (attrByPath ["installFlags"] "" args)} install") ["doMake"];
-
-        # changing this ? see [1]
-        doForceShare = fullDepEntry (" 
-                mkdir -p \"\$prefix/share\"
-                for d in ${toString forceShare}; do
-                        if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then
-                                mv -v \"\$prefix/\$d\" \"\$prefix/share\"
-                                ln -sv share/\$d \"\$prefix\"
-                        fi;
-                done;
-        ") ["minInit" "defEnsureDir"];
-
-        doForceCopy = fullDepEntry (''
-                name="$(basename $out)"
-                name="''${name#*-}"
-                mkdir -p "$prefix/share/$name"
-                for f in ${toString forceCopy}; do
-                        cp -r "$f" "$prefix/share/$name/$f" || true
-                done;
-        '') ["minInit" "defEnsureDir"];
-
-        doDump = n: noDepEntry "echo Dump number ${n}; set";
-
-	saveEnv = noDepEntry ''export > "$TMP/env-vars" || true'';
-
-	doDumpBuildInputs = noDepEntry (''
-	  echo "${toString realBuildInputs}"
-	'');
-
-        patchFlags = if args ? patchFlags then args.patchFlags else "-p1";
-
-        patches = attrByPath ["patches"] [] args;
-
-        toPatchCommand = s: "cat ${s} | patch ${toString patchFlags}";
-
-        doPatch = fullDepEntry (concatStringsSep ";"
-                (map toPatchCommand patches)
-        ) ["minInit" "doUnpack"];
-
-        envAdderInner = s: x: if x==null then s else y: 
-                a: envAdderInner (s+"echo export ${x}='\"'\"\$${x}:${y}\";'\"'\n") a;
-
-        envAdder = envAdderInner "";
-
-        envAdderList = l:  if l==[] then "" else 
-        "echo export ${head l}='\"'\"\\\$${head l}:${head (tail l)}\"'\"';\n" +
-                envAdderList (tail (tail l));
-
-        # changing this ? see [1]
-        wrapEnv = cmd: env: "
-                mv \"${cmd}\" \"${cmd}-orig\";
-                touch \"${cmd}\";
-                chmod a+rx \"${cmd}\";
-                (${envAdderList env}
-                echo '\"'\"${cmd}-orig\"'\"' '\"'\\\$@'\"' \n)  > \"${cmd}\"";
-
-        doWrap = cmd: fullDepEntry (wrapEnv cmd (attrByPath ["wrappedEnv"] [] args)) ["minInit"];
-
-        makeManyWrappers = wildcard : wrapperFlags : fullDepEntry (''
-          for i in ${wildcard}; do
-            wrapProgram "$i" ${wrapperFlags}
-          done
-        '') ["minInit" "addInputs" "defEnsureDir"];
-
-        wrapBinContentsPython = (makeManyWrappers 
-          ''$out/bin/*'' 
-          pythonWrapperArguments
-        );
-
-        pythonWrapperArguments = 
-          (''--prefix PYTHONPATH : $(toPythonPath $out)'' +
-          ''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}'');
-
-        preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }'';
-
-        doPropagate = fullDepEntry ("
-                mkdir -p \$out/nix-support
-                echo '${toString (attrByPath ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs
-        ") ["minInit" "defEnsureDir"];
-
-        cmakeFlags = attrByPath ["cmakeFlags"] [] args;
-
-        cmakeRPathFlag = if attrByPath ["cmakeSkipRpath "] true args then " -DCMAKE_SKIP_BUILD_RPATH=ON " else "";
-
-        cmakeBuildDir = attrByPath ["cmakeBuildDir"] "build" args;
-
-	doCmake = fullDepEntry (''
-          mkdir ${cmakeBuildDir}
-	  cd ${cmakeBuildDir}
-	  cmake -D CMAKE_INSTALL_PREFIX="$out" ${cmakeRPathFlag}${toString cmakeFlags} ..
-	'') ["minInit" "addInputs" "doUnpack"];
-
-	doScons = fullDepEntry (''
-		mkdir -p $out
-		${if (attrByPath ["sconsCleanEnv"] false args)
-		 then ""
-		 else ''
-                   sed -e '1iimport os' -i SConstruct
-                   sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct
-		 ''
-		}
-		scons ${toString (attrByPath ["sconsFlags"] [] args)} PREFIX=$out 
-		scons ${toString (attrByPath ["sconsFlags"] [] args)} PREFIX=$out install
-	'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
-
-        /*debug = x:(trace x x);
-        debugX = x:(trace (toXML x) x);*/
-
-        makeNest = x: if x == defNest.text then x else "startNest\n" + x + "\nstopNest\n";
-        textClosure = a: steps: textClosureMap makeNest a (["defNest"] ++ steps);
-
-        inherit noDepEntry fullDepEntry packEntry;
-
-        defList = attrByPath ["defList"] [] args;
-        getVal = getValue args defList;
-        check = checkFlag args;
-        reqsList = attrByPath ["reqsList"] [] args;
-        buildInputsNames = filter (x: null != getVal x)
-                (uniqList {inputList = 
-                  (concatLists (map 
-                    (x: if x==[] then [] else builtins.tail x) 
-                  reqsList));});
-        configFlags = attrByPath ["configFlags"] [] args;
-        buildFlags = attrByPath ["buildFlags"] [] args;
-        nameSuffixes = attrByPath ["nameSuffixes"] [] args;
-        autoBuildInputs = assert (checkReqs args defList reqsList);
-                filter (x: x!=null) (map getVal buildInputsNames);
-        autoConfigureFlags = condConcat "" configFlags check;
-        autoMakeFlags = condConcat "" buildFlags check;
-        useConfig = attrByPath ["useConfig"] false args;
-        realBuildInputs = 
-                lib.closePropagation ((if useConfig then 
-                        autoBuildInputs else 
-                        attrByPath ["buildInputs"] [] args)++
-                        (attrByPath ["propagatedBuildInputs"] [] args));
-        configureFlags = if useConfig then autoConfigureFlags else 
-            attrByPath ["configureFlags"] "" args;
-        makeFlags = if useConfig then autoMakeFlags else attrByPath ["makeFlags"] "" args;
-
-        inherit lib;
-
-        surroundWithCommands = x : before : after : {deps=x.deps; text = before + "\n" +
-                x.text + "\n" + after ;};
-
-	createDirs = fullDepEntry (concatStringsSep ";"
-		(map (x: "mkdir -p ${x}") (attrByPath ["neededDirs"] [] args))
-	) ["minInit" "defEnsureDir"];
-
-	copyExtraDoc = fullDepEntry (''
-          name="$(basename $out)"
-          name="''${name#*-}"
-          mkdir -p "$out/share/doc/$name"
-	'' + (concatStringsSep ";"
-               (map 
-	         (x: ''cp "${x}" "$out/share/doc/$name" || true;'') 
-		 (attrByPath ["extraDoc"] [] args)))) ["minInit" "defEnsureDir" "doUnpack"];
-
-        realPhaseNames = 
-	  (optional ([] != attrByPath ["neededDirs"] [] args) "createDirs")
-	  ++
-	  (attrByPath ["phaseNames"] [] args)
-	  ++ 
-          ["doForceShare" "doPropagate" "doForceCopy"]
-	  ++
-	  (optional ([] != attrByPath ["extraDoc"] [] args) "copyExtraDoc")
-          ++
-          (optional (attrByPath ["doCheck"] false args) "doMakeCheck")
-          ++
-          (optional (attrByPath ["alwaysFail"] false args) "doFail")
-          ;
-
-        doFail = noDepEntry "
-          echo 'Failing to keep builddir (and to invalidate result).'
-          a() { return 127; } ; a ;
-        ";
-
-        doMakeCheck = fullDepEntry (''
-          make check
-        '') ["minInit"];
-
-        extraDerivationAttrs = lib.attrByPath ["extraDerivationAttrs"] {} args;
-
-        # for overrides..
-	builderDefsArgs = args;
-
-        innerBuilderDefsPackage = bd: args: (
-        let localDefs = bd.passthru.function args; in
-
-        stdenv.mkDerivation ((rec {
-          inherit (localDefs) name;
-          buildCommand = textClosure localDefs localDefs.realPhaseNames;
-          meta = localDefs.meta;
-	  passthru = localDefs.passthru // {inherit (localDefs) src; };
-        }) // (if localDefs ? propagatedBuildInputs then {
-          inherit (localDefs) propagatedBuildInputs;
-        } else {}) // extraDerivationAttrs)
-        );
-
-	builderDefsPackage = bd: func:
-	  if builtins.isFunction func then 
-	    (foldArgs 
-	      (x: y: ((func (bd // x // y)) // y))
-              (innerBuilderDefsPackage bd)
-	      {})
-	  else
-	    (builderDefsPackage bd (import (toString func)))
-	    ;
-
-   generateFontsFromSFD = fullDepEntry (''
-           for i in *.sfd; do
-                echo $i;
-                fontforge -c \
-                        'Open($1);
-                        ${optionalString (args ? extraFontForgeCommands) args.extraFontForgeCommands
-                        }Reencode("unicode");
-                         ${optionalString (attrByPath ["createTTF"] true args) ''Generate($1:r + ".ttf");''}
-                         ${optionalString (attrByPath ["createOTF"] true args) ''Generate($1:r + ".otf");''}
-                         Reencode("TeX-Base-Encoding");
-                         ${optionalString (attrByPath ["createAFM"] true args) ''Generate($1:r + ".afm");''}
-                         ${optionalString (attrByPath ["createPFM"] true args) ''Generate($1:r + ".pfm");''}
-                         ${optionalString (attrByPath ["createPFB"] true args) ''Generate($1:r + ".pfb");''}
-                         ${optionalString (attrByPath ["createMAP"] true args) ''Generate($1:r + ".map");''}
-                         ${optionalString (attrByPath ["createENC"] true args) ''Generate($1:r + ".enc");''}
-                        ' $i; 
-        done
-   '') ["minInit" "addInputs" "doUnpack"];
-
-   installFonts = 
-      let retrievedName = (if args ? name then args.name else ""); in
-   fullDepEntry (''
-           mkdir -p $out/share/fonts/truetype/public/${retrievedName}
-           mkdir -p $out/share/fonts/opentype/public/${retrievedName}
-           mkdir -p $out/share/fonts/type1/public/${retrievedName}
-           mkdir -p $out/share/texmf/fonts/enc/${retrievedName}
-           mkdir -p $out/share/texmf/fonts/map/${retrievedName}
-
-           find -name '*.ttf' -exec cp {} $out/share/fonts/truetype/public/${retrievedName} \;
-           find -name '*.otf' -exec cp {} $out/share/fonts/opentype/public/${retrievedName} \;
-           find -name '*.pfm' -o -name '*.afm' -o -name '*.pfb' -exec cp {} $out/share/fonts/type1/public/${retrievedName} \;
-           find -name '*.enc' -exec cp {} $out/share/texmf/fonts/enc/${retrievedName} \;
-           find -name '*.map' -exec cp {} $out/share/texmf/fonts/map/${retrievedName} \;
-   '') ["minInit" "defEnsureDir"];
-
-   simplyShare = shareName: fullDepEntry (''
-     mkdir -p $out/share
-     cp -r . $out/share/${shareName}
-   '') ["doUnpack" "defEnsureDir"];
-
-   doPatchShebangs = dir: fullDepEntry (''
-     patchShebangFun() {
-     # Rewrite all script interpreter file names (`#! /path') under the
-     # specified  directory tree to paths found in $PATH.  E.g.,
-     # /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh.
-     # Interpreters that are already in the store are left untouched.
-         echo "patching script interpreter paths"
-         local f
-         for f in $(find "${dir}" -xtype f -perm -0100); do
-             local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
-             if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then
-                 local newPath=$(type -P $(basename $oldPath) || true)
-                 if test -n "$newPath" -a "$newPath" != "$oldPath"; then
-                     echo "$f: interpreter changed from $oldPath to $newPath"
-                     sed -i "1 s,$oldPath,$newPath," "$f"
-		 else
-		     echo "$f: not changing interpreter from $oldPath"
-                 fi
-             fi
-         done
-     }
-     patchShebangFun;
-   '') ["minInit"];
-
-   createPythonInstallationTarget = fullDepEntry (''
-     mkdir -p $(toPythonPath $out)
-     export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out)
-   '') ["minInit" "addInputs" "defEnsureDir"];
-
-   fetchUrlFromSrcInfo = srcInfo: fetchurl ({
-     url = srcInfo.url;
-     sha256 = srcInfo.hash;
-   } // 
-   (if srcInfo ? downloadName then {name = srcInfo.downloadName;} else {}));
-
-   fetchGitFromSrcInfo = srcInfo: fetchgit {
-     url = srcInfo.url;
-     rev = srcInfo.rev;
-     sha256 = srcInfo.hash;
-   };
-}) // args
-
-# [1]: rewrite using '' instead of " so that indentation gets stripped. It's
-# only about some spaces but in the end they will sum up

pkgs/build-support/builder-defs/template-auto-callable.nix

@@ -1,48 +0,0 @@
-x@{builderDefsPackage
-  (abort "Specify dependencies")
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [(abort "Specify helper argument names")];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="${abort ''Specify package name''}";
-    version="";
-    name="${baseName}-${version}";
-    url="${name}";
-    hash="";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
-    description = "${abort ''Specify description''}";
-    maintainers = with a.lib.maintainers;
-    [
-      (abort "Specify maintainers")
-    ];
-    platforms = with a.lib.platforms;
-      (abort "Specify platforms");
-    license = a.lib.licenses.(abort "Specify license");
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "${abort ''Specify download page''}";
-    };
-  };
-}) x
-

pkgs/build-support/builder-defs/template-bdp-uud.nix

@@ -1,26 +0,0 @@
-a :  
-let 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
-    description = "${abort "Specify description"}";
-    maintainers = [
-      a.lib.maintainers.(abort "Specify maintainer")
-    ];
-    platforms = with a.lib.platforms; 
-      (abort "Specify supported platforms");
-  };
-}

pkgs/build-support/builder-defs/template-composing+config.nix

@@ -1,22 +0,0 @@
-args : with args; let localDefs = builderDefs (args // rec {
-                src = /* put a fetchurl here */
-                (abort "Specify source");
-                useConfig = true;
-                reqsList = [
-                        ["true" ]
-                        ["false"]
-                ];
-                /* List consisiting of an even number of strings; "key" "value" */
-                configFlags = [
-                ];
-        }) args null; /* null is a terminator for sumArgs */
-        in with localDefs;
-stdenv.mkDerivation rec {
-        name = "${(abort "Specify name")}"+version;
-        builder = writeScript (name + "-builder")
-                (textClosure localDefs [(abort "Check phases") doMakeInstall doForceShare doPropagate]);
-        meta = {
-                description = "${(abort "Specify description")}";
-                inherit src;
-        };
-}

pkgs/build-support/builder-defs/template-composing-builder.nix

@@ -1,26 +0,0 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
-
-  version = a.lib.attrByPath ["version"] "" a; 
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
-  src = /* Here a fetchurl expression goes */;
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "${abort "Specify name"}-" + version;
-  meta = {
-    description = "${abort "Specify description"}";
-    maintainers = [
-      a.lib.maintainers.(abort "Specify maintainer")
-    ];
-  };
-}

pkgs/build-support/upstream-updater/attrset-to-dir.sh

@@ -1,21 +0,0 @@
-#! /bin/sh
-
-[ -n "$2" ] && NIXPKGS_ALL="$2";
-[ -z "$NIXPKGS_ALL" ] && [ -d "/etc/nixos/nixpkgs" ] && NIXPKGS_ALL="/etc/nixos/nixpkgs";
-[ -z "$NIXPKGS_ALL" ] && [ -d "$HOME/nixpkgs" ] && NIXPKGS_ALL="$HOME/nixpkgs";
-[ -z "$NIXPKGS_ALL" ] && {
-  echo "Cannot find Nixpkgs source. Please specify it via NIXPKGS_ALL or second command line argument"
-  exit 1
-};
-
-derivation="$(nix-instantiate --show-trace - << EOF
-let 
-  pkgs = import "${NIXPKGS_ALL}" {};
-  attrSet = import "${1}";
-in
-  pkgs.attrSetToDir attrSet
-EOF
-)"
-echo "Derivation is: $derivation" >&2
-output="$(nix-store -r "$derivation")"
-echo "$output/attributes"

pkgs/data/documentation/man-pages/default.nix

@@ -9,12 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1vimj3va16plxmv46rw6nzw4m9l11hb7r1d217y1bjpd5q8nw8qz";
   };
 
-  # keep developer docs separately (man2 and man3)
-  outputs = [ "out" "devdoc" ];
   makeFlags = [ "MANDIR=$(out)/share/man" ];
-  postFixup = ''
-    moveToOutput share/man/man2 "$devdoc"
-  '';
 
   meta = with stdenv.lib; {
     description = "Linux development manual pages";

pkgs/data/fonts/baekmuk-ttf/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
-    sha256 = "08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882";
+    sha256 = "10hqspl70h141ywz1smlzdanlx9vwgsp1qrcjk68fn2xnpzpvaq8";
   };
 
   dontBuild = true;

pkgs/data/fonts/nerdfonts/default.nix

@@ -19,11 +19,18 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/fonts/truetype
     ./install.sh ${withFont}
   '';
+
   meta = with stdenv.lib; {
-    description = "Nerd Fonts is a project that attempts to patch as many developer targeted and/or used fonts as possible. The patch is to specifically add a high number of additional glyphs from popular 'iconic fonts' such as Font Awesome, Devicons, Octicons, and others.";
+    description = ''
+      Nerd Fonts is a project that attempts to patch as many developer targeted
+      and/or used fonts as possible. The patch is to specifically add a high
+      number of additional glyphs from popular 'iconic fonts' such as Font
+      Awesome, Devicons, Octicons, and others.
+    '';
     homepage = "https://github.com/ryanoasis/nerd-fonts";
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
     platforms = with platforms; unix;
+    hydraPlatforms = []; # 'Output limit exceeded' on Hydra
   };
 }

pkgs/data/fonts/oxygenfonts/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "oxygenfonts-20160825";
+  name = "oxygenfonts-20160824";
 
   src = fetchFromGitHub {
     owner = "vernnobile";

pkgs/data/fonts/roboto-mono/default.nix

@@ -0,0 +1,84 @@
+{ stdenv, fetchurl }:
+
+let
+  # last commit on the directory containing the fonts in the upstream repository
+  commit = "883939708704a19a295e0652036369d22469e8dc";
+in
+stdenv.mkDerivation rec {
+  name = "roboto-mono-${version}";
+  version = "2016-01-11";
+
+  srcs = [
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Regular.ttf";
+      sha256 = "0r6g1xydy824xbbjilq6pvrv8611ga3q1702v5jj1ly5np6gpddz";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Bold.ttf";
+      sha256 = "0x9qnrbd7hin873wjzrl6798bvakixd86qdw0z5b4sm56f7fjl32";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Italic.ttf";
+      sha256 = "17aia6hgpjvvrl79y0f67ncr5y1nhyxj0dzqwdg3dycsa4kij59q";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-BoldItalic.ttf";
+      sha256 = "05gqfnps6qzxgyxrrmkmw0by3j88lf88v67n8jgi2chhhm0sw40q";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Medium.ttf";
+      sha256 = "0ww96qd0cyj3waxf7a98hyd4cp8snajjvjmbhr66zilql8ylfzk0";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-MediumItalic.ttf";
+      sha256 = "1n2cvvcpwm68lazfh3s3xhj4mrc01x84mi2ackwf8ahd95fk9p5y";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Light.ttf";
+      sha256 = "0na2sxz3n1km1ryz002spfa65d91fm48x0qcda2ac0rly7dgaqjf";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-LightItalic.ttf";
+      sha256 = "171fr8wsbmvfllsbmb9pcdax2qfzhbqzyxfn5bcrz9kx5k9x6198";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Thin.ttf";
+      sha256 = "0pv54afyprajb16ksm5vklc1q76iv72v427wgamqzrzyvxgn6ymj";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-ThinItalic.ttf";
+      sha256 = "1ziyysl09z24l735y940g92rqhn9v4npwqzajj9m1kn0xz21r1aw";
+    })
+  ];
+
+  sourceRoot = "./";
+
+  unpackCmd = ''
+    ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
+    cp $curSrc ./$ttfName
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -a *.ttf $out/share/fonts/truetype/
+  '';
+
+  meta = {
+    homepage = https://www.google.com/fonts/specimen/Roboto+Mono;
+    description = "Google Roboto Mono fonts";
+    longDescription = ''
+      Roboto Mono is a monospaced addition to the Roboto type family. Like
+      the other members of the Roboto family, the fonts are optimized for
+      readability on screens across a wide variety of devices and reading
+      environments. While the monospaced version is related to its variable
+      width cousin, it doesn't hesitate to change forms to better fit the
+      constraints of a monospaced environment. For example, narrow glyphs
+      like 'I', 'l' and 'i' have added serifs for more even texture while
+      wider glyphs are adjusted for weight. Curved caps like 'C' and 'O'
+      take on the straighter sides from Roboto Condensed.
+    '';
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/data/fonts/roboto-slab/default.nix

@@ -0,0 +1,60 @@
+{ stdenv, fetchurl }:
+
+let
+  # last commit on the directory containing the fonts in the upstream repository
+  commit = "883939708704a19a295e0652036369d22469e8dc";
+in
+stdenv.mkDerivation rec {
+  name = "roboto-slab-${version}";
+  version = "2016-01-11";
+
+  srcs = [
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Regular.ttf";
+      sha256 = "04180b5zk2nzll1rrgx8f1i1za66pk6pbrp0iww2xypjqra5zahk";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Bold.ttf";
+      sha256 = "0ayl2hf5j33vixxfa7051hzjjxnx8zhag3rr0mmmnxpsn7md44ms";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Light.ttf";
+      sha256 = "09riqgj9ixqjdb3mkzbs799cgmnp3ja3d6izlqkhpkfm52sgafqm";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Thin.ttf";
+      sha256 = "1hd0m7lxhr261a4s2nb572ari6v53w2yd8yjr9i534iqfl4jcbsf";
+    })
+  ];
+
+  sourceRoot = "./";
+
+  unpackCmd = ''
+    ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
+    cp $curSrc ./$ttfName
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -a *.ttf $out/share/fonts/truetype/
+  '';
+
+  meta = {
+    homepage = https://www.google.com/fonts/specimen/Roboto+Slab;
+    description = "Google Roboto Slab fonts";
+    longDescription = ''
+      Roboto has a dual nature. It has a mechanical skeleton and the forms
+      are largely geometric. At the same time, the font features friendly
+      and open curves. While some grotesks distort their letterforms to
+      force a rigid rhythm, Roboto doesn't compromise, allowing letters to
+      be settled into their natural width. This makes for a more natural
+      reading rhythm more commonly found in humanist and serif types.
+
+      This is the Roboto Slab family, which can be used alongside the normal
+      Roboto family and the Roboto Condensed family.
+    '';
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/desktops/kde-4.14/kde-runtime.nix

@@ -16,7 +16,7 @@ kde {
 
   nativeBuildInputs = [ shared_mime_info ];
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];
 

pkgs/desktops/kde-5/applications/kdelibs/default.nix

@@ -27,7 +27,7 @@ kdeApp {
   ];
 
   # cmake does not detect path to `ilmbase`
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
   cmakeFlags = [
     "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"

pkgs/desktops/kde-5/applications/kio-extras.nix

@@ -18,5 +18,5 @@ kdeApp {
     kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
     kpty libmtp libssh openexr openslp phonon qtsvg samba solid
   ];
-  NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev or ilmbase}/include/OpenEXR" ];
+  NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
 }

pkgs/development/compilers/ghc/8.0.1.nix

@@ -8,7 +8,7 @@ let
   fetchFilteredPatch = args: fetchurl (args // {
     downloadToTemp = true;
     postFetch = ''
-      ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out"
+      ${patchutils}/bin/filterdiff --clean --strip-match=1 -x '"testsuite/"*' "$downloadedFile" > "$out"
     '';
   });
 in
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     # Fix https://ghc.haskell.org/trac/ghc/ticket/12130
     (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; })
     (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
-  ];
+  ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
   buildInputs = [ ghc perl hscolour ];
 

pkgs/development/compilers/ghc/ghc-no-madv-free.patch

@@ -0,0 +1,18 @@
+diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
+index 99620ee..e052a84 100644
+--- a/rts/posix/OSMem.c
++++ b/rts/posix/OSMem.c
+@@ -523,13 +523,7 @@ void osDecommitMemory(void *at, W_ size)
+         sysErrorBelch("unable to make released memory unaccessible");
+ #endif
+ 
+-#ifdef MADV_FREE
+-    // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED
+-    // just swaps memory out
+-    r = madvise(at, size, MADV_FREE);
+-#else
+     r = madvise(at, size, MADV_DONTNEED);
+-#endif
+     if(r < 0)
+         sysErrorBelch("unable to decommit memory");
+ }

pkgs/development/compilers/ocaml/3.12.1.nix

@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; linux;
   };
 
 }

pkgs/development/compilers/ocaml/4.00.1.nix

@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; linux;
   };
 
 }

pkgs/development/compilers/openjdk/8.nix

@@ -122,16 +122,17 @@ let
 
       cp -av build/*/images/j2sdk-image/* $out/lib/openjdk
 
-      # Move some stuff to top-level.
+      # Remove some broken manpages.
-      mv $out/lib/openjdk/include $out/include
+      rm -rf $out/lib/openjdk/man/ja*
-      mv $out/lib/openjdk/man $out/share/man
+
+      # Mirror some stuff in top-level.
+      mkdir $out/include $out/share/man
+      ln -s $out/lib/openjdk/include/* $out/include/
+      ln -s $out/lib/openjdk/man/* $out/share/man/
 
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/linux/*_md.h $out/include/
 
-      # Remove some broken manpages.
-      rm -rf $out/share/man/ja*
-
       # Remove crap from the installation.
       rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
 
@@ -174,6 +175,7 @@ let
 
       ln -s $out/lib/openjdk/bin $out/bin
       ln -s $jre/lib/openjdk/jre/bin $jre/bin
+      ln -s $jre/lib/openjdk/jre $out/jre
     '';
 
     # FIXME: this is unnecessary once the multiple-outputs branch is merged.

pkgs/development/compilers/rust/beta.nix

@@ -21,7 +21,7 @@ rec {
     version = "beta-2016-07-25";
     srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
     srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
-    depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc";
+    depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo

pkgs/development/compilers/sbcl/1.2.5.nix

@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.sbcl.org;
     license = stdenv.lib.licenses.bsd3;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     inherit version;
   };
 }

pkgs/development/haskell-modules/configuration-common.nix

@@ -981,16 +981,6 @@ self: super: {
   # us when we patch the cabal file (Link options will be recored in the ghc package registry).
   GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
 
-  # https://github.com/gwern/mueval/issues/14
-  mueval = overrideCabal super.mueval (drv: {
-    revision = null;
-    editedCabalFile = null;
-    patches = [(pkgs.fetchpatch {
-      url = "https://github.com/gwern/mueval/commit/866f895e0b671bcaa232b46ed93dd7d47a4b32b2.patch";
-      sha256 = "16pb9nfr52hwidxv0f7j4yg8yd86959kzbcw9lmnzpvgdy5qyvkg";
-    })];
-  });
-
   # remove if a version > 0.1.0.1 ever gets released
   stunclient = overrideCabal super.stunclient (drv: {
     postPatch = (drv.postPatch or "") + ''

pkgs/development/haskell-modules/configuration-hackage2nix.yaml

@@ -320,6 +320,7 @@ dont-distribute-packages:
   anatomy:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   android-lint-summary:                         [ i686-linux, x86_64-linux ]
   AndroidViewHierarchyImporter:                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  angle:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   Animas:                                       [ i686-linux, x86_64-linux ]
   Annotations:                                  [ i686-linux, x86_64-linux ]
   antagonist:                                   [ i686-linux, x86_64-linux ]
@@ -519,6 +520,7 @@ dont-distribute-packages:
   bindings-libv4l2:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   bindings-libzip:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   bindings-linux-videodev2:                     [ i686-linux, x86_64-linux ]
+  bindings-lxc:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   bindings-mpdecimal:                           [ i686-linux, x86_64-linux ]
   bindings-portaudio:                           [ x86_64-darwin ]
   bindings-sane:                                [ i686-linux, x86_64-linux ]
@@ -589,6 +591,7 @@ dont-distribute-packages:
   bond-haskell-compiler:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   bond-haskell:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   bond:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
+  bookkeeper:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   Bookshelf:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   boolean-normal-forms:                         [ i686-linux, x86_64-linux ]
   boomerang:                                    [ i686-linux, x86_64-linux ]
@@ -666,6 +669,7 @@ dont-distribute-packages:
   call:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   camfort:                                      [ i686-linux, x86_64-linux ]
   campfire:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  canteven-parsedate:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   cantor:                                       [ i686-linux, x86_64-linux ]
   cao:                                          [ i686-linux, x86_64-linux ]
   cap:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -733,6 +737,7 @@ dont-distribute-packages:
   chp-transformers:                             [ i686-linux, x86_64-linux ]
   chp:                                          [ i686-linux, x86_64-linux ]
   ChristmasTree:                                [ i686-linux, x86_64-linux ]
+  chu2:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   chuchu:                                       [ i686-linux, x86_64-linux ]
   chunks:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   cil:                                          [ i686-linux, x86_64-linux ]
@@ -849,6 +854,7 @@ dont-distribute-packages:
   conductive-hsc3:                              [ i686-linux, x86_64-linux ]
   conduit-audio-lame:                           [ i686-linux, x86_64-linux ]
   conduit-audio-samplerate:                     [ i686-linux, x86_64-linux ]
+  conduit-find:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   conduit-network-stream:                       [ i686-linux, x86_64-linux ]
   conduit-resumablesink:                        [ i686-linux, x86_64-linux ]
   config-manager:                               [ i686-linux, x86_64-linux ]
@@ -866,6 +872,7 @@ dont-distribute-packages:
   consumers:                                    [ i686-linux, x86_64-linux ]
   container:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   context-stack:                                [ i686-linux, x86_64-linux ]
+  ContextAlgebra:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   continue:                                     [ i686-linux, x86_64-linux ]
   continuum:                                    [ i686-linux, x86_64-linux ]
   Contract:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -887,6 +894,7 @@ dont-distribute-packages:
   copilot-theorem:                              [ i686-linux, x86_64-linux ]
   copilot:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   COrdering:                                    [ i686-linux, x86_64-linux ]
+  core-compiler:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   core-haskell:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   core:                                         [ i686-linux, x86_64-linux ]
   corebot-bliki:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1030,6 +1038,7 @@ dont-distribute-packages:
   debian-binary:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   debian:                                       [ i686-linux, x86_64-linux ]
   decepticons:                                  [ i686-linux, x86_64-linux ]
+  decimal-arithmetic:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   DecisionTree:                                 [ i686-linux, x86_64-linux ]
   decoder-conduit:                              [ i686-linux, x86_64-linux ]
   dedukti:                                      [ i686-linux, x86_64-linux ]
@@ -1069,6 +1078,7 @@ dont-distribute-packages:
   dfsbuild:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   dgim:                                         [ i686-linux, x86_64-linux ]
   dgs:                                          [ i686-linux, x86_64-linux ]
+  diagrams-boolean:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   diagrams-builder:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   diagrams-cairo:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   diagrams-canvas:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1098,8 +1108,13 @@ dont-distribute-packages:
   diffcabal:                                    [ i686-linux, x86_64-linux ]
   DifferenceLogic:                              [ i686-linux, x86_64-linux ]
   DifferentialEvolution:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  digestive-bootstrap:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  digestive-foundation-lucid:                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  digestive-functors-blaze:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   digestive-functors-happstack:                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  digestive-functors-heist:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   digestive-functors-hsp:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  digestive-functors-lucid:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   DigitalOcean:                                 [ i686-linux, x86_64-linux ]
   DimensionalHash:                              [ i686-linux, x86_64-linux ]
   dingo-core:                                   [ i686-linux, x86_64-linux ]
@@ -1244,6 +1259,7 @@ dont-distribute-packages:
   email-header:                                 [ i686-linux, x86_64-linux ]
   email-postmark:                               [ i686-linux, x86_64-linux ]
   email:                                        [ i686-linux, x86_64-linux ]
+  emailparse:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   embeddock-example:                            [ i686-linux, x86_64-linux ]
   embeddock:                                    [ i686-linux, x86_64-linux ]
   embroidery:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1251,6 +1267,7 @@ dont-distribute-packages:
   Emping:                                       [ i686-linux, x86_64-linux ]
   enchant:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   engine-io-growler:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
+  engine-io-snap:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   enumerate:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   enumeration:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   enumfun:                                      [ i686-linux, x86_64-linux ]
@@ -1397,6 +1414,7 @@ dont-distribute-packages:
   fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   FM-SBLEX:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   FModExRaw:                                    [ i686-linux, x86_64-linux ]
+  fn-extra:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   foldl-incremental:                            [ i686-linux, x86_64-linux ]
   folds-common:                                 [ i686-linux, x86_64-linux ]
   follower:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1419,6 +1437,8 @@ dont-distribute-packages:
   fortran-src:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   foscam-sort:                                  [ i686-linux, x86_64-linux ]
   Foster:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  foundation-edge:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  foundation:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   fpco-api:                                     [ i686-linux, x86_64-linux ]
   fpnla-examples:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   Fractaler:                                    [ i686-linux, x86_64-linux ]
@@ -1447,6 +1467,7 @@ dont-distribute-packages:
   ftdi:                                         [ i686-linux, x86_64-linux ]
   FTGL-bytestring:                              [ i686-linux, x86_64-linux ]
   ftp-conduit:                                  [ i686-linux, x86_64-linux ]
+  FTPLine:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   ftshell:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   full-sessions:                                [ i686-linux, x86_64-linux ]
   full-text-search:                             [ i686-linux, x86_64-linux ]
@@ -1505,6 +1526,7 @@ dont-distribute-packages:
   geniserver:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   GenSmsPdu:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   GenussFold:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  genvalidity-containers:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   geo-resolver:                                 [ i686-linux, x86_64-linux ]
   GeocoderOpenCage:                             [ i686-linux, x86_64-linux ]
   geodetic:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1601,6 +1623,7 @@ dont-distribute-packages:
   GLFW:                                         [ x86_64-darwin ]
   glicko:                                       [ i686-linux, x86_64-linux ]
   glider-nlp:                                   [ i686-linux, x86_64-linux ]
+  glirc:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   GLMatrix:                                     [ i686-linux, x86_64-linux ]
   global-config:                                [ i686-linux, x86_64-linux ]
   global-variables:                             [ i686-linux, x86_64-linux ]
@@ -1832,6 +1855,7 @@ dont-distribute-packages:
   hack-middleware-jsonp:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hack2-handler-happstack-server:               [ i686-linux, x86_64-darwin, x86_64-linux ]
   hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux ]
+  hack2-handler-snap-server:                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   hack2-handler-warp:                           [ i686-linux, x86_64-linux ]
   hack2-interface-wai:                          [ i686-linux, x86_64-linux ]
   hackage-proxy:                                [ i686-linux, x86_64-linux ]
@@ -1877,6 +1901,8 @@ dont-distribute-packages:
   hamusic:                                      [ i686-linux, x86_64-linux ]
   handsy:                                       [ i686-linux, x86_64-linux ]
   hannahci:                                     [ i686-linux, x86_64-linux ]
+  hans-pcap:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  hans:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   haphviz:                                      [ i686-linux, x86_64-linux ]
   happindicator3:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   happindicator:                                [ i686-linux, x86_64-linux ]
@@ -1938,6 +1964,7 @@ dont-distribute-packages:
   has:                                          [ i686-linux, x86_64-linux ]
   hascal:                                       [ i686-linux, x86_64-linux ]
   hascar:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  hascas:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   hascat-lib:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   hascat-setup:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   hascat-system:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1968,6 +1995,7 @@ dont-distribute-packages:
   haskell-generate:                             [ i686-linux, x86_64-linux ]
   haskell-gi-base:                              [ i686-linux ]
   haskell-gi:                                   [ i686-linux ]
+  haskell-igraph:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-mpfr:                                 [ i686-linux, x86_64-linux ]
   haskell-names:                                [ i686-linux, x86_64-linux ]
   haskell-openflow:                             [ i686-linux, x86_64-linux ]
@@ -1978,6 +2006,8 @@ dont-distribute-packages:
   haskell-plot:                                 [ i686-linux, x86_64-linux ]
   haskell-reflect:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-rules:                                [ i686-linux, x86_64-linux ]
+  haskell-src-exts-prisms:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  haskell-src-exts-simple:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-src-meta-mwotton:                     [ i686-linux, x86_64-linux ]
   haskell-token-utils:                          [ i686-linux, x86_64-linux ]
   haskell-tools-ast-fromghc:                    [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2042,12 +2072,16 @@ dont-distribute-packages:
   hasloGUI:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   hasparql-client:                              [ i686-linux, x86_64-linux ]
   hasql-backend:                                [ i686-linux, x86_64-linux ]
+  hasql-cursor-query:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  hasql-cursor-transaction:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   hasql-postgres-options:                       [ i686-linux, x86_64-linux ]
   hasql-postgres:                               [ i686-linux, x86_64-linux ]
   hasql-transaction:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   haste-cabal-install:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  haste-cabal-install:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   haste-cabal-install:                          [ i686-linux, x86_64-linux ]
   haste-Cabal:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  haste-Cabal:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   haste-Cabal:                                  [ i686-linux, x86_64-linux ]
   haste-compiler:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   haste-gapi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2056,6 +2090,7 @@ dont-distribute-packages:
   Hate:                                         [ i686-linux, x86_64-linux ]
   hatex-guide:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   HaTeX-meta:                                   [ i686-linux, x86_64-linux ]
+  hats:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   haverer:                                      [ i686-linux, x86_64-linux ]
   HaVSA:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hawitter:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2116,6 +2151,8 @@ dont-distribute-packages:
   hecc:                                         [ i686-linux, x86_64-linux ]
   Hedi:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   heist-aeson:                                  [ i686-linux, x86_64-linux ]
+  heist-async:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  heist:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   helics-wai:                                   [ i686-linux, x86_64-linux ]
   helics:                                       [ i686-linux, x86_64-linux ]
   helium:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2185,6 +2222,7 @@ dont-distribute-packages:
   hgen:                                         [ i686-linux, x86_64-linux ]
   hgeometric:                                   [ i686-linux, x86_64-linux ]
   hgeometry:                                    [ i686-linux, x86_64-linux ]
+  hgeos:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hgithub:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   hgom:                                         [ i686-linux, x86_64-linux ]
   HGraphStorage:                                [ i686-linux, x86_64-linux ]
@@ -2277,6 +2315,7 @@ dont-distribute-packages:
   hob:                                          [ i686-linux, x86_64-linux ]
   hobbes:                                       [ i686-linux, x86_64-linux ]
   hobbits:                                      [ i686-linux, x86_64-linux ]
+  hocilib:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   HODE:                                         [ i686-linux, x86_64-linux ]
   hoe:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   Hoed:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2375,6 +2414,7 @@ dont-distribute-packages:
   hs-twitter:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   hs-twitterarchiver:                           [ i686-linux, x86_64-linux ]
   hs-vcard:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  hs-watchman:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   hs2bf:                                        [ i686-linux, x86_64-linux ]
   hs2dot:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   Hs2lib:                                       [ i686-linux, x86_64-linux ]
@@ -2390,6 +2430,7 @@ dont-distribute-packages:
   hsc3-rec:                                     [ i686-linux, x86_64-linux ]
   hsc3-server:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   hsc3-unsafe:                                  [ i686-linux, x86_64-linux ]
+  hscaffold:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   hscamwire:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   hscassandra:                                  [ i686-linux, x86_64-linux ]
   hsclock:                                      [ i686-linux, x86_64-linux ]
@@ -2408,6 +2449,7 @@ dont-distribute-packages:
   HSHHelpers:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   HsHyperEstraier:                              [ i686-linux, x86_64-linux ]
   hSimpleDB:                                    [ i686-linux, x86_64-linux ]
+  hsimport:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   HsJudy:                                       [ i686-linux, x86_64-linux ]
   hskeleton:                                    [ i686-linux, x86_64-linux ]
   hslackbuilder:                                [ i686-linux, x86_64-linux ]
@@ -2430,6 +2472,7 @@ dont-distribute-packages:
   hsparql:                                      [ i686-linux, x86_64-linux ]
   hspear:                                       [ i686-linux, x86_64-linux ]
   hspec-experimental:                           [ i686-linux, x86_64-linux ]
+  hspec-golden-aeson:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   hspec-shouldbe:                               [ i686-linux, x86_64-linux ]
   hspec-snap:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   hspec-test-sandbox:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2509,6 +2552,7 @@ dont-distribute-packages:
   hw-bits:                                      [ i686-linux ]
   hw-conduit:                                   [ i686-linux ]
   hw-json:                                      [ i686-linux ]
+  hw-json:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   hw-rankselect:                                [ i686-linux ]
   hw-succinct:                                  [ i686-linux ]
   hworker-ses:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2708,6 +2752,7 @@ dont-distribute-packages:
   jsc:                                          [ i686-linux, x86_64-linux ]
   JsContracts:                                  [ i686-linux, x86_64-linux ]
   jsmw:                                         [ i686-linux, x86_64-linux ]
+  json-api:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   json-ast-json-encoder:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   json-ast-quickcheck:                          [ i686-linux, x86_64-linux ]
   json-autotype:                                [ i686-linux, x86_64-linux ]
@@ -2738,7 +2783,9 @@ dont-distribute-packages:
   JuicyPixels-repa:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   jukebox:                                      [ x86_64-darwin ]
   JunkDB-driver-gdbm:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  jupyter:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   JYU-Utils:                                    [ i686-linux, x86_64-linux ]
+  kaleidoscope:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   kangaroo:                                     [ i686-linux, x86_64-linux ]
   kansas-lava-cores:                            [ i686-linux, x86_64-linux ]
   kansas-lava-papilio:                          [ i686-linux, x86_64-linux ]
@@ -2765,6 +2812,7 @@ dont-distribute-packages:
   Ketchup:                                      [ i686-linux, x86_64-linux ]
   kevin:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   keyring:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  keysafe:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   keystore:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   kicad-data:                                   [ i686-linux, x86_64-linux ]
   kickass-torrents-dump-parser:                 [ i686-linux, x86_64-linux ]
@@ -2774,6 +2822,8 @@ dont-distribute-packages:
   kif-parser:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   kit:                                          [ i686-linux, x86_64-linux ]
   kmeans-par:                                   [ i686-linux, x86_64-linux ]
+  knead-arithmetic:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  knead:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   knots:                                        [ i686-linux, x86_64-linux ]
   koellner-phonetic:                            [ i686-linux, x86_64-linux ]
   Konf:                                         [ i686-linux, x86_64-linux ]
@@ -2795,6 +2845,7 @@ dont-distribute-packages:
   lambda-devs:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   lambda-toolbox:                               [ i686-linux, x86_64-linux ]
   lambdaBase:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  lambdabot-utils:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   LambdaCalculator:                             [ i686-linux, x86_64-linux ]
   lambdacat:                                    [ i686-linux, x86_64-linux ]
   lambdacms-core:                               [ i686-linux, x86_64-linux ]
@@ -2830,6 +2881,7 @@ dont-distribute-packages:
   language-sh:                                  [ i686-linux, x86_64-linux ]
   language-spelling:                            [ i686-linux, x86_64-linux ]
   language-sqlite:                              [ i686-linux, x86_64-linux ]
+  large-hashable:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   Lastik:                                       [ i686-linux, x86_64-linux ]
   lat:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   latest-npm-version:                           [ i686-linux, x86_64-linux ]
@@ -2887,6 +2939,7 @@ dont-distribute-packages:
   libxls:                                       [ i686-linux, x86_64-linux ]
   libxml:                                       [ i686-linux, x86_64-linux ]
   libxslt:                                      [ i686-linux, x86_64-linux ]
+  libzfs:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   LibZip:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   lifter:                                       [ i686-linux, x86_64-linux ]
   lighttpd-conf-qq:                             [ i686-linux, x86_64-linux ]
@@ -2916,6 +2969,7 @@ dont-distribute-packages:
   lio-eci11:                                    [ i686-linux, x86_64-linux ]
   lio-simple:                                   [ i686-linux, x86_64-linux ]
   liquid-fixpoint:                              [ i686-linux, x86_64-linux ]
+  liquid:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   liquidhaskell-cabal-demo:                     [ i686-linux, x86_64-linux ]
   liquidhaskell-cabal:                          [ i686-linux, x86_64-linux ]
   liquidhaskell:                                [ i686-linux, x86_64-linux ]
@@ -2966,6 +3020,8 @@ dont-distribute-packages:
   lojbanXiragan:                                [ i686-linux, x86_64-linux ]
   lojysamban:                                   [ i686-linux, x86_64-linux ]
   lol-apps:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  lol-calculus:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  lol-typing:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   lol:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   loli:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   loop-effin:                                   [ i686-linux, x86_64-linux ]
@@ -2973,6 +3029,8 @@ dont-distribute-packages:
   lord:                                         [ i686-linux, x86_64-linux ]
   loris:                                        [ i686-linux, x86_64-linux ]
   lostcities:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  lp-diagrams-svg:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  lp-diagrams:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   ls-usb:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   lscabal:                                      [ i686-linux, x86_64-linux ]
   LslPlus:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3043,6 +3101,7 @@ dont-distribute-packages:
   markup-preview:                               [ i686-linux, x86_64-linux ]
   marmalade-upload:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   marquise:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  mars:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   marxup:                                       [ i686-linux, x86_64-linux ]
   masakazu-bot:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   matchers:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3092,6 +3151,7 @@ dont-distribute-packages:
   mighttpd:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   milena:                                       [ i686-linux, x86_64-linux ]
   mime-string:                                  [ i686-linux, x86_64-linux ]
+  minecraft-data:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   minesweeper:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   MiniAgda:                                     [ i686-linux, x86_64-linux ]
   miniforth:                                    [ i686-linux, x86_64-linux ]
@@ -3128,6 +3188,7 @@ dont-distribute-packages:
   monad-exception:                              [ i686-linux, x86_64-linux ]
   monad-interleave:                             [ i686-linux, x86_64-linux ]
   monad-levels:                                 [ i686-linux, x86_64-linux ]
+  monad-lgbt:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   monad-lrs:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   monad-memo:                                   [ i686-linux, x86_64-linux ]
   monad-mersenne-random:                        [ i686-linux, x86_64-linux ]
@@ -3222,6 +3283,7 @@ dont-distribute-packages:
   mysnapsession-example:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   mysnapsession:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   mysql-effect:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  mysql-haskell:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   mysql-simple-quasi:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   mysql-simple-typed:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   mysql-simple:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3244,6 +3306,7 @@ dont-distribute-packages:
   natural-number:                               [ i686-linux, x86_64-linux ]
   NaturalLanguageAlphabets:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   nc-indicators:                                [ i686-linux, x86_64-linux ]
+  NearContextAlgebra:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   neat:                                         [ i686-linux, x86_64-linux ]
   needle:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   nehe-tuts:                                    [ i686-linux, x86_64-linux ]
@@ -3265,6 +3328,7 @@ dont-distribute-packages:
   network-bytestring:                           [ i686-linux, x86_64-linux ]
   network-connection:                           [ i686-linux, x86_64-linux ]
   network-dns:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  network-hans:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   network-interfacerequest:                     [ x86_64-darwin ]
   network-ip:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   network-minihttp:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3489,6 +3553,7 @@ dont-distribute-packages:
   Phsu:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   phybin:                                       [ i686-linux, x86_64-linux ]
   pi-calculus:                                  [ i686-linux, x86_64-linux ]
+  pi-forall:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   pianola:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   piet:                                         [ i686-linux, x86_64-linux ]
   piki:                                         [ i686-linux, x86_64-linux ]
@@ -3504,6 +3569,7 @@ dont-distribute-packages:
   pipes-files:                                  [ i686-linux, x86_64-linux ]
   pipes-network-tls:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   pipes-p2p-examples:                           [ i686-linux, x86_64-linux ]
+  pipes-protolude:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   pipes-shell:                                  [ i686-linux, x86_64-linux ]
   pisigma:                                      [ i686-linux, x86_64-linux ]
   Piso:                                         [ i686-linux, x86_64-linux ]
@@ -3549,6 +3615,7 @@ dont-distribute-packages:
   poppler:                                      [ i686-linux, x86_64-linux ]
   porte:                                        [ i686-linux, x86_64-linux ]
   porter:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  PortFusion:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   ports:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   posix-acl:                                    [ i686-linux, x86_64-linux ]
   posix-waitpid:                                [ i686-linux, x86_64-linux ]
@@ -3560,6 +3627,7 @@ dont-distribute-packages:
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux ]
   postgresql-typed:                             [ i686-linux, x86_64-linux ]
   PostgreSQL:                                   [ i686-linux, x86_64-linux ]
+  postgrest-ws:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   postgrest:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   postie:                                       [ i686-linux, x86_64-linux ]
   postmaster:                                   [ i686-linux, x86_64-linux ]
@@ -3693,6 +3761,7 @@ dont-distribute-packages:
   rad:                                          [ i686-linux, x86_64-linux ]
   radium-formula-parser:                        [ i686-linux, x86_64-linux ]
   rados-haskell:                                [ i686-linux, x86_64-linux ]
+  raft:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   rail-compiler-editor:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   rainbow-tests:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   rakhana:                                      [ i686-linux, x86_64-linux ]
@@ -3720,6 +3789,7 @@ dont-distribute-packages:
   rcu:                                          [ i686-linux, x86_64-linux ]
   rdf4h:                                        [ i686-linux, x86_64-linux ]
   rdioh:                                        [ i686-linux, x86_64-linux ]
+  react-tutorial-haskell-server:                [ i686-linux, x86_64-darwin, x86_64-linux ]
   reaction-logic:                               [ i686-linux, x86_64-linux ]
   reactive-bacon:                               [ i686-linux, x86_64-linux ]
   reactive-balsa:                               [ i686-linux, x86_64-linux ]
@@ -3792,6 +3862,7 @@ dont-distribute-packages:
   relational-record-examples:                   [ i686-linux, x86_64-linux ]
   relational-record:                            [ i686-linux, x86_64-linux ]
   relational-schemas:                           [ i686-linux, x86_64-linux ]
+  reload:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   remote-debugger:                              [ i686-linux, x86_64-linux ]
   remote-json-client:                           [ i686-linux, x86_64-linux ]
   remote-json-server:                           [ i686-linux, x86_64-linux ]
@@ -3847,8 +3918,11 @@ dont-distribute-packages:
   ripple:                                       [ i686-linux, x86_64-linux ]
   risc386:                                      [ i686-linux, x86_64-linux ]
   rivers:                                       [ i686-linux, x86_64-linux ]
+  rivet-simple-deploy:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  rivet:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   RJson:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   Rlang-QQ:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  rlwe-challenges:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   rmonad:                                       [ i686-linux, x86_64-linux ]
   RMP:                                          [ i686-linux, x86_64-linux ]
   RNAdesign:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3995,12 +4069,14 @@ dont-distribute-packages:
   servant-github:                               [ i686-linux, x86_64-linux ]
   servant-haxl-client:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-jquery:                               [ i686-linux, x86_64-linux ]
+  servant-matrix-param:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-pandoc:                               [ i686-linux ]
   servant-pool:                                 [ i686-linux, x86_64-linux ]
   servant-postgresql:                           [ i686-linux, x86_64-linux ]
   servant-purescript:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-router:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-scotty:                               [ i686-linux, x86_64-linux ]
+  servant-smsc-ru:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-subscriber:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-swagger:                              [ i686-linux, x86_64-linux ]
   serversession-backend-acid-state:             [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -4055,6 +4131,7 @@ dont-distribute-packages:
   simple-form:                                  [ i686-linux, x86_64-linux ]
   simple-index:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   simple-log-syslog:                            [ i686-linux, x86_64-linux ]
+  simple-logger:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   simple-pascal:                                [ i686-linux, x86_64-linux ]
   simple-postgresql-orm:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   simple-vec3:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -4139,6 +4216,7 @@ dont-distribute-packages:
   snaplet-rest:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   snaplet-riak:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   snaplet-sass:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  snaplet-scoped-session:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   snaplet-sedna:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   snaplet-ses-html:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   snaplet-sqlite-simple:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -4354,6 +4432,7 @@ dont-distribute-packages:
   TBit:                                         [ i686-linux, x86_64-linux ]
   tbox:                                         [ i686-linux, x86_64-linux ]
   tccli:                                        [ i686-linux, x86_64-linux ]
+  tcp-streams:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   tcp:                                          [ i686-linux, x86_64-linux ]
   tdd-util:                                     [ i686-linux, x86_64-linux ]
   tdoc:                                         [ i686-linux, x86_64-linux ]
@@ -4364,6 +4443,7 @@ dont-distribute-packages:
   template-haskell-util:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   template-hsml:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   template-yj:                                  [ i686-linux, x86_64-linux ]
+  templateify:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   tempodb:                                      [ i686-linux, x86_64-linux ]
   temporal-csound:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tempus:                                       [ i686-linux, x86_64-linux ]
@@ -4479,6 +4559,7 @@ dont-distribute-packages:
   transactional-events:                         [ i686-linux, x86_64-linux ]
   transf:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   transformations:                              [ i686-linux, x86_64-linux ]
+  TransformeR:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   transformers-convert:                         [ i686-linux, x86_64-linux ]
   transformers-eff:                             [ i686-linux, x86_64-linux ]
   transformers-runnable:                        [ i686-linux, x86_64-linux ]
@@ -4584,6 +4665,7 @@ dont-distribute-packages:
   unroll-ghc-plugin:                            [ i686-linux, x86_64-linux ]
   unscramble:                                   [ i686-linux, x86_64-linux ]
   unsequential:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  unused:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   up:                                           [ i686-linux, x86_64-linux ]
   uploadcare:                                   [ i686-linux, x86_64-linux ]
   upskirt:                                      [ i686-linux, x86_64-linux ]
@@ -4665,6 +4747,7 @@ dont-distribute-packages:
   VKHS:                                         [ i686-linux, x86_64-linux ]
   vowpal-utils:                                 [ i686-linux, x86_64-linux ]
   voyeur:                                       [ i686-linux, x86_64-linux ]
+  vrpn:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   vte:                                          [ i686-linux, x86_64-linux ]
   vtegtk3:                                      [ i686-linux, x86_64-linux ]
   vty-menu:                                     [ i686-linux, x86_64-linux ]
@@ -4695,6 +4778,7 @@ dont-distribute-packages:
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux ]
   wai-middleware-verbs:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   wai-routes:                                   [ i686-linux, x86_64-linux ]
+  wai-session-mysql:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux ]
   wai-static-cache:                             [ i686-linux, x86_64-linux ]
   wai-thrift:                                   [ i686-linux, x86_64-linux ]

pkgs/development/haskell-modules/configuration-lts.nix

@@ -75,6 +75,7 @@ self: super: {
   "Agda" = doDistribute super."Agda_2_5_1";
   "Agda-executable" = dontDistribute super."Agda-executable";
   "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlanDeniseEricLauren" = dontDistribute super."AlanDeniseEricLauren";
   "AlgorithmW" = dontDistribute super."AlgorithmW";
   "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
   "Allure" = dontDistribute super."Allure";
@@ -461,6 +462,7 @@ self: super: {
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit" = doDistribute super."HUnit_1_3_1_1";
   "HUnit-Diff" = dontDistribute super."HUnit-Diff";
   "HUnit-Plus" = dontDistribute super."HUnit-Plus";
   "HUnit-approx" = dontDistribute super."HUnit-approx";
@@ -867,7 +869,14 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock" = doDistribute super."Spock_0_10_0_1";
+  "Spock-api" = dontDistribute super."Spock-api";
+  "Spock-api-ghcjs" = dontDistribute super."Spock-api-ghcjs";
+  "Spock-api-server" = dontDistribute super."Spock-api-server";
   "Spock-auth" = dontDistribute super."Spock-auth";
+  "Spock-core" = dontDistribute super."Spock-core";
+  "Spock-digestive" = doDistribute super."Spock-digestive_0_2_0_0";
+  "Spock-worker" = doDistribute super."Spock-worker_0_3_0_0";
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
@@ -880,6 +889,7 @@ self: super: {
   "StrategyLib" = dontDistribute super."StrategyLib";
   "Stream" = dontDistribute super."Stream";
   "StrictBench" = dontDistribute super."StrictBench";
+  "StringUtils" = dontDistribute super."StringUtils";
   "SuffixStructures" = dontDistribute super."SuffixStructures";
   "SybWidget" = dontDistribute super."SybWidget";
   "SyntaxMacros" = dontDistribute super."SyntaxMacros";
@@ -1598,6 +1608,7 @@ self: super: {
   "bond" = dontDistribute super."bond";
   "bond-haskell" = dontDistribute super."bond-haskell";
   "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler";
+  "bookkeeper" = dontDistribute super."bookkeeper";
   "boolean-list" = dontDistribute super."boolean-list";
   "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
   "boolexpr" = dontDistribute super."boolexpr";
@@ -1781,6 +1792,12 @@ self: super: {
   "casr-logbook" = dontDistribute super."casr-logbook";
   "casr-logbook-html" = dontDistribute super."casr-logbook-html";
   "casr-logbook-meta" = dontDistribute super."casr-logbook-meta";
+  "casr-logbook-meta-html" = dontDistribute super."casr-logbook-meta-html";
+  "casr-logbook-reports" = dontDistribute super."casr-logbook-reports";
+  "casr-logbook-reports-html" = dontDistribute super."casr-logbook-reports-html";
+  "casr-logbook-reports-meta" = dontDistribute super."casr-logbook-reports-meta";
+  "casr-logbook-reports-meta-html" = dontDistribute super."casr-logbook-reports-meta-html";
+  "casr-logbook-types" = dontDistribute super."casr-logbook-types";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
@@ -1863,6 +1880,7 @@ self: super: {
   "cil" = dontDistribute super."cil";
   "cinvoke" = dontDistribute super."cinvoke";
   "cio" = dontDistribute super."cio";
+  "cipher-aes128" = doDistribute super."cipher-aes128_0_7_0_1";
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
@@ -2035,6 +2053,7 @@ self: super: {
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-combinators" = doDistribute super."conduit-combinators_1_0_4";
   "conduit-find" = dontDistribute super."conduit-find";
   "conduit-merge" = dontDistribute super."conduit-merge";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
@@ -2121,6 +2140,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_3";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -3172,6 +3192,7 @@ self: super: {
   "ghc-parmake" = dontDistribute super."ghc-parmake";
   "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
   "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof" = dontDistribute super."ghc-prof";
   "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
   "ghc-server" = dontDistribute super."ghc-server";
   "ghc-simple" = dontDistribute super."ghc-simple";
@@ -3832,6 +3853,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_19_14";
   "hasql-backend" = dontDistribute super."hasql-backend";
+  "hasql-class" = dontDistribute super."hasql-class";
   "hasql-cursor-query" = dontDistribute super."hasql-cursor-query";
   "hasql-cursor-transaction" = dontDistribute super."hasql-cursor-transaction";
   "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
@@ -3921,6 +3943,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helium-overture" = dontDistribute super."helium-overture";
   "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
@@ -4329,6 +4352,7 @@ self: super: {
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
   "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec-webdriver" = doDistribute super."hspec-webdriver_1_1_0";
   "hspec2" = dontDistribute super."hspec2";
   "hspecVariant" = dontDistribute super."hspecVariant";
   "hspr-sh" = dontDistribute super."hspr-sh";
@@ -4406,6 +4430,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
   "http-kit" = dontDistribute super."http-kit";
+  "http-link-header" = doDistribute super."http-link-header_1_0_1";
   "http-listen" = dontDistribute super."http-listen";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
@@ -4587,6 +4612,7 @@ self: super: {
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
+  "inline-c" = doDistribute super."inline-c_0_5_5_5";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
   "inline-java" = dontDistribute super."inline-java";
   "inline-r" = doDistribute super."inline-r_0_8_0_1";
@@ -4670,6 +4696,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isobmff-builder" = dontDistribute super."isobmff-builder";
   "isohunt" = dontDistribute super."isohunt";
+  "isotope" = dontDistribute super."isotope";
   "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
@@ -5318,10 +5345,10 @@ self: super: {
   "memexml" = dontDistribute super."memexml";
   "memo-ptr" = dontDistribute super."memo-ptr";
   "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memorypool" = dontDistribute super."memorypool";
   "memscript" = dontDistribute super."memscript";
   "merge-bash-history" = dontDistribute super."merge-bash-history";
   "mersenne-random" = dontDistribute super."mersenne-random";
-  "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_5";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5480,6 +5507,7 @@ self: super: {
   "montage" = dontDistribute super."montage";
   "montage-client" = dontDistribute super."montage-client";
   "monte-carlo" = dontDistribute super."monte-carlo";
+  "monzo" = dontDistribute super."monzo";
   "moo" = dontDistribute super."moo";
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
@@ -5671,6 +5699,7 @@ self: super: {
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-uri-flag" = dontDistribute super."network-uri-flag";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
   "network-websocket" = dontDistribute super."network-websocket";
@@ -5730,6 +5759,7 @@ self: super: {
   "np-linear" = dontDistribute super."np-linear";
   "nptools" = dontDistribute super."nptools";
   "nth-prime" = dontDistribute super."nth-prime";
+  "ntha" = dontDistribute super."ntha";
   "nthable" = dontDistribute super."nthable";
   "ntp-control" = dontDistribute super."ntp-control";
   "null-canvas" = dontDistribute super."null-canvas";
@@ -6066,6 +6096,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-http" = doDistribute super."pipes-http_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-io" = dontDistribute super."pipes-io";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6112,6 +6143,7 @@ self: super: {
   "pnm" = dontDistribute super."pnm";
   "pocket-dns" = dontDistribute super."pocket-dns";
   "pointed" = doDistribute super."pointed_4_2_0_2";
+  "pointedalternative" = dontDistribute super."pointedalternative";
   "pointfree" = dontDistribute super."pointfree";
   "pointless-haskell" = dontDistribute super."pointless-haskell";
   "pointless-lenses" = dontDistribute super."pointless-lenses";
@@ -6156,6 +6188,7 @@ self: super: {
   "ports-tools" = dontDistribute super."ports-tools";
   "positive" = dontDistribute super."positive";
   "posix-acl" = dontDistribute super."posix-acl";
+  "posix-error-codes" = dontDistribute super."posix-error-codes";
   "posix-escape" = dontDistribute super."posix-escape";
   "posix-filelock" = dontDistribute super."posix-filelock";
   "posix-paths" = dontDistribute super."posix-paths";
@@ -6171,6 +6204,7 @@ self: super: {
   "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-libpq" = doDistribute super."postgresql-libpq_0_9_1_1";
   "postgresql-query" = dontDistribute super."postgresql-query";
   "postgresql-simple-bind" = dontDistribute super."postgresql-simple-bind";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
@@ -6307,6 +6341,7 @@ self: super: {
   "pugs-hsregex" = dontDistribute super."pugs-hsregex";
   "pulse" = dontDistribute super."pulse";
   "pulse-simple" = dontDistribute super."pulse-simple";
+  "pulseaudio" = dontDistribute super."pulseaudio";
   "punkt" = dontDistribute super."punkt";
   "punycode" = dontDistribute super."punycode";
   "puppetresources" = dontDistribute super."puppetresources";
@@ -6432,6 +6467,8 @@ self: super: {
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "raw-feldspar" = dontDistribute super."raw-feldspar";
+  "rawr" = dontDistribute super."rawr";
   "rawstring-qm" = dontDistribute super."rawstring-qm";
   "razom-text-util" = dontDistribute super."razom-text-util";
   "rbr" = dontDistribute super."rbr";
@@ -6444,6 +6481,7 @@ self: super: {
   "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
+  "react-flux-servant" = dontDistribute super."react-flux-servant";
   "react-haskell" = dontDistribute super."react-haskell";
   "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
@@ -6591,6 +6629,7 @@ self: super: {
   "representable-tries" = dontDistribute super."representable-tries";
   "reqcatcher" = dontDistribute super."reqcatcher";
   "request-monad" = dontDistribute super."request-monad";
+  "reroute" = doDistribute super."reroute_0_3_1_0";
   "reserve" = dontDistribute super."reserve";
   "resistor-cube" = dontDistribute super."resistor-cube";
   "resource-effect" = dontDistribute super."resource-effect";
@@ -6855,6 +6894,7 @@ self: super: {
   "serv-wai" = dontDistribute super."serv-wai";
   "servant-aeson-specs" = dontDistribute super."servant-aeson-specs";
   "servant-auth-cookie" = dontDistribute super."servant-auth-cookie";
+  "servant-auth-hmac" = dontDistribute super."servant-auth-hmac";
   "servant-auth-token" = dontDistribute super."servant-auth-token";
   "servant-auth-token-api" = dontDistribute super."servant-auth-token-api";
   "servant-csharp" = dontDistribute super."servant-csharp";
@@ -6963,6 +7003,7 @@ self: super: {
   "simple-config" = dontDistribute super."simple-config";
   "simple-css" = dontDistribute super."simple-css";
   "simple-download" = dontDistribute super."simple-download";
+  "simple-effects" = dontDistribute super."simple-effects";
   "simple-eval" = dontDistribute super."simple-eval";
   "simple-firewire" = dontDistribute super."simple-firewire";
   "simple-form" = dontDistribute super."simple-form";
@@ -7024,6 +7065,7 @@ self: super: {
   "sleep" = dontDistribute super."sleep";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
+  "slim" = dontDistribute super."slim";
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
@@ -7273,6 +7315,7 @@ self: super: {
   "stm-split" = dontDistribute super."stm-split";
   "stm-tlist" = dontDistribute super."stm-tlist";
   "stmcontrol" = dontDistribute super."stmcontrol";
+  "stochastic" = dontDistribute super."stochastic";
   "stomp-conduit" = dontDistribute super."stomp-conduit";
   "stomp-patterns" = dontDistribute super."stomp-patterns";
   "stomp-queue" = dontDistribute super."stomp-queue";
@@ -7465,12 +7508,14 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty" = doDistribute super."tasty_0_11_0_3";
+  "tasty-golden" = doDistribute super."tasty-golden_2_3_1";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8_1";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7940,6 +7985,7 @@ self: super: {
   "uri" = dontDistribute super."uri";
   "uri-bytestring" = doDistribute super."uri-bytestring_0_2_1_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-encode" = doDistribute super."uri-encode_1_5_0_4";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
   "uri-template" = dontDistribute super."uri-template";
@@ -8016,6 +8062,7 @@ self: super: {
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-fftw" = doDistribute super."vector-fftw_0_1_3_6";
   "vector-functorlazy" = dontDistribute super."vector-functorlazy";
   "vector-heterogenous" = dontDistribute super."vector-heterogenous";
   "vector-instances-collections" = dontDistribute super."vector-instances-collections";
@@ -8106,6 +8153,7 @@ self: super: {
   "wai-predicates" = doDistribute super."wai-predicates_0_8_6";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3_1";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routing" = doDistribute super."wai-routing_0_12_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
@@ -8150,6 +8198,7 @@ self: super: {
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_10";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8188,6 +8237,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wire-streams" = dontDistribute super."wire-streams";
+  "wires" = dontDistribute super."wires";
   "wiring" = dontDistribute super."wiring";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
@@ -8351,6 +8401,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_13_3";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_2";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_5_1_1";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8416,6 +8467,7 @@ self: super: {
   "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
   "yi-gtk" = dontDistribute super."yi-gtk";
   "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-rope" = doDistribute super."yi-rope_0_7_0_1";
   "yi-snippet" = dontDistribute super."yi-snippet";
   "yi-solarized" = dontDistribute super."yi-solarized";
   "yi-spolsky" = dontDistribute super."yi-spolsky";

pkgs/development/interpreters/jimtcl/default.nix

@@ -14,6 +14,8 @@ stdenv.mkDerivation {
     sqlite readline asciidoc SDL SDL_gfx
   ];
 
+  NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
+
   configureFlags = [
     "--with-ext=oo"
     "--with-ext=tree"
@@ -25,12 +27,6 @@ stdenv.mkDerivation {
     "--ipv6"
   ];
 
-  preConfigurePhase = ''
-    export CFLAGS=$(sdl-config --cflags)
-    export LDFLAGS=$(sdl-config --libs)
-  '';
-
-
   meta = {
     description = "An open source small-footprint implementation of the Tcl programming language";
     homepage = http://jim.tcl.tk/;

pkgs/development/interpreters/octave/hg.nix

@@ -1,49 +0,0 @@
-{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex,
- bison, autoconf, automake, sourceFromHead, config, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}:
-
-let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texinfo]; in
-
-stdenv.mkDerivation ({
-  NIX_LDFLAGS = "-lpthread";
-  configureFlags = "--enable-readline --enable-dl";
-  meta = { 
-      description = "High-level interactive language for numerical computations";
-      homepage = http://www.octave.org;
-      license = stdenv.lib.licenses.gpl3;
-    };
-} // (
-  if config.octave.devVersion or false then {
-    name = "octave-hg"; # developement version mercurial repo
-    # REGION AUTO UPDATE:   { name="octave"; type = "hg"; url = "http://www.octave.org/hg/octave"; }
-    src = sourceFromHead "octave-03b414516dd8.tar.gz"
-                 (fetchurl { url = "http://mawercer.de/~nix/repos/octave-03b414516dd8.tar.gz"; sha256 = "30877f1e2ff1a456e7a76153aabf7c59ce7c7a8b63eda0515b1eead6a4351ce7"; });
-    # END
-    # HOME is set to $TMP because octave needs to access ${HOME}/.octave_hist while running targets
-    # in doc/interpreter.. Maybe this can be done better. This hack is fastest :)
-    preConfigure = ''
-        # glob is contained in glibc! Don't know why autotools want to use -lglob
-        sed -i 's/-lglob//' configure.in
-        ./autogen.sh
-        export HOME=$TMP
-        '';
-    buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texLive ]
-                  ++ lib.optionals (config.octave.atlas or true) [ python atlas ];
-    # it does build, but documentation doesn't.. So just remove that directory
-    # from the buildfile
-    buildPhase = ''
-      sed -i octMakefile \
-        -e 's/^\(INSTALL_SUBDIRS = .*\)doc \(.*\)$/\1 \2/' \
-        -e 's/^\(SUBDIRS = .*\)doc \(.*\)$/\1 \2/' \
-        -e 's/\$(MAKE) -C doc/#/'
-      make
-    '';
-  } else {
-    name = "octave-3.1.55";
-    src =  fetchurl {
-      url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-3.1.55.tar.bz2;
-      sha256 = "1lm4v85kdic4n5yxwzrdb0v6dc6nw06ljgx1q8hfkmi146kpg7s6";
-    };
-    buildInputs = commonBuildInputs ++ [ flex bison autoconf automake python ]
-                  ++ lib.optionals (config.octave.atlas or true) [ python atlas ];
-  }
-))

pkgs/development/interpreters/python/build-python-package.nix

@@ -3,57 +3,37 @@
    (http://pypi.python.org/pypi/setuptools/), which represents a large
    number of Python packages nowadays.  */
 
-{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip
+{ lib
-, ensureNewerSourcesHook }:
+, python
+, mkPythonDerivation
+, bootstrapped-pip
+}:
 
-{ name
+{ buildInputs ? []
-
-# by default prefix `name` e.g. "python3.3-${name}"
-, namePrefix ? python.libPrefix + "-"
-
-, buildInputs ? []
 
 # propagate build dependencies so in case we have A -> B -> C,
 # C can import package A propagated by B
-, propagatedBuildInputs ? []
+#, propagatedBuildInputs ? []
 
 # passed to "python setup.py build_ext"
 # https://github.com/pypa/pip/issues/881
 , setupPyBuildFlags ? []
 
-# DEPRECATED: use propagatedBuildInputs
-, pythonPath ? []
-
-# used to disable derivation, useful for specific python versions
-, disabled ? false
-
-, meta ? {}
-
 # Execute before shell hook
 , preShellHook ? ""
 
 # Execute after shell hook
 , postShellHook ? ""
 
-# Additional arguments to pass to the makeWrapper function, which wraps
-# generated binaries.
-, makeWrapperArgs ? []
-
 # Additional flags to pass to "pip install".
 , installFlags ? []
 
-# Raise an error if two packages are installed with the same name
-, catchConflicts ? true
-
 , format ? "setup"
 
 , ... } @ attrs:
 
 
-# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
+
-if disabled
-then throw "${name} not supported for interpreter ${python.executable}"
-else
 
 let
   # use setuptools shim (so that setuptools is imported before distutils)
@@ -73,14 +53,10 @@ let
         installCheckPhase = attrs.checkPhase or ":";
 
         # Wheels don't have any checks to run
-        doInstallCheck = attrs.doCheck or false;
+        doCheck = attrs.doCheck or false;
       }
     else if format == "setup" then
       {
-        # propagate python/setuptools to active setup-hook in nix-shell
-        propagatedBuildInputs =
-          propagatedBuildInputs ++ [ python setuptools ];
-
         # we copy nix_run_setup.py over so it's executed relative to the root of the source
         # many project make that assumption
         buildPhase = attrs.buildPhase or ''
@@ -100,21 +76,17 @@ let
         # are typically distributed with tests.
         # With Python it's a common idiom to run the tests
         # after the software has been installed.
-
+        doCheck = attrs.doCheck or true;
-        # For backwards compatibility, let's use an alias
-        doInstallCheck = attrs.doCheck or true;
       }
     else
       throw "Unsupported format ${format}";
-in
-python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // {
-  name = namePrefix + name;
 
-  buildInputs = [ wrapPython bootstrapped-pip ] ++ buildInputs ++ pythonPath
+in mkPythonDerivation ( attrs // {
-    ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
-    ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
-  pythonPath = pythonPath;
+  # To build and install a wheel we need pip
+  buildInputs = buildInputs ++ [ bootstrapped-pip ];
+
+#inherit propagatedBuildInputs;
 
   configurePhase = attrs.configurePhase or ''
     runHook preConfigure
@@ -126,9 +98,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
     runHook postConfigure
   '';
 
-  # Python packages don't have a checkPhase, only an installCheckPhase
-  doCheck = false;
-
   installPhase = attrs.installPhase or ''
     runHook preInstall
 
@@ -142,14 +111,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
     runHook postInstall
   '';
 
-  postFixup = attrs.postFixup or ''
-    wrapPythonPrograms
-  '' + lib.optionalString catchConflicts ''
-    # check if we have two packages with the same name in closure and fail
-    # this shouldn't happen, something went wrong with dependencies specs
-    ${python.interpreter} ${./catch_conflicts.py}
-  '';
-
   shellHook = attrs.shellHook or ''
     ${preShellHook}
     if test -e setup.py; then
@@ -162,13 +123,4 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
     ${postShellHook}
   '';
 
-  meta = with lib.maintainers; {
-    # default to python's platforms
-    platforms = python.meta.platforms;
-  } // meta // {
-    # add extra maintainer(s) to every package
-    maintainers = (meta.maintainers or []) ++ [ chaoflow domenkozar ];
-    # a marker for release utilities to discover python packages
-    isBuildPythonPackage = python.meta.platforms;
-  };
 } // formatspecific)

pkgs/development/interpreters/python/cpython/3.3/default.nix

@@ -2,7 +2,6 @@
 , bzip2
 , db
 , gdbm
-, less
 , libX11, xproto
 , lzma
 , ncurses
@@ -29,10 +28,6 @@ let
     zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
   ];
 
-  propagatedBuildInputs = [
-    less
-  ];
-
 in
 stdenv.mkDerivation {
   name = "python3-${version}";
@@ -40,7 +35,6 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   inherit buildInputs;
-  inherit propagatedBuildInputs;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";

pkgs/development/interpreters/python/cpython/3.4/default.nix

@@ -2,7 +2,6 @@
 , bzip2
 , db
 , gdbm
-, less
 , libX11, xproto
 , lzma
 , ncurses
@@ -44,10 +43,6 @@ let
     xproto
   ] ++ optionals stdenv.isDarwin [ CF configd ];
 
-  propagatedBuildInputs = [
-    less
-  ];
-
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
@@ -55,7 +50,6 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   inherit buildInputs;
-  inherit propagatedBuildInputs;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";

pkgs/development/interpreters/python/cpython/3.5/default.nix

@@ -1,8 +1,6 @@
 { stdenv, fetchurl
 , bzip2
-, db
 , gdbm
-, less
 , libX11, xproto
 , lzma
 , ncurses
@@ -34,7 +32,6 @@ let
     lzma
     gdbm
     sqlite
-    db
     readline
     ncurses
     openssl
@@ -43,11 +40,6 @@ let
     libX11
     xproto
   ] ++ optionals stdenv.isDarwin [ CF configd ];
-
-  propagatedBuildInputs = [
-    less
-  ];
-
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
@@ -55,7 +47,6 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   inherit buildInputs;
-  inherit propagatedBuildInputs;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
@@ -102,10 +93,21 @@ stdenv.mkDerivation {
     paxmark E $out/bin/python${majorVersion}
   '';
 
+  postFixup = ''
+    # Get rid of retained dependencies on -dev packages, and remove
+    # some $TMPDIR references to improve binary reproducibility.
+    for i in $out/lib//python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
+      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
+    done
+
+    # FIXME: should regenerate this.
+    rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
+  '';
+
   passthru = rec {
     zlibSupport = zlib != null;
     sqliteSupport = sqlite != null;
-    dbSupport = db != null;
+    dbSupport = false;
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);

pkgs/development/interpreters/python/cpython/3.6/default.nix

@@ -3,7 +3,6 @@
 , bzip2
 , db
 , gdbm
-, less
 , libX11, xproto
 , lzma
 , ncurses
@@ -45,11 +44,6 @@ let
     libX11
     xproto
   ] ++ optionals stdenv.isDarwin [ CF configd ];
-
-  propagatedBuildInputs = [
-    less
-  ];
-
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
@@ -57,7 +51,6 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   inherit buildInputs;
-  inherit propagatedBuildInputs;
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.0/Python-${fullVersion}.tar.xz";

pkgs/development/interpreters/python/mk-python-derivation.nix

@@ -0,0 +1,95 @@
+/* Generic builder for Python packages that come without a setup.py. */
+
+{ lib
+, python
+, wrapPython
+, setuptools
+, unzip
+, ensureNewerSourcesHook
+}:
+
+{ name
+
+# by default prefix `name` e.g. "python3.3-${name}"
+, namePrefix ? python.libPrefix + "-"
+
+# Dependencies for building the package
+, buildInputs ? []
+
+# Dependencies needed for running the checkPhase.
+# These are added to buildInputs when doCheck = true.
+, checkInputs ? []
+
+# propagate build dependencies so in case we have A -> B -> C,
+# C can import package A propagated by B
+, propagatedBuildInputs ? []
+
+# DEPRECATED: use propagatedBuildInputs
+, pythonPath ? []
+
+# used to disable derivation, useful for specific python versions
+, disabled ? false
+
+# Raise an error if two packages are installed with the same name
+, catchConflicts ? true
+
+# Additional arguments to pass to the makeWrapper function, which wraps
+# generated binaries.
+, makeWrapperArgs ? []
+
+, meta ? {}
+
+, passthru ? {}
+
+, doCheck ? false
+
+, ... } @ attrs:
+
+
+# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
+if disabled
+then throw "${name} not supported for interpreter ${python.executable}"
+else
+
+python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
+
+  name = namePrefix + name;
+
+  inherit pythonPath;
+
+  buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
+    ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
+    ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
+    ++ lib.optionals doCheck checkInputs;
+
+  # propagate python/setuptools to active setup-hook in nix-shell
+  propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];
+
+  # Python packages don't have a checkPhase, only an installCheckPhase
+  doCheck = false;
+  doInstallCheck = doCheck;
+
+  postFixup = attrs.postFixup or ''
+    wrapPythonPrograms
+  '' + lib.optionalString catchConflicts ''
+    # check if we have two packages with the same name in closure and fail
+    # this shouldn't happen, something went wrong with dependencies specs
+    ${python.interpreter} ${./catch_conflicts.py}
+  '';
+
+  passthru = {
+    inherit python; # The python interpreter
+  } // passthru;
+
+  meta = with lib.maintainers; {
+    # default to python's platforms
+    platforms = python.meta.platforms;
+  } // meta // {
+    # add extra maintainer(s) to every package
+    maintainers = (meta.maintainers or []) ++ [ chaoflow domenkozar ];
+    # a marker for release utilities to discover python packages
+    isBuildPythonPackage = python.meta.platforms;
+  };
+})
+
+

pkgs/development/interpreters/python/wrap-python.nix

@@ -0,0 +1,51 @@
+{ lib
+, python
+, makeSetupHook
+, makeWrapper }:
+
+with lib;
+
+makeSetupHook {
+      deps = makeWrapper;
+      substitutions.libPrefix = python.libPrefix;
+      substitutions.executable = python.interpreter;
+      substitutions.python = python;
+      substitutions.magicalSedExpression = let
+        # Looks weird? Of course, it's between single quoted shell strings.
+        # NOTE: Order DOES matter here, so single character quotes need to be
+        #       at the last position.
+        quoteVariants = [ "'\"'''\"'" "\"\"\"" "\"" "'\"'\"'" ]; # hey Vim: ''
+
+        mkStringSkipper = labelNum: quote: let
+          label = "q${toString labelNum}";
+          isSingle = elem quote [ "\"" "'\"'\"'" ];
+          endQuote = if isSingle then "[^\\\\]${quote}" else quote;
+        in ''
+          /^[a-z]?${quote}/ {
+            /${quote}${quote}|${quote}.*${endQuote}/{n;br}
+            :${label}; n; /^${quote}/{n;br}; /${endQuote}/{n;br}; b${label}
+          }
+        '';
+
+        # This preamble does two things:
+        # * Sets argv[0] to the original application's name; otherwise it would be .foo-wrapped.
+        #   Python doesn't support `exec -a`.
+        # * Adds all required libraries to sys.path via `site.addsitedir`. It also handles *.pth files.
+        preamble = ''
+          import sys
+          import site
+          import functools
+          sys.argv[0] = '"'$(basename "$f")'"'
+          functools.reduce(lambda k, p: site.addsitedir(p, k), ['"$([ -n "$program_PYTHONPATH" ] && (echo "'$program_PYTHONPATH'" | sed "s|:|','|g") || true)"'], site._init_pathinfo())
+        '';
+
+      in ''
+        1 {
+          :r
+          /\\$|,$/{N;br}
+          /__future__|^ |^ *(#.*)?$/{n;br}
+          ${concatImapStrings mkStringSkipper quoteVariants}
+          /^[^# ]/i ${replaceStrings ["\n"] [";"] preamble}
+        }
+      '';
+} ./wrap.sh