Merge branch 'master' into staging

doc/package-notes.xml

@@ -366,4 +366,20 @@ it. Place the resulting <filename>package.nix</filename> file into
 
 </section>
 
+<section xml:id="sec-autojump">
+
+<title>Autojump</title>
+
+<para>
+  autojump needs the shell integration to be useful but unlike other systems,
+  nix doesn't have a standard share directory location. This is why a
+  <command>autojump-share</command> script is shipped that prints the location
+  of the shared folder. This can then be used in the .bashrc like this:
+<screen>
+  source "$(autojump-share)/autojump.bash"
+</screen>
+</para>
+
+</section>
+
 </chapter>

doc/stdenv.xml

@@ -1171,12 +1171,14 @@ echo @foo@
 
     That is, no substitution is performed for undefined variables.</para>
 
-    <para>Environment variables that start with an uppercase letter are filtered out,
+    <para>Environment variables that start with an uppercase letter or an
-    to prevent global variables (like <literal>HOME</literal>) from accidentally
+    underscore are filtered out,
+    to prevent global variables (like <literal>HOME</literal>) or private
+    variables (like <literal>__ETC_PROFILE_DONE</literal>) from accidentally
     getting substituted.
     The variables also have to be valid bash “names”, as
-    defined in the bash manpage (alphanumeric or <literal>_</literal>, must not
+    defined in the bash manpage (alphanumeric or <literal>_</literal>,
-    start with a number).</para>
+    must not start with a number).</para>
   </listitem>
   </varlistentry>
 

maintainers/scripts/travis-nox-review-pr.sh

@@ -26,6 +26,9 @@ elif [[ $1 == build ]]; then
     echo "=== Checking tarball creation"
     nix-build pkgs/top-level/release.nix -A tarball
 
+    echo "=== Checking NixOS options"
+    nix-build --show-trace nixos/release.nix -A options
+
     if [[ $TRAVIS_PULL_REQUEST == false ]]; then
         echo "=== Not a pull request"
     else

nixos/maintainers/scripts/ec2/create-amis.sh

@@ -102,6 +102,11 @@ for type in hvm pv; do
                             mv $vhdFile.tmp $vhdFile
                         fi
 
+                        vhdFileLogicalBytes="$(qemu-img info "$vhdFile" | grep ^virtual\ size: | cut -f 2 -d \(  | cut -f 1 -d \ )"
+                        vhdFileLogicalGigaBytes=$(((vhdFileLogicalBytes-1)/1024/1024/1024+1)) # Round to the next GB
+
+                        echo "Disk size is $vhdFileLogicalBytes bytes. Will be registered as $vhdFileLogicalGigaBytes GB."
+
                         taskId=$(cat $stateDir/$region.$type.task-id 2> /dev/null || true)
                         volId=$(cat $stateDir/$region.$type.vol-id 2> /dev/null || true)
                         snapId=$(cat $stateDir/$region.$type.snap-id 2> /dev/null || true)
@@ -165,7 +170,7 @@ for type in hvm pv; do
                             rm -f $stateDir/$region.$type.vol-id
                         fi
 
-                        extraFlags="-b /dev/sda1=$snapId:20:true:gp2"
+                        extraFlags="-b /dev/sda1=$snapId:$vhdFileLogicalGigaBytes:true:gp2"
 
                         if [ $type = pv ]; then
                             extraFlags+=" --root-device-name=/dev/sda1"

nixos/modules/rename.nix

@@ -123,6 +123,8 @@ with lib;
     (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ])
     (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ])
     (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ])
+    (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ])
+    (mkRemovedOptionModule [ "services" "dovecot2" "package" ])
 
   ];
 }

nixos/modules/security/apparmor-suid.nix

@@ -29,7 +29,7 @@ with lib;
         network inet raw,
 
         ${pkgs.glibc.out}/lib/*.so mr,
-        ${pkgs.libcap.out}/lib/libcap.so* mr,
+        ${pkgs.libcap.lib}/lib/libcap.so* mr,
         ${pkgs.attr.out}/lib/libattr.so* mr,
 
         ${pkgs.iputils}/bin/ping mixr,

nixos/modules/services/games/factorio.nix

@@ -75,7 +75,8 @@ in
       after         = [ "network.target" ];
 
       preStart = ''
-          test -e ${stateDir}/saves/${cfg.saveName}.zip || ${pkgs.factorio-headless}/bin/factorio \
+          test -e ${stateDir}/saves/${cfg.saveName}.zip || \
+            ${pkgs.factorio-headless}/bin/factorio         \
               --config=${cfg.configFile}                   \
               --create=${cfg.saveName}
       '';

nixos/modules/services/mail/dovecot.nix

@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.services.dovecot2;
-  dovecotPkg = cfg.package;
+  dovecotPkg = pkgs.dovecot;
 
   baseDir = "/run/dovecot2";
   stateDir = "/var/lib/dovecot";
@@ -98,13 +98,6 @@ in
       description = "Additional listeners to start when Dovecot is enabled.";
     };
 
-    package = mkOption {
-      type = types.package;
-      default = pkgs.dovecot;
-      defaultText = "pkgs.dovecot";
-      description = "Dovecot package to use.";
-    };
-
     user = mkOption {
       type = types.str;
       default = "dovecot2";
@@ -159,8 +152,7 @@ in
       description = ''
         Symlinks the contents of lib/dovecot of every given package into
         /etc/dovecot/modules. This will make the given modules available
-        if a dovecot package with the module_dir patch applied (like
+        if a dovecot package with the module_dir patch applied is being used.
-        pkgs.dovecot22, the default) is being used.
       '';
     };
 

nixos/modules/services/misc/dictd.nix

@@ -11,6 +11,7 @@ with lib;
     services.dictd = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable the DICT.org dictionary server.
@@ -18,8 +19,9 @@ with lib;
       };
 
       DBs = mkOption {
+        type = types.listOf types.package;
         default = [];
-        # example = [ pkgs.dictDBs.nld2eng ];
+        example = [ pkgs.dictdDBs.nld2eng ];
         description = ''List of databases to make available.'';
       };
 

nixos/modules/services/network-filesystems/nfsd.nix

@@ -126,7 +126,7 @@ in
       { description = "NFSv3 Mount Daemon";
 
         requires = [ "rpcbind.service" ];
-        after = [ "rpcbind.service" ];
+        after = [ "rpcbind.service" "local-fs.target" ];
 
         path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];
 

nixos/modules/services/networking/dnscrypt-proxy.nix

@@ -165,7 +165,7 @@ in
         ${pkgs.xz.out}/lib/liblzma.so.* mr,
         ${pkgs.libgcrypt.out}/lib/libgcrypt.so.* mr,
         ${pkgs.libgpgerror.out}/lib/libgpg-error.so.* mr,
-        ${pkgs.libcap.out}/lib/libcap.so.* mr,
+        ${pkgs.libcap.lib}/lib/libcap.so.* mr,
         ${pkgs.lz4}/lib/liblz4.so.* mr,
         ${pkgs.attr.out}/lib/libattr.so.* mr,
 

nixos/modules/services/networking/ejabberd.nix

@@ -78,6 +78,12 @@ in {
         description = "Configuration dumps that should be loaded on the first startup";
         example = literalExample "[ ./myejabberd.dump ]";
       };
+
+      imagemagick = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Add ImageMagick to server's path; allows for image thumbnailing";
+      };
     };
 
   };
@@ -105,7 +111,7 @@ in {
       description = "ejabberd server";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      path = [ pkgs.findutils pkgs.coreutils ];
+      path = [ pkgs.findutils pkgs.coreutils ] ++ lib.optional cfg.imagemagick pkgs.imagemagick;
 
       serviceConfig = {
         Type = "forking";

nixos/modules/services/torrent/transmission.nix

@@ -126,7 +126,7 @@ in
           ${pkgs.libgpgerror.out}/lib/libgpg-error*.so* mr,
           ${pkgs.nghttp2.lib}/lib/libnghttp2*.so*       mr,
           ${pkgs.c-ares.out}/lib/libcares*.so*          mr,
-          ${pkgs.libcap.out}/lib/libcap*.so*            mr,
+          ${pkgs.libcap.lib}/lib/libcap*.so*            mr,
           ${pkgs.attr.out}/lib/libattr*.so*             mr,
           ${pkgs.lz4}/lib/liblz4*.so*               mr,
 

nixos/modules/services/web-servers/apache-httpd/default.nix

@@ -406,7 +406,7 @@ let
         ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
     }
     ''
-      cat ${php}/etc/php-recommended.ini > $out
+      cat ${php}/etc/php.ini > $out
       echo "$options" >> $out
     '';
 

nixos/modules/services/web-servers/phpfpm.nix

@@ -19,6 +19,12 @@ let
     ${concatStringsSep "\n" (mapAttrsToList (n: v: "[${n}]\n${v}") cfg.poolConfigs)}
   '';
 
+  phpIni = pkgs.writeText "php.ini" ''
+    ${readFile "${cfg.phpPackage}/etc/php.ini"}
+
+    ${cfg.phpOptions}
+  '';
+
 in {
 
   options = {
@@ -44,10 +50,15 @@ in {
         '';
       };
 
-      phpIni = mkOption {
+      phpOptions = mkOption {
-        type = types.path;
+        type = types.lines;
-        default = "${cfg.phpPackage}/etc/php-recommended.ini";
+        default = "";
-        description = "php.ini file to use.";
+        example =
+          ''
+            date.timezone = "CET"
+          '';
+        description =
+          "Options appended to the PHP configuration file <filename>php.ini</filename>.";
       };
 
       poolConfigs = mkOption {
@@ -84,7 +95,7 @@ in {
         mkdir -p "${stateDir}"
       '';
       serviceConfig = {
-        ExecStart = "${cfg.phpPackage}/sbin/php-fpm -y ${cfgFile} -c ${cfg.phpIni}";
+        ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
         PIDFile = pidFile;
       };
     };

nixos/modules/services/x11/unclutter.nix

@@ -1,32 +1,78 @@
 { config, lib, pkgs, ... }:
+
 with lib;
+
 let cfg = config.services.unclutter;
+
 in {
-  options = {
+  options.services.unclutter = {
-    services.unclutter.enable = mkOption {
+
+    enable = mkOption {
+      description = "Enable unclutter to hide your mouse cursor when inactive";
       type = types.bool;
       default = false;
       example = true;
-      description = "Enable unclutter to hide your mouse cursor when inactive";
     };
 
-    services.unclutter.arguments = mkOption {
+    package = mkOption {
-      description = "Arguments to pass to unclutter command";
+      type = types.package;
-      default = "-idle 1";
+      default = pkgs.unclutter;
+      defaultText = "pkgs.unclutter";
+      description = "unclutter derivation to use.";
+    };
+
+    keystroke = mkOption {
+      description = "Wait for a keystroke before hiding the cursor";
+      type = types.bool;
+      default = false;
+    };
+
+    timeout = mkOption {
+      description = "Number of seconds before the cursor is marked inactive";
+      type = types.int;
+      default = 1;
+    };
+
+    threeshold = mkOption {
+      description = "Minimum number of pixels considered cursor movement";
+      type = types.int;
+      default = 1;
+    };
+
+    displayName = mkOption {
+      description = "Name of the X11 display";
       type = types.str;
+      default = ":0";
+    };
+
+    excluded = mkOption {
+      description = "Names of windows where unclutter should not apply";
+      type = types.listOf types.str;
+      default = [];
+      example = [ "" ];
+    };
+
+    extraOptions = mkOption {
+      description = "More arguments to pass to the unclutter command";
+      type = types.listOf types.str;
+      default = [];
+      example = [ "noevent" "grab" ];
     };
   };
 
   config = mkIf cfg.enable {
-    systemd.services.unclutter = {
+    systemd.user.services.unclutter = {
       description = "unclutter";
-      requires = [ "display-manager.service" ];
+      wantedBy = [ "default.target" ];
-      after = [ "display-manager.service" ];
-      wantedBy = [ "graphical.target" ];
       serviceConfig.ExecStart = ''
-        ${pkgs.unclutter}/bin/unclutter ${cfg.arguments}
+        ${cfg.package}/bin/unclutter \
+          -idle ${toString cfg.timeout} \
+          -display ${cfg.displayName} \
+          -jitter ${toString (cfg.threeshold - 1)} \
+          ${optionalString cfg.keystroke "-keystroke"} \
+          ${concatMapStrings (x: " -"+x) cfg.extraOptions} \
+          -not ${concatStringsSep " " cfg.excluded} \
       '';
-      environment = { DISPLAY = ":0"; };
       serviceConfig.Restart = "always";
     };
   };

nixos/modules/system/boot/initrd-ssh.nix

@@ -88,7 +88,7 @@ in
 
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
-      cp -pv ${pkgs.glibc}/lib/libnss_files.so.* $out/lib
+      cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
     '';
 
     boot.initrd.extraUtilsCommandsTest = ''

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

@@ -439,8 +439,18 @@ eval "exec $logOutFd>&- $logErrFd>&-"
 
 # Kill any remaining processes, just to be sure we're not taking any
 # with us into stage 2. But keep storage daemons like unionfs-fuse.
-pkill -9 -v -f '@'
+#
-
+# Storage daemons are distinguished by an @ in front of their command line:
+# https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
+local pidsToKill="$(pgrep -v -f '^@')"
+for pid in $pidsToKill; do
+    # Make sure we don't kill kernel processes, see #15226 and:
+    # http://stackoverflow.com/questions/12213445/identifying-kernel-threads
+    readlink "/proc/$pid/exe" &> /dev/null || continue
+    # Try to avoid killing ourselves.
+    [ $pid -eq $$ ] && continue
+    kill -9 "$pid"
+done
 
 if test -n "$debug1mounts"; then fail; fi
 

nixos/modules/virtualisation/vmware-guest.nix

@@ -25,6 +25,8 @@ in
         serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
       };
 
+    environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*";
+
     services.xserver = {
       videoDrivers = mkOverride 50 [ "vmware" ];
 

nixos/release-combined.nix

@@ -48,7 +48,7 @@ in rec {
         nixos.ova.x86_64-linux
 
         #(all nixos.tests.containers)
-        (all nixos.tests.chromium)
+        nixos.tests.chromium
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
@@ -67,6 +67,7 @@ in rec {
         (all nixos.tests.boot.biosUsb)
         (all nixos.tests.boot.uefiCdrom)
         (all nixos.tests.boot.uefiUsb)
+        (all nixos.tests.boot-stage1)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         #(all nixos.tests.lightdm)

nixos/release.nix

@@ -209,6 +209,7 @@ in rec {
   tests.bittorrent = callTest tests/bittorrent.nix {};
   tests.blivet = callTest tests/blivet.nix {};
   tests.boot = callSubTests tests/boot.nix {};
+  tests.boot-stage1 = callTest tests/boot-stage1.nix {};
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
   tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
   tests.cjdns = callTest tests/cjdns.nix {};

nixos/tests/boot-stage1.nix

@@ -0,0 +1,155 @@
+import ./make-test.nix ({ pkgs, ... }: {
+  name = "boot-stage1";
+
+  machine = { config, pkgs, lib, ... }: {
+    boot.extraModulePackages = let
+      compileKernelModule = name: source: pkgs.runCommand name rec {
+        inherit source;
+        kdev = config.boot.kernelPackages.kernel.dev;
+        kver = config.boot.kernelPackages.kernel.modDirVersion;
+        ksrc = "${kdev}/lib/modules/${kver}/build";
+      } ''
+        echo "obj-m += $name.o" > Makefile
+        echo "$source" > "$name.c"
+        make -C "$ksrc" M=$(pwd) modules
+        install -vD "$name.ko" "$out/lib/modules/$kver/$name.ko"
+      '';
+
+      # This spawns a kthread which just waits until it gets a signal and
+      # terminates if that is the case. We want to make sure that nothing during
+      # the boot process kills any kthread by accident, like what happened in
+      # issue #15226.
+      kcanary = compileKernelModule "kcanary" ''
+        #include <linux/init.h>
+        #include <linux/module.h>
+        #include <linux/kernel.h>
+        #include <linux/kthread.h>
+        #include <linux/sched.h>
+
+        struct task_struct *canaryTask;
+
+        static int kcanary(void *nothing)
+        {
+          allow_signal(SIGINT);
+          allow_signal(SIGTERM);
+          allow_signal(SIGKILL);
+          while (!kthread_should_stop()) {
+            set_current_state(TASK_INTERRUPTIBLE);
+            schedule_timeout_interruptible(msecs_to_jiffies(100));
+            if (signal_pending(current)) break;
+          }
+          return 0;
+        }
+
+        static int kcanaryInit(void)
+        {
+          kthread_run(&kcanary, NULL, "kcanary");
+          return 0;
+        }
+
+        static void kcanaryExit(void)
+        {
+          kthread_stop(canaryTask);
+        }
+
+        module_init(kcanaryInit);
+        module_exit(kcanaryExit);
+      '';
+
+    in lib.singleton kcanary;
+
+    boot.initrd.kernelModules = [ "kcanary" ];
+
+    boot.initrd.extraUtilsCommands = let
+      compile = name: source: pkgs.runCommand name { inherit source; } ''
+        mkdir -p "$out/bin"
+        echo "$source" | gcc -Wall -o "$out/bin/$name" -xc -
+      '';
+
+      daemonize = name: source: compile name ''
+        #include <stdio.h>
+        #include <unistd.h>
+
+        void runSource(void) {
+        ${source}
+        }
+
+        int main(void) {
+          if (fork() > 0) return 0;
+          setsid();
+          runSource();
+          return 1;
+        }
+      '';
+
+      mkCmdlineCanary = { name, cmdline ? "", source ? "" }: (daemonize name ''
+        char *argv[] = {"${cmdline}", NULL};
+        execvp("${name}-child", argv);
+      '') // {
+        child = compile "${name}-child" ''
+          #include <stdio.h>
+          #include <unistd.h>
+
+          int main(void) {
+            ${source}
+            while (1) sleep(1);
+            return 1;
+          }
+        '';
+      };
+
+      copyCanaries = with lib; concatMapStrings (canary: ''
+        ${optionalString (canary ? child) ''
+          copy_bin_and_libs "${canary.child}/bin/${canary.child.name}"
+        ''}
+        copy_bin_and_libs "${canary}/bin/${canary.name}"
+      '');
+
+    in copyCanaries [
+      # Simple canary process which just sleeps forever and should be killed by
+      # stage 2.
+      (daemonize "canary1" "while (1) sleep(1);")
+
+      # We want this canary process to try mimicking a kthread using a cmdline
+      # with a zero length so we can make sure that the process is properly
+      # killed in stage 1.
+      (mkCmdlineCanary {
+        name = "canary2";
+        source = ''
+          FILE *f;
+          f = fopen("/run/canary2.pid", "w");
+          fprintf(f, "%d\n", getpid());
+          fclose(f);
+        '';
+      })
+
+      # This canary process mimicks a storage daemon, which we do NOT want to be
+      # killed before going into stage 2. For more on root storage daemons, see:
+      # https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
+      (mkCmdlineCanary {
+        name = "canary3";
+        cmdline = "@canary3";
+      })
+    ];
+
+    boot.initrd.postMountCommands = ''
+      canary1
+      canary2
+      canary3
+      # Make sure the pidfile of canary 2 is created so that we still can get
+      # its former pid after the killing spree starts next within stage 1.
+      while [ ! -s /run/canary2.pid ]; do sleep 0.1; done
+    '';
+  };
+
+  testScript = ''
+    $machine->waitForUnit("multi-user.target");
+    $machine->succeed('test -s /run/canary2.pid');
+    $machine->fail('pgrep -a canary1');
+    $machine->fail('kill -0 $(< /run/canary2.pid)');
+    $machine->succeed('pgrep -a -f \'^@canary3$\''');
+    $machine->succeed('pgrep -a -f \'^kcanary$\''');
+  '';
+
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ aszlig ];
+})

nixos/tests/installer.nix

@@ -7,7 +7,7 @@ with pkgs.lib;
 let
 
   # The configuration to install.
-  makeConfig = { grubVersion, grubDevice, grubIdentifier
+  makeConfig = { bootLoader, grubVersion, grubDevice, grubIdentifier
                , extraConfig, forceGrubReinstallCount ? 0
                }:
     pkgs.writeText "configuration.nix" ''
@@ -18,6 +18,7 @@ let
             <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
           ];
 
+        ${optionalString (bootLoader == "grub") ''
           boot.loader.grub.version = ${toString grubVersion};
           ${optionalString (grubVersion == 1) ''
             boot.loader.grub.splashImage = null;
@@ -27,6 +28,11 @@ let
           boot.loader.grub.fsIdentifier = "${grubIdentifier}";
 
           boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount};
+        ''}
+
+        ${optionalString (bootLoader == "gummiboot") ''
+          boot.loader.gummiboot.enable = true;
+        ''}
 
         hardware.enableAllFirmware = lib.mkForce false;
 
@@ -42,7 +48,7 @@ let
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems.
-  testScriptFun = { createPartitions, grubVersion, grubDevice
+  testScriptFun = { bootLoader, createPartitions, grubVersion, grubDevice
                   , grubIdentifier, preBootCommands, extraConfig
                   }:
     let
@@ -50,7 +56,8 @@ let
       qemuFlags =
         (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
         (optionalString (system == "x86_64-linux") "-cpu kvm64 ");
-      hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '';
+      hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''
+        + optionalString (bootLoader == "gummiboot") ''bios => "${pkgs.OVMF}/FV/OVMF.fd", '';
     in
     ''
       $machine->start;
@@ -73,7 +80,7 @@ let
       $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; } }",
+          "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -97,7 +104,11 @@ let
       # Did /boot get mounted?
       $machine->waitForUnit("local-fs.target");
 
-      $machine->succeed("test -e /boot/grub");
+      ${if bootLoader == "grub" then
+          ''$machine->succeed("test -e /boot/grub");''
+        else
+          ''$machine->succeed("test -e /boot/loader/loader.conf");''
+      }
 
       # Check whether /root has correct permissions.
       $machine->succeed("stat -c '%a' /root") =~ /700/ or die;
@@ -114,7 +125,7 @@ let
 
       # We need to a writable nix-store on next boot.
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }",
+          "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }",
           "/etc/nixos/configuration.nix");
 
       # Check whether nixos-rebuild works.
@@ -132,7 +143,7 @@ let
       ${preBootCommands}
       $machine->waitForUnit("multi-user.target");
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }",
+          "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }",
           "/etc/nixos/configuration.nix");
       $machine->succeed("nixos-rebuild boot >&2");
       $machine->shutdown;
@@ -148,8 +159,9 @@ let
 
   makeInstallerTest = name:
     { createPartitions, preBootCommands ? "", extraConfig ? ""
-    , grubVersion ? 2, grubDevice ? "/dev/vda"
+    , bootLoader ? "grub" # either "grub" or "gummiboot"
-    , grubIdentifier ? "uuid", enableOCR ? false, meta ? {}
+    , grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid"
+    , enableOCR ? false, meta ? {}
     }:
     makeTest {
       inherit enableOCR;
@@ -183,6 +195,8 @@ let
             virtualisation.qemu.diskInterface =
               if grubVersion == 1 then "scsi" else "virtio";
 
+            boot.loader.gummiboot.enable = mkIf (bootLoader == "gummiboot") true;
+
             hardware.enableAllFirmware = mkForce false;
 
             # The test cannot access the network, so any packages we
@@ -198,8 +212,8 @@ let
                 pkgs.perlPackages.XMLLibXML
                 pkgs.perlPackages.ListCompare
               ]
-              ++ optional (grubVersion == 1) pkgs.grub
+              ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
-              ++ optionals (grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
+              ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
 
             nix.binaryCaches = mkForce [ ];
           };
@@ -207,8 +221,8 @@ let
       };
 
       testScript = testScriptFun {
-        inherit createPartitions preBootCommands grubVersion
+        inherit bootLoader createPartitions preBootCommands
-                grubDevice grubIdentifier extraConfig;
+                grubVersion grubDevice grubIdentifier extraConfig;
       };
     };
 
@@ -236,6 +250,29 @@ in {
         '';
     };
 
+  # Simple GPT/UEFI configuration using Gummiboot with 3 partitions: ESP, swap & root filesystem
+  simpleUefiGummiboot = makeInstallerTest "simpleUefiGummiboot"
+    { createPartitions =
+        ''
+          $machine->succeed(
+              "parted /dev/vda mklabel gpt",
+              "parted -s /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
+              "parted -s /dev/vda -- set 1 boot on",
+              "parted -s /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
+              "parted -s /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
+              "udevadm settle",
+              "mkswap /dev/vda2 -L swap",
+              "swapon -L swap",
+              "mkfs.ext3 -L nixos /dev/vda3",
+              "mount LABEL=nixos /mnt",
+              "mkfs.vfat -n BOOT /dev/vda1",
+              "mkdir -p /mnt/boot",
+              "mount LABEL=BOOT /mnt/boot",
+          );
+        '';
+        bootLoader = "gummiboot";
+    };
+
   # Same as the previous, but now with a separate /boot partition.
   separateBoot = makeInstallerTest "separateBoot"
     { createPartitions =
@@ -370,6 +407,10 @@ in {
               "mdadm --verbose -W /dev/md1",
           );
         '';
+      preBootCommands = ''
+        $machine->start;
+        $machine->fail("dmesg | grep 'immediate safe mode'");
+      '';
     };
 
   # Test a basic install using GRUB 1.

pkgs/applications/audio/CharacterCompressor/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
 stdenv.mkDerivation rec {
   name = "CharacterCompressor-${version}";
   version = "0.2";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "0fvi8m4nshcxypn4jgxhnh7pxp68wshhav3k8wn3il7qpw71pdxi";
   };
 
-  buildInputs = [ faust2jack faust2lv2 ];
+  buildInputs = [ faust2jaqt faust2lv2gui ];
 
   buildPhase = ''
-    faust2jack -t 99999 CharacterCompressor.dsp
+    faust2jaqt -t 99999 CharacterCompressor.dsp
-    faust2lv2 -t 99999 CharacterCompressor.dsp
+    faust2lv2 -gui -t 99999 CharacterCompressor.dsp
   '';
 
   installPhase = ''

pkgs/applications/audio/CompBus/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
 stdenv.mkDerivation rec {
   name = "CompBus-${version}";
   version = "1.1.02";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
     sha256 = "025vi60caxk3j2vxxrgbc59xlyr88vgn7k3127s271zvpyy7apwh";
   };
 
-  buildInputs = [ faust2jack faust2lv2 ];
+  buildInputs = [ faust2jaqt faust2lv2gui ];
 
   buildPhase = ''
     for f in *.dsp;
     do
-      faust2jack -t 99999 $f
+      faust2jaqt -t 99999 $f
-      faust2lv2 -t 99999 $f
+      faust2lv2 -gui -t 99999 $f
     done
   '';
 

pkgs/applications/audio/LazyLimiter/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
 stdenv.mkDerivation rec {
   name = "LazyLimiter-${version}";
   version = "0.3.01";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l";
   };
 
-  buildInputs = [ faust2jack faust2lv2 ];
+  buildInputs = [ faust2jaqt faust2lv2gui ];
 
   buildPhase = ''
-    faust2jack -t 99999 LazyLimiter.dsp
+    faust2jaqt -t 99999 LazyLimiter.dsp
-    faust2lv2 -t 99999 LazyLimiter.dsp
+    faust2lv2 -gui -t 99999 LazyLimiter.dsp
   '';
 
   installPhase = ''

pkgs/applications/audio/MBdistortion/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
 stdenv.mkDerivation rec {
   name = "MBdistortion-${version}";
   version = "1.1";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp";
   };
 
-  buildInputs = [ faust2jack faust2lv2 ];
+  buildInputs = [ faust2jaqt faust2lv2gui ];
 
   buildPhase = ''
-    faust2jack -t 99999 MBdistortion.dsp
+    faust2jaqt -t 99999 MBdistortion.dsp
-    faust2lv2 -t 99999 MBdistortion.dsp
+    faust2lv2 -gui -t 99999 MBdistortion.dsp
   '';
 
   installPhase = ''

pkgs/applications/audio/RhythmDelay/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
 stdenv.mkDerivation rec {
   name = "RhythmDelay-${version}";
   version = "2.0";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "0n938nm08mf3lz92k6v07k1469xxzmfkgclw40jgdssfcfa16bn7";
   };
 
-  buildInputs = [ faust2jack faust2lv2 ];
+  buildInputs = [ faust2jaqt faust2lv2gui ];
 
   buildPhase = ''
-    faust2jack -t 99999 RhythmDelay.dsp
+    faust2jaqt -t 99999 RhythmDelay.dsp
-    faust2lv2 -t 99999 RhythmDelay.dsp
+    faust2lv2 -gui -t 99999 RhythmDelay.dsp
   '';
 
   installPhase = ''

pkgs/applications/audio/constant-detune-chorus/default.nix

@@ -1,27 +1,27 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
 stdenv.mkDerivation rec {
   name = "constant-detune-chorus-${version}";
-  version = "0.1.01";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "constant-detune-chorus";
     rev = "v${version}";
-    sha256 = "1z8aj1a36ix9jizk9wl06b3i98hrkg47qxqp8vx930r624pc5z86";
+    sha256 = "1ks2k6pflqyi2cs26bnbypphyrrgn0xf31l31kgx1qlilyc57vln";
   };
 
-  buildInputs = [ faust2jack faust2lv2 ];
+  buildInputs = [ faust2jaqt faust2lv2gui ];
 
   buildPhase = ''
-    faust2jack -t 99999 constant-detune-chorus.dsp
+    faust2jaqt -t 99999 ConstantDetuneChorus.dsp
-    faust2lv2 -t 99999 constant-detune-chorus.dsp
+    faust2lv2 -gui -t 99999 ConstantDetuneChorus.dsp
   '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp constant-detune-chorus $out/bin/
+    cp ConstantDetuneChorus $out/bin/
     mkdir -p $out/lib/lv2
-    cp -r constant-detune-chorus.lv2/ $out/lib/lv2
+    cp -r ConstantDetuneChorus.lv2/ $out/lib/lv2
   '';
 
   meta = {

pkgs/applications/audio/deadbeef/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
 # deadbeef can use either gtk2 or gtk3
 , gtk2Support ? false, gtk2 ? null
-, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
+, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
 # input plugins
 , vorbisSupport ? true, libvorbis ? null
 , mp123Support ? true, libmad ? null
@@ -30,7 +30,7 @@
 
 assert gtk2Support || gtk3Support;
 assert gtk2Support -> gtk2 != null;
-assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && makeWrapper != null;
+assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null;
 assert vorbisSupport -> libvorbis != null;
 assert mp123Support -> libmad != null;
 assert flacSupport -> flac != null;
@@ -85,15 +85,10 @@ stdenv.mkDerivation rec {
     ;
 
   nativeBuildInputs = with stdenv.lib; [ intltool pkgconfig ]
-    ++ optional gtk3Support makeWrapper;
+    ++ optional gtk3Support wrapGAppsHook;
 
   enableParallelBuilding = true;
 
-  postInstall = if !gtk3Support then "" else ''
-    wrapProgram "$out/bin/deadbeef" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
   meta = with stdenv.lib; {
     description = "Ultimate Music Player for GNU/Linux";
     homepage = "http://deadbeef.sourceforge.net/";

pkgs/applications/audio/faust/faust1git.nix

@@ -0,0 +1,210 @@
+{ stdenv
+, coreutils
+, fetchgit
+, makeWrapper
+, pkgconfig
+}:
+
+with stdenv.lib.strings;
+
+let
+
+  version = "2016-04-27";
+
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/faudiostream/code";
+    rev = "931fca3e649f99ef09025d37bd6a7dc70a03e6f6";
+    sha256 = "05yam8jfdnziysvpxa5w118k5bbl103vamyqgka6vyhjjizp1nx7";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://faust.grame.fr/;
+    downloadPage = http://sourceforge.net/projects/faudiostream/files/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ magnetophon pmahoney ];
+  };
+
+  faust = stdenv.mkDerivation {
+
+    name = "faust-${version}";
+
+    inherit src;
+
+    buildInputs = [ makeWrapper ];
+
+    passthru = {
+      inherit wrap wrapWithBuildEnv;
+    };
+
+    preConfigure = ''
+      makeFlags="$makeFlags prefix=$out"
+
+      # The faust makefiles use 'system ?= $(shell uname -s)' but nix
+      # defines 'system' env var, so undefine that so faust detects the
+      # correct system.
+      unset system
+    '';
+
+    # Remove most faust2appl scripts since they won't run properly
+    # without additional paths setup. See faust.wrap,
+    # faust.wrapWithBuildEnv.
+    postInstall = ''
+      # syntax error when eval'd directly
+      pattern="faust2!(svg)"
+      (shopt -s extglob; rm "$out"/bin/$pattern)
+    '';
+
+    postFixup = ''
+      # Set faustpath explicitly.
+      substituteInPlace "$out"/bin/faustpath \
+        --replace "/usr/local /usr /opt /opt/local" "$out"
+
+      # The 'faustoptflags' is 'source'd into other faust scripts and
+      # not used as an executable, so patch 'uname' usage directly
+      # rather than use makeWrapper.
+      substituteInPlace "$out"/bin/faustoptflags \
+        --replace uname "${coreutils}/bin/uname"
+
+      # wrapper for scripts that don't need faust.wrap*
+      for script in "$out"/bin/faust2*; do
+        wrapProgram "$script" \
+          --prefix PATH : "$out"/bin
+      done
+    '';
+
+    meta = meta // {
+      description = "A functional programming language for realtime audio signal processing";
+      longDescription = ''
+        FAUST (Functional Audio Stream) is a functional programming
+        language specifically designed for real-time signal processing
+        and synthesis. FAUST targets high-performance signal processing
+        applications and audio plug-ins for a variety of platforms and
+        standards.
+        The Faust compiler translates DSP specifications into very
+        efficient C++ code. Thanks to the notion of architecture,
+        FAUST programs can be easily deployed on a large variety of
+        audio platforms and plugin formats (jack, alsa, ladspa, maxmsp,
+        puredata, csound, supercollider, pure, vst, coreaudio) without
+        any change to the FAUST code.
+
+        This package has just the compiler, libraries, and headers.
+        Install faust2* for specific faust2appl scripts.
+      '';
+    };
+
+  };
+
+  # Default values for faust2appl.
+  faust2ApplBase =
+    { baseName
+    , dir ? "tools/faust2appls"
+    , scripts ? [ baseName ]
+    , ...
+    }@args:
+
+    args // {
+      name = "${baseName}-${version}";
+
+      inherit src;
+
+      configurePhase = ":";
+
+      buildPhase = ":";
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p "$out/bin"
+        for script in ${concatStringsSep " " scripts}; do
+          cp "${dir}/$script" "$out/bin/"
+        done
+
+        runHook postInstall
+      '';
+
+      postInstall = ''
+        # For the faust2appl script, change 'faustpath' and
+        # 'faustoptflags' to absolute paths.
+        for script in "$out"/bin/*; do
+          substituteInPlace "$script" \
+            --replace ". faustpath" ". '${faust}/bin/faustpath'" \
+            --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'"
+        done
+      '';
+
+      meta = meta // {
+        description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing";
+      };
+    };
+
+  # Some 'faust2appl' scripts, such as faust2alsa, run faust to
+  # generate cpp code, then invoke the c++ compiler to build the code.
+  # This builder wraps these scripts in parts of the stdenv such that
+  # when the scripts are called outside any nix build, they behave as
+  # if they were running inside a nix build in terms of compilers and
+  # paths being configured (e.g. rpath is set so that compiled
+  # binaries link to the libs inside the nix store)
+  #
+  # The function takes two main args: the appl name (e.g.
+  # 'faust2alsa') and an optional list of propagatedBuildInputs. It
+  # returns a derivation that contains only the bin/${appl} script,
+  # wrapped up so that it will run as if it was inside a nix build
+  # with those build inputs.
+  #
+  # The build input 'faust' is automatically added to the
+  # propagatedBuildInputs.
+  wrapWithBuildEnv =
+    { baseName
+    , propagatedBuildInputs ? [ ]
+    , ...
+    }@args:
+
+    stdenv.mkDerivation ((faust2ApplBase args) // {
+
+      buildInputs = [ makeWrapper pkgconfig ];
+
+      propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
+
+      postFixup = ''
+
+        # export parts of the build environment
+        for script in "$out"/bin/*; do
+          wrapProgram "$script" \
+            --set FAUSTLIB "${faust}/lib/faust" \
+            --set FAUSTINC "${faust}/include/faust" \
+            --prefix PATH : "$PATH" \
+            --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
+            --set NIX_CFLAGS_COMPILE "\"$NIX_CFLAGS_COMPILE\"" \
+            --set NIX_LDFLAGS "\"$NIX_LDFLAGS\""
+        done
+      '';
+    });
+
+  # Builder for 'faust2appl' scripts, such as faust2firefox that
+  # simply need to be wrapped with some dependencies on PATH.
+  #
+  # The build input 'faust' is automatically added to the PATH.
+  wrap =
+    { baseName
+    , runtimeInputs ? [ ]
+    , ...
+    }@args:
+
+    let
+
+      runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs));
+
+    in stdenv.mkDerivation ((faust2ApplBase args) // {
+
+      buildInputs = [ makeWrapper ];
+
+      postFixup = ''
+        for script in "$out"/bin/*; do
+          wrapProgram "$script" --prefix PATH : "${runtimePath}"
+        done
+      '';
+
+    });
+
+in faust

pkgs/applications/audio/faust/faust2lv2gui.nix

@@ -0,0 +1,14 @@
+{ boost
+, faust1git
+, lv2
+, qt4
+
+}:
+
+faust1git.wrapWithBuildEnv {
+
+  baseName = "faust2lv2";
+
+  propagatedBuildInputs = [ boost lv2 qt4 ];
+
+}

pkgs/applications/audio/faustCompressors/default.nix

@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
+stdenv.mkDerivation rec {
+  name = "faustCompressors-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "magnetophon";
+    repo = "faustCompressors";
+    rev = "v${version}";
+    sha256 = "0x5nd2cjhknb4aclhkkjaywx75bi2wj22prgv8n47czi09jcj0jb";
+  };
+
+  buildInputs = [ faust2jaqt faust2lv2gui ];
+
+  buildPhase = ''
+    for f in *.dsp;
+    do
+      faust2jaqt -double -t 99999 $f
+      faust2lv2 -double -gui -t 99999 $f
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib/lv2
+    mv *.lv2/ $out/lib/lv2
+    mkdir -p $out/bin
+    for f in $(find . -executable -type f);
+    do
+      cp $f $out/bin/
+    done
+  '';
+
+  meta = {
+    description = "A collection of bread and butter compressors";
+    homepage = https://github.com/magnetophon/faustCompressors;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+  };
+}

pkgs/applications/audio/fmit/default.nix

@@ -7,33 +7,39 @@ assert alsaSupport -> alsaLib != null;
 assert jackSupport -> libjack2 != null;
 assert portaudioSupport -> portaudio != null;
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "fmit-${version}";
-  version = "1.0.13";
+  version = "1.0.15";
 
   src = fetchFromGitHub {
-    sha256 = "04cj70q60sqns68nvw4zfy6078x4cc2q1y2y13z3rs5n80jw27by";
+    sha256 = "0bakqwgl7xx6khs8993w10a8kvlbr7sbqdaljbsmy8y8mjd6inqb";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ fftw freeglut mesa_glu qtbase qtmultimedia qmakeHook ]
+  buildInputs = [ fftw qtbase qtmultimedia qmakeHook ]
-    ++ stdenv.lib.optionals alsaSupport [ alsaLib ]
+    ++ optionals alsaSupport [ alsaLib ]
-    ++ stdenv.lib.optionals jackSupport [ libjack2 ]
+    ++ optionals jackSupport [ libjack2 ]
-    ++ stdenv.lib.optionals portaudioSupport [ portaudio ];
+    ++ optionals portaudioSupport [ portaudio ];
+
+  postPatch = ''
+    substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
+  '';
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags \
-      CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \
+      CONFIG+=${optionalString alsaSupport "acs_alsa"} \
-      CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \
+      CONFIG+=${optionalString jackSupport "acs_jack"} \
-      CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \
+      CONFIG+=${optionalString portaudioSupport "acs_portaudio"} \
       PREFIXSHORTCUT=$out"
   '';
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Free Musical Instrument Tuner";
     longDescription = ''
       FMIT is a graphical utility for tuning musical instruments, with error

pkgs/applications/audio/i-score/default.nix

@@ -0,0 +1,85 @@
+{
+  boost,
+  cln,
+  cmake,
+  fetchgit,
+  gcc5,
+  ginac,
+  jamomacore,
+  kde5,
+  libsndfile,
+  ninja,
+  portaudio,
+  qtbase,
+  qtdeclarative,
+  qtimageformats,
+  qtsvg,
+  qttools,
+  qtwebsockets,
+  rtaudio,
+  stdenv
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.0.0-a67";
+  name = "i-score-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/OSSIA/i-score.git";
+    rev = "ede2453b139346ae46702b5e2643c5488f8c89fb";
+    sha256 = "04li771nj0k8gym7vg6rnawjkp2f6d5m5mby26h0k6ksf7hg7h70";
+    leaveDotGit = true;
+    deepClone = true;
+  };
+
+  buildInputs = [
+    boost
+    cln
+    cmake
+    ginac
+    gcc5
+    jamomacore
+    kde5.kdnssd
+    libsndfile
+    ninja
+    portaudio
+    qtbase
+    qtdeclarative
+    qtimageformats
+    qtsvg
+    qttools
+    qtwebsockets
+    rtaudio
+  ];
+
+  cmakeFlags = [
+    "-GNinja"
+    "-DISCORE_CONFIGURATION=static-release"
+    "-DISCORE_ENABLE_LTO=OFF"
+    "-DISCORE_BUILD_FOR_PACKAGE_MANAGER=True"
+  ];
+
+  patchPhase = ''
+    sed -e '77d' -i CMake/modules/GetGitRevisionDescription.cmake
+  '';
+
+  preConfigure = ''
+    export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
+  '';
+
+  preBuild = ''
+    ninja
+  '';
+
+  installPhase = ''
+    cmake --build . --target install
+  '';
+
+  meta = {
+    description = "An interactive sequencer for the intermedia arts";
+    homepage = http://i-score.org/;
+    license = stdenv.lib.licenses.cecill20;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/applications/editors/eclipse/plugins.nix

@@ -360,11 +360,11 @@ rec {
 
   scala = buildEclipseUpdateSite rec {
     name = "scala-${version}";
-    version = "4.4.0.201604010956";
+    version = "4.4.1.201605041056";
 
     src = fetchzip {
       url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
-      sha256 = "1yypzcf2iwlcj43vd6h9n4y2ka1gxjf5vm3yx87bgfbzbchzckz7";
+      sha256 = "13xgx2rwlll0l4bs0g6gyvrx5gcc0125vzn501fdj0wv2fqxn5lw";
     };
 
     meta = with stdenv.lib; {

pkgs/applications/editors/neovim/default.nix

@@ -141,7 +141,7 @@ let
       # those contributions were copied from Vim (identified in the commit logs
       # by the vim-patch token). See LICENSE for details."
       license = with licenses; [ asl20 vim ];
-      maintainers = with maintainers; [ manveru nckx garbas ];
+      maintainers = with maintainers; [ manveru garbas ];
       platforms   = platforms.unix;
     };
   };

pkgs/applications/editors/tiled/default.nix

@@ -5,12 +5,12 @@ let
 #  qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
 in stdenv.mkDerivation rec {
   name = "tiled-${version}";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
-    sha256 = "1vlhfkgl126irp53xw94jw1xnj96l1hwnbxmm1s5az60460gfbf0";
+    sha256 = "0s1i6yhm1z9ayzjh8cprcc9jvj5m87l9snyqg6w7zlj3q9zn4rn6";
   };
 
   nativeBuildInputs = [ pkgconfig qmakeHook ];

pkgs/applications/editors/vim/macvim.nix

@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, ncurses, gettext
 , pkgconfig, cscope, python, ruby, tcl, perl, luajit
+, darwin
 }:
 
 stdenv.mkDerivation rec {
@@ -72,6 +73,10 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  postConfigure = ''
+    substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS	=" "PERL_CFLAGS	= -I${darwin.libutil}/include"
+  '';
+
   postInstall = ''
     mkdir -p $out/Applications
     cp -r src/MacVim/build/Release/MacVim.app $out/Applications

pkgs/applications/graphics/darktable/default.nix

@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.0.2";
+  version = "2.0.4";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "0014j73sy956xqdhd4jrxvbamildqqadx8hmagrbiah8xda67skm";
+    sha256 = "0qhyjsjjcd8yirqdnzbbzsldwd6y4wf1bxjbsshvqq7h5xi4ir40";
   };
 
   buildInputs =

pkgs/applications/graphics/hugin/default.nix

@@ -1,34 +1,32 @@
-{ stdenv, cmake, fetchurl, gnumake, pkgconfig, makeWrapper
+{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig
-, boost, gettext, tclap, wxGTK
+, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
-, freeglut, glew, libX11, libXi, libXmu, mesa, cairo
+, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
-, autopanosiftc, enblend-enfuse, exiv2, fftw, ilmbase, lensfun, libpng, libtiff
+, libXmu, mesa, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
-, openexr, panotools, perlPackages, sqlite, vigra
 }:
 
 stdenv.mkDerivation rec {
-  name = "hugin-2015.0.0";
+  name = "hugin-2016.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/hugin/${name}.tar.bz2";
-    sha256 = "1gfblax9rxay8xskz5r8bips4nfh70vkyrb8ksgl6pg91c8krn9c";
+    sha256 = "1rk5bgsvszv9bza46jxwr3i3qgiha2rza5v8lbwkqn4b4idv0c5h";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  buildInputs = [
-
+    boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
-  buildInputs = [ boost gettext tclap wxGTK
+    libpng libtiff libX11 libXi libXmu mesa openexr panotools sqlite vigra
-                  freeglut glew libX11 libXi libXmu mesa cairo
+    wxGTK zlib
-                  exiv2 fftw ilmbase lensfun libtiff libpng openexr panotools
-                  sqlite vigra
-                  perlPackages.ImageExifTool makeWrapper
   ];
 
+  nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
+
   # disable installation of the python scripting interface
   cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-
   enableParallelBuilding = true;
 
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
   postInstall = ''
     for p in $out/bin/*; do
       wrapProgram "$p" \
@@ -39,11 +37,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://hugin.sourceforge.net/;
     description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ viric hrdinka ];
+    maintainers = with maintainers; [ viric hrdinka ];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/applications/graphics/sane/backends/git.nix

@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2016-04-23";
+  version = "2016-05-07";
   src = fetchgit {
-    sha256 = "11bf60cd5a6b314e855a69a6f57a5ca0db3254527def55662bce25810a2314df";
+    sha256 = "5f8974bc56d5eb1d33fbe53b30e80395b690151a1ea418d8aa44c7e092656896";
-    rev = "c8169b1e656f7f95c67946298da5a0e1c143f8e8";
+    rev = "926bfade544de4a4fd5f1a8082b85a97e2443770";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

pkgs/applications/misc/flamerobin/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, wxGTK30, boost, firebird }:
+
+stdenv.mkDerivation rec {
+  version = "0.9.3.1";
+  name = "flamerobin-${version}";
+
+  src = fetchFromGitHub {
+    owner = "mariuz";
+    repo = "flamerobin";
+    rev = version;
+    sha256 = "1wwcsca01hpgi9z5flvbdhs9zv7jvahnbn97j6ymy0hdyb8lv6si";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ wxGTK30 boost firebird ];
+
+  preBuild = ''
+    sed -i 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -nostartfiles/' Makefile
+  '';
+
+  configureFlags = [
+    "--disable-debug"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Database administration tool for Firebird RDBMS";
+    homepage = "https://github.com/mariuz/flamerobin";
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ uralbash ];
+    platforms = platforms.unix;
+  };
+}

pkgs/applications/misc/keepass/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, plugins ? [] }:
+{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, gtk2, plugins ? [] }:
 
 # KeePass looks for plugins in under directory in which KeePass.exe is
 # located. It follows symlinks where looking for that directory, so
@@ -72,6 +72,8 @@ with builtins; buildDotnetPackage rec {
   # is found and does not pollute output path.
   binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
 
+  dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ];
+
   postInstall = 
   let
     extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh;
@@ -79,7 +81,9 @@ with builtins; buildDotnetPackage rec {
   ''
     mkdir -p "$out/share/applications"
     cp ${desktopItem}/share/applications/* $out/share/applications
-    wrapProgram $out/bin/keepass --prefix PATH : "$binPaths"
+    wrapProgram $out/bin/keepass \
+      --prefix PATH : "$binPaths" \
+      --prefix LD_LIBRARY_PATH : "$dynlibPath"
 
     ${extractFDeskIcons} \
       "./Translation/TrlUtil/Resources/KeePass.ico" \

pkgs/applications/misc/tint2/default.nix

@@ -1,18 +1,18 @@
 { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, pango, cairo, glib
 , pcre , imlib2, libXinerama , libXrender, libXcomposite, libXdamage, libX11
 , libXrandr, gtk, libpthreadstubs , libXdmcp, librsvg
-, libstartup_notification, wrapGAppsHook
+, libstartup_notification, hicolor_icon_theme, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.12.9";
+  version = "0.12.10";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "17n3yssqiwxqrwsxypzw8skwzxm2540ikbyx7kfxv2gqlbjx5y6q";
+    sha256 = "0da28ykid84i4pw0cvgaxw0wq2yn03i68g54dzmajgsl1wvkqb0z";
   };
 
   enableParallelBuilding = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pango cairo glib pcre imlib2 libXinerama libXrender
     libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs libXdmcp
-    librsvg libstartup_notification ];
+    librsvg libstartup_notification hicolor_icon_theme ];
 
   preConfigure = ''
     substituteInPlace CMakeLists.txt --replace /etc $out/etc
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://gitlab.com/o9000/tint2;
     license = stdenv.lib.licenses.gpl2;
-    description = "A simple panel/taskbar unintrusive and light (memory / cpu / aestetic)";
+    description = "Simple panel/taskbar unintrusive and light (memory / cpu / aestetic)";
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/networking/bittorrentsync/1.4.x.nix

@@ -1,42 +1,9 @@
-{ stdenv, fetchurl, patchelf }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
+import ./generic.nix (args // {
-  arch = if stdenv.system == "x86_64-linux" then "x64"
+  version = "1.4.111";
-    else if stdenv.system == "i686-linux" then "i386"
+  sha256s = {
-    else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
+    "x86_64-linux" = "0bw3ds3ndcnkry5mpv645z2bfi5z387bh0f7b35blxq1yv93r83f";
-
+    "i686-linux"   = "1qwaj7l7nsd4afx7ksb4b1c22mki9qa40803v9x1a8bhbdfhkczk";
-  sha256 = if stdenv.system == "x86_64-linux" then "1b9f6qxpvyrzf23l71hw42qyg4i27by3hs91sm34drm24z7m7fpd"
-    else if stdenv.system == "i686-linux" then "0caqwaxd6i8cap35kpzkwy5dknk7iaxf5fbfjy46cbwylgcpsc2x"
-    else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
-
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
-in
-stdenv.mkDerivation rec {
-  name = "btsync-${version}";
-  version = "1.4.110";
-
-  src  = fetchurl {
-    url  = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";
-    inherit sha256;
   };
-
+})
-  dontStrip   = true; # Don't strip, otherwise patching the rpaths breaks
-  sourceRoot  = ".";
-  buildInputs = [ patchelf ];
-
-  installPhase = ''
-    mkdir -p "$out/bin/"
-    cp -r "btsync" "$out/bin/"
-
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath} "$out/bin/btsync"
-  '';
-
-  meta = {
-    description = "Automatically sync files via secure, distributed technology";
-    homepage    = "http://www.bittorrent.com/sync";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice ];
-  };
-}

pkgs/applications/networking/bittorrentsync/2.0.x.nix

@@ -1,41 +1,9 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
+import ./generic.nix (args // {
-  arch = if stdenv.system == "x86_64-linux" then "x64"
+  version = "2.3.7";
-    else if stdenv.system == "i686-linux" then "i386"
+  sha256s = {
-    else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
+    "x86_64-linux" = "1hnw6bv60xrnc733gm1ilywc0y93k2g6bmwgnww9qk7ivbvi6pd1";
-
+    "i686-linux"   = "0hj8nbq6mava15m1hxaqq371fqk0whdx5iqsbnppyci0jjnr4qv1";
-  sha256 = if stdenv.system == "x86_64-linux" then "01yrligi61gxcixh7z6gi427ga0sx97wnmkv08p9ykd4b90hvj7s"
-    else if stdenv.system == "i686-linux" then     "119dll7f4w7h8nrrafmrj1d0lddjzwg5l8hnf74xdjg6g7rhrmd7"
-    else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
-
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
-in
-stdenv.mkDerivation rec {
-  name = "btsync-${version}";
-  version = "2.3.6";
-
-  src  = fetchurl {
-    url  = "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";
-    inherit sha256;
   };
-
+})
-  dontStrip   = true; # Don't strip, otherwise patching the rpaths breaks
-  sourceRoot  = ".";
-
-  installPhase = ''
-    mkdir -p "$out/bin/"
-    cp -r "btsync" "$out/bin/"
-
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath} "$out/bin/btsync"
-  '';
-
-  meta = {
-    description = "Automatically sync files via secure, distributed technology";
-    homepage    = https://www.getsync.com/;
-    license     = stdenv.lib.licenses.unfreeRedistributable;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice cwoac ];
-  };
-}

pkgs/applications/networking/bittorrentsync/generic.nix

@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, version, sha256s, ... } @ args:
+
+let
+  arch = {
+    "x86_64-linux" = "x64";
+    "i686-linux" = "i386";
+  }.${stdenv.system};
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
+in
+
+stdenv.mkDerivation rec {
+  name = "btsync-${version}";
+  inherit version;
+
+  src = fetchurl {
+    # annoyingly, downloads for 1.4 and 2.3 do not follow the same URL layout; this is
+    # a simple work-around, in place of overriding the url in the caller.
+    urls = [
+      "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz"
+      "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"
+    ];
+    sha256 = sha256s.${stdenv.system};
+  };
+
+  dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
+  sourceRoot = ".";
+
+  installPhase = ''
+    install -D btsync "$out/bin/btsync"
+    patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync"
+  '';
+
+  meta = {
+    description = "Automatically sync files via secure, distributed technology";
+    homepage    = https://www.getsync.com/;
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice cwoac ];
+  };
+}

pkgs/applications/networking/browsers/firefox-bin/default.nix

@@ -138,6 +138,9 @@ stdenv.mkDerivation {
         patchelf --set-rpath "$libPath" \
           "$out/usr/lib/firefox-bin-${version}/{}" \;
 
+      # wrapFirefox expects "$out/lib" instead of "$out/usr/lib"
+      ln -s "$out/usr/lib" "$out/lib"
+
       # Create a desktop item.
       mkdir -p $out/share/applications
       cat > $out/share/applications/firefox.desktop <<EOF

pkgs/applications/networking/dropbox/default.nix

@@ -151,5 +151,6 @@ in stdenv.mkDerivation {
     description = "Online stored folders (daemon version)";
     maintainers = with stdenv.lib.maintainers; [ ttuegel ];
     platforms = [ "i686-linux" "x86_64-linux" ];
+    license = stdenv.lib.licenses.unfree;
   };
 }

pkgs/applications/networking/instant-messengers/teamspeak/client.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
 , xorg, fontconfig, qtbase, xkeyboard_config, alsaLib, libpulseaudio ? null
-, libredirect, quazip, less, which, unzip
+, libredirect, quazip, less, which, unzip, llvmPackages
 }:
 
 let
@@ -13,6 +13,7 @@ let
     [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
       xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
       xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase libpulseaudio
+      llvmPackages.libcxx llvmPackages.libcxxabi
     ];
 
   desktopItem = makeDesktopItem {
@@ -30,7 +31,7 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.0.18.2";
+  version = "3.0.19.1";
 
   src = fetchurl {
     urls = [
@@ -38,14 +39,14 @@ stdenv.mkDerivation rec {
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit
-                then "1r0l0jlng1fz0cyvnfa4hqwlszfraj5kcs2lg9qnqvp03x8sqn6h"
+                then "173mcvrckia0mming1v9nzi0bllr4m430y9swl9kyfsvp44f5n5h"
-                else "1pgpsv1r216l76fx0grlqmldd9gha3sj84gnm44km8y98b3hj525";
+                else "1iansjlbalwil0nlrlxfl70zzbx009c4rccf4va0kq097rqhgznx";
   };
 
   # grab the plugin sdk for the desktop icon
   pluginsdk = fetchurl {
-    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.18.1.zip";
+    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.19.1.zip";
-    sha256 = "108y52mfg44cnnhhipnmrr0cxh7ram5c2hnchxjkwvf5766vbaq4";
+    sha256 = "1r1ss6zq5axr7h82inlp98zaz50041rizli5bwz3lfyipfr034ya";
   };
 
   buildInputs = [ makeWrapper less which unzip ];

pkgs/applications/networking/irc/quassel/source.nix

@@ -1,9 +1,9 @@
 { fetchurl }:
 
 rec {
-  version = "0.12.3";
+  version = "0.12.4";
   src = fetchurl {
-    url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
+    url = "https://github.com/quassel/quassel/archive/${version}.tar.gz";
-    sha256 = "0d6lwf6qblj1ia5j9mjy112zrmpbbg9mmxgscbgxiqychldyjgjd";
+    sha256 = "0q2qlhy1d6glw9pwxgcgwvspd1mkk3yi6m21dx9gnj86bxas2qs2";
   };
 }

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

@@ -20,12 +20,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "1.4";
+  version = "1.5";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-    sha256 = "1m6xq6izcac5186xvvmm8znfjzrg9hq42p69jabdvv7cri4rjvg0";
+    sha256 = "0n4cbhh9a7qq6y70ac9b4r0kb7hydwsic99h45ppr2jly322fvij";
   };
 
   cmakeFlags = with stdenv.lib; []

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

@@ -6,25 +6,26 @@
 , cairo, gstreamer, gst_plugins_base, icu
 , debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Shredder", enable this option.  However, those
+  # instead of "Earlybird", enable this option.  However, those
   # binaries may not be distributed without permission from the
   # Mozilla Foundation, see
   # http://www.mozilla.org/foundation/trademarks/.
   enableOfficialBranding ? false
 }:
 
-let version = "38.7.1"; in
+let version = "45.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
   name = "thunderbird-${verName}";
 
   src = fetchurl {
-    url = "http://archive.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
+    url = "http://archive.mozilla.org/pub/thunderbird/releases/"
-    sha256 = "0a4kbmas0a6wavp8dxkva0fl1y1qrx6b7l3xdjdan7qx7ysmm626";
+      + "${verName}/source/thunderbird-${verName}.source.tar.xz";
+    sha256 = "0rynfyxgpvfla17zniaq84slc02kg848qawkjmdbnv74y6bkhs8m";
   };
 
-  buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
+  buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
     [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2
       python dbus dbus_glib pango freetype fontconfig xorg.libXi
       xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
       "--enable-system-pixman"
       "--enable-system-sqlite"
       "--enable-system-cairo"
+      "--disable-gconf"
       "--disable-gstreamer"
       "--enable-startup-notification"
       # "--enable-content-sandbox"            # available since 26.0, but not much info available

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

@@ -1,56 +1,28 @@
-x@{builderDefsPackage
+{ stdenv, fetchurl, zlib }:
-  , zlib
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
 
-  buildInputs = map (n: builtins.getAttr n x)
+stdenv.mkDerivation rec {
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  name = "minisat-${version}";
-  sourceInfo = rec {
+  version = "2.2.0";
-    baseName="minisat";
+
-    version="2.2.0";
+  src = fetchurl {
-    name="${baseName}-${version}";
+    url = "http://minisat.se/downloads/${name}.tar.gz";
-    url="http://minisat.se/downloads/${name}.tar.gz";
+    sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
-    hash="023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
   };
 
-  inherit (sourceInfo) name version;
+  buildInputs = [ zlib ];
-  inherit buildInputs;
 
-  phaseNames = ["setVars" "doMake" "doDeploy"];
+  sourceRoot = "minisat/simp";
-  goSrcDir = "cd simp";
+  makeFlags = [ "r" "MROOT=.." ];
-  doDeploy = a.fullDepEntry (''
+  installPhase = ''
-    mkdir -p "$out"/bin
+    mkdir -p $out/bin
-    cp minisat_static "$out/bin"/minisat
+    cp minisat_release $out/bin/minisat
-  '') ["minInit" "defEnsureDir"];
+  '';
-  makeFlags = ["rs"];
-  setVars = a.fullDepEntry (''
-    export MROOT=$PWD/../
-  '') ["doUnpack"];
 
-  meta = {
+  meta = with stdenv.lib; {
-    description = "A compact and readable SAT-solver";
+    description = "Compact and readable SAT solver";
-    maintainers = with a.lib.maintainers;
+    maintainers = with maintainers; [ gebner raskin ];
-    [
+    platforms = platforms.unix;
-      raskin
+    license = licenses.mit;
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.stdenv.lib.licenses.mit;
     homepage = "http://minisat.se/";
   };
-  passthru = {
+}
-    updateInfo = {
-      downloadPage = "http://minisat.se/MiniSat.html";
-    };
-  };
-}) x

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

@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook flex bison ];
   buildInputs = [ gmp ];
 
+  # --disable-static actually enables static linking here...
+  dontDisableStatic = true;
+
   makeFlags = [ "LEX=${flex}/bin/flex" ];
 
   preInstall = ''

pkgs/applications/version-management/git-and-tools/hub/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchgit {
     url = https://github.com/github/hub.git;
     rev = "refs/tags/v${version}";
-    sha256 = "147rsh8zkqv6iqx3q7wzszfqlv65qj3hm3264ma042g7naf8hkwr";
+    sha256 = "0iwpy50jvb8w3nn6q857j9c3k7bp17azj8yc5brh04dpkyfysm02";
   };
 
 

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

@@ -4,7 +4,7 @@
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
-  version = "3.7.3";
+  version = "3.8.1";
   name = "mercurial-${version}";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "0c2vkad9piqkggyk8y310rf619qgdfcwswnk3nv21mg2fhnw96f0";
+    sha256 = "156m6269xdqq7mpw01c6b065k29xnb8b9lyzn1b0nlz5il2izkps";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
@@ -68,5 +68,6 @@ stdenv.mkDerivation {
     downloadPage = "http://mercurial.selenic.com/release/";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.eelco ];
+    updateWalker = true;
   };
 }

pkgs/applications/video/popcorntime/default.nix

@@ -1,45 +0,0 @@
-{ lib, stdenv, fetchurl, makeWrapper, nwjs, zip }:
-
-let
-  arch = if stdenv.system == "x86_64-linux" then "l64"
-    else if stdenv.system == "i686-linux"   then "l32" 
-    else throw "Unsupported system ${stdenv.system}";
-
-in stdenv.mkDerivation rec {
-  name = "popcorntime-${version}";
-  version = "0.4.0";
-  build = "2";
-
-  src = fetchurl {
-    url = "http://popcorntime.ag/download.php?file=popcorn-time-community-v${version}-${build}-${arch}.tar.xz";
-    sha256 =
-      if arch == "l64"
-      then "0a68d0a81d8e97c94afa0c75209056ee4b8486f400854c952bd3ad7251bd80c9"
-      else "b311c312a29d408a7c661a271d1f3a8fc83865d8a204cf026ee87e9ac173874d";
-  };
-
-  dontPatchELF = true;
-  sourceRoot = ".";
-  buildInputs  = [ zip makeWrapper ];
-
-  buildPhase = ''
-    rm Popcorn-Time
-    cat ${nwjs}/bin/nw nw.pak > Popcorn-Time
-    chmod 555 Popcorn-Time
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -r * $out/
-    makeWrapper $out/Popcorn-Time $out/bin/popcorntime
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://popcorntime.sh/;
-    description = "An application that streams movies and TV shows from torrents";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bobvanderlinden rnhmjoj ];
-    broken = true;
-  };
-}

pkgs/applications/virtualization/open-vm-tools/default.nix

@@ -1,26 +1,29 @@
-{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook,
+{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
   libmspack, openssl, pam, xercesc, icu, libdnet, procps,
   xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
-  pkgconfig, glib, gtk, gtkmm }:
+  pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd }:
 
 let
-  majorVersion = "9.10";
+  majorVersion = "10.0";
-  minorVersion = "0";
+  minorVersion = "7";
-  patchSet = "2476743";
+  version = "${majorVersion}.${minorVersion}";
-  version = "${majorVersion}.${minorVersion}-${patchSet}";
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "open-vm-tools-${version}";
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "mirror://sourceforge/project/open-vm-tools/open-vm-tools/stable-${majorVersion}.x/open-vm-tools-${version}.tar.gz";
+    owner = "vmware";
-    sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1";
+    repo = "open-vm-tools";
+    rev = "stable-${version}";
+    sha256 = "0xxgppxjisg3jly21r7mjk06rc4n7ssyvapasxhbi2d1bw0xkvrj";
   };
 
+  sourceRoot = "${src.name}/open-vm-tools";
+
   buildInputs =
     [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps
       pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
 
-  patchPhase = ''
+  postPatch = ''
      sed -i s,-Werror,,g configure.ac
      sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
      sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
@@ -30,6 +33,14 @@ in stdenv.mkDerivation {
 
   configureFlags = "--without-kernel-modules --without-xmlsecurity";
 
+  postInstall = ''
+	sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network"
+	wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
+		--prefix PATH ':' "${iproute}/bin" \
+		--prefix PATH ':' "${dbus}/bin" \
+		--prefix PATH ':' "${systemd}/bin"
+  '';
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/vmware/open-vm-tools";
     description = "Set of tools for VMWare guests to improve host-guest interaction";

pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch

@@ -1,18 +1,7 @@
-From d1b753212ee5151db941de0e2b826dcf9722f2f3 Mon Sep 17 00:00:00 2001
+diff -ruN open-vm-tools.orig/lib/include/guest_os.h open-vm-tools/lib/include/guest_os.h
-From: Arseniy Seroka <ars.seroka@gmail.com>
+--- open-vm-tools.orig/lib/include/guest_os.h	2016-02-12 00:50:33.000000000 +0000
-Date: Fri, 21 Aug 2015 20:20:16 +0300
++++ open-vm-tools/lib/include/guest_os.h	2016-04-18 20:07:41.677251511 +0000
-Subject: [PATCH] [PATCH]: recognize NixOS Linux
+@@ -222,6 +222,7 @@
-
----
- open-vm-tools/lib/include/guest_os.h   | 1 +
- open-vm-tools/lib/misc/hostinfoPosix.c | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
-index 4fc9ea7..f5104fd 100644
---- a/open-vm-tools/lib/include/guest_os.h
-+++ b/open-vm-tools/lib/include/guest_os.h
-@@ -215,6 +215,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
  #define STR_OS_MANDRAKE_FULL      "Mandrake Linux"
  #define STR_OS_MANDRIVA           "mandriva"
  #define STR_OS_MKLINUX            "MkLinux"
@@ -20,19 +9,30 @@ index 4fc9ea7..f5104fd 100644
  #define STR_OS_NOVELL             "nld9"
  #define STR_OS_NOVELL_FULL        "Novell Linux Desktop 9"
  #define STR_OS_ORACLE             "oraclelinux"
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
+diff -ruN open-vm-tools.orig/lib/include/vmblock.h open-vm-tools/lib/include/vmblock.h
-index 6c13fe3..5b82983 100644
+--- open-vm-tools.orig/lib/include/vmblock.h	2016-02-12 00:50:33.000000000 +0000
---- a/open-vm-tools/lib/misc/hostinfoPosix.c
++++ open-vm-tools/lib/include/vmblock.h	2016-04-18 21:51:15.651235848 +0000
-+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
+@@ -145,7 +145,7 @@
-@@ -184,6 +184,7 @@ static const DistroInfo distroArray[] = {
+ # define VMBLOCK_DEVICE_MODE           VMBLOCK_FUSE_DEVICE_MODE
+ # define VMBLOCK_MOUNT_POINT           VMBLOCK_FUSE_MOUNT_POINT
+ 
+-#elif defined(linux)
++#elif defined(__linux__)
+ # define VMBLOCK_ADD_FILEBLOCK         98
+ # define VMBLOCK_DEL_FILEBLOCK         99
+ # ifdef VMX86_DEVEL
+diff -ruN open-vm-tools.orig/lib/misc/hostinfoPosix.c open-vm-tools/lib/misc/hostinfoPosix.c
+--- open-vm-tools.orig/lib/misc/hostinfoPosix.c	2016-02-12 00:50:33.000000000 +0000
++++ open-vm-tools/lib/misc/hostinfoPosix.c	2016-04-18 20:09:45.841668252 +0000
+@@ -195,6 +195,7 @@
     {"Mandrake",           "/etc/mandrake-release"},
     {"Mandriva",           "/etc/mandriva-release"},
-    {"Mandrake",           "/etc/mandrakelinux-release"},
+    {"MkLinux",            "/etc/mklinux-release"},
 +   {"NixOS",              "/etc/os-release"},
-    {"TurboLinux",         "/etc/turbolinux-release"},
+    {"Novell",             "/etc/nld-release"},
-    {"Fedora Core",        "/etc/fedora-release"},
+    {"OracleLinux",        "/etc/oracle-release"},
-    {"Gentoo",             "/etc/gentoo-release"},
+    {"Photon",             "/etc/lsb-release"},
-@@ -613,6 +614,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
+@@ -619,6 +620,8 @@
        Str_Strcpy(distroShort, STR_OS_MANDRIVA, distroShortSize);
     } else if (strstr(distroLower, "mklinux")) {
        Str_Strcpy(distroShort, STR_OS_MKLINUX, distroShortSize);
@@ -41,6 +41,3 @@ index 6c13fe3..5b82983 100644
     } else if (strstr(distroLower, "pld")) {
        Str_Strcpy(distroShort, STR_OS_PLD, distroShortSize);
     } else if (strstr(distroLower, "slackware")) {
--- 
-2.5.0
-

pkgs/applications/virtualization/rkt/default.nix

@@ -9,7 +9,7 @@ let
   stage1Flavours = [ "coreos" "fly" "host" ];
 
 in stdenv.mkDerivation rec {
-  version = "1.4.0";
+  version = "1.5.1";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "0lnvqhg88aa6zx4wnkz17v3f529i9hi0y2aihfsq09pvsn56hwjl";
+      sha256 = "1y99m0ay9qj5a0rb657abdjmwjvqi9dh3k6xr0npmx6vnvwpxs58";
   };
 
   stage1BaseImage = fetchurl {

pkgs/applications/window-managers/wmii-hg/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python
+{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python, which
 , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
 
 stdenv.mkDerivation rec {
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   # for dlopen-ing
   patchPhase = ''
     substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so"
+    substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which"
   '';
 
   configurePhase = ''
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  buildInputs = [ pkgconfig libixp_hg txt2tags dash python
+  buildInputs = [ pkgconfig libixp_hg txt2tags dash python which
                   libX11 libXrender libXext libXinerama libXrandr libXft ];
 
   # For some reason including mercurial in buildInputs did not help

pkgs/build-support/docker/default.nix

@@ -286,17 +286,20 @@ EOF
         cp ${layer}/* temp/
         chmod ug+w temp/*
 
+        for dep in $(cat $layerClosure); do
+          find $dep -path "${layer}" -prune -o -print >> layerFiles
+        done
+
+        if [ -s layerFiles ]; then
           # FIXME: might not be /nix/store
           echo '/nix' >> layerFiles
           echo '/nix/store' >> layerFiles
-        for dep in $(cat $layerClosure); do
+        fi
-          find $dep >> layerFiles
-        done
 
         echo Adding layer
         tar -tf temp/layer.tar >> baseFiles
         sed 's/^\.//' -i baseFiles
-        comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
+        comm <(sort -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles
         tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true
 
         echo Adding meta

pkgs/build-support/grsecurity/default.nix

@@ -15,6 +15,7 @@ let
       unrestrictProcGid = 121; # Ugh, an awful hack. See grsecurity NixOS gid
       disableRBAC = false;
       disableSimultConnect = false;
+      redistKernel = true;
       verboseVersion = false;
       kernelExtraConfig = "";
     } // grsecOptions.config;
@@ -91,6 +92,12 @@ let
         GRKERNSEC y
         ${grsecMainConfig}
 
+        # Disable features rendered useless by redistributing the kernel
+        ${optionalString cfg.config.redistKernel ''
+          GRKERNSEC_RANDSTRUCT n
+          GRKERNSEC_HIDESYM n
+          ''}
+
         # The paxmarks mechanism relies on ELF header markings, but the default
         # grsecurity configuration only enables xattr markings
         PAX_PT_PAX_FLAGS y

pkgs/data/fonts/pecita/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pecita-${version}";
-  version = "5.2";
+  version = "5.3";
 
   src = fetchurl {
     url = "http://archive.rycee.net/pecita/${name}.tar.xz";
-    sha256 = "0ryfvxdla5iinwwin4dc1k89hk1bjq2mfdrrv67q6fdgz41l0qf0";
+    sha256 = "1glr21gi1b9db17ln8qn4zk9gwpxs0frm76i4hp3anlpivbwiis8";
   };
 
   phases = ["unpackPhase" "installPhase"];

pkgs/desktops/gnome-3/extensions/impatience.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-impatience-${version}";
+  version = "6564c21e4caf4a6bc5fe2bf21116d7c15408d494";
+
+  src = fetchFromGitHub {
+    owner = "timbertson";
+    repo = "gnome-shell-impatience";
+    rev = version;
+    sha256 = "10zyj42i07dcvaciv47qgkcs5g5n2bpc8a0m6fsimfi0442iwlcn";
+  };
+
+  buildInputs = [
+    glib
+  ];
+
+  buildPhase = ''
+    make schemas
+  '';
+
+  installPhase = ''
+    cp -r impatience $out
+  '';
+
+  uuid = "impatience@gfxmonk.net";
+
+  meta = with stdenv.lib; {
+    description = "Speed up builtin gnome-shell animations";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ aneeshusa timbertson ];
+    homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml;
+  };
+}

pkgs/desktops/gnome-3/extensions/system-monitor.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-system-monitor-${version}";
+  version = "8b31f070e9e59109d729661ced313d6a63e31787";
+
+  src = fetchFromGitHub {
+    owner = "paradoxxxzero";
+    repo = "gnome-shell-system-monitor-applet";
+    rev = version;
+    sha256 = "0fm5zb6qp53jjy2mnkb8ybxygzjwpb314giiq0ywq87hhrpch8m3";
+  };
+
+  buildInputs = [
+    glib
+  ];
+
+  buildPhase = ''
+    ${glib}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
+  '';
+
+  installPhase = ''
+    cp -r ${uuid} $out
+  '';
+
+  uuid = "system-monitor@paradoxxx.zero.gmail.com";
+
+  meta = with stdenv.lib; {
+    description = "Display system informations in gnome shell status bar";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ aneeshusa ];
+    homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
+  };
+}

pkgs/desktops/gnome-3/extensions/volume-mixer.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-volume-mixer-${version}";
+  version = "844ed80ad448855d8f6218847183a80474b523c7";
+
+  src = fetchFromGitHub {
+    owner = "aleho";
+    repo = "gnome-shell-volume-mixer";
+    rev = version;
+    sha256 = "1vcj2spbymhdi1nazvhldvcfgad23r3h7f0ihh4nianbxn7hjs9w";
+  };
+
+  buildInputs = [
+    glib
+  ];
+
+  buildPhase = ''
+    ${glib}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
+  '';
+
+  installPhase = ''
+    cp -r ${uuid} $out
+  '';
+
+  uuid = "shell-volume-mixer@derhofbauer.at";
+
+  meta = with stdenv.lib; {
+    description = "GNOME Shell Extension allowing separate configuration of PulseAudio devices";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ aneeshusa ];
+    homepage = https://github.com/aleho/gnome-shell-volume-mixer;
+  };
+}

pkgs/desktops/gnome-3/extensions/workspace-grid.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-workspace-grid-${version}";
+  version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b";
+
+  src = fetchFromGitHub {
+    owner = "zakkak";
+    repo = "workspace-grid-gnome-shell-extension";
+    rev = version;
+    sha256 = "0503b7lmydrbblfvf9b56pv5hpmykzgyc6v8y99rckg58h2jhs69";
+  };
+
+  buildInputs = [
+    glib
+  ];
+
+  installPhase = ''
+    cp -r ${uuid} $out
+  '';
+
+  uuid = "workspace-grid@mathematical.coffee.gmail.com";
+
+  meta = with stdenv.lib; {
+    description = "Arranges workspaces in a configurable grid";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ aneeshusa ];
+    homepage = https://github.com/zakkak/workspace-grid-gnome-shell-extension;
+  };
+}

pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix

@@ -1,12 +1,11 @@
 { kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcrash
 , kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
-, libcap_progs
 }:
 
 kdeFramework {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap.out ];
   propagatedBuildInputs = [
     kconfig kcrash ki18n kio kservice kwindowsystem libcap
   ];

pkgs/development/compilers/bupc/default.nix

@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, perl, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "berkeley_upc-2.22.0";
+
+  src = fetchurl {
+    url = "http://upc.lbl.gov/download/release/${name}.tar.gz";
+    sha256 = "041l215x8z1cvjcx7kwjdgiaf9rl2d778k6kiv8q09bc68nwd44m";
+  };
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  # Used during the configure phase
+  ENVCMD = "${coreutils}/bin/env";
+
+  nativeBuildInputs = [ coreutils ];
+  buildInputs = [ perl ];
+
+  meta = with stdenv.lib; {
+    description = "A compiler for the Berkely Unified Parallel C language";
+    longDescription = ''
+      Unified Parallel C (UPC) is an extension of the C programming language
+      designed for high performance computing on large-scale parallel
+      machines.The language provides a uniform programming model for both
+      shared and distributed memory hardware. The programmer is presented with
+      a single shared, partitioned address space, where variables may be
+      directly read and written by any processor, but each variable is
+      physically associated with a single processor. UPC uses a Single Program
+      Multiple Data (SPMD) model of computation in which the amount of
+      parallelism is fixed at program startup time, typically with a single
+      thread of execution per processor.
+    '';
+    homepage = http://upc.lbl.gov/;
+    license = licenses.mit;
+    platforms = with platforms; [ linux ];
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}

pkgs/development/compilers/chez/default.nix

@@ -3,39 +3,32 @@
 stdenv.mkDerivation rec {
   name    = "chez-scheme-${version}";
   version = "9.4-${dver}";
-  dver    = "20160501";
+  dver    = "20160507";
 
   src = fetchgit {
     url    = "https://github.com/cisco/chezscheme.git";
-    rev    = "8343b7172532a00d2d19914206fcf83c93798c80";
+    rev    = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c";
-    sha256 = "1jq55sdk468lckccfnqh0iv868bhw6yb9ba9bakqg2pfydb8r4qf";
+    sha256 = "024x79xcdqp665xjyccpn02w6dmdvnhw0h0vdc42g9s5wv5ry92m";
     fetchSubmodules = true;
   };
 
   enableParallelBuilding = true;
   buildInputs = [ ncurses libX11 ];
 
-  /* Chez uses a strange default search path, which completely
+  /* We patch out a very annoying 'feature' in ./configure, which
-  ** ignores the installation prefix for some reason, and instead
+  ** tries to use 'git' to update submodules.
-  ** defaults to {/usr,/usr/local,$HOME}/lib for finding the .boot
-  ** file.
   **
-  ** Also, we patch out a very annoying 'feature' in ./configure, too,
+  ** We have to also fix a few occurrences to tools with absolute
-  ** which tries to use 'git' to update submodules.
+  ** paths in some helper scripts, otherwise the build will fail on
-  **
+  ** NixOS or in any chroot build.
-  ** Finally, we have to also fix a few occurrences to tools with
-  ** absolute paths in some helper scripts, otherwise the build will
-  ** fail on NixOS or in any chroot build.
   */
   patchPhase = ''
-    substituteInPlace ./c/scheme.c \
-      --replace "/usr/lib/csv" "$out/lib/csv"
-
     substituteInPlace ./configure \
       --replace "git submodule init && git submodule update || exit 1" ""
 
     substituteInPlace ./workarea \
-      --replace "/bin/ln" "${coreutils}/bin/ln"
+      --replace "/bin/ln" "${coreutils}/bin/ln" \
+      --replace "/bin/cp" "${coreutils}/bin/cp"
 
     substituteInPlace ./makefiles/installsh \
       --replace "/usr/bin/true" "${coreutils}/bin/true"

pkgs/development/compilers/gcc/6/default.nix

@@ -0,0 +1,538 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false
+, langObjC ? stdenv.isDarwin
+, langObjCpp ? stdenv.isDarwin
+, langJava ? false
+, langAda ? false
+, langVhdl ? false
+, langGo ? false
+, profiledCompiler ? false
+, staticCompiler ? false
+, enableShared ? true
+, texinfo ? null
+, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, gmp, mpfr, libmpc, gettext, which
+, libelf                      # optional, for link-time optimizations (LTO)
+, isl ? null # optional, for the Graphite optimization framework.
+, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null, pkgconfig ? null
+, gtk ? null, libart_lgpl ? null
+, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
+, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, x11Support ? langJava
+, gnatboot ? null
+, enableMultilib ? false
+, enablePlugin ? true             # whether to support user-supplied plug-ins
+, name ? "gcc"
+, cross ? null
+, binutilsCross ? null
+, libcCross ? null
+, crossStageStatic ? true
+, gnat ? null
+, libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
+, stripped ? true
+, gnused ? null
+, binutils ? null
+, cloog # unused; just for compat with gcc4, as we override the parameter on some places
+}:
+
+assert langJava     -> zip != null && unzip != null
+                       && zlib != null && boehmgc != null
+                       && perl != null;  # for `--enable-java-home'
+assert langAda      -> gnatboot != null;
+assert langVhdl     -> gnat != null;
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
+# Need c++filt on darwin
+assert stdenv.isDarwin -> binutils != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "6.1.0";
+
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+
+    enableParallelBuilding = true;
+
+    patches =
+      [ ../use-source-date-epoch.patch ]
+      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional noSysDirs ../no-sys-dirs.patch
+      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
+      # target libraries and tools.
+      ++ optional langAda ../gnat-cflags.patch
+      ++ optional langFortran ../gfortran-driving.patch;
+
+    javaEcj = fetchurl {
+      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+      # `configure' time.
+
+      # XXX: Eventually we might want to take it from upstream.
+      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
+      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
+    };
+
+    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
+    # binary distribution here to allow the whole chain to be bootstrapped.
+    javaAntlr = fetchurl {
+      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
+    };
+
+    xlibs = [
+      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
+      xproto renderproto xextproto inputproto randrproto
+    ];
+
+    javaAwtGtk = langJava && x11Support;
+
+    /* Platform flags */
+    platformFlags = let
+        gccArch = stdenv.platform.gcc.arch or null;
+        gccCpu = stdenv.platform.gcc.cpu or null;
+        gccAbi = stdenv.platform.gcc.abi or null;
+        gccFpu = stdenv.platform.gcc.fpu or null;
+        gccFloat = stdenv.platform.gcc.float or null;
+        gccMode = stdenv.platform.gcc.mode or null;
+        withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+        withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+        withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode;
+
+    /* Cross-gcc settings */
+    crossMingw = cross != null && cross.libc == "msvcrt";
+    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossConfigureFlags = let
+        gccArch = stdenv.cross.gcc.arch or null;
+        gccCpu = stdenv.cross.gcc.cpu or null;
+        gccAbi = stdenv.cross.gcc.abi or null;
+        gccFpu = stdenv.cross.gcc.fpu or null;
+        gccFloat = stdenv.cross.gcc.float or null;
+        gccMode = stdenv.cross.gcc.mode or null;
+        withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+        withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+        withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        "--target=${cross.config}" +
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode +
+        (if crossMingw && crossStageStatic then
+          " --with-headers=${libcCross}/include" +
+          " --with-gcc" +
+          " --with-gnu-as" +
+          " --with-gnu-ld" +
+          " --with-gnu-ld" +
+          " --disable-shared" +
+          " --disable-nls" +
+          " --disable-debug" +
+          " --enable-sjlj-exceptions" +
+          " --enable-threads=win32" +
+          " --disable-win32-registry"
+          else if crossStageStatic then
+          " --disable-libssp --disable-nls" +
+          " --without-headers" +
+          " --disable-threads " +
+          " --disable-libgomp " +
+          " --disable-libquadmath" +
+          " --disable-shared" +
+          " --disable-libatomic " +  # libatomic requires libc
+          " --disable-decimal-float" # libdecnumber requires libc
+          else
+          (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+           else                " --with-headers=${libcCross}/include") +
+          # Ensure that -print-prog-name is able to find the correct programs.
+          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
+            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
+            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+          )) +
+          " --enable-__cxa_atexit" +
+          " --enable-long-long" +
+          (if crossMingw then
+            " --enable-threads=win32" +
+            " --enable-sjlj-exceptions" +
+            " --enable-hash-synchronization" +
+            " --disable-libssp" +
+            " --disable-nls" +
+            " --with-dwarf2" +
+            # I think noone uses shared gcc libs in mingw, so we better do the same.
+            # In any case, mingw32 g++ linking is broken by default with shared libs,
+            # unless adding "-lsupc++" to any linking command. I don't know why.
+            " --disable-shared" +
+            # To keep ABI compatibility with upstream mingw-w64
+            " --enable-fully-dynamic-string"
+            else (if cross.libc == "uclibc" then
+              # In uclibc cases, libgomp needs an additional '-ldl'
+              # and as I don't know how to pass it, I disable libgomp.
+              " --disable-libgomp" else "") +
+            " --enable-threads=posix" +
+            " --enable-nls" +
+            " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
+          );
+    stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
+    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+
+  bootstrap = cross == null;
+
+in
+
+# We need all these X libraries when building AWT with GTK+.
+assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
+
+stdenv.mkDerivation ({
+  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+
+  builder = ../builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "0ld3y4rgimyqgx1nwvzqyl5gr4wzc0ch4akkvsqp3fgbmdfcii09";
+  };
+
+  inherit patches;
+
+  outputs = [ "out" "lib" "man" "info" ];
+  setOutputFlags = false;
+  NIX_NO_SELF_RPATH = true;
+
+  libc_dev = stdenv.cc.libc_dev;
+
+  postPatch =
+    if (stdenv.isGNU
+        || (libcCross != null                  # e.g., building `gcc.crossDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
+        || (crossGNU && libcCross != null))
+    then
+      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
+      # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
+      let
+        libc = if libcCross != null then libcCross else stdenv.glibc;
+        gnu_h = "gcc/config/gnu.h";
+        extraCPPDeps =
+             libc.propagatedBuildInputs
+          ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
+          ++ stdenv.lib.optional (libpthread != null) libpthread;
+        extraCPPSpec =
+          concatStrings (intersperse " "
+                          (map (x: "-I${x}/include") extraCPPDeps));
+        extraLibSpec =
+          if libpthreadCross != null
+          then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+          else "-L${libpthread}/lib";
+      in
+        '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
+
+           echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
+        ''
+    else if cross != null || stdenv.cc.libc != null then
+      # On NixOS, use the right path to the dynamic linker instead of
+      # `/lib/ld*.so'.
+      let
+        libc = if libcCross != null then libcCross else stdenv.cc.libc;
+      in
+        '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
+           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+           do
+             grep -q LIBC_DYNAMIC_LINKER "$header" || continue
+             echo "  fixing \`$header'..."
+             sed -i "$header" \
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
+           done
+        ''
+    else null;
+
+  inherit noSysDirs staticCompiler langJava crossStageStatic
+    libcCross crossMingw;
+
+  nativeBuildInputs = [ texinfo which gettext ]
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig);
+
+  buildInputs = [ gmp mpfr libmpc libelf ]
+    ++ (optional (isl != null) isl)
+    ++ (optional (zlib != null) zlib)
+    ++ (optionals langJava [ boehmgc zip unzip ])
+    ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
+    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals langAda [gnatboot])
+    ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
+    ++ (optional stdenv.isDarwin binutils)
+    ;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+
+  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+    export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+    export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+    export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+    export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
+  '';
+
+  dontDisableStatic = true;
+
+  configureFlags = "
+    ${if stdenv.isSunOS then
+      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
+      # On Illumos/Solaris GNU as is preferred
+      " --with-gnu-as --without-gnu-ld "
+      else ""}
+    --enable-lto
+    ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
+    ${if enableShared then "" else "--disable-shared"}
+    ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
+    ${optionalString (isl != null) "--with-isl=${isl}"}
+    ${if langJava then
+      "--with-ecj-jar=${javaEcj} " +
+
+      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
+      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
+      "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre "
+      else ""}
+    ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+    ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
+    --with-gmp=${gmp}
+    --with-mpfr=${mpfr}
+    --with-mpc=${libmpc}
+    ${if libelf != null then "--with-libelf=${libelf}" else ""}
+    --disable-libstdcxx-pch
+    --without-included-gettext
+    --with-system-zlib
+    --enable-static
+    --enable-languages=${
+      concatStrings (intersperse ","
+        (  optional langC        "c"
+        ++ optional langCC       "c++"
+        ++ optional langFortran  "fortran"
+        ++ optional langJava     "java"
+        ++ optional langAda      "ada"
+        ++ optional langVhdl     "vhdl"
+        ++ optional langGo       "go"
+        ++ optional langObjC     "objc"
+        ++ optional langObjCpp   "obj-c++"
+        ++ optionals crossDarwin [ "objc" "obj-c++" ]
+        )
+      )
+    }
+    ${if (stdenv ? glibc && cross == null)
+      then " --with-native-system-header-dir=${stdenv.glibc.dev}/include"
+      else ""}
+    ${if langAda then " --enable-libada" else ""}
+    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
+    ${if cross != null then crossConfigureFlags else ""}
+    ${if !bootstrap then "--disable-bootstrap" else ""}
+    ${if cross == null then platformFlags else ""}
+  ";
+
+  targetConfig = if cross != null then cross.config else null;
+
+  buildFlags = if bootstrap then
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap")
+    else "";
+
+  installTargets =
+    if stripped
+    then "install-strip"
+    else "install";
+
+  crossAttrs = let
+    xgccArch = stdenv.cross.gcc.arch or null;
+    xgccCpu = stdenv.cross.gcc.cpu or null;
+    xgccAbi = stdenv.cross.gcc.abi or null;
+    xgccFpu = stdenv.cross.gcc.fpu or null;
+    xgccFloat = stdenv.cross.gcc.float or null;
+    xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
+    xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
+    xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
+    xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
+    xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
+  in {
+    AR = "${stdenv.cross.config}-ar";
+    LD = "${stdenv.cross.config}-ld";
+    CC = "${stdenv.cross.config}-gcc";
+    CXX = "${stdenv.cross.config}-gcc";
+    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
+    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
+    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
+    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
+    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    # If we are making a cross compiler, cross != null
+    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    dontStrip = true;
+    configureFlags = ''
+      ${if enableMultilib then "" else "--disable-multilib"}
+      ${if enableShared then "" else "--disable-shared"}
+      ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
+      ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+      ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
+      --with-gmp=${gmp.crossDrv}
+      --with-mpfr=${mpfr.crossDrv}
+      --disable-libstdcxx-pch
+      --without-included-gettext
+      --with-system-zlib
+      --enable-languages=${
+        concatStrings (intersperse ","
+          (  optional langC        "c"
+          ++ optional langCC       "c++"
+          ++ optional langFortran  "fortran"
+          ++ optional langJava     "java"
+          ++ optional langAda      "ada"
+          ++ optional langVhdl     "vhdl"
+          ++ optional langGo       "go"
+          )
+        )
+      }
+      ${if langAda then " --enable-libada" else ""}
+      --target=${stdenv.cross.config}
+      ${xwithArch}
+      ${xwithCpu}
+      ${xwithAbi}
+      ${xwithFpu}
+      ${xwithFloat}
+    '';
+    buildFlags = "";
+  };
+
+
+  # Needed for the cross compilation to work
+  AR = "ar";
+  LD = "ld";
+  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";
+
+  # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find
+  # the library headers and binaries, regarless of the language being
+  # compiled.
+
+  # Note: When building the Java AWT GTK+ peer, the build system doesn't
+  # honor `--with-gmp' et al., e.g., when building
+  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just
+  # add them to $CPATH and $LIBRARY_PATH in this case.
+  #
+  # Likewise, the LTO code doesn't find zlib.
+
+  CPATH = concatStrings
+            (intersperse ":" (map (x: x + "/include")
+                                  (optionals (zlib != null) [ zlib ]
+                                   ++ optionals langJava [ boehmgc ]
+                                   ++ optionals javaAwtGtk xlibs
+                                   ++ optionals javaAwtGtk [ gmp mpfr ]
+                                   ++ optional (libpthread != null) libpthread
+                                   ++ optional (libpthreadCross != null) libpthreadCross
+
+                                   # On GNU/Hurd glibc refers to Mach & Hurd
+                                   # headers.
+                                   ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )
+                                        libcCross.propagatedBuildInputs)));
+
+  LIBRARY_PATH = concatStrings
+                   (intersperse ":" (map (x: x + "/lib")
+                                         (optionals (zlib != null) [ zlib ]
+                                          ++ optionals langJava [ boehmgc ]
+                                          ++ optionals javaAwtGtk xlibs
+                                          ++ optionals javaAwtGtk [ gmp mpfr ]
+                                          ++ optional (libpthread != null) libpthread)));
+
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
+    else null;
+
+  EXTRA_TARGET_LDFLAGS =
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
+    else null;
+
+  passthru =
+    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+
+  inherit enableParallelBuilding enableMultilib;
+
+  inherit (stdenv) is64bit;
+
+  meta = {
+    homepage = http://gcc.gnu.org/;
+    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    description = "GNU Compiler Collection, version ${version}"
+      + (if stripped then "" else " (with debugging info)");
+
+    longDescription = ''
+      The GNU Compiler Collection includes compiler front ends for C, C++,
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
+      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+
+      GCC development is a part of the GNU Project, aiming to improve the
+      compiler used in the GNU system including the GNU/Linux variant.
+    '';
+
+    maintainers = with stdenv.lib.maintainers; [ viric simons ];
+
+    # gnatboot is not available out of linux platforms, so we disable the darwin build
+    # for the gnat (ada compiler).
+    platforms =
+      stdenv.lib.platforms.linux ++
+      stdenv.lib.platforms.freebsd ++
+      optionals (langAda == false) stdenv.lib.platforms.darwin;
+  };
+}
+
+// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+  makeFlags = [ "all-gcc" "all-target-libgcc" ];
+  installTargets = "install-gcc install-target-libgcc";
+}
+
+# Strip kills static libs of other archs (hence cross != null)
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+
+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
+)

pkgs/development/compilers/go/1.6.nix

@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
 , perl, which, pkgconfig, patch, fetchpatch
 , pcre
-, Security, Foundation }:
+, Security, Foundation, bash }:
 
 let
   goBootstrap = runCommand "go-bootstrap" {} ''
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
   # I'm not sure what go wants from its 'src', but the go installation manual
   # describes an installation keeping the src.
   preUnpack = ''
+    topdir=$PWD
     mkdir -p $out/share
     cd $out/share
   '';
@@ -92,14 +93,22 @@ stdenv.mkDerivation rec {
     sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
 
     touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+
+    sed -i '1 a\exit 0' misc/cgo/errors/test.bash
+
+    mkdir $topdir/dirtyhacks
+    cat <<EOF > $topdir/dirtyhacks/clang
+    #!${bash}/bin/bash
+    $(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
+    exit $?
+    EOF
+    chmod +x $topdir/dirtyhacks/clang
+    PATH=$topdir/dirtyhacks:$PATH
   '';
 
   patches = [
     ./remove-tools-1.5.patch
-  ]
+  ];
-  # -ldflags=-s is required to compile on Darwin, see
-  # https://github.com/golang/go/issues/11994
-  ++ stdenv.lib.optional stdenv.isDarwin ./strip.patch;
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";
   GOARCH = if stdenv.isDarwin then "amd64"

pkgs/development/compilers/oraclejdk/jdk-linux-base.nix

@@ -106,7 +106,8 @@ let result = stdenv.mkDerivation rec {
       mv $sourceRoot $out
     fi
 
-    for file in $out/*
+    shopt -s extglob
+    for file in $out/!(*src.zip)
     do
       if test -f $file ; then
         rm $file

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

@@ -175,9 +175,6 @@ self: super: {
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
 
-  # The test suite won't even start.
-  darcs = dontCheck super.darcs;
-
   # https://github.com/massysett/rainbox/issues/1
   rainbox = dontCheck super.rainbox;
 
@@ -704,10 +701,6 @@ self: super: {
     then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate
     else super.hmatrix;
 
-  # https://github.com/commercialhaskell/stack/issues/408
-  # https://github.com/commercialhaskell/stack/issues/409
-  stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });
-
   # Hydra no longer allows building texlive packages.
   lhs2tex = dontDistribute super.lhs2tex;
 
@@ -1009,10 +1002,6 @@ self: super: {
   # tinc is a new build driver a la Stack that's not yet available from Hackage.
   tinc = self.callPackage ../tools/haskell/tinc {};
 
-  # Avoid transient build failures because the QuickCheck testsuite cannot
-  # generate enough conclusive test cases.
-  split = dontCheck super.split;
-
   # https://github.com/NixOS/nixpkgs/issues/14967
   yi = markBroken super.yi;
   yi-fuzzy-open = markBroken super.yi-fuzzy-open;

pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix

@@ -203,4 +203,7 @@ self: super: {
   # https://github.com/fpco/stackage/issues/1112
   vector-algorithms = dontCheck super.vector-algorithms;
 
+  # Trigger rebuild to mitigate broken packaes on Hydra.
+  amazonka-core = triggerRebuild super.amazonka-core 1;
+
 }

pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix

@@ -86,6 +86,9 @@ self: super: {
 
   force-layout   = doJailbreak super.force-layout;
 
+  # packaged 0.2.2.6 is missing: base >=4.7 && <4.9
+  freer          = doJailbreak super.freer;
+
   # Partial fixes released in 1.20.5 upstream, full fixes only in git
   linear         = pkgs.haskell.lib.overrideCabal super.linear (oldAttrs: {
     editedCabalFile = null;
@@ -113,6 +116,9 @@ self: super: {
   servant-client = dontCheck (doJailbreak super.servant-client_0_7);
   servant-server = dontCheck (doJailbreak super.servant-server_0_7);
 
+  # packaged shelly 1.6.6 complains: time >=1.3 && <1.6
+  shelly         = doJailbreak super.shelly;
+
   # The essential part is released in 2.1 upstream (needs hackage import)
   singletons     = (pkgs.haskell.lib.overrideCabal super.singletons (oldAttrs: {
     src = pkgs.fetchgit {
@@ -140,15 +146,6 @@ self: super: {
     };
   }));
 
-  # The essential part is released in 0.1.4.1 upstream (needs hackage import)
-  th-reify-many          = doJailbreak (pkgs.haskell.lib.overrideCabal super.th-reify-many (oldAttrs: {
-    src = pkgs.fetchgit {
-            url    = https://github.com/mgsloan/th-reify-many.git;
-            rev    = "699eed232c2ccaf9fb109f131e80ed8d654d6f08";
-            sha256 = "001fvpq039l9wj9v8id7kfjwmp4acf53zr4z6sppdvrv6npzz5yb";
-    };
-  }));
-
   trifecta       = doJailbreak super.trifecta;
 
   turtle         = doJailbreak super.turtle;

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

@@ -105,6 +105,7 @@ package-maintainers:
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
   AWin32Console:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  d3d11binding:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   DirectSound:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9base:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9d3d:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -194,10 +195,12 @@ dont-distribute-packages:
   AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-RnToRm:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   aeson-bson:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  aeson-diff:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   aeson-native:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   aeson-schema:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   aeson-smart:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   AesonBson:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  AFSM:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   afv:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   Agata:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   Agda-executable:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -316,6 +319,8 @@ dont-distribute-packages:
   autonix-deps:                                 [ x86_64-darwin ]
   autoproc:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   avahi:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  avers-api:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  avers-server:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   AvlTree:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   awesomium-glut:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   awesomium-raw:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -476,6 +481,7 @@ dont-distribute-packages:
   BlogLiterately-diagrams:                      [ x86_64-darwin ]
   bloodhound-amazonka-auth:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   bloodhound:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  bloomfilter-redis:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   bloxorz:                                      [ x86_64-darwin ]
   blubber:                                      [ x86_64-darwin ]
   Blueprint:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -666,6 +672,7 @@ dont-distribute-packages:
   cmdargs-browser:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   cmdtheline:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   cmonad:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  cmph:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   cnc-spec-compiler:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   cndict:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   Coadjute:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -682,6 +689,7 @@ dont-distribute-packages:
   collections-api:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   collections-base-instances:                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   collections:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  color-counter:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   coltrane:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   com:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   combinat-diagrams:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -814,6 +822,7 @@ dont-distribute-packages:
   CV:                                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   cyclotomic:                                   [ i686-linux ]
   cypher:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  d-bus:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   DAG-Tournament:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   Dangerous:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   Dao:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1218,6 +1227,7 @@ dont-distribute-packages:
   frag:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   franchise:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   Frank:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  freddy:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   free-game:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   free-operational:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   free-theorems-counterexamples:                [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1305,6 +1315,7 @@ dont-distribute-packages:
   ghc-dup:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   ghc-events-parallel:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   ghc-exactprint:                               [ x86_64-darwin ]
+  ghc-imported-from:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   ghc-pkg-autofix:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   ghc-syb:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   ghc-vis:                                      [ x86_64-darwin ]
@@ -1395,10 +1406,100 @@ dont-distribute-packages:
   goal-probability:                             [ x86_64-darwin ]
   goal-simulation:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   gofer-prelude:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-adexchange-buyer:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-adexchange-seller:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-admin-datatransfer:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-admin-directory:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-admin-emailmigration:                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-admin-reports:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-adsense-host:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-adsense:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-affiliates:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-analytics:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-android-enterprise:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-android-publisher:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-appengine:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-apps-activity:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-apps-calendar:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-apps-licensing:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-apps-reseller:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-apps-tasks:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-appstate:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-autoscaler:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-bigquery:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-billing:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-blogger:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-books:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-civicinfo:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-classroom:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-cloudtrace:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-compute:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-container:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-core:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-customsearch:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-dataflow:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-datastore:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-debugger:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-deploymentmanager:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-dfareporting:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-discovery:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-dns:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-doubleclick-bids:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-doubleclick-search:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-drive:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-fitness:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-fonts:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-freebasesearch:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-fusiontables:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-games-configuration:                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-games-management:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-games:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-genomics:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-gmail:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-groups-migration:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-groups-settings:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-identity-toolkit:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-latencytest:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-logging:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-maps-coordinate:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-maps-engine:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-mirror:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-monitoring:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-oauth2:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-pagespeed:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-partners:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-play-moviespartner:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-plus-domains:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-plus:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-prediction:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-proximitybeacon:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-pubsub:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-qpxexpress:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-replicapool-updater:                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-replicapool:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-resourcemanager:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-resourceviews:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-shopping-content:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-siteverification:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-spectrum:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-sqladmin:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-storage-transfer:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-storage:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-tagmanager:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-taskqueue:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-translate:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-urlshortener:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-useraccounts:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-webmaster-tools:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-youtube-analytics:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-youtube-reporting:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol-youtube:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gogol:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   gooey:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   google-html5-slide:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   google-mail-filters:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   google-search:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  google-translate:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   GoogleDirections:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   googleplus:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   GoogleSB:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1490,6 +1591,7 @@ dont-distribute-packages:
   gtksourceview3:                               [ x86_64-darwin ]
   GtkTV:                                        [ x86_64-darwin ]
   guess-combinator:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  guid:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   GuiHaskell:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   GuiTV:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   gulcii:                                       [ x86_64-darwin ]
@@ -1525,6 +1627,7 @@ dont-distribute-packages:
   hackage2twitter:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   hackernews:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   HackMail:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  hackport:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   hactor:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   haddock-leksah:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   haggis:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1622,6 +1725,7 @@ dont-distribute-packages:
   haskell-ftp:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-gi-base:                              [ i686-linux ]
   haskell-gi:                                   [ i686-linux, x86_64-darwin ]
+  haskell-kubernetes:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-mpfr:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-mpi:                                  [ x86_64-darwin ]
   haskell-names:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1749,6 +1853,7 @@ dont-distribute-packages:
   her-lexer:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   HERA:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   herbalizer:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  heredocs:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   Hermes:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   hermit-syb:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   hermit:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1814,7 +1919,7 @@ dont-distribute-packages:
   hiernotify:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   Hieroglyph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HiggsSet:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
-  higher-leveldb:                               [ x86_64-darwin ]
+  higher-leveldb:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   higherorder:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   highjson:                                     [ i686-linux ]
   highWaterMark:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1961,6 +2066,7 @@ dont-distribute-packages:
   HROOT-math:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   HROOT:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hruby:                                        [ i686-linux ]
+  hs-blake2:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   hs-carbon-examples:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   hs-cdb:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   hs-dotnet:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2177,6 +2283,7 @@ dont-distribute-packages:
   informative:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   inilist:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   inline-c-cpp:                                 [ x86_64-darwin ]
+  inline-java:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   inline-r:                                     [ i686-linux, x86_64-darwin ]
   instant-aeson:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   instant-zipper:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2190,6 +2297,7 @@ dont-distribute-packages:
   interruptible:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   intricacy:                                    [ x86_64-darwin ]
   intset:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  io-capture:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   io-reactive:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   IOR:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   IORefCAS:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2249,6 +2357,7 @@ dont-distribute-packages:
   jsc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   JsContracts:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   jsmw:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
+  json-ast-quickcheck:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   json-b:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   JSON-Combinator-Examples:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   JSON-Combinator:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2390,7 +2499,7 @@ dont-distribute-packages:
   leksah:                                       [ x86_64-darwin ]
   Level0:                                       [ x86_64-darwin ]
   leveldb-haskell-fork:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
-  leveldb-haskell:                              [ x86_64-darwin ]
+  leveldb-haskell:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   levmar-chart:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   levmar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lgtk:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2729,6 +2838,7 @@ dont-distribute-packages:
   nano-md5:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   nanoAgda:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   nanocurses:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  nanovg:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   nanq:                                         [ i686-linux ]
   narc:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   nats-queue:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2933,9 +3043,11 @@ dont-distribute-packages:
   peparser:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   perdure:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   PerfectHash:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  perfecthash:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   perm:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   permute:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   PermuteEffects:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  persistent-database-url:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   persistent-hssqlppp:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   persistent-map:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   persistent-protobuf:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2970,8 +3082,10 @@ dont-distribute-packages:
   pipes-key-value-csv:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   pipes-network-tls:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   pipes-p2p-examples:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
+  pipes-transduce:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   pisigma:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   pit:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  pivotal-tracker:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   pkggraph:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   planar-graph:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   plat:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3057,6 +3171,7 @@ dont-distribute-packages:
   process-listlike:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   process-progress:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   process-qq:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  process-streaming:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   processing:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   procrastinating-structure:                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   procrastinating-variable:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3114,7 +3229,7 @@ dont-distribute-packages:
   quadratic-irrational:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   quantum-arrow:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   qudb:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
-  Quelea:                                       [ x86_64-darwin ]
+  Quelea:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   quenya-verb:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   querystring-pickle:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   queuelike:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3127,6 +3242,7 @@ dont-distribute-packages:
   quickset:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   Quickson:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   quicktest:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  quickwebapp:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   quoridor-hs:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   qux:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   R-pandoc:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3158,7 +3274,7 @@ dont-distribute-packages:
   rcu:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   rdf4h:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   rdioh:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
-  re2:                                          [ x86_64-darwin ]
+  re2:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   reaction-logic:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   reactive-bacon:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3171,6 +3287,7 @@ dont-distribute-packages:
   reactive-thread:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   reactive:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   reactor:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  readshp:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   really-simple-xml-parser:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   reasonable-lens:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   record-aeson:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3320,7 +3437,7 @@ dont-distribute-packages:
   satchmo-funsat:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   satchmo-minisat:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   satchmo-toysat:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
-  satchmo:                                      [ x86_64-darwin ]
+  satchmo:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   SBench:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   sbp:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   scaleimage:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3384,8 +3501,12 @@ dont-distribute-packages:
   seqloc-datafiles:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   sequent-core:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   sequor:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  servant-csharp:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-examples:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-foreign:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  servant-github:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  servant-haxl-client:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  servant-jquery:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-js:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-pool:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   servant-postgresql:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3454,6 +3575,7 @@ dont-distribute-packages:
   sindre:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   sirkel:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   sized:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  sjsp:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   skeleton:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   skulk:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   skype4hs:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3467,6 +3589,7 @@ dont-distribute-packages:
   smartword:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   sme:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   Smooth:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  smsaero:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   smt-lib:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   smtp-mail-ng:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   smtp2mta:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3525,6 +3648,7 @@ dont-distribute-packages:
   SpaceInvaders:                                [ i686-linux ]
   SpacePrivateers:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   spanout:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  sparkle:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   sparse:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   sparsebit:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   sparsecheck:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3581,8 +3705,10 @@ dont-distribute-packages:
   storablevector-streamfusion:                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   storablevector:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  stratosphere:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   stratum-tool:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   stream-fusion:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  stream:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                              [ i686-linux ]
   strict-concurrency:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3669,6 +3795,7 @@ dont-distribute-packages:
   taskpool:                                     [ x86_64-darwin ]
   tasty-groundhog-converters:                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   tasty-integrate:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  tasty-laws:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   TBC:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   TBit:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   tbox:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3677,6 +3804,7 @@ dont-distribute-packages:
   tdd-util:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   teams:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  telegram-api:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   telegram:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   template-default:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   template-haskell-util:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3773,6 +3901,7 @@ dont-distribute-packages:
   transf:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   transformers-convert:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   transformers-runnable:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  transient-universe:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   transient:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   translate:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   traypoweroff:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3782,7 +3911,7 @@ dont-distribute-packages:
   triangulation:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   TrieMap:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   trimpolya:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
-  tripLL:                                       [ x86_64-darwin ]
+  tripLL:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   tropical:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   tsession-happstack:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   tsession:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3837,6 +3966,7 @@ dont-distribute-packages:
   typescript-docs:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   tz:                                           [ x86_64-darwin ]
   uAgda:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
+  uber:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   uberlast:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   uconv:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   udbus-model:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3848,7 +3978,7 @@ dont-distribute-packages:
   unamb-custom:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   unbounded-delays-units:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   unboxed-containers:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
-  unbreak:                                      [ x86_64-darwin ]
+  unbreak:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   unicode-normalization:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   unicoder:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   uniform-io:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3954,6 +4084,8 @@ dont-distribute-packages:
   wai-middleware-preprocessor:                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   wai-middleware-route:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   wai-middleware-static-caching:                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  wai-predicates:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
+  wai-routing:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   wai-session-tokyocabinet:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   wai-static-cache:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   wai-thrift:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -4003,6 +4135,7 @@ dont-distribute-packages:
   winerror:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   winio:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   Wired:                                        [ x86_64-darwin ]
+  wkt:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   WL500gPControl:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   wlc-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WMSigner:                                     [ i686-linux ]
@@ -4119,6 +4252,7 @@ dont-distribute-packages:
   yesod-comments:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   yesod-content-pdf:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   yesod-continuations:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  yesod-crud:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   yesod-datatables:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   yesod-examples:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   yesod-goodies:                                [ i686-linux, x86_64-darwin, x86_64-linux ]

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

@@ -2673,6 +2673,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3577,6 +3578,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_2";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3982,6 +3984,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -6010,6 +6013,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7061,6 +7065,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2673,6 +2673,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3577,6 +3578,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_2";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3982,6 +3984,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -6010,6 +6013,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7061,6 +7065,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2673,6 +2673,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3577,6 +3578,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_2";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3982,6 +3984,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -6010,6 +6013,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7061,6 +7065,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2673,6 +2673,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3577,6 +3578,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_2";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3982,6 +3984,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -6010,6 +6013,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7061,6 +7065,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2673,6 +2673,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3576,6 +3577,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_2";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3979,6 +3981,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -6007,6 +6010,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7058,6 +7062,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2673,6 +2673,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3576,6 +3577,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_2";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3979,6 +3981,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -6007,6 +6010,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7058,6 +7062,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2672,6 +2672,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3575,6 +3576,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3978,6 +3980,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -6005,6 +6008,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7056,6 +7060,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2672,6 +2672,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3575,6 +3576,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3978,6 +3980,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -6005,6 +6008,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7056,6 +7060,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2665,6 +2665,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3567,6 +3568,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3969,6 +3971,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5996,6 +5999,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7047,6 +7051,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2663,6 +2663,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3564,6 +3565,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3966,6 +3968,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5989,6 +5992,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7040,6 +7044,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2659,6 +2659,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3555,6 +3556,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3956,6 +3958,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5972,6 +5975,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7020,6 +7024,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2659,6 +2659,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3554,6 +3555,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3955,6 +3957,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5968,6 +5971,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7016,6 +7020,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2659,6 +2659,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3554,6 +3555,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3955,6 +3957,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5967,6 +5970,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7015,6 +7019,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2659,6 +2659,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3554,6 +3555,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3954,6 +3956,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5966,6 +5969,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7014,6 +7018,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2656,6 +2656,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3551,6 +3552,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3951,6 +3953,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5963,6 +5966,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7010,6 +7014,7 @@ self: super: {
   "quicklz" = dontDistribute super."quicklz";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2653,6 +2653,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3547,6 +3548,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3947,6 +3949,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5959,6 +5962,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7003,6 +7007,7 @@ self: super: {
   "quicklz" = dontDistribute super."quicklz";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2661,6 +2661,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3561,6 +3562,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3963,6 +3965,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5986,6 +5989,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7036,6 +7040,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2660,6 +2660,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3559,6 +3560,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3961,6 +3963,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5983,6 +5986,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7032,6 +7036,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2659,6 +2659,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3558,6 +3559,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3960,6 +3962,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5982,6 +5985,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7031,6 +7035,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";

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

@@ -2659,6 +2659,7 @@ self: super: {
   "debug-diff" = dontDistribute super."debug-diff";
   "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
+  "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3558,6 +3559,7 @@ self: super: {
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
   "ghcid" = doDistribute super."ghcid_0_3_4";
+  "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3960,6 +3962,7 @@ self: super: {
   "hackage-diff" = dontDistribute super."hackage-diff";
   "hackage-mirror" = dontDistribute super."hackage-mirror";
   "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-processing" = dontDistribute super."hackage-processing";
   "hackage-proxy" = dontDistribute super."hackage-proxy";
   "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
   "hackage-security" = dontDistribute super."hackage-security";
@@ -5977,6 +5980,7 @@ self: super: {
   "monad-skeleton" = dontDistribute super."monad-skeleton";
   "monad-state" = dontDistribute super."monad-state";
   "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-ste" = dontDistribute super."monad-ste";
   "monad-stlike-io" = dontDistribute super."monad-stlike-io";
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-stm" = dontDistribute super."monad-stm";
@@ -7026,6 +7030,7 @@ self: super: {
   "quickpull" = doDistribute super."quickpull_0_4_0_0";
   "quickset" = dontDistribute super."quickset";
   "quickspec" = dontDistribute super."quickspec";
+  "quickterm" = dontDistribute super."quickterm";
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";